From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 15 Nov 2021 13:51:57 +0000 (+0100)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v5.4.160~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09ff91cd80c569c0f1c3c8a93b2a10dac34b7d69;p=thirdparty%2Fkernel%2Fstable-queue.git

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

09ff91cd80c569c0f1c3c8a93b2a10dac34b7d69
diff --cc queue-5.10/series
index 2571523adfd,e8f3174744f..c02ccf5a509
--- a/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 186b52e6df6,e02d7a110c4..7f851b6a5c4
--- a/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 c24b05e21f9,d7078ff183d..cef108f5bd3
--- a/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 979eafcea18,3dc1f0f846f..6d0b2699b33
--- a/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