| 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
| ||
|
Date: Thu, 4 Jun 2015 14:26:22 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jens Axboe <axboe@...nel.dk>,
Jesper Nilsson <jesper.nilsson@...s.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Christoph Hellwig <hch@....de>, Rabin Vincent <rabin@....in>
Subject: linux-next: manual merge of the block tree with the cris tree
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
arch/cris/include/asm/Kbuild between commit 5527b7d955ac ("CRIS: UAPI:
use generic headers via Kbuild") from the cris tree and commit
c546d5db75b4 ("remove scatterlist.h generation from arch Kbuild files")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc arch/cris/include/asm/Kbuild
index 2fc4331a69ca,d294f6aaff1d..000000000000
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -24,23 -18,11 +24,22 @@@ generic-y += linkage.
generic-y += local.h
generic-y += local64.h
generic-y += mcs_spinlock.h
+generic-y += mman.h
generic-y += module.h
+generic-y += msgbuf.h
generic-y += percpu.h
+generic-y += poll.h
generic-y += preempt.h
+generic-y += resource.h
- generic-y += scatterlist.h
generic-y += sections.h
+generic-y += sembuf.h
+generic-y += shmbuf.h
+generic-y += siginfo.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += statfs.h
generic-y += topology.h
generic-y += trace_clock.h
+generic-y += types.h
generic-y += vga.h
generic-y += xor.h
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists