linux-next: manual merge of the ia64 tree with the asm-generic tree

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

 



Hi all,

Today's linux-next merge of the ia64 tree got a conflict in
arch/ia64/include/asm/Kbuild between commit e7a570ff7dff ("asm-generic:
Add default clkdev.h") from the asm-generic tree and commit f68301fee715
("UAPI: (Scripted) Disintegrate arch/ia64/include/asm") from the ia64
tree.

I fixed it up (see below - I am not sure if this is the correct fix) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/ia64/include/asm/Kbuild
index 58f3d14,e69de29..0000000
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@@ -1,16 -1,0 +1,1 @@@
- include include/asm-generic/Kbuild.asm
- 
- header-y += break.h
- header-y += cmpxchg.h
- header-y += fpu.h
- header-y += gcc_intrin.h
- header-y += ia64regs.h
- header-y += intel_intrin.h
- header-y += intrinsics.h
- header-y += perfmon.h
- header-y += perfmon_default_smpl.h
- header-y += ptrace_offsets.h
- header-y += rse.h
- header-y += ucontext.h
- header-y += ustack.h
 +generic-y += clkdev.h

Attachment: pgp1JljRfARPM.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux