From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 16 Jul 2019 02:48:27 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v5.2.2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6e7fa96910ca3e74b5a328b795cd1e50d1bdef3;p=thirdparty%2Fkernel%2Fstable-queue.git

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

Merge with Sasha's changes

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

e6e7fa96910ca3e74b5a328b795cd1e50d1bdef3
diff --cc queue-4.9/series
index 6676667d9bd,1d4af95b0b0..4dfc20b67a8
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@@ -40,4 -40,10 +40,11 @@@ mips-remove-superfluous-check-for-__lin
  revert-e1000e-fix-cyclic-resets-at-link-up-with-active-tx.patch
  e1000e-start-network-tx-queue-only-when-link-is-up.patch
  nilfs2-do-not-use-unexported-cpu_to_le32-le32_to_cpu-in-uapi-header.patch
 +arm64-crypto-remove-accidentally-backported-files.patch
+ perf-core-fix-perf_sample_regs_user-mm-check.patch
+ arm-omap2-remove-incorrect-__init-annotation.patch
+ be2net-fix-link-failure-after-ethtool-offline-test.patch
+ ppp-mppe-add-softdep-to-arc4.patch
+ sis900-fix-tx-completion.patch
+ arm-dts-imx6ul-fix-pwm-1-4-interrupts.patch
+ dm-verity-use-message-limit-for-data-block-corruptio.patch