From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 24 Jun 2019 06:27:01 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v5.1.15~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd3bf0a12237a23a0563718cacad6b9d8626e6ee;p=thirdparty%2Fkernel%2Fstable-queue.git

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

Handle merge conflict in series files between me and Sasha
---

dd3bf0a12237a23a0563718cacad6b9d8626e6ee
diff --cc queue-4.14/series
index 775fd312eb2,e3436d1f836..c8334f5080b
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@@ -9,9 -9,30 +9,36 @@@ ib-hfi1-silence-txreq-allocation-warnin
  input-synaptics-enable-smbus-on-thinkpad-e480-and-e580.patch
  input-uinput-add-compat-ioctl-number-translation-for-ui_-_ff_upload.patch
  apparmor-enforce-nullbyte-at-end-of-tag-string.patch
+ arc-fix-build-warnings.patch
+ arc-plat-hsdk-add-missing-multicast-filter-bins-numb.patch
+ arc-plat-hsdk-add-missing-fifo-size-entry-in-gmac-no.patch
+ parport-fix-mem-leak-in-parport_register_dev_model.patch
+ parisc-fix-compiler-warnings-in-float-emulation-code.patch
+ ib-rdmavt-fix-alloc_qpn-warn_on.patch
+ ib-hfi1-insure-freeze_work-work_struct-is-canceled-o.patch
+ ib-qib-hfi1-rdmavt-correct-ibv_devinfo-max_mr-value.patch
+ ib-hfi1-validate-page-aligned-for-a-given-virtual-ad.patch
+ mips-uprobes-remove-set-but-not-used-variable-epc.patch
+ xtensa-fix-section-mismatch-between-memblock_reserve.patch
+ net-dsa-mv88e6xxx-avoid-error-message-on-remove-from.patch
+ net-hns-fix-loopback-test-failed-at-copper-ports.patch
+ mdesc-fix-a-missing-check-bug-in-get_vdev_port_node_.patch
+ sparc-perf-fix-updated-event-period-in-response-to-p.patch
+ net-ethernet-mediatek-use-hw_feature-to-judge-if-hwl.patch
+ net-ethernet-mediatek-use-net_ip_align-to-judge-if-h.patch
+ drm-arm-hdlcd-actually-validate-crtc-modes.patch
+ drm-arm-hdlcd-allow-a-bit-of-clock-tolerance.patch
+ scripts-checkstack.pl-fix-arm64-wrong-or-unknown-arc.patch
+ scsi-ufs-check-that-space-was-properly-alloced-in-co.patch
+ scsi-smartpqi-unlock-on-error-in-pqi_submit_raid_req.patch
+ net-ipvlan-fix-ipvlan-device-tso-disabled-while-neti.patch
+ s390-qeth-fix-vlan-attribute-in-bridge_hostnotify-ud.patch
+ hwmon-core-add-thermal-sensors-only-if-dev-of_node-i.patch
+ hwmon-pmbus-core-treat-parameters-as-paged-if-on-mul.patch
+ nvme-fix-u32-overflow-in-the-number-of-namespace-lis.patch
 +btrfs-start-readahead-also-in-seed-devices.patch
 +can-flexcan-fix-timeout-when-set-small-bitrate.patch
 +can-purge-socket-error-queue-on-sock-destruct.patch
 +powerpc-bpf-use-unsigned-division-instruction-for-64-bit-operations.patch
 +arm-imx-cpuidle-imx6sx-restrict-the-sw2iso-increase-to-i.mx6sx.patch
 +arm-dts-am57xx-idk-remove-support-for-voltage-switching-for-sd-card.patch
diff --cc queue-4.19/series
index 0a53577cc26,e2bc30cc277..bb0bbda6177
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@@ -27,15 -27,41 +27,53 @@@ apparmor-fix-profile_mediates-for-untru
  apparmor-enforce-nullbyte-at-end-of-tag-string.patch
  brcmfmac-sdio-disable-auto-tuning-around-commands-expected-to-fail.patch
  brcmfmac-sdio-don-t-tune-while-the-card-is-off.patch
+ arc-fix-build-warnings.patch
+ dmaengine-dw-axi-dmac-fix-null-dereference-when-poin.patch
+ dmaengine-sprd-fix-block-length-overflow.patch
+ arc-plat-hsdk-add-missing-multicast-filter-bins-numb.patch
+ arc-plat-hsdk-add-missing-fifo-size-entry-in-gmac-no.patch
+ fpga-dfl-afu-pass-the-correct-device-to-dma_mapping_.patch
+ fpga-dfl-add-lockdep-classes-for-pdata-lock.patch
+ parport-fix-mem-leak-in-parport_register_dev_model.patch
+ parisc-fix-compiler-warnings-in-float-emulation-code.patch
+ ib-rdmavt-fix-alloc_qpn-warn_on.patch
+ ib-hfi1-insure-freeze_work-work_struct-is-canceled-o.patch
+ ib-qib-hfi1-rdmavt-correct-ibv_devinfo-max_mr-value.patch
+ ib-hfi1-validate-page-aligned-for-a-given-virtual-ad.patch
+ mips-uprobes-remove-set-but-not-used-variable-epc.patch
+ xtensa-fix-section-mismatch-between-memblock_reserve.patch
+ kselftest-cgroup-fix-unexpected-testing-failure-on-t.patch
+ kselftest-cgroup-fix-unexpected-testing-failure-on-t.patch-1010
+ kselftest-cgroup-fix-incorrect-test_core-skip.patch
+ selftests-vm-install-test_vmalloc.sh-for-run_vmtests.patch
+ net-dsa-mv88e6xxx-avoid-error-message-on-remove-from.patch
+ net-hns-fix-loopback-test-failed-at-copper-ports.patch
+ mdesc-fix-a-missing-check-bug-in-get_vdev_port_node_.patch
+ sparc-perf-fix-updated-event-period-in-response-to-p.patch
+ net-ethernet-mediatek-use-hw_feature-to-judge-if-hwl.patch
+ net-ethernet-mediatek-use-net_ip_align-to-judge-if-h.patch
+ drm-arm-mali-dp-add-a-loop-around-the-second-set-cva.patch
+ drm-arm-hdlcd-actually-validate-crtc-modes.patch
+ drm-arm-hdlcd-allow-a-bit-of-clock-tolerance.patch
+ nvmet-fix-data_len-to-0-for-bdev-backed-write_zeroes.patch
+ scripts-checkstack.pl-fix-arm64-wrong-or-unknown-arc.patch
+ scsi-ufs-check-that-space-was-properly-alloced-in-co.patch
+ scsi-smartpqi-unlock-on-error-in-pqi_submit_raid_req.patch
+ net-ipvlan-fix-ipvlan-device-tso-disabled-while-neti.patch
+ s390-qeth-fix-vlan-attribute-in-bridge_hostnotify-ud.patch
+ hwmon-core-add-thermal-sensors-only-if-dev-of_node-i.patch
+ hwmon-pmbus-core-treat-parameters-as-paged-if-on-mul.patch
+ arm64-silence-gcc-warnings-about-arch-abi-drift.patch
+ nvme-fix-u32-overflow-in-the-number-of-namespace-lis.patch
 +btrfs-start-readahead-also-in-seed-devices.patch
 +can-xilinx_can-use-correct-bittiming_const-for-can-fd-core.patch
 +can-flexcan-fix-timeout-when-set-small-bitrate.patch
 +can-purge-socket-error-queue-on-sock-destruct.patch
 +riscv-mm-synchronize-mmu-after-pte-change.patch
 +powerpc-bpf-use-unsigned-division-instruction-for-64-bit-operations.patch
 +arm-imx-cpuidle-imx6sx-restrict-the-sw2iso-increase-to-i.mx6sx.patch
 +arm-dts-dra76x-update-mmc2_hs200_manual1-iodelay-values.patch
 +arm-dts-am57xx-idk-remove-support-for-voltage-switching-for-sd-card.patch
 +arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uapi-linux-prctl.h.patch
 +arm64-ssbd-explicitly-depend-on-linux-prctl.h.patch
 +drm-vmwgfx-use-the-backdoor-port-if-the-hb-port-is-not-available.patch
diff --cc queue-4.4/series
index afa3def8158,366be9edb68..1f03322bdf8
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@@ -3,8 -3,13 +3,18 @@@ gcc-9-silence-address-of-packed-member-
  usb-chipidea-udc-workaround-for-endpoint-conflict-issue.patch
  input-uinput-add-compat-ioctl-number-translation-for-ui_-_ff_upload.patch
  apparmor-enforce-nullbyte-at-end-of-tag-string.patch
+ parport-fix-mem-leak-in-parport_register_dev_model.patch
+ parisc-fix-compiler-warnings-in-float-emulation-code.patch
+ ib-hfi1-insure-freeze_work-work_struct-is-canceled-o.patch
+ mips-uprobes-remove-set-but-not-used-variable-epc.patch
+ net-hns-fix-loopback-test-failed-at-copper-ports.patch
+ sparc-perf-fix-updated-event-period-in-response-to-p.patch
+ scripts-checkstack.pl-fix-arm64-wrong-or-unknown-arc.patch
+ scsi-ufs-check-that-space-was-properly-alloced-in-co.patch
+ s390-qeth-fix-vlan-attribute-in-bridge_hostnotify-ud.patch
+ hwmon-pmbus-core-treat-parameters-as-paged-if-on-mul.patch
 +btrfs-fix-race-between-readahead-and-device-replace-removal.patch
 +btrfs-start-readahead-also-in-seed-devices.patch
 +can-flexcan-fix-timeout-when-set-small-bitrate.patch
 +can-purge-socket-error-queue-on-sock-destruct.patch
 +arm-imx-cpuidle-imx6sx-restrict-the-sw2iso-increase-to-i.mx6sx.patch
diff --cc queue-4.9/series
index eb6e8603b89,47eeb1081c0..68c6391afad
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@@ -5,8 -5,21 +5,26 @@@ usb-chipidea-udc-workaround-for-endpoin
  ib-hfi1-silence-txreq-allocation-warnings.patch
  input-uinput-add-compat-ioctl-number-translation-for-ui_-_ff_upload.patch
  apparmor-enforce-nullbyte-at-end-of-tag-string.patch
+ arc-fix-build-warnings-with-config_kprobes.patch
+ parport-fix-mem-leak-in-parport_register_dev_model.patch
+ parisc-fix-compiler-warnings-in-float-emulation-code.patch
+ ib-rdmavt-fix-alloc_qpn-warn_on.patch
+ ib-hfi1-insure-freeze_work-work_struct-is-canceled-o.patch
+ ib-qib-hfi1-rdmavt-correct-ibv_devinfo-max_mr-value.patch
+ mips-uprobes-remove-set-but-not-used-variable-epc.patch
+ net-dsa-mv88e6xxx-avoid-error-message-on-remove-from.patch
+ net-hns-fix-loopback-test-failed-at-copper-ports.patch
+ sparc-perf-fix-updated-event-period-in-response-to-p.patch
+ net-ethernet-mediatek-use-hw_feature-to-judge-if-hwl.patch
+ net-ethernet-mediatek-use-net_ip_align-to-judge-if-h.patch
+ drm-arm-hdlcd-allow-a-bit-of-clock-tolerance.patch
+ scripts-checkstack.pl-fix-arm64-wrong-or-unknown-arc.patch
+ scsi-ufs-check-that-space-was-properly-alloced-in-co.patch
+ s390-qeth-fix-vlan-attribute-in-bridge_hostnotify-ud.patch
+ hwmon-pmbus-core-treat-parameters-as-paged-if-on-mul.patch
+ nvme-fix-u32-overflow-in-the-number-of-namespace-lis.patch
 +btrfs-start-readahead-also-in-seed-devices.patch
 +can-flexcan-fix-timeout-when-set-small-bitrate.patch
 +can-purge-socket-error-queue-on-sock-destruct.patch
 +powerpc-bpf-use-unsigned-division-instruction-for-64-bit-operations.patch
 +arm-imx-cpuidle-imx6sx-restrict-the-sw2iso-increase-to-i.mx6sx.patch
diff --cc queue-5.1/series
index 09140694563,0f11383f34c..de85aeb5764
--- a/queue-5.1/series
+++ b/queue-5.1/series
@@@ -28,19 -28,64 +28,80 @@@ apparmor-reset-pos-on-failure-to-unpack
  revert-brcmfmac-disable-command-decode-in-sdio_aos.patch
  brcmfmac-sdio-disable-auto-tuning-around-commands-expected-to-fail.patch
  brcmfmac-sdio-don-t-tune-while-the-card-is-off.patch
+ lkdtm-usercopy-moves-the-kernel_ds-test-to-non-canon.patch
+ arc-fix-build-warnings.patch
+ dmaengine-jz4780-fix-transfers-being-acked-too-soon.patch
+ dmaengine-dw-axi-dmac-fix-null-dereference-when-poin.patch
+ dmaengine-mediatek-cqdma-sleeping-in-atomic-context.patch
+ dmaengine-sprd-fix-the-possible-crash-when-getting-d.patch
+ dmaengine-sprd-add-validation-of-current-descriptor-.patch
+ dmaengine-sprd-fix-the-incorrect-start-for-2-stage-d.patch
+ dmaengine-sprd-fix-block-length-overflow.patch
+ dmaengine-sprd-fix-the-right-place-to-configure-2-st.patch
+ arc-plat-hsdk-add-missing-multicast-filter-bins-numb.patch
+ arc-plat-hsdk-add-missing-fifo-size-entry-in-gmac-no.patch
+ mips-mark-ginvt-as-__always_inline.patch
+ fpga-stratix10-soc-fix-use-after-free-on-s10_init.patch
+ fpga-dfl-afu-pass-the-correct-device-to-dma_mapping_.patch
+ fpga-dfl-add-lockdep-classes-for-pdata-lock.patch
+ parport-fix-mem-leak-in-parport_register_dev_model.patch
+ parisc-fix-compiler-warnings-in-float-emulation-code.patch
+ habanalabs-fix-bug-in-checking-huge-page-optimizatio.patch
+ ib-rdmavt-fix-alloc_qpn-warn_on.patch
+ ib-hfi1-insure-freeze_work-work_struct-is-canceled-o.patch
+ ib-qib-hfi1-rdmavt-correct-ibv_devinfo-max_mr-value.patch
+ ib-hfi1-validate-page-aligned-for-a-given-virtual-ad.patch
+ mips-uprobes-remove-set-but-not-used-variable-epc.patch
+ crypto-hmac-fix-memory-leak-in-hmac_init_tfm.patch
+ xtensa-fix-section-mismatch-between-memblock_reserve.patch
+ kselftest-cgroup-fix-unexpected-testing-failure-on-t.patch
+ kselftest-cgroup-fix-unexpected-testing-failure-on-t.patch-32330
+ kselftest-cgroup-fix-incorrect-test_core-skip.patch
+ userfaultfd-selftest-fix-compiler-warning.patch
+ selftests-vm-install-test_vmalloc.sh-for-run_vmtests.patch
+ nds32-avoid-iex-status-being-incorrectly-modified.patch
+ net-dsa-mv88e6xxx-avoid-error-message-on-remove-from.patch
+ net-hns-fix-loopback-test-failed-at-copper-ports.patch
+ mdesc-fix-a-missing-check-bug-in-get_vdev_port_node_.patch
+ sparc-perf-fix-updated-event-period-in-response-to-p.patch
+ net-ethernet-mediatek-use-hw_feature-to-judge-if-hwl.patch
+ net-ethernet-mediatek-use-net_ip_align-to-judge-if-h.patch
+ selftests-set-sysctl-bc_forwarding-properly-in-route.patch
+ drm-arm-mali-dp-add-a-loop-around-the-second-set-cva.patch
+ drm-arm-hdlcd-actually-validate-crtc-modes.patch
+ drm-arm-hdlcd-allow-a-bit-of-clock-tolerance.patch
+ nvmet-fix-data_len-to-0-for-bdev-backed-write_zeroes.patch
+ kbuild-tar-pkg-enable-communication-with-jobserver.patch
+ scripts-checkstack.pl-fix-arm64-wrong-or-unknown-arc.patch
+ net-phylink-avoid-reducing-support-mask.patch
+ scsi-ufs-check-that-space-was-properly-alloced-in-co.patch
+ scsi-smartpqi-unlock-on-error-in-pqi_submit_raid_req.patch
+ net-ipvlan-fix-ipvlan-device-tso-disabled-while-neti.patch
+ udmabuf-actually-unmap-the-scatterlist.patch
+ tests-fix-pidfd-test-compilation.patch
+ s390-qeth-handle-limited-ipv4-broadcast-in-l3-tx-pat.patch
+ s390-qeth-check-dst-entry-before-use.patch
+ s390-qeth-fix-vlan-attribute-in-bridge_hostnotify-ud.patch
+ hwmon-core-add-thermal-sensors-only-if-dev-of_node-i.patch
+ hwmon-pmbus-core-treat-parameters-as-paged-if-on-mul.patch
+ arm64-silence-gcc-warnings-about-arch-abi-drift.patch
+ nvme-fix-u32-overflow-in-the-number-of-namespace-lis.patch
+ ovl-detect-overlapping-layers.patch
+ ovl-don-t-fail-with-disconnected-lower-nfs.patch
+ ovl-fix-bogus-wmaybe-unitialized-warning.patch
 +btrfs-start-readahead-also-in-seed-devices.patch
 +can-xilinx_can-use-correct-bittiming_const-for-can-fd-core.patch
 +can-flexcan-fix-timeout-when-set-small-bitrate.patch
 +can-purge-socket-error-queue-on-sock-destruct.patch
 +riscv-mm-synchronize-mmu-after-pte-change.patch
 +powerpc-bpf-use-unsigned-division-instruction-for-64-bit-operations.patch
 +arm-imx-cpuidle-imx6sx-restrict-the-sw2iso-increase-to-i.mx6sx.patch
 +arm-mvebu_v7_defconfig-fix-ethernet-on-clearfog.patch
 +arm-dts-dra76x-update-mmc2_hs200_manual1-iodelay-values.patch
 +arm-dts-am57xx-idk-remove-support-for-voltage-switching-for-sd-card.patch
 +arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uapi-linux-prctl.h.patch
 +arm64-ssbd-explicitly-depend-on-linux-prctl.h.patch
 +kvm-x86-mmu-allocate-pae-root-array-when-using-svm-s-32-bit-npt.patch
 +ovl-make-i_ino-consistent-with-st_ino-in-more-cases.patch
 +drm-vmwgfx-use-the-backdoor-port-if-the-hb-port-is-not-available.patch
 +drm-i915-don-t-clobber-m-n-values-during-fastset-check.patch