linux-kernel - Re: linux-next: manual merge of the char-misc 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <9e32a49c-fb78-c5f8-77cf-66b4b4a8b4a2@linaro.org>
Date:   Tue, 29 Jan 2019 13:46:26 +0200
From:   Georgi Djakov <georgi.djakov@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <greg@...ah.com>,
        Arnd Bergmann <arnd@...db.de>,
        Andy Gross <andy.gross@...aro.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        David Dai <daidavid1@...eaurora.org>,
        Taniya Das <tdas@...eaurora.org>,
        Rajendra Nayak <rnayak@...eaurora.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the qcom tree

Hi Stephen,

On 1/29/19 05:08, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   arch/arm64/boot/dts/qcom/sdm845.dtsi
> 
> between commits:
> 
>   05556681948b ("arm64: dts: sdm845: Add videocc node")
>   5b6f186f0abb ("arm64: dts: sdm845: Add rpmh powercontroller node")
> 
> from the qcom tree and commit:
> 
>   ae0037dbfc5e ("arm64: dts: sdm845: Add interconnect provider DT nodes")
> 
> from the char-misc 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.

Thanks for the fix! I have checked the tree and the merge is correct.

BR,
Georgi