linux-next: manual merge of the rr tree with the s390 tree

linux-next: manual merge of the rr tree with the s390 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 880 bytes --]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/s390/Kconfig between commit 867c2dcb369b ("s390/seccomp: add support
for system call filtering using BPF") from the s390 tree and commit
d673c23ca730 ("Make most arch asm/module.h files use
asm-generic/module.h") from the rr tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/s390/Kconfig
index 107610e,11cc724..0000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -124,7 -123,8 +124,9 @@@ config S39
  	select GENERIC_TIME_VSYSCALL
  	select GENERIC_CLOCKEVENTS
  	select KTIME_SCALAR if 32BIT
 +	select HAVE_ARCH_SECCOMP_FILTER
+ 	select HAVE_MOD_ARCH_SPECIFIC
+ 	select MODULES_USE_ELF_RELA
  
  config SCHED_OMIT_FRAME_POINTER
  	def_bool y

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the rr tree with the s390 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

Hi Rusty,

On Tue, 17 Mar 2009 13:15:36 +1030 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> Actually, they took my pull, and Martin mentioned a fix.
> 
> I'll drop my version from linux-next for tomorrow.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the rr tree with the s390 tree

[Rusty Russell]

On Tuesday 17 March 2009 13:05:27 Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next merge of the rr tree got a conflict in
> arch/s390/include/asm/tlbflush.h between commit
> e6f19dbd10f5d871750ee3fb03e2e99a06eebf92 ("[S390] cpumask: use mm_cpumask
> () wrapper") from the s390 tree and commit
> 49797d75185490d793bd5bd5db50f143ee8c9d89 ("cpumask:use-mm_cpumask-s390")
> from the rr tree.
> 
> I assumed that the rr tree version was the correct version and used that.

Actually, they took my pull, and Martin mentioned a fix.

I'll drop my version from linux-next for tomorrow.

Thanks!
Rusty.

linux-next: manual merge of the rr tree with the s390 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/s390/include/asm/tlbflush.h between commit
e6f19dbd10f5d871750ee3fb03e2e99a06eebf92 ("[S390] cpumask: use mm_cpumask
() wrapper") from the s390 tree and commit
49797d75185490d793bd5bd5db50f143ee8c9d89 ("cpumask:use-mm_cpumask-s390")
from the rr tree.

I assumed that the rr tree version was the correct version and used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]