Subject: linux-next: manual merge of the tip tree with the vfs tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 29 Sep 2016 12:57:53 +1000

Hi all,

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

  arch/x86/mm/fault.c

between commit:

  df720ac12fc7 ("exceptions: detritus removal")

from the vfs tree and commit:

  744c193eb9a2 ("x86: Migrate exception table users off module.h and onto extable.h")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/mm/fault.c
index c0413d5541af,4dc13340653e..000000000000
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -5,7 -5,7 +5,7 @@@
   */
  #include <linux/sched.h>		/* test_thread_flag(), ...	*/
  #include <linux/kdebug.h>		/* oops_begin/end, ...		*/
- #include <linux/module.h>		/* search_exception_tables	*/
 -#include <linux/extable.h>		/* search_exception_table	*/
++#include <linux/extable.h>		/* search_exception_tables	*/
  #include <linux/bootmem.h>		/* max_low_pfn			*/
  #include <linux/kprobes.h>		/* NOKPROBE_SYMBOL, ...		*/
  #include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/