linux-kernel - Re: linux-next: manual merge of the asm-generic tree with the kbuild 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20180404090735.2c8f0231@canb.auug.org.au>
Date:   Wed, 4 Apr 2018 09:07:35 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Nicholas Piggin <npiggin@...il.com>
Subject: Re: linux-next: manual merge of the asm-generic tree with the
 kbuild tree

Hi all,

On Thu, 15 Mar 2018 09:42:01 +1100 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped