linux-kernel - Re: linux-next: manual merge of the rockchip tree with the arm-soc 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: <CAOesGMhm2n3-7zLD4xUdJGJ7B6p9J_kNdNU-b-z7w+NXGZu_0g@mail.gmail.com>
Date:   Mon, 21 Nov 2016 15:38:17 -0800
From:   Olof Johansson <olof@...om.net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Heiko Stuebner <heiko@...ech.de>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Neil Armstrong <narmstrong@...libre.com>,
        Kevin Hilman <khilman@...libre.com>,
        Andy Yan <andy.yan@...k-chips.com>
Subject: Re: linux-next: manual merge of the rockchip tree with the arm-soc tree

Hi,

On Mon, Nov 21, 2016 at 3:19 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Heiko,
>
> Today's linux-next merge of the rockchip tree got a conflict in:
>
>   arch/arm64/configs/defconfig
>
> between commit:
>
>   a59294b2f7c7 ("ARM64: defconfig: Enable MMC related configs")
>
> from the arm-soc tree and commit:
>
>   5295a3157348 ("arm64: defconfig: enable RK808 components")
>
> from the rockchip 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.

This sounds fine, and it's a conflict we'll resolve when we merge this
material from Heiko.


-Olof