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

diff --cc queue-4.4/series
index d40677b66f83747ba93c169f2796933b99cb0aef,0d9266129c82a79dbd07a0a480fe69b49d2cbc58..021b454d24e85994768795eee1ab00ea810f083c
--- 1/queue-4.4/series
--- 2/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 9e01bddf6f8de96ff3e4d516c90a03af0ec1fb50,1c9bb7c59b11795ba467c90c70384f0ff7ef3ee7..d900ac43fc085000caf8a73f3fb1bad5eadb6bbd
--- 1/queue-4.9/series
--- 2/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