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

diff --cc queue-4.14/series
index 803245dfe89485bccd1a456307e93e810b878ac1,86eff6d27794eb5dab1440db5fc2fe465cbec2c9..26ef0139bdc77b02f15598027b39fa080effb183
--- 1/queue-4.14/series
--- 2/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 eda37e2c552c60d3a2578d632288b375865d4675,b017b0c0ef8398bfa1656e0e7a50c89d06786746..ecc81ccd31b70cfd8b6ec2613a1803221a896f8e
--- 1/queue-4.19/series
--- 2/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

diff --cc queue-5.5/series
Simple merge