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

Stephen Rothwell
2014-01-13T03:18:35Z

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

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 sfr@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

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