linux-next: manual merge of the akpm-current tree with the tree

linux-next: manual merge of the akpm-current tree with the tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/x86/mm/pgtable.c between commit d6ccc3ec95251d8d327 ("x86/paravirt:
Remove paravirt ops pmd_update[_defer] and pte_update_defer") from the tip tree
and commit cc5bc0810343b ("x86, thp: remove infrastructure for handling
splitting PMDs") from the akpm-current tree.

I fixed it up by removing pmdp_splitting_flush and can carry the fix as 
necessary (no action is required). No diff seems to have been generated which
is confusing me a bit.

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

linux-next: manual merge of the akpm-current tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
mm/swap.c between commit 97b713ba3eba ("fs: kill BDI_CAP_SWAP_BACKED")
from the block tree and commit f69ec11fad9f ("rmap: drop support of
non-linear mappings") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc mm/swap.c
index 4e0109a2f37b,5b3087228b99..000000000000
--- a/mm/swap.c
+++ b/mm/swap.c
@@@ -1138,10 -1138,10 +1138,8 @@@ void __init swap_setup(void
  #ifdef CONFIG_SWAP
  	int i;
  
- 	for (i = 0; i < MAX_SWAPFILES; i++) {
 -	if (bdi_init(swapper_spaces[0].backing_dev_info))
 -		panic("Failed to init swap bdi");
+ 	for (i = 0; i < MAX_SWAPFILES; i++)
  		spin_lock_init(&swapper_spaces[i].tree_lock);
- 		INIT_LIST_HEAD(&swapper_spaces[i].i_mmap_nonlinear);
- 	}
  #endif
  
  	/* Use a smaller cluster for small-memory machines */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the akpm-current tree with the tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2173 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in drivers/clk/rockchip/clk.h and drivers/clk/rockchip/clk.c between commits like fe94f974e9c8b8 ("clk: rockchip: protect critical clocks from getting disabled") from the clk tree and "clk: rockchip: add restart handler" from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc drivers/clk/rockchip/clk.c
index d9c6db2151ba,aa41433eb34f..000000000000
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@@ -297,15 -244,26 +298,39 @@@ void __init rockchip_clk_register_branc
  	}
  }
  
 +void __init rockchip_clk_protect_critical(const char *clocks[], int nclocks)
 +{
 +	int i;
 +
 +	/* Protect the clocks that needs to stay on */
 +	for (i = 0; i < nclocks; i++) {
 +		struct clk *clk = __clk_lookup(clocks[i]);
 +
 +		if (clk)
 +			clk_prepare_enable(clk);
 +	}
 +}
++
+ static unsigned int reg_restart;
+ static int rockchip_restart_notify(struct notifier_block *this,
+ 				   unsigned long mode, void *cmd)
+ {
+ 	writel(0xfdb9, reg_base + reg_restart);
+ 	return NOTIFY_DONE;
+ }
+ 
+ static struct notifier_block rockchip_restart_handler = {
+ 	.notifier_call = rockchip_restart_notify,
+ 	.priority = 128,
+ };
+ 
+ void __init rockchip_register_restart_notifier(unsigned int reg)
+ {
+ 	int ret;
+ 
+ 	reg_restart = reg;
+ 	ret = register_restart_handler(&rockchip_restart_handler);
+ 	if (ret)
+ 		pr_err("%s: cannot register restart handler, %d\n",
+ 		       __func__, ret);
+ }
diff --cc drivers/clk/rockchip/clk.h
index 2b0bca19db47,0b5eab5b521f..000000000000
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@@ -329,7 -329,7 +329,8 @@@ void rockchip_clk_register_branches(str
  				    unsigned int nr_clk);
  void rockchip_clk_register_plls(struct rockchip_pll_clock *pll_list,
  				unsigned int nr_pll, int grf_lock_offset);
 +void rockchip_clk_protect_critical(const char *clocks[], int nclocks);
+ void rockchip_register_restart_notifier(unsigned int reg);
  
  #define ROCKCHIP_SOFTRST_HIWORD_MASK	BIT(0)
  

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the akpm-current tree with the tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 360 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in scripts/checkpatch.pl between commit 8678fa326053d41 ("checkpatch: relax check for length of git commit IDs") from Linus' tree and what looks like the same commit from the akpm-current tree.

I fixed it up by taking Linus' version and can carry as required.

Thanks,
Mark

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the akpm-current tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/powerpc/include/asm/topology.h between commit 4750afa2c568
("powerpc: Fix comment around arch specific definition of
RECLAIM_DISTANCE") from the powerpc tree and commit ba5b7fb4aebd ("mm:
disable zone_reclaim_mode by default") from the akpm-current tree.

I fixed it up (I use th akpm-current tree version) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the akpm-current tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1191 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/btrfs/inode.cfs/btrfs/file.c between commit 55e301fd57a6 ("Btrfs: move
fs/btrfs/ioctl.h to include/uapi/linux/btrfs.h") from the btrfs tree and
commit "aio: don't include aio.h in sched.h" from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/btrfs/file.c
index 8614c5b,39f556f..0000000
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@@ -30,7 -30,7 +30,8 @@@
  #include <linux/statfs.h>
  #include <linux/compat.h>
  #include <linux/slab.h>
 +#include <linux/btrfs.h>
+ #include <linux/aio.h>
  #include "ctree.h"
  #include "disk-io.h"
  #include "transaction.h"
diff --cc fs/btrfs/inode.c
index 40d49da,ed7ea0a..0000000
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -39,8 -39,7 +39,9 @@@
  #include <linux/slab.h>
  #include <linux/ratelimit.h>
  #include <linux/mount.h>
 +#include <linux/btrfs.h>
 +#include <linux/blkdev.h>
+ #include <linux/aio.h>
  #include "compat.h"
  #include "ctree.h"
  #include "disk-io.h"

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the akpm-current tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2088 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
mm/memcontrol.c between commit 2ef37d3fe474 ("memcg: Simplify
mem_cgroup_force_empty_list error handling") from the cgroup tree and
commit 4bfe8322f427 ("memcg: fix hotplugged memory zone oops") from the
akpm-current tree.

I fixed it up (as suggested by Andrew - see below) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc mm/memcontrol.c
index 08adaaa,dd39ba0..0000000
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -3673,32 -3712,30 +3706,32 @@@ unsigned long mem_cgroup_soft_limit_rec
  	return nr_reclaimed;
  }
  
 -/*
 +/**
 + * mem_cgroup_force_empty_list - clears LRU of a group
 + * @memcg: group to clear
 + * @node: NUMA node
 + * @zid: zone id
 + * @lru: lru to to clear
 + *
   * Traverse a specified page_cgroup list and try to drop them all.  This doesn't
 - * reclaim the pages page themselves - it just removes the page_cgroups.
 - * Returns true if some page_cgroups were not freed, indicating that the caller
 - * must retry this operation.
 + * reclaim the pages page themselves - pages are moved to the parent (or root)
 + * group.
   */
 -static bool mem_cgroup_force_empty_list(struct mem_cgroup *memcg,
 +static void mem_cgroup_force_empty_list(struct mem_cgroup *memcg,
  				int node, int zid, enum lru_list lru)
  {
- 	struct mem_cgroup_per_zone *mz;
+ 	struct lruvec *lruvec;
 -	unsigned long flags, loop;
 +	unsigned long flags;
  	struct list_head *list;
  	struct page *busy;
  	struct zone *zone;
  
  	zone = &NODE_DATA(node)->node_zones[zid];
- 	mz = mem_cgroup_zoneinfo(memcg, node, zid);
- 	list = &mz->lruvec.lists[lru];
+ 	lruvec = mem_cgroup_zone_lruvec(zone, memcg);
+ 	list = &lruvec->lists[lru];
  
 -	loop = mem_cgroup_get_lru_size(lruvec, lru);
 -	/* give some margin against EBUSY etc...*/
 -	loop += 256;
  	busy = NULL;
 -	while (loop--) {
 +	do {
  		struct page_cgroup *pc;
  		struct page *page;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]