linux-next: manual merge of the vfs-brauner tree with the origin tree

linux-next: manual merge of the vfs-brauner tree with the origin tree

[Mark Brown]

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

Hi all,

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

  include/linux/ipc_namespace.h

between commit:

  18b19abc3709b ("Merge tag 'namespace-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs")

from the origin tree and commit:

  53195eef8fbf0 ("Merge branch 'namespace-6.18' into vfs.all")

from the vfs-brauner 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.

diff --cc include/linux/ipc_namespace.h
index 12faca29bbb9c,75bd73839b3b7..0000000000000
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@@ -129,6 -129,9 +129,10 @@@ static inline int mq_init_ns(struct ipc
  #endif
  
  #if defined(CONFIG_IPC_NS)
++
+ extern struct ipc_namespace *copy_ipcs(u64 flags,
+ 	struct user_namespace *user_ns, struct ipc_namespace *ns);
+ 
  static inline struct ipc_namespace *to_ipc_ns(struct ns_common *ns)
  {
  	return container_of(ns, struct ipc_namespace, ns);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs-brauner tree with the origin tree

[Mark Brown]

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

Hi all,

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

  security/apparmor/apparmorfs.c

between commit:

  8e135b8aee5a0 ("apparmor: fix race between freeing data and fs accessing it")

from the origin tree and commit:

  5c6c7ae93236e ("Apparmor: Use simple_start_creating() / simple_done_creating()")

from the vfs-brauner 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.

diff --cc security/apparmor/apparmorfs.c
index 242c71b3fb6ef,32611e13dc3b0..0000000000000
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@@ -364,22 -289,13 +358,17 @@@ static struct dentry *aafs_create(cons
  	}
  
  	error = __aafs_setup_d_inode(dir, dentry, mode, data, link, fops, iops);
+ 	simple_done_creating(dentry);
  	if (error)
- 		goto fail_dentry;
- 	inode_unlock(dir);
+ 		goto fail;
 +
 +	if (data)
 +		aa_get_common_ref(data);
 +
  	return dentry;
  
- fail_dentry:
- 	dput(dentry);
- 
- fail_lock:
- 	inode_unlock(dir);
+ fail:
  	simple_release_fs(&aafs_mnt, &aafs_count);
- 
  	return ERR_PTR(error);
  }
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]