linux-kernel - Re: linux-next: manual merge of the usb tree with the usb.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: <2025041530-amperage-recycled-2131@gregkh>
Date: Tue, 15 Apr 2025 14:02:36 +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>,
	Mathias Nyman <mathias.nyman@...ux.intel.com>,
	Wesley Cheng <quic_wcheng@...cinc.com>
Subject: Re: linux-next: manual merge of the usb tree with the usb.current
 tree

On Mon, Apr 14, 2025 at 02:27:40PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/host/xhci.h
> 
> between commit:
> 
>   bea5892d0ed2 ("xhci: Limit time spent with xHC interrupts disabled during bus resume")
> 
> from the usb.current tree and commit:
> 
>   5beb4a53a1dd ("usb: host: xhci-mem: Cleanup pending secondary event ring events")
> 
> from the usb tree.
> 
> I fixed it up (they both added the same function, and the former added
> another function, so I used that) 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.

Looks good, thanks!

greg k-h