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

diff --cc queue-4.19/series
index 14fdbd643ee7747dcd757c0db7e08f7781dc53ef,6ee09f37966dab903c53e9933b037c1653f89ce2..f558376efca60106a83bdf321811f71c5dad9c5f
--- 1/queue-4.19/series
--- 2/queue-4.19/series
+++ b/queue-4.19/series
@@@ -45,4 -45,6 +45,6 @@@ efi-sysfb_efi-add-quirk-for-lenovo-yoga
  verify_pefile-relax-wrapper-length-check.patch
  scsi-ses-handle-enclosure-with-just-a-primary-component-gracefully.patch
  x86-pci-add-quirk-for-amd-xhci-controller-that-loses-msi-x-state-in-d3hot.patch
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.patch
 +ubi-fix-failure-attaching-when-vid_hdr-offset-equals-to-sub-page-size.patch
+ mtd-ubi-wl-fix-a-couple-of-kernel-doc-issues.patch
+ ubi-fix-deadlock-caused-by-recursively-holding-work_.patch

diff --cc queue-5.10/series
index 8c9aa3c7fa4b9f9ee3798d1bdb8df6c83bd32dd7,1bfc575cee3062395788e4c459220992e83721bf..aff95ea84ff567783d663e3488a35084390ae6db
--- 1/queue-5.10/series
--- 2/queue-5.10/series
+++ b/queue-5.10/series
@@@ -95,4 -95,16 +95,16 @@@ net-sfp-initialize-sfp-i2c_block_size-a
  scsi-ses-handle-enclosure-with-just-a-primary-component-gracefully.patch
  x86-pci-add-quirk-for-amd-xhci-controller-that-loses-msi-x-state-in-d3hot.patch
  cgroup-cpuset-wake-up-cpuset_attach_wq-tasks-in-cpuset_cancel_attach.patch
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.patch
 +ubi-fix-failure-attaching-when-vid_hdr-offset-equals-to-sub-page-size.patch
+ mtd-ubi-wl-fix-a-couple-of-kernel-doc-issues.patch
+ ubi-fix-deadlock-caused-by-recursively-holding-work_.patch
+ powerpc-pseries-rename-min_common_depth-to-primary_d.patch
+ powerpc-pseries-rename-type1_affinity-to-form1_affin.patch
+ powerpc-pseries-consolidate-different-numa-distance-.patch
+ powerpc-pseries-add-a-helper-for-form1-cpu-distance.patch
+ powerpc-pseries-add-support-for-form2-associativity.patch
+ powerpc-papr_scm-update-the-numa-distance-table-for-.patch
+ sched-fair-move-calculate-of-avg_load-to-a-better-lo.patch
+ sched-fair-fix-imbalance-overflow.patch
+ x86-rtc-remove-__init-for-runtime-functions.patch
+ i2c-ocores-generate-stop-condition-after-timeout-in-.patch

diff --cc queue-5.15/series
index 34b105a265dcec418a764bb998ce53f9a7ad8681,d1306f14a30b5e126d0131af73678e06c1f9b882..ce481490f0f2fdb0953c460c85eabdb4c3f6f213
--- 1/queue-5.15/series
--- 2/queue-5.15/series
+++ b/queue-5.15/series
@@@ -64,4 -64,22 +64,22 @@@ x86-pci-add-quirk-for-amd-xhci-controll
  cgroup-cpuset-wake-up-cpuset_attach_wq-tasks-in-cpuset_cancel_attach.patch
  mptcp-use-mptcp_schedule_work-instead-of-open-coding-it.patch
  mptcp-stricter-state-check-in-mptcp_worker.patch
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.patch
 +ubi-fix-failure-attaching-when-vid_hdr-offset-equals-to-sub-page-size.patch
+ ubi-fix-deadlock-caused-by-recursively-holding-work_.patch
+ powerpc-papr_scm-update-the-numa-distance-table-for-.patch
+ sched-fair-move-calculate-of-avg_load-to-a-better-lo.patch
+ sched-fair-fix-imbalance-overflow.patch
+ x86-rtc-remove-__init-for-runtime-functions.patch
+ i2c-ocores-generate-stop-condition-after-timeout-in-.patch
+ sh-remove-meaningless-archclean-line.patch
+ kbuild-use-more-subdir-for-visiting-subdirectories-w.patch
+ purgatory-fix-disabling-debug-info.patch
+ nvme-pci-add-nvme_quirk_bogus_nid-for-adata-xpg-gamm.patch
+ nvme-pci-avoid-the-deepest-sleep-state-on-zhitai-tip.patch
+ nvme-pci-crucial-p2-has-bogus-namespace-ids.patch
+ nvme-pci-add-nvme_quirk_bogus_nid-for-lexar-nm610.patch
+ nvme-pci-add-nvme_quirk_bogus_nid-for-lexar-nm760.patch
+ nvme-pci-mark-lexar-nm760-as-ignore_dev_subnqn.patch
+ nvme-pci-add-nvme_quirk_bogus_nid-for-t-force-z330-s.patch
+ cgroup-cpuset-skip-spread-flags-update-on-v2.patch
+ cgroup-cpuset-make-cpuset_fork-handle-clone_into_cgr.patch

diff --cc queue-5.4/series
index 40e88282a92d11389e3da02b7a16041a5246ffbc,5d203e1804498284948b3bf68841c2749a3243d9..903c7ba2d6efd8a176ab71e4f466bade7640c1b9
--- 1/queue-5.4/series
--- 2/queue-5.4/series
+++ b/queue-5.4/series
@@@ -67,4 -67,7 +67,7 @@@ efi-sysfb_efi-add-quirk-for-lenovo-yoga
  drm-panel-orientation-quirks-add-quirk-for-lenovo-yo.patch
  verify_pefile-relax-wrapper-length-check.patch
  asymmetric_keys-log-on-fatal-failures-in-pe-pkcs7.patch
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.patch
 +ubi-fix-failure-attaching-when-vid_hdr-offset-equals-to-sub-page-size.patch
+ mtd-ubi-wl-fix-a-couple-of-kernel-doc-issues.patch
+ ubi-fix-deadlock-caused-by-recursively-holding-work_.patch
+ i2c-ocores-generate-stop-condition-after-timeout-in-.patch

diff --cc queue-6.1/series
index e42ba3f96c137c740f5dbafdaa886fd9df068d7a,2c77aa0729628c8d74d16715c2f20a81928de865..ffcc68c3fb98b5c5c080c5bae5ae1088090d21d0
--- 1/queue-6.1/series
--- 2/queue-6.1/series
+++ b/queue-6.1/series
@@@ -115,4 -115,20 +115,20 @@@ drm-amd-pm-correct-smu13.0.7-pstate-pro
  drm-amd-pm-correct-smu13.0.7-max-shader-clock-reporting.patch
  mptcp-use-mptcp_schedule_work-instead-of-open-coding-it.patch
  mptcp-stricter-state-check-in-mptcp_worker.patch
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.patch
 +ubi-fix-failure-attaching-when-vid_hdr-offset-equals-to-sub-page-size.patch
+ ubi-fix-deadlock-caused-by-recursively-holding-work_.patch
+ i2c-mchp-pci1xxxx-update-timing-registers.patch
+ powerpc-papr_scm-update-the-numa-distance-table-for-.patch
+ sched-fair-fix-imbalance-overflow.patch
+ x86-rtc-remove-__init-for-runtime-functions.patch
+ i2c-ocores-generate-stop-condition-after-timeout-in-.patch
+ cifs-fix-negotiate-context-parsing.patch
+ risc-v-add-infrastructure-to-allow-different-str-imp.patch
+ purgatory-fix-disabling-debug-info.patch
+ documentation-riscv-document-the-sv57-vm-layout.patch
+ riscv-move-early-dtb-mapping-into-the-fixmap-region.patch
+ nvme-pci-mark-lexar-nm760-as-ignore_dev_subnqn.patch
+ nvme-pci-add-nvme_quirk_bogus_nid-for-t-force-z330-s.patch
+ cgroup-cpuset-skip-spread-flags-update-on-v2.patch
+ cgroup-cpuset-make-cpuset_fork-handle-clone_into_cgr.patch
+ cgroup-cpuset-add-cpuset_can_fork-and-cpuset_cancel_.patch

diff --cc queue-6.2/series
index baaf508baa1ac9e6a7cdd8bc0fb5b9b95f5f3f74,8f447c039ecf44c51790c605ed530baa7daa421a..7f97e0de3946ee887c99e713f3e4bac252f6b434
--- 1/queue-6.2/series
--- 2/queue-6.2/series
+++ b/queue-6.2/series
@@@ -125,4 -125,15 +125,15 @@@ mptcp-use-mptcp_schedule_work-instead-o
  mptcp-stricter-state-check-in-mptcp_worker.patch
  mptcp-fix-null-pointer-dereference-on-fastopen-early-fallback.patch
  selftests-mptcp-userspace-pm-uniform-verify-events.patch
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.patch
 +ubi-fix-failure-attaching-when-vid_hdr-offset-equals-to-sub-page-size.patch
+ ubi-fix-deadlock-caused-by-recursively-holding-work_.patch
+ i2c-mchp-pci1xxxx-update-timing-registers.patch
+ powerpc-papr_scm-update-the-numa-distance-table-for-.patch
+ sched-fair-fix-imbalance-overflow.patch
+ x86-rtc-remove-__init-for-runtime-functions.patch
+ i2c-ocores-generate-stop-condition-after-timeout-in-.patch
+ cifs-fix-negotiate-context-parsing.patch
+ risc-v-add-infrastructure-to-allow-different-str-imp.patch
+ purgatory-fix-disabling-debug-info.patch
+ nvme-pci-mark-lexar-nm760-as-ignore_dev_subnqn.patch
+ nvme-pci-add-nvme_quirk_bogus_nid-for-t-force-z330-s.patch