linux-kernel - Re: linux-next: manual merge of the usb tree with the qcom 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: <20220318183717.7acac615@canb.auug.org.au>
Date:   Fri, 18 Mar 2022 18:37:17 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Olof Johansson <olof@...om.net>,
        Arnd Bergmann <arnd@...db.de>
Cc:     Andy Gross <agross@...nel.org>, Baruch Siach <baruch@...s.co.il>,
        Bjorn Andersson <bjorn.andersson@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sean Anderson <sean.anderson@...o.com>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Subject: Re: linux-next: manual merge of the usb tree with the qcom tree

Hi all,

On Thu, 10 Feb 2022 09:02:18 +0100 Greg KH <greg@...ah.com> wrote:
>
> On Thu, Feb 10, 2022 at 02:11:00PM +1100, Stephen Rothwell wrote:
> > 
> > Today's linux-next merge of the usb tree got a conflict in:
> > 
> >   arch/arm64/boot/dts/qcom/ipq6018.dtsi
> > 
> > between commit:
> > 
> >   d1c10ab1494f ("arm64: dts: qcom: ipq6018: fix usb reference period")
> > 
> > from the qcom tree and commit:
> > 
> >   5726079cd486 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period")
> > 
> > from the usb tree.
> > 
> > I fixed it up (I just use the latter) 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.
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell  
> 
> 
> That is fine, thanks.

This is now a conflict between the usb tree and the arm-soc tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped