From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 5 Jul 2020 14:07:29 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v4.4.230~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63ff7bd58220fa626ea09da5934d0180e1202b27;p=thirdparty%2Fkernel%2Fstable-queue.git

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

63ff7bd58220fa626ea09da5934d0180e1202b27
diff --cc queue-4.4/series
index d40677b66f8,0d9266129c8..021b454d24e
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@@ -5,5 -5,4 +5,6 @@@ edac-amd64-read-back-the-scrub-rate-pci
  mm-slub-fix-stack-overruns-with-slub_stats.patch
  usb-usbtest-fix-missing-kfree-dev-buf-in-usbtest_dis.patch
  kgdb-avoid-suspicious-rcu-usage-warning.patch
 +tpm_tis-remove-the-hid-ifx0102.patch
 +crypto-af_alg-fix-use-after-free-in-af_alg_accept-due-to-bh_lock_sock.patch
+ sched-rt-show-the-sched_rr_timeslice-sched_rr-timesl.patch
diff --cc queue-4.9/series
index 9e01bddf6f8,1c9bb7c59b1..d900ac43fc0
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@@ -8,5 -8,4 +8,6 @@@ mm-slub.c-fix-corrupted-freechain-in-de
  mm-slub-fix-stack-overruns-with-slub_stats.patch
  usb-usbtest-fix-missing-kfree-dev-buf-in-usbtest_dis.patch
  kgdb-avoid-suspicious-rcu-usage-warning.patch
 +tpm_tis-remove-the-hid-ifx0102.patch
 +crypto-af_alg-fix-use-after-free-in-af_alg_accept-due-to-bh_lock_sock.patch
+ sched-rt-show-the-sched_rr_timeslice-sched_rr-timesl.patch