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

Stephen Rothwell
2014-01-13T03:21:15Z

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

Hi all,

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.

--
Cheers,
Stephen Rothwell sfr@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
generic-y += preempt.h
- generic-y += hash.h
-generic-y += barrier.h

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