linux-next: manual merge of the modules tree with Linus' tree

2013-12-18 Thread Stephen Rothwell
Hi Rusty, Today's linux-next merge of the modules tree got a conflict in Documentation/module-signing.txt between commit 3cafea307642 ("Add Documentation/module-signing.txt file") from the tree and commit 160e01aca3da ("Add Documentation/module-signing.txt file") from the modules tree. I fixe

Re: linux-next: manual merge of the modules tree with Linus' tree

2012-12-19 Thread Stephen Rothwell
Hi Rusty, On Wed, 19 Dec 2012 16:08:08 +1030 Rusty Russell wrote: > > I have reverted to the previous modules-next. I see that Linus has pulled that in, could you please clean up your tree in linux-next as well. I will reset it by had for today. -- Cheers, Stephen Rothwell

Re: linux-next: manual merge of the modules tree with Linus' tree

2012-12-18 Thread Rusty Russell
Stephen Rothwell writes: > Hi Rusty, > > Today's linux-next merge of the modules tree got a conflict in > kernel/modsign_pubkey.c between commit 84ecfd15f554 ("modsign: add symbol > prefix to certificate list") from Linus' tree and commit bb8f5966421d > ("MODSIGN: Avoid using .incbin in C source")

linux-next: manual merge of the modules tree with Linus' tree

2012-12-18 Thread Stephen Rothwell
Hi Rusty, Today's linux-next merge of the modules tree got a conflict in kernel/modsign_pubkey.c between commit 84ecfd15f554 ("modsign: add symbol prefix to certificate list") from Linus' tree and commit bb8f5966421d ("MODSIGN: Avoid using .incbin in C source") from the modules tree. I fixed it u

Re: linux-next: manual merge of the modules tree with Linus' tree

2012-10-07 Thread Rusty Russell
Stephen Rothwell writes: > Hi Rusty, > > Today's linux-next merge of the modules tree got a conflict in > init/Kconfig between commit 754b7b63d112 ("sections: disable const > sections for PA-RISC v2") from Linus' tree and commit 54ddd23d78ba > ("X.509: Add simple ASN.1 grammar compiler") from the

linux-next: manual merge of the modules tree with Linus' tree

2012-10-07 Thread Stephen Rothwell
Hi Rusty, Today's linux-next merge of the modules tree got a conflict in init/Kconfig between commit 754b7b63d112 ("sections: disable const sections for PA-RISC v2") from Linus' tree and commit 54ddd23d78ba ("X.509: Add simple ASN.1 grammar compiler") from the modules tree. I fixed it up (see bel

linux-next: manual merge of the modules tree with Linus' tree

2012-10-03 Thread Stephen Rothwell
Hi Rusty, Today's linux-next merge of the modules tree got a conflict in Makefile between commit d183e6f570f3 ("UAPI: Move linux/version.h") from Linus' tree and commit 91657140708d ("MODSIGN: Make mrproper should remove generated files") from the modules tree. I fixed it up (see below) and can c