linux-kernel - linux-next: manual merge of the cris tree with Linus' 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Mon, 20 Jul 2015 10:01:44 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jesper Nilsson <jesper.nilsson@...s.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@....de>, Jens Axboe <axboe@...com>,
	Rabin Vincent <rabin@....in>,
	Laurent Dufour <ldufour@...ux.vnet.ibm.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the cris tree with Linus' tree

Hi Jesper,

Today's linux-next merge of the cris tree got a conflict in:

  arch/cris/include/asm/Kbuild

between commits:

  c546d5db75b4 ("remove scatterlist.h generation from arch Kbuild files")
  f2abeef9fd6f ("mm: clean up per architecture MM hook header files")

from Linus' tree and commit:

  d0529229a92c ("CRIS: UAPI: use generic headers via Kbuild")

from the cris 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 ad2244f35bca,2fc4331a69ca..000000000000
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -18,12 -24,23 +24,23 @@@ generic-y += linkage.
  generic-y += local.h
  generic-y += local64.h
  generic-y += mcs_spinlock.h
+ generic-y += mman.h
 +generic-y += mm-arch-hooks.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/