linux-next: manual merge of the userns tree with the syscalls tree

[Stephen Rothwell]

Hi Eric,

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

  ipc/msg.c

between commit:

  370c8f44ce16 ("ipc: add msgget syscall wrapper")

from the syscalls tree and commit:

  50ab44b1c5d1 ("ipc: Directly call the security hook in ipc_ops.associate")

from the userns 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.

-- 
Cheers,
Stephen Rothwell

diff --cc ipc/msg.c
index 9de48065c1ac,d667dd8e97ab..000000000000
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@@ -253,17 -272,7 +272,7 @@@ static void freeque(struct ipc_namespac
  	ipc_rcu_putref(&msq->q_perm, msg_rcu_free);
  }
  
- /*
-  * Called with msg_ids.rwsem and ipcp locked.
-  */
- static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
- {
- 	struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm);
- 
- 	return security_msg_queue_associate(msq, msgflg);
- }
- 
 -SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
 +long ksys_msgget(key_t key, int msgflg)
  {
  	struct ipc_namespace *ns;
  	static const struct ipc_ops msg_ops = {

Attachment: pgpdaVqA4t0fn.pgp
Description: OpenPGP digital signature