On 19 February 2016 at 05:09, Stephen Rothwell <s...@canb.auug.org.au> wrote: > 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. >
Hi Andrew, Unfortunately, this is not the only problem currently with my extable series. The arm64 patch now also conflicts with patches that are queued in the arm64 tree. So could you please drop all six of them for now? I will ask Catalin to take the ones that are essential to the arm64 KASLR implementation via the arm64 tree, and once that hits mainline, I will rebase and resubmit the remaining patches. extable-add-support-for-relative-extables-to-search-and-sort-routines.patch alpha-extable-use-generic-search-and-sort-routines.patch s390-extable-use-generic-search-and-sort-routines.patch x86-extable-use-generic-search-and-sort-routines.patch ia64-extable-use-generic-search-and-sort-routines.patch arm64-switch-to-relative-exception-tables.patch Thanks, Ard.