From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 27 Jan 2023 07:12:23 +0000 (+0100)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v5.10.166~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20bfbebcfe83fd0823b0eced9fc7ca4edf0642b3;p=thirdparty%2Fkernel%2Fstable-queue.git

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

20bfbebcfe83fd0823b0eced9fc7ca4edf0642b3
diff --cc queue-4.14/series
index d0fd67c1721,8bae9f7fae2..8baf271bf6f
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@@ -20,4 -20,4 +20,5 @@@ hid-betop-check-shape-of-output-reports
  w1-fix-deadloop-in-__w1_remove_master_device.patch
  w1-fix-warning-after-calling-w1_process.patch
  comedi-adv_pci1760-fix-pwm-instruction-handling.patch
 +fs-reiserfs-remove-useless-new_opts-in-reiserfs_remount.patch
+ bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
diff --cc queue-4.19/series
index 127cecdf3c9,328b37f9660..5af99da7be2
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@@ -37,4 -37,4 +37,5 @@@ mmc-sdhci-esdhc-imx-correct-the-tuning-
  netfilter-conntrack-do-not-renew-entry-stuck-in-tcp-.patch
  block-fix-and-cleanup-bio_check_ro.patch
  perf-env-do-not-return-pointers-to-local-variables.patch
 +fs-reiserfs-remove-useless-new_opts-in-reiserfs_remount.patch
+ bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
diff --cc queue-5.10/series
index 705af7fb8c1,8fa2e471799..1b5bf9dfe56
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@@ -75,4 -75,24 +75,25 @@@ lockref-stop-doing-cpu_relax-in-the-cmp
  revert-selftests-bpf-check-null-propagation-only-nei.patch
  netfilter-conntrack-do-not-renew-entry-stuck-in-tcp-.patch
  x86-acpi-cstate-optimize-c3-entry-on-amd-cpus.patch
 +fs-reiserfs-remove-useless-new_opts-in-reiserfs_remount.patch
+ sysctl-add-a-new-register_sysctl_init-interface.patch
+ kernel-panic-move-panic-sysctls-to-its-own-file.patch
+ panic-unset-panic_on_warn-inside-panic.patch
+ ubsan-no-need-to-unset-panic_on_warn-in-ubsan_epilog.patch
+ kasan-no-need-to-unset-panic_on_warn-in-end_report.patch
+ exit-add-and-use-make_task_dead.patch
+ objtool-add-a-missing-comma-to-avoid-string-concaten.patch
+ hexagon-fix-function-name-in-die.patch
+ h8300-fix-build-errors-from-do_exit-to-make_task_dea.patch
+ csky-fix-function-name-in-csky_alignment-and-die.patch
+ ia64-make-ia64_mca_recovery-bool-instead-of-tristate.patch
+ panic-separate-sysctl-logic-from-config_smp.patch
+ exit-put-an-upper-limit-on-how-often-we-can-oops.patch
+ exit-expose-oops_count-to-sysfs.patch
+ exit-allow-oops_limit-to-be-disabled.patch
+ panic-consolidate-open-coded-panic_on_warn-checks.patch
+ panic-introduce-warn_limit.patch
+ panic-expose-warn_count-to-sysfs.patch
+ docs-fix-path-paste-o-for-sys-kernel-warn_count.patch
+ exit-use-read_once-for-all-oops-warn-limit-reads.patch
+ bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
diff --cc queue-5.15/series
index 336cc6051eb,0ccc0e3dce3..cff24bf44ff
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@@ -121,4 -121,24 +121,25 @@@ drm-i915-allow-switching-away-via-vga-s
  revert-selftests-bpf-check-null-propagation-only-nei.patch
  drm-i915-remove-unused-variable.patch
  x86-acpi-cstate-optimize-c3-entry-on-amd-cpus.patch
 +fs-reiserfs-remove-useless-new_opts-in-reiserfs_remount.patch
+ sysctl-add-a-new-register_sysctl_init-interface.patch
+ kernel-panic-move-panic-sysctls-to-its-own-file.patch
+ panic-unset-panic_on_warn-inside-panic.patch
+ ubsan-no-need-to-unset-panic_on_warn-in-ubsan_epilog.patch
+ kasan-no-need-to-unset-panic_on_warn-in-end_report.patch
+ exit-add-and-use-make_task_dead.patch
+ objtool-add-a-missing-comma-to-avoid-string-concaten.patch
+ hexagon-fix-function-name-in-die.patch
+ h8300-fix-build-errors-from-do_exit-to-make_task_dea.patch
+ csky-fix-function-name-in-csky_alignment-and-die.patch
+ ia64-make-ia64_mca_recovery-bool-instead-of-tristate.patch
+ panic-separate-sysctl-logic-from-config_smp.patch
+ exit-put-an-upper-limit-on-how-often-we-can-oops.patch
+ exit-expose-oops_count-to-sysfs.patch
+ exit-allow-oops_limit-to-be-disabled.patch
+ panic-consolidate-open-coded-panic_on_warn-checks.patch
+ panic-introduce-warn_limit.patch
+ panic-expose-warn_count-to-sysfs.patch
+ docs-fix-path-paste-o-for-sys-kernel-warn_count.patch
+ exit-use-read_once-for-all-oops-warn-limit-reads.patch
+ bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
diff --cc queue-5.4/series
index a2aa830da20,a339fab4caf..84decce63c5
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@@ -70,4 -70,11 +70,12 @@@ mmc-sdhci-esdhc-imx-disable-the-cmd-crc
  mmc-sdhci-esdhc-imx-correct-the-tuning-start-tap-and.patch
  revert-selftests-bpf-check-null-propagation-only-nei.patch
  netfilter-conntrack-do-not-renew-entry-stuck-in-tcp-.patch
 +fs-reiserfs-remove-useless-new_opts-in-reiserfs_remount.patch
+ x86-vmlinux.lds-add-runtime_discard_exit-to-generic-.patch
+ arch-fix-broken-buildid-for-arm64-and-riscv.patch
+ powerpc-vmlinux.lds-define-runtime_discard_exit.patch
+ powerpc-vmlinux.lds-don-t-discard-.rela-for-relocata.patch
+ s390-define-runtime_discard_exit-to-fix-link-error-w.patch
+ sh-define-runtime_discard_exit.patch
+ revert-revert-xhci-set-hcd-flag-to-defer-primary-roo.patch
+ bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch