Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

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

1 view
Skip to first unread message

Stephen Rothwell

unread,
Jan 12, 2014, 10:20:01 PM1/12/14
to
Hi all,

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 :-(

--
Cheers,
Stephen Rothwell s...@canb.auug.org.au

diff --cc arch/arc/include/asm/Kbuild
index 93e6ca919620,e07c786011af..000000000000
--- a/arch/arc/include/asm/Kbuild
+++ b/arch/arc/include/asm/Kbuild
@@@ -1,4 -1,4 +1,5 @@@
generic-y += auxvec.h
++generic-y += barrier.h
generic-y += bugs.h
generic-y += bitsperlong.h
generic-y += clkdev.h
@@@ -11,6 -11,6 +12,7 @@@ generic-y += fcntl.
generic-y += fb.h
generic-y += ftrace.h
generic-y += hardirq.h
++generic-y += hash.h
generic-y += hw_irq.h
generic-y += ioctl.h
generic-y += ioctls.h
@@@ -47,4 -47,4 +49,3 @@@ generic-y += user.
generic-y += vga.h
generic-y += xor.h
generic-y += preempt.h
- generic-y += hash.h
-generic-y += barrier.h
diff --cc arch/cris/include/asm/Kbuild
index c5963b3e4624,35ec2e5ca832..000000000000
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -3,8 -3,8 +3,10 @@@ header-y += arch-v10
header-y += arch-v32/


++generic-y += barrier.h
generic-y += clkdev.h
generic-y += exec.h
++generic-y += hash.h
generic-y += kvm_para.h
generic-y += linkage.h
generic-y += module.h
@@@ -12,4 -12,4 +14,3 @@@ generic-y += trace_clock.
generic-y += vga.h
generic-y += xor.h
generic-y += preempt.h
- generic-y += hash.h
-generic-y += barrier.h
diff --cc arch/hexagon/include/asm/Kbuild
index 469d223950ff,a614ec9747a6..000000000000
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@@ -2,6 -2,6 +2,7 @@@
header-y += ucontext.h

generic-y += auxvec.h
++generic-y += barrier.h
generic-y += bug.h
generic-y += bugs.h
generic-y += clkdev.h
@@@ -15,6 -15,6 +16,7 @@@ generic-y += fb.
generic-y += fcntl.h
generic-y += ftrace.h
generic-y += hardirq.h
++generic-y += hash.h
generic-y += hw_irq.h
generic-y += ioctl.h
generic-y += ioctls.h
@@@ -54,4 -54,4 +56,3 @@@ generic-y += ucontext.
generic-y += unaligned.h
generic-y += xor.h
generic-y += preempt.h
- generic-y += hash.h
-generic-y += barrier.h
diff --cc arch/microblaze/include/asm/Kbuild
index 43eec338ff50,f77fb6630b11..000000000000
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@@ -1,7 -1,7 +1,8 @@@

++generic-y += barrier.h
generic-y += clkdev.h
generic-y += exec.h
++generic-y += hash.h
generic-y += trace_clock.h
generic-y += syscalls.h
generic-y += preempt.h
- generic-y += hash.h
-generic-y += barrier.h
diff --cc arch/parisc/include/asm/Kbuild
index 75edd5fcc6ff,8df06d0074f4..000000000000
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@@ -1,8 -1,8 +1,9 @@@

++generic-y += barrier.h
generic-y += word-at-a-time.h auxvec.h user.h cputime.h emergency-restart.h \
segment.h topology.h vga.h device.h percpu.h hw_irq.h mutex.h \
div64.h irq_regs.h kdebug.h kvm_para.h local64.h local.h param.h \
poll.h xor.h clkdev.h exec.h
++generic-y += hash.h
generic-y += trace_clock.h
generic-y += preempt.h
- generic-y += hash.h
-generic-y += barrier.h
diff --cc arch/score/include/asm/Kbuild
index 099e7ba40599,ee2993b6e5d1..000000000000
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@@ -1,9 -1,8 +1,9 @@@

header-y +=

++generic-y += barrier.h
generic-y += clkdev.h
++generic-y += hash.h
generic-y += trace_clock.h
generic-y += xor.h
generic-y += preempt.h
- generic-y += hash.h
-
-generic-y += barrier.h

Stephen Rothwell

unread,
Jan 12, 2014, 10:30:02 PM1/12/14
to
Hi all,

On Mon, 13 Jan 2014 14:18:24 +1100 Stephen Rothwell <s...@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.

--
Cheers,
Stephen Rothwell s...@canb.auug.org.au

diff --cc arch/mn10300/include/asm/Kbuild
index bc42f14c9c2e,367ef399ddf7..000000000000
--- a/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@@ -1,6 -1,6 +1,7 @@@

++generic-y += barrier.h
generic-y += clkdev.h
generic-y += exec.h
++generic-y += hash.h
generic-y += trace_clock.h

Stephen Rothwell

unread,
Jan 13, 2014, 10:10:01 PM1/13/14
to
Hi all,

On Mon, 13 Jan 2014 14:20:59 +1100 Stephen Rothwell <s...@canb.auug.org.au> wrote:
>
> On Mon, 13 Jan 2014 14:18:24 +1100 Stephen Rothwell <s...@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.

Not happy :-(

H. Peter Anvin

unread,
Jan 14, 2014, 12:00:01 AM1/14/14
to
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?

-hpa


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Stephen Rothwell

unread,
Jan 14, 2014, 12:20:01 AM1/14/14
to
Hi,
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 :-().

David Miller

unread,
Jan 14, 2014, 12:20:02 AM1/14/14
to
From: "H. Peter Anvin" <h...@zytor.com>
Date: Mon, 13 Jan 2014 20:51:43 -0800

> Is there a sensible way we can fix this in either net-next or tip?

I think if I sort the files in net-next the problem will go away,
if someone can confirm this I'll do it.

Stephen Rothwell

unread,
Jan 14, 2014, 12:50:02 AM1/14/14
to
On Mon, 13 Jan 2014 21:19:46 -0800 (PST) David Miller <da...@davemloft.net> wrote:
>
> From: "H. Peter Anvin" <h...@zytor.com>
> Date: Mon, 13 Jan 2014 20:51:43 -0800
>
> > Is there a sensible way we can fix this in either net-next or tip?
>
> I think if I sort the files in net-next the problem will go away,
> if someone can confirm this I'll do it.

I have attached 2 patches: one for net-next and one for tip/auto-latest
(but should be applicable in the appropriate topic branch). If both are
applied to their respect trees, then I get no conflict when merging the
two trees.
0001-net-resort-some-Kbuild-files-to-hopefully-help-avoid.patch
0001-tip-resort-some-Kbuild-files-to-hopefully-help-avoid.patch

David Miller

unread,
Jan 14, 2014, 12:50:02 AM1/14/14
to
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Tue, 14 Jan 2014 16:44:20 +1100
Net patch applied, thanks Stephen.

tip-bot for Stephen Rothwell

unread,
Jan 14, 2014, 1:10:01 AM1/14/14
to
Commit-ID: f549ed1abc7e4f0292ce08c4143c64a610c8b2cb
Gitweb: http://git.kernel.org/tip/f549ed1abc7e4f0292ce08c4143c64a610c8b2cb
Author: Stephen Rothwell <s...@canb.auug.org.au>
AuthorDate: Tue, 14 Jan 2014 16:36:10 +1100
Committer: H. Peter Anvin <h...@linux.intel.com>
CommitDate: Mon, 13 Jan 2014 21:56:54 -0800

arch: Re-sort some Kbuild files to hopefully help avoid some conflicts

Checkin:

93ea02bb8435 arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h

... unfortunately left some Kbuild files out of order, which caused
unnecessary merge conflicts, in particular with checkin:

e3fec2f74f7f lib: Add missing arch generic-y entries for asm-generic/hash.h

Put them back in order to make the upcoming merges cleaner.

Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
Link: http://lkml.kernel.org/r/20140114164420.d296...@canb.auug.org.au
Signed-off-by: H. Peter Anvin <h...@linux.intel.com>
Cc: Geert Uytterhoeven <ge...@linux-m68k.org>
Cc: "Paul E. McKenney" <pau...@linux.vnet.ibm.com>
Cc: Mathieu Desnoyers <mathieu....@polymtl.ca>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: David Miller <da...@davemloft.net>
---
arch/arc/include/asm/Kbuild | 2 +-
arch/cris/include/asm/Kbuild | 2 +-
arch/hexagon/include/asm/Kbuild | 2 +-
arch/microblaze/include/asm/Kbuild | 2 +-
arch/mn10300/include/asm/Kbuild | 2 +-
arch/parisc/include/asm/Kbuild | 2 +-
arch/score/include/asm/Kbuild | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild
index e07c786..9ae21c1 100644
--- a/arch/arc/include/asm/Kbuild
+++ b/arch/arc/include/asm/Kbuild
@@ -1,4 +1,5 @@
generic-y += auxvec.h
+generic-y += barrier.h
generic-y += bugs.h
generic-y += bitsperlong.h
generic-y += clkdev.h
@@ -47,4 +48,3 @@ generic-y += user.h
generic-y += vga.h
generic-y += xor.h
generic-y += preempt.h
-generic-y += barrier.h
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 35ec2e5..199b1a9 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -3,6 +3,7 @@ header-y += arch-v10/
header-y += arch-v32/


+generic-y += barrier.h
generic-y += clkdev.h
generic-y += exec.h
generic-y += kvm_para.h
@@ -12,4 +13,3 @@ generic-y += trace_clock.h
generic-y += vga.h
generic-y += xor.h
generic-y += preempt.h
-generic-y += barrier.h
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
index a614ec9..ada843c 100644
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@ -2,6 +2,7 @@
header-y += ucontext.h

generic-y += auxvec.h
+generic-y += barrier.h
generic-y += bug.h
generic-y += bugs.h
generic-y += clkdev.h
@@ -54,4 +55,3 @@ generic-y += ucontext.h
generic-y += unaligned.h
generic-y += xor.h
generic-y += preempt.h
-generic-y += barrier.h
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index f77fb66..a824265 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -1,7 +1,7 @@

+generic-y += barrier.h
generic-y += clkdev.h
generic-y += exec.h
generic-y += trace_clock.h
generic-y += syscalls.h
generic-y += preempt.h
-generic-y += barrier.h
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild
index 367ef39..032143e 100644
--- a/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@ -1,6 +1,6 @@

+generic-y += barrier.h
generic-y += clkdev.h
generic-y += exec.h
generic-y += trace_clock.h
generic-y += preempt.h
-generic-y += barrier.h
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index 8df06d0..34b0be4 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -1,8 +1,8 @@

+generic-y += barrier.h
generic-y += word-at-a-time.h auxvec.h user.h cputime.h emergency-restart.h \
segment.h topology.h vga.h device.h percpu.h hw_irq.h mutex.h \
div64.h irq_regs.h kdebug.h kvm_para.h local64.h local.h param.h \
poll.h xor.h clkdev.h exec.h
generic-y += trace_clock.h
generic-y += preempt.h
-generic-y += barrier.h
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index ee2993b..fe7471e 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -1,8 +1,8 @@

header-y +=

+generic-y += barrier.h
generic-y += clkdev.h
generic-y += trace_clock.h
generic-y += xor.h
generic-y += preempt.h
-generic-y += barrier.h

Stephen Rothwell

unread,
Jan 14, 2014, 1:20:01 AM1/14/14
to
Hi Dave,

On Mon, 13 Jan 2014 21:48:41 -0800 (PST) David Miller <da...@davemloft.net> wrote:
>
> Net patch applied, thanks Stephen.

Thanks.
0 new messages