From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Howells <dhowells@redhat•com>,
Geert Uytterhoeven <geert@linux-m68k•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Kars de Jong <jongk@linux-m68k•org>
Subject: linux-next: manual merge of the keys tree with the m86k tree
Date: Mon, 13 Jan 2020 12:36:03 +1100 [thread overview]
Message-ID: <20200113123603.33c957e1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
Hi all,
Today's linux-next merge of the keys tree got a conflict in:
arch/m68k/kernel/syscalls/syscall.tbl
between commit:
e8bb2a2a1d51 ("m68k: Wire up clone3() syscall")
from the m86k tree and commit:
519c484a997a ("Add a general, global device notification watch list")
from the keys 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-01-13 1:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 1:36 Stephen Rothwell [this message]
2020-01-13 1:37 ` linux-next: manual merge of the keys tree with the m86k tree Stephen Rothwell
2020-01-27 20:52 ` Stephen Rothwell
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=20200113123603.33c957e1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=geert@linux-m68k$(echo .)org \
--cc=jongk@linux-m68k$(echo .)org \
--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