Re: linux-next: manual merge of the scsi-mkp tree with the origin tree

[Mark Brown]

On Thu, Jul 16, 2026 at 12:13:59PM +0200, Uwe Kleine-König wrote:

> So the fixup is applied to the merge of the scsi tree and not the
> scsi-mkp tree. The latter wasn't pulled into next-20260715 at all. Given
> that e73ba3d6ed03b isn't in next, the fixup shouldn't be there either.

> Looking at merge.log I see merging scsi-mkp is tried, the fixup is
> applied, yielding 0fd66dadace89 and then `git reset --hard HEAD^`
> follows throwing away that commit to replace it by
> next-20260714/scsi-mkp which is already included and thus the
> patches/device-id-zorro fixup is applied to the wrong commit.

Right, the fixups don't differentiate between versions of the tree and
the fact that scsi-mkp is broken and never had a version that was merged
this cycle means that the tooling gets confused about the fixup.  We
need the fixup to try the build on the off chance that there's a fix,
but then it's not needed if the fix failed and since it's not dependent
on any context added by the merge it doesn't get skipped.

> Having said that e73ba3d6ed03b is still in
> https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next
> without the patch preparing drivers/ata/pata_buddha.c for that change
> and thus resulting in a build failure on m68k.

It's also got an arm64 allyesconfig build failure which is what's
keeping it out of -next, the submitter of the offending patch asked for
their patches to be dropped but I've seen no response from Martin.

Hopefully at some point the various build failures will be addressed and
this will all get sorted.

Attachment: signature.asc
Description: PGP signature