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: <YhSUZGqjtzV32tDV@kroah.com>
Date:   Tue, 22 Feb 2022 08:44:36 +0100
From:   Greg KH <greg@...ah.com>
To:     broonie@...nel.org
Cc:     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>
Subject: Re: linux-next: manual merge of the usb tree with the qcom tree

On Mon, Feb 21, 2022 at 07:16:41PM +0000, broonie@...nel.org wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   arch/arm64/boot/dts/qcom/ipq6018.dtsi
> 
> between commit:
> 
>   d1c10ab1494f0 ("arm64: dts: qcom: ipq6018: fix usb reference period")
> 
> from the qcom tree and commit:
> 
>   5726079cd4860 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period")
> 
> 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.
> 
> diff --cc arch/arm64/boot/dts/qcom/ipq6018.dtsi
> index 4e7efa97724bd,a614b9f73e2cd..0000000000000
> --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
> +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
> 
> (deleted the property updated by the qcom patch)

Deleted files are good :)