linux-next: manual merge of the tip tree with the mm-unstable tree

[Mark Brown]

Hi all,

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

  init/main.c

between commit:

  e91e16820a507 ("lib: introduce hierarchical per-cpu counters")

from the mm-unstable tree and commit:

  05988dba11791 ("vdso/datastore: Allocate data pages dynamically")

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.

diff --cc init/main.c
index 13aeb7834111a,de867b2693d21..0000000000000
--- a/init/main.c
+++ b/init/main.c
@@@ -105,7 -105,7 +105,8 @@@
  #include <linux/ptdump.h>
  #include <linux/time_namespace.h>
  #include <linux/unaligned.h>
 +#include <linux/percpu_counter_tree.h>
+ #include <linux/vdso_datastore.h>
  #include <net/net_namespace.h>
  
  #include <asm/io.h>

Attachment: signature.asc
Description: PGP signature