Re: linux-next: duplicate patches in the cxl-fixes tree

[Dan Williams <dan.j.williams@intel.com>]

Stephen Rothwell wrote:
> Hi Dan,
> 
> On Tue, 2 Jan 2024 02:32:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > A large number of commits in the cxl-fixes tree are also in Linus
> > Torvalds' tree as different commits (but the same patches).
> > 
> > A bad rebase onto v6.7-rc6 has been done.  I cannot use this tree as
> > it is.
> 
> Can this be fixed up, please?
> 
> $ git rebase --onto v6.7-rc6 251c56533a2c
> 
> should do it

Now fixed, but the divergence is just odd. Most of the commits were
identical but below ones were different (trimmed git range-diff
cef295b57778...5459e186a5c9). Not even sure where I would pick up a
bunch of commits with edited changelogs.

  7:  6eb467e165fc !   7:  f40f939917b2 platform/x86: hp-bioscfg: Fix error handling in hp_add_other_attributes()
    @@ Commit message
         used by all the error paths after kobject_init_and_add().
     
         Fixes: a34fc329b189 ("platform/x86: hp-bioscfg: bioscfg")
    -    Cc: stable@vger.kernel.org # 6.6.x: acfff1760745: platform/x86: hp-bioscfg: Simplify return check in hp_add_other_attributes()
    -    Cc: stable@vger.kernel.org # 6.6.x: 9950a86160a1: platform/x86: hp-bioscfg: move mutex_lock() down in hp_add_other_attributes()
    +    Cc: stable@vger.kernel.org # 6.6.x: c5dbf0416000: platform/x86: hp-bioscfg: Simplify return check in hp_add_other_attributes()
    +    Cc: stable@vger.kernel.org # 6.6.x: 5736aa9537c9: platform/x86: hp-bioscfg: move mutex_lock() down in hp_add_other_attributes()
         Reported-by: kernel test robot <lkp@intel.com>
         Reported-by: Dan Carpenter <error27@gmail.com>
         Closes: https://lore.kernel.org/r/202309201412.on0VXJGo-lkp@intel.com/
237:  4087f4734f48 ! 237:  a0575b4add21 ASoC: hdac_hda: Conditionally register dais for HDMI and Analog
    @@ Commit message
         for HDMI hdev only register the dais needed for HDMI
         for non HDMI hdev do not  register the HDMI dais.
     
    -    Depends-on: 36c7ac1c277f ("ASoC: Intel: skl_hda_dsp_generic: Drop HDMI routes when HDMI is not available")
    +    Depends-on: 3d1dc8b1030d ("ASoC: Intel: skl_hda_dsp_generic: Drop HDMI routes when HDMI is not available")
         Link: https://github.com/thesofproject/linux/issues/4509
         Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
         Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
293:  7517f209328d ! 293:  fcc9b50e5517 Revert "greybus: gb-beagleplay: Ensure le for values in transport"
    @@ Metadata
      ## Commit message ##
         Revert "greybus: gb-beagleplay: Ensure le for values in transport"
     
    -    This reverts commit 360c237fe6a6dc0e3b4c59ad158c3cfa3ceaa3e6.
    +    This reverts commit 52eb67861ebeb2110318bd9fe33d85ddcf92aac7.
     
         Turns out to not be correct, a new version will be generated later.
375:  31043eadf2fd ! 375:  5b750b22530f drm/amd/display: Increase frame warning limit with KASAN or KCSAN in dml
    @@ Commit message
         Reviewed-by: Harry Wentland <harry.wentland@amd.com>
         Reported-by: kernel test robot <lkp@intel.com>
         Closes: https://lore.kernel.org/oe-kbuild-all/202311302107.hUDXVyWT-lkp@intel.com/
    -    Fixes: 1a2bd2c77933 ("drm/amd/display: Increase num voltage states to 40")
    +    Fixes: 67e38874b85b ("drm/amd/display: Increase num voltage states to 40")
         Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
         Cc: Alvin Lee <alvin.lee2@amd.com>
         Cc: Hamza Mahfooz <hamza.mahfooz@amd.com>
446:  82d5522cdc1c ! 446:  6e455f5dcdd1 drm/crtc: fix uninitialized variable use
    @@ Metadata
      ## Commit message ##
         drm/crtc: fix uninitialized variable use
     
    -    Commit 5d7d3616cec9 ("drm/crtc: Fix uninit-value bug in
    +    Commit 3823119b9c2b ("drm/crtc: Fix uninit-value bug in
         drm_mode_setcrtc") was supposed to fix use of an uninitialized variable,
         but introduced another.
     
         num_connectors is only initialized if crtc_req->count_connectors > 0,
         but it's used regardless. Fix it.
     
    -    Fixes: 5d7d3616cec9 ("drm/crtc: Fix uninit-value bug in drm_mode_setcrtc")
    +    Fixes: 3823119b9c2b ("drm/crtc: Fix uninit-value bug in drm_mode_setcrtc")
         Cc: syzbot+4fad2e57beb6397ab2fc@syzkaller.appspotmail.com
         Cc: Ziqi Zhao <astrajoan@yahoo.com>
         Cc: Maxime Ripard <mripard@kernel.org>
495:  75857788dedc ! 495:  1f721a93a528 drm/i915: Use internal class when counting engine resets
    @@ Metadata
      ## Commit message ##
         drm/i915: Use internal class when counting engine resets
     
    -    Commit 94ac2100d07a ("drm/i915/gsc: Mark internal GSC engine with reserved uabi class")
    +    Commit 503579448db9 ("drm/i915/gsc: Mark internal GSC engine with reserved uabi class")
         made the GSC0 engine not have a valid uabi class and so broke the engine
         reset counting, which in turn was made class based in cb823ed9915b ("drm/i915/gt: Use intel_gt as the primary object for handling resets").
     
    @@ Commit message
         igt_live_test_end.
     
         Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
    -    Fixes: 94ac2100d07a ("drm/i915/gsc: Mark internal GSC engine with reserved uabi class")
    +    Fixes: 503579448db9 ("drm/i915/gsc: Mark internal GSC engine with reserved uabi class")
         [tursulin: fixed Fixes tag]
         Reported-by: Alan Previn Teres Alexis <alan.previn.teres.alexis@intel.com>
         Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
502:  000c070ec631 ! 502:  9fd2fbaabdb9 drm/amdgpu: fix buffer funcs setting order on suspend harder
    @@ Metadata
      ## Commit message ##
         drm/amdgpu: fix buffer funcs setting order on suspend harder
     
    -    Part of commit 4b9c2bd29761 ("drm/amdgpu: fix buffer funcs setting order on suspend")
    +    Part of commit dab96d8b61aa ("drm/amdgpu: fix buffer funcs setting order on suspend")
         got dropped accidently.  Add it back.
     
    -    Fixes: 4b9c2bd29761 ("drm/amdgpu: fix buffer funcs setting order on suspend")
    +    Fixes: dab96d8b61aa ("drm/amdgpu: fix buffer funcs setting order on suspend")
         Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
     
      ## drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ##
505:  6eda23feb3cd ! 505:  b96ab339ee50 drm/amd/display: Restore guard against default backlight value < 1 nit
    @@ Commit message
     
         Mark reports that brightness is not restored after Xorg dpms screen blank.
     
    -    This behavior was introduced by commit 413900a95bc2 ("drm/amd/display:
    +    This behavior was introduced by commit d9e865826c20 ("drm/amd/display:
         Simplify brightness initialization") which dropped the cached backlight
         value in display code, but also removed code for when the default value
         read back was less than 1 nit.
    @@ Commit message
         Cc: Camille Cho <camille.cho@amd.com>
         Cc: Krunoslav Kovac <krunoslav.kovac@amd.com>
         Cc: Hamza Mahfooz <hamza.mahfooz@amd.com>
    -    Fixes: 413900a95bc2 ("drm/amd/display: Simplify brightness initialization")
    +    Fixes: d9e865826c20 ("drm/amd/display: Simplify brightness initialization")
         Acked-by: Alex Deucher <alexander.deucher@amd.com>
         Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
         Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
551:  4fabcdf1bfc0 ! 551:  9702817384aa Revert "tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set"
    @@ Metadata
      ## Commit message ##
         Revert "tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set"
     
    -    This reverts commit e15d5eff889895c78f01bdc16cea04025ce3d882.
    +    This reverts commit f3f32a356c0d2379d4431364e74f101f8f075ce3.
     
         Paolo reports that the change disables autocorking even after
         the userspace sets TCP_CORK.
     
    -    Fixes: e15d5eff8898 ("tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set")
    +    Fixes: f3f32a356c0d ("tcp: disable tcp_autocorking for socket when TCP_NODELAY flag is set")
         Link: https://lore.kernel.org/r/0d30d5a41d3ac990573016308aaeacb40a9dc79f.camel@redhat.com
         Signed-off-by: Jakub Kicinski <kuba@kernel.org>
569:  33f1d5856a46 ! 569:  7e2c1e4b34f0 perf: Fix perf_event_validate_size() lockdep splat
    @@ Commit message
         Avoid the splat by bailing out early when the new event is its own
         group_leader.
     
    -    Fixes: 97a5538a6b154429 ("perf: Fix perf_event_validate_size()")
    +    Fixes: 382c27f4ed28f803 ("perf: Fix perf_event_validate_size()")
         Closes: https://lore.kernel.org/lkml/20231214000620.3081018-1-lucas.demarchi@intel.com/
         Closes: https://lore.kernel.org/lkml/ZXpm6gQ%2Fd59jGsuW@xpf.sh.intel.com/
         Reported-by: Lucas De Marchi <lucas.demarchi@intel.com>