linux-kernel - Re: linux-next: manual merge of the mfd tree with Linus' 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: <20180308081215.n2m6hixmpfhpgn6f@dell>
Date:   Thu, 8 Mar 2018 08:12:15 +0000
From:   Lee Jones <lee.jones@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Baolin Wang <baolin.wang@...aro.org>,
        Mark Brown <broonie@...nel.org>,
        David Lechner <david@...hnology.com>
Subject: Re: linux-next: manual merge of the mfd tree with Linus' tree

On Thu, 08 Mar 2018, Stephen Rothwell wrote:

> Hi Lee,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   drivers/mfd/syscon.c
> 
> between commit:
> 
>   3bafc09e7797 ("mfd: syscon: Add hardware spinlock support")
> 
> from Linus' tree and commit:
> 
>   34c90dcce6b1 ("mfd: syscon: Set regmap name to DT node name")
> 
> from the mfd 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.

Now fixed in my tree.  You may withdraw your patch.

Thanks Stephen.

-- 
Lee Jones
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog