linux-kernel - Re: [GIT PULL] Please pull powerpc/linux.git powerpc-6.4-1 tag

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 for Android: free password hash cracker in your pocket

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

Message-ID: <CAHk-=wgY8_-BvS5mFR+UtCwbLrOVikYfHi_m9OFxE2D43B+=8g@mail.gmail.com>
Date:   Fri, 28 Apr 2023 16:34:46 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Michael Ellerman <mpe@...erman.id.au>
Cc:     aik@...abs.ru, ajd@...ux.ibm.com, alex.williamson@...hat.com,
        arkamar@...as.cz, bgray@...ux.ibm.com, christophe.leroy@...roup.eu,
        ira.weiny@...el.com, joel@....id.au, kconsul@...ux.vnet.ibm.com,
        kjain@...ux.ibm.com, leoyang.li@....com,
        linux-kernel@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
        liubo03@...pur.com, mcgrof@...nel.org, mikey@...ling.org,
        nathan@...nel.org, nathanl@...ux.ibm.com, nicholas@...ux.ibm.com,
        npiggin@...il.com, nysal@...ux.ibm.com, pali@...nel.org,
        paul.gortmaker@...driver.com, paulus@...abs.org,
        rdunlap@...radead.org, robh@...nel.org, seanjc@...gle.com,
        tpearson@...torengineering.com, windhl@....com
Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-6.4-1 tag

On Fri, Apr 28, 2023 at 2:44 AM Michael Ellerman <mpe@...erman.id.au> wrote:
>
>   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git tags/powerpc-6.4-1

Odd. Your shortlog has this:

> Michael Ellerman (46):
>       powerpc/configs: Make pseries_defconfig an alias for ppc64le_guest

that removed the 'pseries_defconfig' file, but then your diffstat

>  arch/powerpc/configs/pq2fads_defconfig                                               |  80 ----
>  arch/powerpc/include/asm/atomic.h                                                    |  53 +-

doesn't have it, resulting in the summary not matching what I get:

> 278 files changed, 2672 insertions(+), 9188 deletions(-)

versus my

 279 files changed, 2690 insertions(+), 9528 deletions(-)

and I see no obvious reason for it.

I wonder if your test-merge just didn't remove the file (it did have a
conflict due to the IXGB driver removal), and that's why.

Anyway, I'm not entirely sure about the mismatch of the end result,
but it seems to be due to that one defconfig file, and I think my
merge is fine. But please double-check.

                   Linus