From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 18 Apr 2023 09:12:39 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v4.14.313~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f3b1ce88a482ff84cace46b65006603653b1804;p=thirdparty%2Fkernel%2Fstable-queue.git

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

9f3b1ce88a482ff84cace46b65006603653b1804
diff --cc queue-4.19/series
index 14fdbd643ee,6ee09f37966..f558376efca
--- a/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-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
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.patch
diff --cc queue-5.10/series
index 8c9aa3c7fa4,1bfc575cee3..aff95ea84ff
--- a/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-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
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.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 34b105a265d,d1306f14a30..ce481490f0f
--- a/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-to-sub-page-size.patch
+ ubi-fix-deadlock-caused-by-recursively-holding-work_.patch
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.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 40e88282a92,5d203e18044..903c7ba2d6e
--- a/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-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
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.patch
+ i2c-ocores-generate-stop-condition-after-timeout-in-.patch
diff --cc queue-6.1/series
index e42ba3f96c1,2c77aa07296..ffcc68c3fb9
--- a/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-to-sub-page-size.patch
+ ubi-fix-deadlock-caused-by-recursively-holding-work_.patch
+ i2c-mchp-pci1xxxx-update-timing-registers.patch
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.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 baaf508baa1,8f447c039ec..7f97e0de394
--- a/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-to-sub-page-size.patch
+ ubi-fix-deadlock-caused-by-recursively-holding-work_.patch
+ i2c-mchp-pci1xxxx-update-timing-registers.patch
 -ubi-fix-failure-attaching-when-vid_hdr-offset-equals.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