From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 24 Mar 2020 08:03:13 +0000 (+0100)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v4.19.113~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=878d528e79efd910fe205f833fb8b83c5e9e39e0;p=thirdparty%2Fkernel%2Fstable-queue.git

Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue
---

878d528e79efd910fe205f833fb8b83c5e9e39e0
diff --cc queue-4.14/series
index 803245dfe89,86eff6d2779..26ef0139bdc
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@@ -42,5 -42,5 +42,7 @@@ usb-cdc-acm-fix-rounding-error-in-tiocs
  iio-adc-at91-sama5d2_adc-fix-channel-configuration-f.patch
  iio-adc-at91-sama5d2_adc-fix-differential-channels-i.patch
  kbuild-disable-wpointer-to-enum-cast.patch
 +futex-fix-inode-life-time-issue.patch
 +futex-unbreak-futex-hashing.patch
+ revert-vrf-mark-skb-for-multicast-or-link-local-as-e.patch
+ revert-ipv6-fix-handling-of-lla-with-vrf-and-sockets.patch
diff --cc queue-4.19/series
index eda37e2c552,b017b0c0ef8..ecc81ccd31b
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@@ -53,5 -53,5 +53,7 @@@ usb-cdc-acm-fix-close_delay-and-closing
  usb-cdc-acm-fix-rounding-error-in-tiocsserial.patch
  iio-light-vcnl4000-update-sampling-periods-for-vcnl4.patch
  kbuild-disable-wpointer-to-enum-cast.patch
 +futex-fix-inode-life-time-issue.patch
 +futex-unbreak-futex-hashing.patch
+ revert-vrf-mark-skb-for-multicast-or-link-local-as-e.patch
+ revert-ipv6-fix-handling-of-lla-with-vrf-and-sockets.patch