* linux-next: manual merge of the notifications tree with the keys tree
@ 2021-01-22 5:08 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-01-22 5:08 UTC (permalink / raw)
To: David Howells
Cc: Gabriel Krisman Bertazi, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
Hi all,
Today's linux-next merge of the notifications tree got conflicts in:
Documentation/security/keys/core.rst
samples/Kconfig
samples/watch_queue/watch_test.c
security/keys/Kconfig
between commit:
0c3f19da1229 ("watch_queue: Drop references to /dev/watch_queue")
from the keys tree and commit:
e3bc554d80d3 ("watch_queue: Clean up references to /dev/watch_queue")
from the notifications tree.
I fixed it up (in each file I used the latter's version of the
conflicted text) 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-01-22 5:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-22 5:08 linux-next: manual merge of the notifications tree with the keys 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