linux-kernel - Re: linux-next: manual merge of the livepatching 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]

Date:	Tue, 19 Apr 2016 11:57:34 +1000
From:	Michael Ellerman <mpe@...erman.id.au>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Jiri Kosina <jikos@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Li Zhang <zhlcindy@...ux.vnet.ibm.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the livepatching tree with Linus'
 tree

On Mon, 2016-04-18 at 14:23 +1000, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the livepatching tree got a conflict in:
> 
>   arch/powerpc/Kconfig
> 
> between commit:
> 
>   7f2bd0063342 ("powerpc/mm: enable page parallel initialisation")
> 
> from Linus' tree and commit:
> 
>   85baa095497f ("powerpc/livepatch: Add live patching support on ppc64le")
> 
> from the livepatching 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.
> 
> Maybe the selects under config PPC should be sorted ...

Hmm maybe. I guess it reduces the likelyhood of two new additions clashing
slightly.

cheers