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: <2023110355-reuse-spoken-9945@gregkh>
Date:   Fri, 3 Nov 2023 09:45:04 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Bartosz Golaszewski <brgl@...ev.pl>,
        Bartosz Golaszewski <bartosz.golaszewski@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Uwe Kleine-König 
        <u.kleine-koenig@...gutronix.de>, Wentong Wu <wentong.wu@...el.com>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the usb tree

On Thu, Nov 02, 2023 at 11:29:50AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 16 Oct 2023 13:41:59 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> > 
> > Today's linux-next merge of the gpio-brgl tree got a conflict in:
> > 
> >   drivers/gpio/gpio-ljca.c
> > 
> > between commit:
> > 
> >   1034cc423f1b ("gpio: update Intel LJCA USB GPIO driver")
> > 
> > from the usb tree and commit:
> > 
> >   da2ad5fe2292 ("gpio: ljca: Convert to platform remove callback returning void")
> > 
> > from the gpio-brgl tree.
> 
> This is now a conflict between the usb tree and Linus' tree.

Thanks, I'll note this in my pull request to Linus.

greg k-h

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ