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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 8 Oct 2012 10:11:31 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Luck, Tony" <tony.luck@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Arnd Bergmann <arnd@...db.de>,
	David Howells <dhowells@...hat.com>
Subject: linux-next: manual merge of the ia64 tree with the asm-generic tree

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@...b.auug.org.au

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

Content of type "application/pgp-signature" skipped