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

merge conflicts fixed up as I forgot to push my 5.10 and 5.15 queues :(

diff --cc queue-5.10/nfs-lookup_directory-is-also-ok-with-symlinks.patch
index 6c51a1035d3e275c189138c844eb9d41ce467911,cb253e33066cd2a971fe5d32609c4c76e02c42df..5069fbd8fb88c1b1c9944777b13084a379f7acf5
--- 1/queue-5.10/nfs-lookup_directory-is-also-ok-with-symlinks.patch
--- 2/queue-5.10/nfs-lookup_directory-is-also-ok-with-symlinks.patch
+++ b/queue-5.10/nfs-lookup_directory-is-also-ok-with-symlinks.patch
@@@ -17,14 -17,16 +17,15 @@@ Fixes: ac795161c936 ("NFSv4: Handle cas
  Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
  Tested-by: Donald Buczek <buczek@molgen.mpg.de>
  Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
 +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  ---
 - fs/nfs/dir.c | 4 ++--
 + fs/nfs/dir.c |    4 ++--
   1 file changed, 2 insertions(+), 2 deletions(-)
  
 -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
 -index 682c7b45d8b71..2ad56ff4752c7 100644
  --- a/fs/nfs/dir.c
  +++ b/fs/nfs/dir.c
 -@@ -1780,14 +1780,14 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
 +@@ -1780,14 +1780,14 @@ no_open:
        if (!res) {
                inode = d_inode(dentry);
                if ((lookup_flags & LOOKUP_DIRECTORY) && inode &&

diff --cc queue-5.10/series
index 4dfaeb8e2d8f28d869d314f5310ae00fb99bc221,57d2398eff5f35e3e955b6cdbc4c5bcc2aadb657..6e7d1a0ac008bb5e26e4c9ba0684f9492766e424
--- 1/queue-5.10/series
--- 2/queue-5.10/series
+++ b/queue-5.10/series
@@@ -77,10 -77,34 +77,34 @@@ mtd-rawnand-gpmi-don-t-leak-pm-referenc
  kvm-svm-never-reject-emulation-due-to-smap-errata-for-sev-guests.patch
  tee-export-teedev_open-and-teedev_close_context.patch
  optee-use-driver-internal-tee_context-for-some-rpc.patch
 -mtd-rawnand-qcom-fix-clock-sequencing-in-qcom_nandc_.patch
 -mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-st.patch
 -drivers-hv-vmbus-fix-memory-leak-in-vmbus_add_channe.patch
  asoc-tas2770-insert-post-reset-delay.patch
 -nfs-lookup_directory-is-also-ok-with-symlinks.patch
 -tty-n_tty-do-not-look-ahead-for-eol-character-past-t.patch
 -nfs-do-not-report-writeback-errors-in-nfs_getattr.patch
 -block-wbt-fix-negative-inflight-counter-when-remove-.patch
 +block-wbt-fix-negative-inflight-counter-when-remove-scsi-device.patch
 +nfs-lookup_directory-is-also-ok-with-symlinks.patch
 +nfs-do-not-report-writeback-errors-in-nfs_getattr.patch
 +tty-n_tty-do-not-look-ahead-for-eol-character-past-the-end-of-the-buffer.patch
 +mtd-rawnand-qcom-fix-clock-sequencing-in-qcom_nandc_probe.patch
 +mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-status.patch
++drivers-hv-vmbus-fix-memory-leak-in-vmbus_add_channe.patch
+ kvm-x86-pmu-refactoring-find_arch_event-to-pmc_perf_.patch
+ kvm-x86-pmu-don-t-truncate-the-perfevtseln-msr-when-.patch
+ kvm-x86-pmu-use-amd64_raw_event_mask-for-perf_type_r.patch
+ nfs-don-t-set-nfs_ino_invalid_xattr-if-there-is-no-x.patch
+ arm-omap2-hwmod-add-of_node_put-before-break.patch
+ arm-omap2-adjust-the-location-of-put_device-call-in-.patch
+ phy-usb-leave-some-clocks-running-during-suspend.patch
+ irqchip-sifive-plic-add-missing-thead-c900-plic-matc.patch
+ netfilter-conntrack-don-t-refresh-sctp-entries-in-cl.patch
+ arm64-dts-meson-gx-add-atf-bl32-reserved-memory-regi.patch
+ arm64-dts-meson-g12-add-atf-bl32-reserved-memory-reg.patch
+ arm64-dts-meson-g12-drop-bl32-region-from-sei510-sei.patch
+ pidfd-fix-test-failure-due-to-stack-overflow-on-some.patch
+ selftests-fixup-build-warnings-in-pidfd-clone3-tests.patch
+ kconfig-let-shell-return-enough-output-for-deep-path.patch
+ ata-libata-core-disable-trim-on-m88v29.patch
+ soc-aspeed-lpc-ctrl-block-error-printing-on-probe-de.patch
+ xprtrdma-fix-pointer-derefs-in-error-cases-of-rpcrdm.patch
+ drm-rockchip-dw_hdmi-do-not-leave-clock-enabled-in-e.patch
+ tracing-fix-tp_printk-option-related-with-tp_printk_.patch
+ net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch
+ net-macb-align-the-dma-and-coherent-dma-masks.patch
+ kconfig-fix-failing-to-generate-auto.conf.patch

diff --cc queue-5.15/series
index 489a0acd4ca1e45ef07db47888cec7468e5d72c0,91bed6cf6219c631af25148e8b85f55a8cdf6c35..ef286313307365a7c56e2c80ea2dcd5adf5d0df4
--- 1/queue-5.15/series
--- 2/queue-5.15/series
+++ b/queue-5.15/series
@@@ -125,16 -125,52 +125,51 @@@ smb3-fix-snapshot-mount-option.patc
  tipc-fix-wrong-notification-node-addresses.patch
  scsi-ufs-remove-dead-code.patch
  scsi-ufs-fix-a-deadlock-in-the-error-handler.patch
 -mtd-rawnand-qcom-fix-clock-sequencing-in-qcom_nandc_.patch
 -mtd-parsers-qcom-fix-kernel-panic-on-skipped-partiti.patch
 -mtd-parsers-qcom-fix-missing-free-for-pparts-in-clea.patch
 -mtd-phram-prevent-divide-by-zero-bug-in-phram_setup.patch
 -mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-st.patch
 +asoc-tas2770-insert-post-reset-delay.patch
 +asoc-qcom-actually-clear-dma-interrupt-register-for-hdmi.patch
 +block-wbt-fix-negative-inflight-counter-when-remove-scsi-device.patch
 +nfs-remove-an-incorrect-revalidation-in-nfs4_update_changeattr_locked.patch
 +nfs-lookup_directory-is-also-ok-with-symlinks.patch
 +nfs-do-not-report-writeback-errors-in-nfs_getattr.patch
 +tty-n_tty-do-not-look-ahead-for-eol-character-past-the-end-of-the-buffer.patch
 +block-fix-surprise-removal-for-drivers-calling-blk_set_queue_dying.patch
 +mtd-rawnand-qcom-fix-clock-sequencing-in-qcom_nandc_probe.patch
 +mtd-parsers-qcom-fix-kernel-panic-on-skipped-partition.patch
 +mtd-parsers-qcom-fix-missing-free-for-pparts-in-cleanup.patch
 +mtd-phram-prevent-divide-by-zero-bug-in-phram_setup.patch
 +mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-status.patch
+ hid-elo-fix-memory-leak-in-elo_probe.patch
+ mtd-rawnand-ingenic-fix-missing-put_device-in-ingeni.patch
 -asoc-tas2770-insert-post-reset-delay.patch
 -asoc-qcom-actually-clear-dma-interrupt-register-for-.patch
+ drivers-hv-vmbus-fix-memory-leak-in-vmbus_add_channe.patch
 -nfs-remove-an-incorrect-revalidation-in-nfs4_update_.patch
 -nfs-lookup_directory-is-also-ok-with-symlinks.patch
 -tty-n_tty-do-not-look-ahead-for-eol-character-past-t.patch
 -nfs-do-not-report-writeback-errors-in-nfs_getattr.patch
 -nvme-prepare-for-pairing-quiescing-and-unquiescing.patch
 -block-fix-surprise-removal-for-drivers-calling-blk_s.patch
 -block-wbt-fix-negative-inflight-counter-when-remove-.patch
+ kvm-x86-pmu-refactoring-find_arch_event-to-pmc_perf_.patch
+ kvm-x86-pmu-don-t-truncate-the-perfevtseln-msr-when-.patch
+ kvm-x86-pmu-use-amd64_raw_event_mask-for-perf_type_r.patch
+ arm-omap2-hwmod-add-of_node_put-before-break.patch
+ arm-omap2-adjust-the-location-of-put_device-call-in-.patch
+ phy-usb-leave-some-clocks-running-during-suspend.patch
+ staging-vc04_services-fix-rcu-dereference-check.patch
+ phy-phy-mtk-tphy-fix-duplicated-argument-in-phy-mtk-.patch
+ irqchip-sifive-plic-add-missing-thead-c900-plic-matc.patch
+ x86-bug-merge-annotate_reachable-into-_bug_flags-asm.patch
+ netfilter-conntrack-don-t-refresh-sctp-entries-in-cl.patch
+ ksmbd-fix-same-uniqueid-for-dot-and-dotdot-entries.patch
+ ksmbd-don-t-align-last-entry-offset-in-smb2-query-di.patch
+ arm64-dts-meson-gx-add-atf-bl32-reserved-memory-regi.patch
+ arm64-dts-meson-g12-add-atf-bl32-reserved-memory-reg.patch
+ arm64-dts-meson-g12-drop-bl32-region-from-sei510-sei.patch
+ pidfd-fix-test-failure-due-to-stack-overflow-on-some.patch
+ selftests-fixup-build-warnings-in-pidfd-clone3-tests.patch
+ mm-io_uring-allow-oom-killer-from-io_uring_setup.patch
+ acpi-pm-revert-only-mark-ec-gpe-for-wakeup-on-intel-.patch
+ kconfig-let-shell-return-enough-output-for-deep-path.patch
+ ata-libata-core-disable-trim-on-m88v29.patch
+ soc-aspeed-lpc-ctrl-block-error-printing-on-probe-de.patch
+ xprtrdma-fix-pointer-derefs-in-error-cases-of-rpcrdm.patch
+ drm-rockchip-dw_hdmi-do-not-leave-clock-enabled-in-e.patch
+ tracing-fix-tp_printk-option-related-with-tp_printk_.patch
+ display-amd-decrease-message-verbosity-about-waterma.patch
+ drm-amd-display-cap-pflip-irqs-per-max-otg-number.patch
+ drm-amd-display-fix-yellow-carp-wm-clamping.patch
+ net-usb-qmi_wwan-add-support-for-dell-dw5829e.patch
+ net-macb-align-the-dma-and-coherent-dma-masks.patch
+ kconfig-fix-failing-to-generate-auto.conf.patch