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

diff --cc queue-5.10/series
index 2571523adfd86dfadbdefdefbe3ed4d6b3fa0080,e8f3174744f805a12eaa0029036231fad014d9eb..c02ccf5a509c849ab81a8195087428e10ac6331d
--- 1/queue-5.10/series
--- 2/queue-5.10/series
+++ b/queue-5.10/series
@@@ -541,9 -541,4 +541,10 @@@ arm-9156-1-drop-cc-option-fallbacks-for
  parisc-fix-backtrace-to-always-include-init-funtion-names.patch
  mips-fix-assembly-error-from-mipsr2-code-used-within-mips_isa_arch_level.patch
  x86-mce-add-errata-workaround-for-skylake-skx37.patch
 +posix-cpu-timers-clear-task-posix_cputimers_work-in-copy_process.patch
 +irqchip-sifive-plic-fixup-eoi-failed-when-masked.patch
 +f2fs-should-use-gfp_nofs-for-directory-inodes.patch
 +block-hold-invalidate_lock-in-blkdiscard-ioctl.patch
 +block-hold-invalidate_lock-in-blkzeroout-ioctl.patch
 +block-hold-invalidate_lock-in-blkresetzone-ioctl.patch
+ net-neigh-enable-state-migration-between-nud_permane.patch

diff --cc queue-5.14/series
index 186b52e6df6a8216b4be8fc8c583e47afd69102f,e02d7a110c4286154ce305f972203359a4596ee9..7f851b6a5c43aa812118df3f7f3f677f93aef5d8
--- 1/queue-5.14/series
--- 2/queue-5.14/series
+++ b/queue-5.14/series
@@@ -793,15 -793,6 +793,18 @@@ mips-fix-duplicated-slashes-for-platfor
  mips-fix-assembly-error-from-mipsr2-code-used-within-mips_isa_arch_level.patch
  x86-mce-add-errata-workaround-for-skylake-skx37.patch
  kvm-x86-move-guest_pv_has-out-of-user_access-section.patch
 +posix-cpu-timers-clear-task-posix_cputimers_work-in-copy_process.patch
 +irqchip-sifive-plic-fixup-eoi-failed-when-masked.patch
 +f2fs-should-use-gfp_nofs-for-directory-inodes.patch
 +f2fs-include-non-compressed-blocks-in-compr_written_block.patch
 +f2fs-fix-uaf-in-f2fs_available_free_memory.patch
 +erofs-fix-unsafe-pagevec-reuse-of-hooked-pclusters.patch
 +block-hold-invalidate_lock-in-blkdiscard-ioctl.patch
 +block-hold-invalidate_lock-in-blkzeroout-ioctl.patch
 +block-hold-invalidate_lock-in-blkresetzone-ioctl.patch
 +dmaengine-ti-k3-udma-set-bchan-to-null-if-a-channel-request-fail.patch
 +dmaengine-ti-k3-udma-set-r-tchan-or-rflow-to-null-if-request-fail.patch
 +dmaengine-bestcomm-fix-system-boot-lockups.patch
+ net-neigh-enable-state-migration-between-nud_permane.patch
+ bpf-cgroups-fix-cgroup-v2-fallback-on-v1-v2-mixed-mo.patch
+ bpf-cgroup-assign-cgroup-in-cgroup_sk_alloc-when-cal.patch

diff --cc queue-5.15/series
index c24b05e21f9318203bb4fa5cc56f6abd61dc6928,d7078ff183d4029334c4576056c61b7a43b7ad47..cef108f5bd38971cea8ef4153bf46d3afc801a25
--- 1/queue-5.15/series
--- 2/queue-5.15/series
+++ b/queue-5.15/series
@@@ -857,19 -857,4 +857,20 @@@ x86-mce-add-errata-workaround-for-skyla
  pci-msi-move-non-mask-check-back-into-low-level-accessors.patch
  pci-msi-destroy-sysfs-before-freeing-entries.patch
  kvm-x86-move-guest_pv_has-out-of-user_access-section.patch
 +posix-cpu-timers-clear-task-posix_cputimers_work-in-copy_process.patch
 +irqchip-sifive-plic-fixup-eoi-failed-when-masked.patch
 +f2fs-should-use-gfp_nofs-for-directory-inodes.patch
 +f2fs-include-non-compressed-blocks-in-compr_written_block.patch
 +f2fs-fix-uaf-in-f2fs_available_free_memory.patch
 +ceph-fix-mdsmap-decode-when-there-are-mds-s-beyond-max_mds.patch
 +erofs-fix-unsafe-pagevec-reuse-of-hooked-pclusters.patch
 +drm-i915-guc-fix-blocked-context-accounting.patch
 +block-hold-invalidate_lock-in-blkdiscard-ioctl.patch
 +block-hold-invalidate_lock-in-blkzeroout-ioctl.patch
 +block-hold-invalidate_lock-in-blkresetzone-ioctl.patch
 +ksmbd-fix-buffer-length-check-in-fsctl_validate_negotiate_info.patch
 +ksmbd-don-t-need-8byte-alignment-for-request-length-in-ksmbd_check_message.patch
 +dmaengine-ti-k3-udma-set-bchan-to-null-if-a-channel-request-fail.patch
 +dmaengine-ti-k3-udma-set-r-tchan-or-rflow-to-null-if-request-fail.patch
 +dmaengine-bestcomm-fix-system-boot-lockups.patch
+ net-neigh-enable-state-migration-between-nud_permane.patch

diff --cc queue-5.4/series
index 979eafcea181a5cc2832f054a33ac1d6e646f149,3dc1f0f846f92a844cf42785f1e6eea9c1e7c8c9..6d0b2699b333f5b00209fd2ccefeff372a5734da
--- 1/queue-5.4/series
--- 2/queue-5.4/series
+++ b/queue-5.4/series
@@@ -336,5 -336,4 +336,6 @@@ arm-9155-1-fix-early-early_iounmap.patc
  arm-9156-1-drop-cc-option-fallbacks-for-architecture-selection.patch
  parisc-fix-backtrace-to-always-include-init-funtion-names.patch
  parisc-fix-set_fixmap-on-pa1.x-cpus.patch
 +irqchip-sifive-plic-fixup-eoi-failed-when-masked.patch
 +f2fs-should-use-gfp_nofs-for-directory-inodes.patch
+ net-neigh-enable-state-migration-between-nud_permane.patch