From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 3 Apr 2023 13:19:30 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v4.14.312~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9408da669179e3f7140cbcb3541a6af6c9d5bdc;p=thirdparty%2Fkernel%2Fstable-queue.git

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

d9408da669179e3f7140cbcb3541a6af6c9d5bdc
diff --cc queue-5.10/series
index 789436c3aa4,eaad3b728d5..275d5a4391b
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@@ -161,6 -161,7 +161,10 @@@ xtensa-fix-kasan-report-for-show_stack.
  rcu-fix-rcu_torture_read-ftrace-event.patch
  drm-etnaviv-fix-reference-leak-when-mmaping-imported-buffer.patch
  drm-amd-display-add-dsc-support-for-synaptics-cascaded-mst-hub.patch
 +s390-uaccess-add-missing-earlyclobber-annotations-to-__clear_user.patch
 +btrfs-scan-device-in-non-exclusive-mode.patch
 +zonefs-fix-error-message-in-zonefs_file_dio_append.patch
+ selftests-bpf-test-btf-dump-for-struct-with-padding-.patch
+ libbpf-fix-btf-to-c-converter-s-padding-logic.patch
+ selftests-bpf-add-few-corner-cases-to-test-padding-h.patch
+ libbpf-fix-btf_dump-s-packed-struct-determination.patch
diff --cc queue-5.15/series
index 49833e2b2b0,3861fc79c02..391ba9c992c
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@@ -85,9 -85,9 +85,13 @@@ xtensa-fix-kasan-report-for-show_stack.
  rcu-fix-rcu_torture_read-ftrace-event.patch
  drm-etnaviv-fix-reference-leak-when-mmaping-imported-buffer.patch
  drm-amd-display-add-dsc-support-for-synaptics-cascaded-mst-hub.patch
 -kvm-arm64-pmu-fix-get_one_reg-for-vpmc-regs-to-return-the-current-value.patch
  kvm-arm64-disable-interrupts-while-walking-userspace-pts.patch
 +s390-uaccess-add-missing-earlyclobber-annotations-to-__clear_user.patch
 +kvm-vmx-move-preemption-timer-hrtimer-dance-to-common-x86.patch
 +kvm-x86-inject-gp-on-x2apic-wrmsr-that-sets-reserved-bits-63-32.patch
 +kvm-x86-purge-highest-isr-cache-when-updating-apicv-state.patch
 +zonefs-fix-error-message-in-zonefs_file_dio_append.patch
+ selftests-bpf-test-btf-dump-for-struct-with-padding-.patch
+ libbpf-fix-btf-to-c-converter-s-padding-logic.patch
+ selftests-bpf-add-few-corner-cases-to-test-padding-h.patch
+ libbpf-fix-btf_dump-s-packed-struct-determination.patch
diff --cc queue-6.1/series
index a3a40914a29,5d5f0041675..b152aaa6a4d
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@@ -168,6 -168,7 +168,10 @@@ drm-i915-disable-dc-states-for-all-comm
  drm-i915-move-csc-load-back-into-.color_commit_arm-when-psr-is-enabled-on-skl-glk.patch
  kvm-arm64-pmu-fix-get_one_reg-for-vpmc-regs-to-return-the-current-value.patch
  kvm-arm64-disable-interrupts-while-walking-userspace-pts.patch
 +net-dsa-mv88e6xxx-read-fid-when-handling-atu-violations.patch
 +net-dsa-mv88e6xxx-replace-atu-violation-prints-with-trace-points.patch
 +net-dsa-mv88e6xxx-replace-vtu-violation-prints-with-trace-points.patch
+ selftests-bpf-test-btf-dump-for-struct-with-padding-.patch
+ libbpf-fix-btf-to-c-converter-s-padding-logic.patch
+ selftests-bpf-add-few-corner-cases-to-test-padding-h.patch
+ libbpf-fix-btf_dump-s-packed-struct-determination.patch