linux-kernel - Re: linux-next: manual merge of the scsi tree with the kbuild tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210215085933.53d42bf0@canb.auug.org.au>
Date:   Mon, 15 Feb 2021 08:59:33 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Masahiro Yamada <masahiroy@...nel.org>,
        James Bottomley <James.Bottomley@...senPartnership.com>
Cc:     "Martin K. Petersen" <martin.petersen@...cle.com>,
        Hannes Reinecke <hare@...e.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sasha Levin <sashal@...nel.org>
Subject: Re: linux-next: manual merge of the scsi tree with the kbuild tree

Hi all,

On Thu, 28 Jan 2021 16:56:11 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> On Mon, 25 Jan 2021 15:02:13 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Today's linux-next merge of the scsi-mkp tree got a conflict in:
> > 
> >   drivers/scsi/gdth.c
> > 
> > between commit:
> > 
> >   537896fabed1 ("kbuild: give the SUBLEVEL more room in KERNEL_VERSION")
> > 
> > from the kbuild tree and commit:
> > 
> >   0653c358d2dc ("scsi: Drop gdth driver")
> > 
> > from the scsi-mkp tree.
> > 
> > I fixed it up (I deleted the file) and can carry the fix as necessary.
> > This is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.  
> 
> This is now a conflict between the scsi tree and the kbuild tree.

With the merge window about to open, this is a reminder that this
conflict still exists.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped