* linux-next: manual merge of the vfs-brauner tree with the mm-stable tree
@ 2023-12-20 23:52 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2023-12-20 23:52 UTC (permalink / raw)
To: Christian Brauner, Andrew Morton
Cc: David Howells, Linux Kernel Mailing List, Linux Next Mailing List,
Matthew Wilcox (Oracle)
[-- Attachment #1: Type: text/plain, Size: 851 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/afs/write.c
between commits:
8525d5984b7b ("afs: do not test the return value of folio_start_writeback()")
af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")
from the mm-stable tree and commit:
874ff39da314 ("afs: Use the netfs write helpers")
from the vfs-brauner tree.
I fixed it up (the latter removed the code modified by the former) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the vfs-brauner tree with the mm-stable tree
@ 2025-11-25 1:29 Stephen Rothwell
2025-12-03 2:33 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2025-11-25 1:29 UTC (permalink / raw)
To: Christian Brauner, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List, jianyun.gao
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
mm/secretmem.c
between commit:
b6c46600bfb2 ("mm: fix some typos in mm module")
from the mm-stable tree and commit:
1011f385f492 ("secretmem: convert memfd_secret() to FD_ADD()")
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.
--
Cheers,
Stephen Rothwell
diff --cc mm/secretmem.c
index 37f6d1097853,f0ef4e198884..000000000000
--- a/mm/secretmem.c
+++ b/mm/secretmem.c
@@@ -224,10 -224,7 +224,7 @@@ err_free_inode
SYSCALL_DEFINE1(memfd_secret, unsigned int, flags)
{
- struct file *file;
- int fd, err;
-
- /* make sure local flags do not confict with global fcntl.h */
+ /* make sure local flags do not conflict with global fcntl.h */
BUILD_BUG_ON(SECRETMEM_FLAGS_MASK & O_CLOEXEC);
if (!secretmem_enable || !can_set_direct_map())
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the vfs-brauner tree with the mm-stable tree
2025-11-25 1:29 linux-next: manual merge of the vfs-brauner tree with the mm-stable tree Stephen Rothwell
@ 2025-12-03 2:33 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-12-03 2:33 UTC (permalink / raw)
To: Andrew Morton
Cc: Christian Brauner, Linux Kernel Mailing List,
Linux Next Mailing List, jianyun.gao
[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]
Hi all,
On Tue, 25 Nov 2025 12:29:34 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> mm/secretmem.c
>
> between commit:
>
> b6c46600bfb2 ("mm: fix some typos in mm module")
>
> from the mm-stable tree and commit:
>
> 1011f385f492 ("secretmem: convert memfd_secret() to FD_ADD()")
>
> 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 mm/secretmem.c
> index 37f6d1097853,f0ef4e198884..000000000000
> --- a/mm/secretmem.c
> +++ b/mm/secretmem.c
> @@@ -224,10 -224,7 +224,7 @@@ err_free_inode
>
> SYSCALL_DEFINE1(memfd_secret, unsigned int, flags)
> {
> - struct file *file;
> - int fd, err;
> -
> - /* make sure local flags do not confict with global fcntl.h */
> + /* make sure local flags do not conflict with global fcntl.h */
> BUILD_BUG_ON(SECRETMEM_FLAGS_MASK & O_CLOEXEC);
>
> if (!secretmem_enable || !can_set_direct_map())
This is now a conflict between the mm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-12-03 2:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-25 1:29 linux-next: manual merge of the vfs-brauner tree with the mm-stable tree Stephen Rothwell
2025-12-03 2:33 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-12-20 23:52 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox