MIME-Version: 1.0
References: <ef8fbda8-cace-1db3-9161-abd2e75dcf13@infradead.org>
 <A8D501D3-68ED-4112-BDA7-EE67357A2E28@physik.fu-berlin.de>
 <ca94954e-88ea-6707-d2a5-722e589d0c87@infradead.org> <50863bc8642d52f1533ad5809ae2dcd690e2493b.camel@physik.fu-berlin.de>
In-Reply-To: <50863bc8642d52f1533ad5809ae2dcd690e2493b.camel@physik.fu-berlin.de>
From:   Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Fri, 17 Mar 2023 08:31:28 +0100
Message-ID: <CAMuHMdXaZEWxB9Opgt2wcD2xAqF9Jv4r4KY9RGaR7vVVFXs5NQ@mail.gmail.com>
Subject: Re: [PATCH 5/7 v4] sh: remove sh5/sh64 last fragments
To:     John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc:     Randy Dunlap <rdunlap@infradead.org>, linux-kernel@vger.kernel.org,
        Arnd Bergmann <arnd@arndb.de>, Rich Felker <dalias@libc.org>,
        Yoshinori Sato <ysato@users.sourceforge.jp>,
        linux-sh@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
Precedence: bulk

Hi Adrian,

On Thu, Mar 16, 2023 at 9:46 PM John Paul Adrian Glaubitz
<glaubitz@physik.fu-berlin.de> wrote:
> On Thu, 2023-03-16 at 13:43 -0700, Randy Dunlap wrote:
> > > Oops, sorry. My bad. I will use the proper tree.
> >
> > Just let me know if you want me to resend it.
> > Thanks.
>
> No, that's fine. I will rebase my for-next tree.

Rebase on top of what? Commit 49deed336ef9a409 ("parisc:
update kbuild doc. aliases for parisc64") is in the parisc tree.
You must not base the SH tree on the parisc tree.

Don't care about the simple conflict, Stephen and Linus can
handle that fine.

FTR, if the conflict was more complex, an immutable branch to be
merged by all parties would be appropriate.  But that's overkill and
thus not needed for simple conflicts like this.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds