linux-kernel - linux-next: manual merge of the tile 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]

Message-Id: <20120402103719.c65942de252fc39af503acf4@canb.auug.org.au>
Date:	Mon, 2 Apr 2012 10:37:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Chris Metcalf <cmetcalf@...era.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>,
	Linus <torvalds@...ux-foundation.org>
Subject: linux-next: manual merge of the tile tree with Linus' tree

Hi Chris,

Today's linux-next merge of the tile tree got a conflict in
arch/tile/include/asm/pgtable.h between commit bd119c692393
("Disintegrate asm/system.h for Tile") from Linus' tree and commit
7dc0069e58f6 ("arch/tile: Allow tilegx to build with either 16K or 64K
page size") from the tile tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/tile/include/asm/pgtable.h
index 6749091,ff01704..0000000
--- a/arch/tile/include/asm/pgtable.h
+++ b/arch/tile/include/asm/pgtable.h
@@@ -27,8 -27,11 +27,10 @@@
  #include <linux/slab.h>
  #include <linux/list.h>
  #include <linux/spinlock.h>
+ #include <linux/pfn.h>
  #include <asm/processor.h>
  #include <asm/fixmap.h>
 -#include <asm/system.h>
+ #include <asm/page.h>
  
  struct mm_struct;
  struct vm_area_struct;

Content of type "application/pgp-signature" skipped