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

2012-10-24 Thread Rusty Russell
Stephen Rothwell writes: > Hi Rusty, > > Today's linux-next merge of the modules tree got a conflict in > kernel/module.c between commit caabe240574a ("MODSIGN: Move the magic > string to the end of a module and eliminate the search") from Linus' tree > and commit 0250abdeec54 ("module: add sysca

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

2012-10-21 Thread Kees Cook
On Sun, Oct 21, 2012 at 6:35 PM, Stephen Rothwell wrote: > Hi Rusty, > > Today's linux-next merge of the modules tree got a conflict in > kernel/module.c between commit caabe240574a ("MODSIGN: Move the magic > string to the end of a module and eliminate the search") from Linus' tree > and commit 0

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

2012-10-21 Thread Stephen Rothwell
Hi Rusty, Today's linux-next merge of the modules tree got a conflict in kernel/module.c between commit caabe240574a ("MODSIGN: Move the magic string to the end of a module and eliminate the search") from Linus' tree and commit 0250abdeec54 ("module: add syscall to load module from fd") from the m