From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>
Cc: Geert Uytterhoeven <geert@linux-m68k•org>,
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>,
Aleksa Sarai <cyphar@cyphar•com>
Subject: Re: linux-next: manual merge of the vfs tree with the m68k tree
Date: Tue, 28 Jan 2020 07:49:42 +1100 [thread overview]
Message-ID: <20200128074942.74ae0eaf@canb.auug.org.au> (raw)
In-Reply-To: <20200113095037.156597ff@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]
Hi all,
On Mon, 13 Jan 2020 09:50:37 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> arch/m68k/kernel/syscalls/syscall.tbl
>
> between commit:
>
> e8bb2a2a1d51 ("m68k: Wire up clone3() syscall")
>
> from the m68k tree and commit:
>
> 0a51692d49ec ("open: introduce openat2(2) syscall")
>
> from the vfs 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
>
> diff --cc arch/m68k/kernel/syscalls/syscall.tbl
> index a00a5d0db602,2559925f1924..000000000000
> --- a/arch/m68k/kernel/syscalls/syscall.tbl
> +++ b/arch/m68k/kernel/syscalls/syscall.tbl
> @@@ -434,4 -434,5 +434,5 @@@
> 432 common fsmount sys_fsmount
> 433 common fspick sys_fspick
> 434 common pidfd_open sys_pidfd_open
> -# 435 reserved for clone3
> +435 common clone3 __sys_clone3
> + 437 common openat2 sys_openat2
This is now a conflict between the vfs tree and Linus' tree - just a
reminder for pull requests.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-01-27 20:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-12 22:50 linux-next: manual merge of the vfs tree with the m68k tree Stephen Rothwell
2020-01-27 20:49 ` Stephen Rothwell [this message]
2020-01-27 21:39 ` Geert Uytterhoeven
-- strict thread matches above, loose matches on Subject: below --
2020-09-08 1:24 Stephen Rothwell
2020-09-10 0:31 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=20200128074942.74ae0eaf@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cyphar@cyphar$(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 \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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