5.15-stable patches

added patches:
	drm-i915-remove-unused-variable.patch

diff --git a/queue-5.15/drm-i915-remove-unused-variable.patch b/queue-5.15/drm-i915-remove-unused-variable.patch
new file mode 100644 (file)
index 0000000..0fba495
--- /dev/null
+++ b/queue-5.15/drm-i915-remove-unused-variable.patch
@@ -0,0 +1,33 @@
+From 2293a73ad4f3b6c37c06713ff1b67659d92ef43d Mon Sep 17 00:00:00 2001
+From: Nirmoy Das <nirmoy.das@intel.com>
+Date: Wed, 18 Jan 2023 18:06:24 +0100
+Subject: drm/i915: Remove unused variable
+
+From: Nirmoy Das <nirmoy.das@intel.com>
+
+commit 2293a73ad4f3b6c37c06713ff1b67659d92ef43d upstream.
+
+Removed unused i915 var.
+
+Fixes: a273e95721e9 ("drm/i915: Allow switching away via vga-switcheroo if uninitialized")
+Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
+Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20230118170624.9326-1-nirmoy.das@intel.com
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/i915/i915_drv.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -986,8 +986,6 @@ static int i915_driver_open(struct drm_d
+  */
+ static void i915_driver_lastclose(struct drm_device *dev)
+ {
+-      struct drm_i915_private *i915 = to_i915(dev);
+-
+       intel_fbdev_restore_mode(dev);
+ 
+       vga_switcheroo_process_delayed_switch();

diff --git a/queue-5.15/revert-selftests-bpf-check-null-propagation-only-nei.patch b/queue-5.15/revert-selftests-bpf-check-null-propagation-only-nei.patch
index 1fae93941ea19cc59e31242f6ececd837c87342e..eb187848632126274f4f43d0f582087759ee398e 100644 (file)
--- a/queue-5.15/revert-selftests-bpf-check-null-propagation-only-nei.patch
+++ b/queue-5.15/revert-selftests-bpf-check-null-propagation-only-nei.patch
@@ -8,15 +8,12 @@ This reverts commit 95fc28a8e92169cff4b649ae9f4a209a783f2c91.
 
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- .../bpf/prog_tests/jeq_infer_not_null.c       |  9 ----
- .../bpf/progs/jeq_infer_not_null_fail.c       | 42 -------------------
+ tools/testing/selftests/bpf/prog_tests/jeq_infer_not_null.c |    9 --
+ tools/testing/selftests/bpf/progs/jeq_infer_not_null_fail.c |   42 ------------
  2 files changed, 51 deletions(-)
  delete mode 100644 tools/testing/selftests/bpf/prog_tests/jeq_infer_not_null.c
  delete mode 100644 tools/testing/selftests/bpf/progs/jeq_infer_not_null_fail.c
 
-diff --git a/tools/testing/selftests/bpf/prog_tests/jeq_infer_not_null.c b/tools/testing/selftests/bpf/prog_tests/jeq_infer_not_null.c
-deleted file mode 100644
-index 3add34df5767..000000000000
 --- a/tools/testing/selftests/bpf/prog_tests/jeq_infer_not_null.c
 +++ /dev/null
 @@ -1,9 +0,0 @@
@@ -29,9 +26,6 @@ index 3add34df5767..000000000000
 -{
 -      RUN_TESTS(jeq_infer_not_null_fail);
 -}
-diff --git a/tools/testing/selftests/bpf/progs/jeq_infer_not_null_fail.c b/tools/testing/selftests/bpf/progs/jeq_infer_not_null_fail.c
-deleted file mode 100644
-index f46965053acb..000000000000
 --- a/tools/testing/selftests/bpf/progs/jeq_infer_not_null_fail.c
 +++ /dev/null
 @@ -1,42 +0,0 @@
@@ -77,6 +71,3 @@ index f46965053acb..000000000000
 -
 -      return ret;
 -}
--- 
-2.39.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 20627c113c6efde268b7db280335db5fa71deddc..5ec8857decaf7edda96ae73841c88d77421f9399 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -119,3 +119,4 @@ lockref-stop-doing-cpu_relax-in-the-cmpxchg-loop.patch
 firmware-coreboot-check-size-of-table-entry-and-use-.patch
 drm-i915-allow-switching-away-via-vga-switcheroo-if-.patch
 revert-selftests-bpf-check-null-propagation-only-nei.patch
+drm-i915-remove-unused-variable.patch