lkml.org 
[lkml]   [2011]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the tip tree with the tree
Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/mm/fault.c between commit cedf03bd9aa5 ("x86: fix mm/fault.c
build") from Linus' tree and commit fab1167c4698 ("x86, vsyscall: Add
missing <asm/fixmap.h> to arch/x86/mm/fault.c") from the tip tree.

These are both fixing the same problem but differently. Given the
comments in the latter, I have used its version.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-08-18 06:17    [W:0.196 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site