From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Howells <dhowells@redhat•com>
Cc: Gabriel Krisman Bertazi <krisman@collabora•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the notifications tree with the keys tree
Date: Fri, 22 Jan 2021 16:08:57 +1100 [thread overview]
Message-ID: <20210122160857.3e2939de@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2021-01-22 5:10 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210122160857.3e2939de@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=krisman@collabora$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox