From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Helge Deller <deller@gmx.de>,
Parisc List <linux-parisc@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the parisc-hd tree with the asm-generic tree
Date: Tue, 22 Mar 2022 11:09:25 +1100 [thread overview]
Message-ID: <20220322110925.7b295e54@canb.auug.org.au> (raw)
In-Reply-To: <20220228114523.03b2f921@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 657 bytes --]
Hi all,
On Mon, 28 Feb 2022 11:45:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the parisc-hd tree got a conflict in:
>
> arch/parisc/lib/memcpy.c
>
> between commit:
>
> 967747bbc084 ("uaccess: remove CONFIG_SET_FS")
>
> from the asm-generic tree and commit:
>
> d4a767ea8b0e ("parisc: Use constants to encode the space registers like SR_KERNEL")
>
> from the parisc-hd tree.
This is now a conflict between the asm-generic tree and commit
360bd6c65807 ("parisc: Use constants to encode the space registers like SR_KERNEL")
in Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-03-22 0:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 0:45 linux-next: manual merge of the parisc-hd tree with the asm-generic tree Stephen Rothwell
2022-03-22 0:09 ` Stephen Rothwell [this message]
2022-03-22 7:34 ` Helge Deller
2022-03-22 17:06 ` Arnd Bergmann
2022-03-22 20:01 ` Helge Deller
-- strict thread matches above, loose matches on Subject: below --
2020-11-02 1:38 Stephen Rothwell
2020-12-14 19:48 ` Stephen Rothwell
2020-12-15 4:45 ` Helge Deller
2020-12-15 5:05 ` 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=20220322110925.7b295e54@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=deller@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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