* linux-next: manual merge of the vfs-brauner tree with the origin tree
@ 2026-03-13 12:59 Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2026-03-13 12:59 UTC (permalink / raw)
To: Christian Brauner
Cc: John Johansen, Linux Kernel Mailing List, Linux Next Mailing List,
NeilBrown
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread* linux-next: manual merge of the vfs-brauner tree with the origin tree
@ 2026-04-15 10:43 Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2026-04-15 10:43 UTC (permalink / raw)
To: Christian Brauner
Cc: Linus Torvalds, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2561 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got conflicts in:
kernel/fork.c
kernel/nsproxy.c
between commit:
7c8a4671dc324 ("Merge tag 'vfs-7.1-rc1.mount.v2' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs")
from the origin tree and commit:
8ee708daac8a2 ("Merge branch 'kernel-7.1.misc' 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 --combined kernel/fork.c
index 8c61c8dd43720,17497679cec70..0000000000000
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -2113,7 -2113,6 +2113,7 @@@ __latent_entropy struct task_struct *co
ftrace_graph_init_task(p);
rt_mutex_init_task(p);
+ raw_spin_lock_init(&p->blocked_lock);
lockdep_assert_irqs_enabled();
#ifdef CONFIG_PROVE_LOCKING
@@@ -2956,10 -2955,9 +2956,10 @@@ static inline bool clone3_stack_valid(s
static bool clone3_args_valid(struct kernel_clone_args *kargs)
{
/* Verify that no unknown flags are passed along. */
- if (kargs->flags & ~(CLONE_LEGACY_FLAGS | CLONE_CLEAR_SIGHAND |
- CLONE_INTO_CGROUP | CLONE_AUTOREAP | CLONE_NNP |
- CLONE_PIDFD_AUTOKILL | CLONE_EMPTY_MNTNS))
+ if (kargs->flags &
+ ~(CLONE_LEGACY_FLAGS | CLONE_CLEAR_SIGHAND |
+ CLONE_INTO_CGROUP | CLONE_AUTOREAP | CLONE_NNP |
+ CLONE_PIDFD_AUTOKILL | CLONE_EMPTY_MNTNS))
return false;
/*
@@@ -3110,7 -3108,7 +3110,7 @@@ static int check_unshare_flags(unsigne
{
if (unshare_flags & ~(CLONE_THREAD|CLONE_FS|CLONE_SIGHAND|
CLONE_VM|CLONE_FILES|CLONE_SYSVSEM|
- CLONE_NS_ALL|UNSHARE_EMPTY_MNTNS))
+ CLONE_NS_ALL | UNSHARE_EMPTY_MNTNS))
return -EINVAL;
/*
* Not implemented, but pretend it works if there is nothing
diff --combined kernel/nsproxy.c
index d9d3d5973bf52,71bf313087671..0000000000000
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@@ -215,7 -215,7 +215,7 @@@ int unshare_nsproxy_namespaces(unsigne
u64 flags = unshare_flags;
int err = 0;
- if (!(flags & (CLONE_NS_ALL & ~CLONE_NEWUSER)))
+ if (!(flags & (CLONE_NS_ALL & ~(CLONE_NEWUSER | UNSHARE_EMPTY_MNTNS))))
return 0;
user_ns = new_cred ? new_cred->user_ns : current_user_ns();
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* linux-next: manual merge of the vfs-brauner tree with the origin tree
@ 2026-04-14 11:22 Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2026-04-14 11:22 UTC (permalink / raw)
To: Christian Brauner
Cc: Linus Torvalds, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/ext4/fsync.c
between commit:
fc825e513cd49 ("Merge tag 'vfs-7.1-rc1.bh.metadata' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs")
from the origin tree and commits:
6e22726900ea5 ("Merge patch series "fs: Move metadata bh tracking from address_space"")
f2bab85781e80 ("Merge branch 'vfs-7.1.bh.metadata' 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 --combined fs/ext4/fsync.c
index 924726dcc85ff,abeb078a34647..0000000000000
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@@ -100,7 -100,6 +100,7 @@@ static int ext4_fsync_nojournal(struct
return ret;
ret = ext4_sync_parent(inode);
+
if (test_opt(inode->i_sb, BARRIER))
*needs_barrier = true;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* linux-next: manual merge of the vfs-brauner tree with the origin tree
@ 2025-10-02 11:31 Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2025-10-02 11:31 UTC (permalink / raw)
To: Christian Brauner
Cc: Linus Torvalds, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-04-15 10:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-13 12:59 linux-next: manual merge of the vfs-brauner tree with the origin tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2026-04-15 10:43 Mark Brown
2026-04-14 11:22 Mark Brown
2025-10-02 11:31 Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox