Messages in this thread | | | Subject | Re: linux-next: manual merge of the livepatching tree with the powerpc tree | From | Michael Ellerman <> | Date | Tue, 19 Apr 2016 11:56:19 +1000 |
| |
On Mon, 2016-04-18 at 14:27 +1000, Stephen Rothwell wrote: > Hi Jiri, > > Today's linux-next merge of the livepatching tree got a conflict in: > > arch/powerpc/kernel/process.c > > between commit: > > 7f92bc569455 ("powerpc: sparse: Include headers for __weak symbols") > > from the powerpc tree and commit: > > 5d31a96e6c01 ("powerpc/livepatch: Add livepatch stack to struct thread_info") > > 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.
Thanks.
This should go away tomorrow because then my next will have the topic branch merged.
cheers
| |