linux-next: manual merge of the sysctl tree with the ext3 tree

[Stephen Rothwell]

Hi all,

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

  mm/filemap.c

between commit:

  e6529028f9ac ("Revert "fsnotify: generate pre-content permission event on page fault"")

from the ext3 tree and commit:

  73aa354af21d ("mm: filemap: move sysctl to mm/filemap.c")

from the sysctl 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 mm/filemap.c
index 1911d43b319e,004d78767804..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -47,6 -47,8 +47,7 @@@
  #include <linux/splice.h>
  #include <linux/rcupdate_wait.h>
  #include <linux/sched/mm.h>
+ #include <linux/sysctl.h>
 -#include <linux/fsnotify.h>
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
  #include "internal.h"

Attachment: pgp1pf19e75Wx.pgp
Description: OpenPGP digital signature