Re: [GIT PULL] s390 updates for 6.6 merge window

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


On Mon, Aug 28, 2023 at 09:42:28AM +1000, Stephen Rothwell wrote:
> Hi Heiko,
> On Sun, 27 Aug 2023 22:34:01 +0200 Heiko Carstens <hca@xxxxxxxxxxxxx> wrote:
> >
> > On Sun, Aug 27, 2023 at 10:31:00PM +0200, Heiko Carstens wrote:
> > 
> > Maybe I'm doing something wrong, but below is the rather large diff
> > of the merge commit, using "git diff HEAD HEAD^@", where HEAD is the
> > merge commit.
> Something weird there.  I just see the arch/s390/Kconfig part (I use
> git diff-tree <merge commit>).  What did you merge?
> I can't see any commits affecting kernel/Kconfig.kexec in the s390
> branch in linux-next.

There is logical conflict between

commit 37002bc6b603 ("docs: move s390 under arch")

from the s390 tree:
git:// tags/s390-6.6-1

commit 89cde455915f ("kexec: consolidate kexec and crash options into kernel/Kconfig.kexec")

from Andrew's tree:
git:// mm-nonmm-stable

The commit in Andrew's tree introduces kernel/Kconfic.kexec and uses the
old location for Documentation (which is correct for Andrew's tree). So
when merging the s390 tree and Andrew's tree into Linus' tree that should
be fixed as well (btw.: this is not "fixed" in linux-next).

So I guess the size of the merge commit diff is simply a result of
kernel/Kconfig.exec not being present in both trees and being modified with
the merge, and therefore the complete file is part of the diff.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Kernel Development]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Info]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Linux Media]     [Device Mapper]

  Powered by Linux