* linux-next: manual merge of the kspp tree with the fscache tree
@ 2022-05-23 10:57 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2022-05-23 10:57 UTC (permalink / raw)
To: Kees Cook, David Howells
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
include/linux/netfs.h
between commit:
713423282ae1 ("netfs: Fix gcc-12 warning by embedding vfs inode in netfs_i_context")
from the fscache tree and commit:
3b5eed3c71a2 ("netfs: Eliminate Clang randstruct warning")
from the kspp tree.
I fixed it up (I just used 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] only message in thread
only message in thread, other threads:[~2022-05-23 10:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-23 10:57 linux-next: manual merge of the kspp tree with the fscache tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).