Re: linux-next: manual merge of the asm-generic tree with the kbuild tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Nicholas Piggin <npiggin@gmail.com>
Subject: Re: linux-next: manual merge of the asm-generic tree with the kbuild tree
Date: Wed, 4 Apr 2018 09:07:35 +1000	[thread overview]
Message-ID: <20180404090735.2c8f0231@canb.auug.org.au> (raw)
In-Reply-To: <20180315094201.1a70ed2a@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 935 bytes --]

Hi all,

On Thu, 15 Mar 2018 09:42:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the asm-generic tree got a conflict in:
> 
>   arch/blackfin/kernel/bfin_ksyms.c
> 
> between commit:
> 
>   4d9c7a5907dd ("kbuild: rename built-in.o to built-in.a")
> 
> from the kbuild tree and commit:
> 
>   e7e57f690e38 ("arch: remove blackfin port")
> 
> from the asm-generic tree.
> 
> I fixed it up (I just removed the file) 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 conflict now exists between the kbuild tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]