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
| ||
|
Date: Mon, 5 Sep 2022 08:04:55 +0200 From: Greg KH <greg@...ah.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, Wesley Cheng <quic_wcheng@...cinc.com> Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree On Thu, Sep 01, 2022 at 01:52:30PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/dwc3/gadget.c > > between commit: > > 040f2dbd2010 ("usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop") > > from the usb.current tree and commit: > > 9711c67de748 ("usb: dwc3: gadget: Synchronize IRQ between soft connect/disconnect") > > from the usb tree. > > I fixed it up (see below) 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. Now fixed up in my tree as well, thanks! greg k-h
Powered by blists - more mailing lists