linux-kernel - Re: [PATCH 5/7 v4] sh: remove sh5/sh64 last fragments

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAMuHMdXaZEWxB9Opgt2wcD2xAqF9Jv4r4KY9RGaR7vVVFXs5NQ@mail.gmail.com>
Date:   Fri, 17 Mar 2023 08:31:28 +0100
From:   Geert Uytterhoeven <geert@...ux-m68k.org>
To:     John Paul Adrian Glaubitz <glaubitz@...sik.fu-berlin.de>
Cc:     Randy Dunlap <rdunlap@...radead.org>, linux-kernel@...r.kernel.org,
        Arnd Bergmann <arnd@...db.de>, Rich Felker <dalias@...c.org>,
        Yoshinori Sato <ysato@...rs.sourceforge.jp>,
        linux-sh@...r.kernel.org
Subject: Re: [PATCH 5/7 v4] sh: remove sh5/sh64 last fragments

Hi Adrian,

On Thu, Mar 16, 2023 at 9:46 PM John Paul Adrian Glaubitz
<glaubitz@...sik.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@...ux-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