* linux-next: manual merge of the vfs tree with the csky tree
@ 2021-04-21 23:39 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-04-21 23:39 UTC (permalink / raw)
To: Al Viro, Guo Ren
Cc: Guo Ren, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 785 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
arch/csky/include/asm/uaccess.h
between commit:
d3900e8d918f ("csky: uaccess.h: Coding convention with asm generic")
from the csky tree and commit:
a0d8d552783b ("whack-a-mole: kill strlen_user() (again)")
from the vfs tree.
I fixed it up (I just used the former version (which also removed
strlen_user) 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:[~2021-04-21 23:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-21 23:39 linux-next: manual merge of the vfs tree with the csky tree Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.