Re: linux-next: manual merge of the tip tree with the net-next tree

Stephen Rothwell
2014-01-14T05:19:20Z

[-- Attachment #1: Type: text/plain, Size: 2160 bytes --]

Hi,

On Mon, 13 Jan 2014 20:51:43 -0800 "H. Peter Anvin" <hpa@zytor.com> wrote:
>
> On 01/13/2014 07:02 PM, Stephen Rothwell wrote:
> >
> > On Mon, 13 Jan 2014 14:20:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> On Mon, 13 Jan 2014 14:18:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>>
> >>> Today's linux-next merge of the tip tree got conflicts in
> >>> arch/arc/include/asm/Kbuild, arch/cris/include/asm/Kbuild,
> >>> arch/hexagon/include/asm/Kbuild,
> >>> arch/microblaze/include/asm/Kbuild,
> >>> arch/parisc/include/asm/Kbuild and
> >>> arch/score/include/asm/Kbuild between commit e3fec2f74f7f
> >>> ("lib: Add missing arch generic-y entries for
> >>> asm-generic/hash.h") from the net-next tree and commit
> >>> 93ea02bb8435 ("arch: Clean up asm/barrier.h implementations
> >>> using asm-generic/barrier.h") from the tip tree.
> >>>
> >>> I fixed it up (see below) and can carry the fix as necessary
> >>> (no action is required).
> >>>
> >>> BTW: thanks for not keeping the Kbuild files sorted :-(
> >>
> >> I missed arch/mn10300/include/asm/Kbuild the first time round.
> >
> > And ... git rerere does not work well here. It stores resolutions
> > by a hash of the (sanitised) conflict and since most of these files
> > have exactly the same conflict, I am going to have to edit 5 of
> > them by hand every day.
> >
>
> Well, you probably can keep a diff from the conflict-merge tree to the
> fix, but still.
>
> Is there a sensible way we can fix this in either net-next or tip?

Probably not now. If the respective patches had kept those Kbuild files
sorted, then (most of the) conflicts would not have happened.

Maybe if there were follow up patches that put them back in order it may
help. Or at least maybe make the conflicts different enough so that
git rerere would store them all.

I am just grumbling because I guessed this would happen when I saw the
patch go into the next-next tree (unfortunately, it was a report of mine
that caused that patch to be created :-().
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]