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

[Stephen Rothwell]

Hi all,

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

  mm/memory.c

between commit:

  7df676974359 ("mm/memory.c: Update local TLB if PTE entry exists")

from the mips tree and commit:

  e325f89fdd69 ("mm: memcontrol: convert anon and file-thp to new mem_cgroup_charge() API")

from the akpm-current 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/memory.c
index c7c8960bdd1e,8d52a91d707b..000000000000
--- a/mm/memory.c
+++ b/mm/memory.c
@@@ -2752,9 -2748,6 +2749,8 @@@ static vm_fault_t wp_page_copy(struct v
  		/* Free the old page.. */
  		new_page = old_page;
  		page_copied = 1;
 +	} else {
 +		update_mmu_tlb(vma, vmf->address, vmf->pte);
- 		mem_cgroup_cancel_charge(new_page, memcg, false);
  	}
  
  	if (new_page)

Attachment: pgpACBa42w3yP.pgp
Description: OpenPGP digital signature