linux-kernel - Re: linux-next: manual merge of the mmc tree with the imx-mxs 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: <20161110013535.GD14622@dragon>
Date:   Thu, 10 Nov 2016 09:35:36 +0800
From:   Shawn Guo <shawnguo@...nel.org>
To:     Ulf Hansson <ulf.hansson@...aro.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Shawn Guo <shawn.guo@...aro.org>, linux-next@...r.kernel.org,
        linux-kernel@...r.kernel.org, Yangbo Lu <yangbo.lu@....com>,
        Hongtao Jia <hongtao.jia@....com>
Subject: Re: linux-next: manual merge of the mmc tree with the imx-mxs tree

Hi Ulf,

On Thu, Nov 10, 2016 at 11:50:04AM +1100, Stephen Rothwell wrote:
> Hi Ulf,
> 
> Today's linux-next merge of the mmc tree got a conflict in:
> 
>   arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
> 
> between commit:
> 
>   784e94eeb377 ("arm64: dts: ls2080a: Add TMU device tree support for LS2080A")
> 
> from the imx-mxs tree and commit:
> 
>   61ab9ffac1b9 ("ARM64: dts: ls2080a: add device configuration node")

Is there a reason why this dts patch has to go through mmc tree?  We
normally have them go via arm-soc tree.

Shawn

> 
> from the mmc tree.