Messages in this thread | | | From | Michael Ellerman <> | Subject | Re: [GIT PULL] Please pull powerpc/linux.git powerpc-6.4-1 tag | Date | Sat, 29 Apr 2023 13:41:18 +1000 |
| |
Linus Torvalds <torvalds@linux-foundation.org> writes: > On Fri, Apr 28, 2023 at 2:44 AM Michael Ellerman <mpe@ellerman.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.
Yeah my fault, looks like I edited the conflict in powernv_defconfig and then did 'git add arch/powerpc/configs/*' which added back the pseries one.
> 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.
Yep looks fine, thanks.
cheers
| |