[PATCH] drm-misc: Another check in the bugfix flow

[Daniel Vetter]

Even in feature freeze it can happen that the broken patch is only in
drm-misc-next, and then applying to drm-misc-next-fixes will
rightfully stumble over dim's Fixes: validation since the sha1 wont be
an ancestor.

Fix that by adding another check.

v2: Less confusing wording (Marek)

Cc: Marek Vasut 
Signed-off-by: Daniel Vetter 
---
 drm-misc-commit-flow.dot | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drm-misc-commit-flow.dot b/drm-misc-commit-flow.dot
index 04afab6f4074..f1062d2ff8a8 100644
--- a/drm-misc-commit-flow.dot
+++ b/drm-misc-commit-flow.dot
@@ -1,6 +1,7 @@
 digraph {
next_0[shape=box, style=rounded, color=blue, label="drm-misc-next"];
next_1[shape=box, style=rounded, color=blue, label="drm-misc-next"];
+   next_2[shape=box, style=rounded, color=blue, label="drm-misc-next"];
fixes_0[shape=box, style=rounded, color=blue, label="drm-misc-fixes"];
next_fixes_0[shape=box, style=rounded, color=blue,
 label="drm-misc-next-fixes"];
@@ -10,6 +11,8 @@ digraph {
  label="Is the bug in the current rc?"];
is_late[shape=diamond, color=red,
label="Is drm in feature freeze?\n(occurs after -rc6)"];
+   is_next[shape=diamond, color=red,
+   label="Is the bug both in drm-next\nand in drm-misc-next?"];
 
is_fix -> next_0[label="no"];
is_fix -> in_origin[label="yes"];
@@ -18,5 +21,8 @@ digraph {
in_origin -> is_late[label="no"];
 
is_late -> next_1[label="no"]
-   is_late -> next_fixes_0[label="yes"]
+   is_late -> is_next[label="yes"]
+
+   is_next -> next_2[label="no"]
+   is_next -> next_fixes_0[label="yes"]
 }
-- 
2.36.0

[PULL] drm-intel-next-fixes

[Jani Nikula]

Hi Dave & Daniel -

Some i915 fixes for v5.19 merge window.

drm-intel-next-fixes-2022-05-24:
drm/i915 fixes for v5.19 merge window:
- Build, sparse, UB, and CFI fixes
- Variable scope fix
- Audio pipe logging fix
- ICL+ DSI NULL dereference fix

BR,
Jani.

The following changes since commit f83493f7d34da258310ecd3d07f0cc78f884c954:

  Merge tag 'drm-msm-next-2022-05-09' of https://gitlab.freedesktop.org/drm/msm 
into drm-next (2022-05-11 12:40:47 +1000)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-intel 
tags/drm-intel-next-fixes-2022-05-24

for you to fetch changes up to 0ea917819d12fed41ea4662cc26ffa0060a5c354:

  drm/i915/dsi: fix VBT send packet port selection for ICL+ (2022-05-23 
12:08:58 +0300)


drm/i915 fixes for v5.19 merge window:
- Build, sparse, UB, and CFI fixes
- Variable scope fix
- Audio pipe logging fix
- ICL+ DSI NULL dereference fix


Andi Shyti (1):
  drm/i915/gt: Fix use of static in macro mismatch

Borislav Petkov (1):
  drm/i915/uc: Fix undefined behavior due to shift overflowing the constant

Imre Deak (1):
  drm/i915: Fix 'mixing different enum types' warnings in 
intel_display_power.c

Jani Nikula (3):
  drm/i915/audio: fix audio code enable/disable pipe logging
  drm/i915/reg: fix undefined behavior due to shift overflowing the constant
  drm/i915/dsi: fix VBT send packet port selection for ICL+

Nathan Chancellor (1):
  drm/i915: Fix CFI violation with show_dynamic_id()

YueHaibing (1):
  drm/i915/gt: Fix build error without CONFIG_PM

 drivers/gpu/drm/i915/display/intel_audio.c |  4 +--
 drivers/gpu/drm/i915/display/intel_display_power.c |  8 +++---
 drivers/gpu/drm/i915/display/intel_dsi_vbt.c   | 33 ++
 drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c| 23 +++
 drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h   |  2 +-
 .../drm/i915/gt/uc/abi/guc_communication_ctb_abi.h |  2 +-
 drivers/gpu/drm/i915/gt/uc/abi/guc_messages_abi.h  |  2 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h |  2 +-
 drivers/gpu/drm/i915/i915_perf.c   |  4 +--
 drivers/gpu/drm/i915/i915_perf_types.h |  2 +-
 drivers/gpu/drm/i915/i915_reg.h| 32 ++---
 11 files changed, 63 insertions(+), 51 deletions(-)

-- 
Jani Nikula, Intel Open Source Graphics Center