linux-kernel - Re: linux-next: manual merge of the staging tree with the staging.current 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: <20191214121930.GA3338917@kroah.com>
Date:   Sat, 14 Dec 2019 13:19:30 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Johan Hovold <johan@...nel.org>, Arnd Bergmann <arnd@...db.de>
Subject: Re: linux-next: manual merge of the staging tree with the
 staging.current tree

On Fri, Dec 13, 2019 at 12:05:34PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/isdn/gigaset/usb-gigaset.c
> 
> between commits:
> 
>   53f35a39c386 ("staging: gigaset: fix general protection fault on probe")
>   84f60ca7b326 ("staging: gigaset: fix illegal free on probe errors")
>   ed9ed5a89acb ("staging: gigaset: add endpoint-type sanity check")
> 
> from the staging.current tree and commit:
> 
>   f10870b05d5e ("staging: remove isdn capi drivers")
> 
> from the staging 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.

Thanks, I knew this would happen :)

greg k-h