Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220228114523.03b2f921@canb.auug.org.au> <20220322110925.7b295e54@canb.auug.org.au>
 <8ce9d045-c3c9-c839-7b82-9f5ccdae2d52@gmx.de>
In-Reply-To: <8ce9d045-c3c9-c839-7b82-9f5ccdae2d52@gmx.de>
From:   Arnd Bergmann <arnd@arndb.de>
Date:   Tue, 22 Mar 2022 18:06:20 +0100
Message-ID: <CAK8P3a3hR0JP-coRBNDytC1onPUfYCUn_q148kMO5-FWvxwgOg@mail.gmail.com>
Subject: Re: linux-next: manual merge of the parisc-hd tree with the
 asm-generic tree
To:     Helge Deller <deller@gmx.de>
Cc:     Arnd Bergmann <arnd@arndb.de>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        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>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Mar 22, 2022 at 8:34 AM Helge Deller <deller@gmx.de> wrote:
>
> On 3/22/22 01:09, Stephen Rothwell wrote:
> > 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.
>
>
> Arnd,
> can you please drop the changes in your asm-generic tree for
> arch/parisc/lib/memcpy.c
> They are not needed any more.
>

Sorry I missed that earlier when the conflict happened originally.

I can't really rebase my changes on top of your tree now, and just dropping
the change without a rebase would break mine. I'll make sure to mention
the conflict in the pull request then and have Linus resolve it.

       Arnd