linux-next: manual merge of the tip tree with the security tree

linux-next: manual merge of the tip tree with the security tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/Kconfig between commit c6cfbeb40296 ("x86: Enable
HAVE_ARCH_SECCOMP_FILTER") from the security tree and commit 8b5ad4729917
("Revert "x86, extable: Disable presorted exception table for now"") from
the tip 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/x86/Kconfig
index 3a41c44,83db6b9..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -82,10 -83,10 +83,11 @@@ config X8
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG
  	select GENERIC_IOMAP
  	select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
 +	select HAVE_ARCH_SECCOMP_FILTER
+ 	select BUILDTIME_EXTABLE_SORT
  
  config INSTRUCTION_DECODER
- 	def_bool (KPROBES || PERF_EVENTS)
+ 	def_bool (KPROBES || PERF_EVENTS || UPROBES)
  
  config OUTPUT_FORMAT
  	string

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

linux-next: manual merge of the tip tree with the security tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  security/apparmor/include/apparmor.h

between commit:

  12557dcba21b ("apparmor: move lib definitions into separate lib include")

from the security tree and commit:

  6b1ffa06e59d ("locking/atomic, kref: Use kref_get_unless_zero() more")

from the tip tree.

I fixed it up (the former moved the code to another file, so I applied the
below patch there) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Jan 2017 14:01:15 +1100
Subject: [PATCH] locking/atomic, kref: merge fixup for code movement

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 security/apparmor/include/lib.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
index fa281c272970..65ff492a9807 100644
--- a/security/apparmor/include/lib.h
+++ b/security/apparmor/include/lib.h
@@ -76,12 +76,6 @@ static inline void *kvzalloc(size_t size)
 	return __aa_kvmalloc(size, __GFP_ZERO);
 }
 
-/* returns 0 if kref not incremented */
-static inline int kref_get_not0(struct kref *kref)
-{
-	return atomic_inc_not_zero(&kref->refcount);
-}
-
 /**
  * aa_strneq - compare null terminated @str to a non null terminated substring
  * @str: a null terminated string
-- 
2.10.2



-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the tip tree with the security tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
include/net/sock.h between commit 404015308747 ("security: trim
security.h") from the security tree and commit 77a73e5383a9 ("static
keys: Introduce 'struct static_key', very_[un]likely(), static_key_slow_
[inc|dec]()") from the tip 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 include/net/sock.h
index 7b195a8,907bbe0..0000000
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@@ -55,9 -55,7 +55,9 @@@
  #include <linux/uaccess.h>
  #include <linux/memcontrol.h>
  #include <linux/res_counter.h>
- #include <linux/jump_label.h>
+ #include <linux/static_key.h>
 +#include <linux/aio.h>
 +#include <linux/sched.h>
  
  #include <linux/filter.h>
  #include <linux/rculist_nulls.h>

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