linux-kernel - Re: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180409115831.46a351ef@canb.auug.org.au>
Date:   Mon, 9 Apr 2018 11:58:31 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     James Morris <jmorris@...ei.org>
Cc:     David Howells <dhowells@...hat.com>,
        "Martin K. Petersen" <martin.petersen@...cle.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the
 efi-lock-down tree

Hi all,

On Fri, 6 Apr 2018 09:22:16 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> On Thu, 15 Mar 2018 18:34:12 +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/eata.c
> > 
> > between commit:
> > 
> >   5b76b160badb ("scsi: Lock down the eata driver")
> > 
> > from the efi-lock-down tree and commit:
> > 
> >   6b1745caa14a ("scsi: eata: eata-pio: Deprecate legacy EATA drivers")
> > 
> > from the scsi-mkp tree.
> > 
> > I fixed it up (I just removed 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 efi-lock-down tree and Linus' tree.

This is now a conflict between the security tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped