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

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

arch/x86/mm/extable.c

between commit:

548acf19234d ("x86/mm: Expand the exception table logic to allow new handling options")

from the tip tree and commit:

f1cd2c09ff09 ("x86/extable: use generic search and sort routines")

from the akpm-current tree.

I couldn't figure out how to fix this up, so I just dropped the
akpm-current tree patch.

--
Cheers,
Stephen Rothwell

\
 
 \ /
  Last update: 2016-02-19 05:41    [W:0.055 / U:0.204 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site