From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968943AbdAICvG (ORCPT ); Sun, 8 Jan 2017 21:51:06 -0500 Received: from ozlabs.org ([103.22.144.67]:35951 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757411AbdAICvF (ORCPT ); Sun, 8 Jan 2017 21:51:05 -0500 Date: Mon, 9 Jan 2017 13:51:01 +1100 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Johannes Weiner , Matthew Wilcox Subject: linux-next: manual merge of the akpm tree with Linus' tree Message-ID: <20170109135101.3dfce262@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: include/linux/radix-tree.h between commit: ea07b862ac8e ("mm: workingset: fix use-after-free in shadow node shrinker") from Linus' tree and patch: "Reimplement IDR and IDA using the radix tree" from the akpm 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 include/linux/radix-tree.h index 52bda854593b,50aaac14a4f1..000000000000 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@@ -306,9 -309,9 +309,11 @@@ void radix_tree_iter_replace(struct rad void radix_tree_replace_slot(struct radix_tree_root *root, void **slot, void *item); void __radix_tree_delete_node(struct radix_tree_root *root, - struct radix_tree_node *node); + struct radix_tree_node *node, + radix_tree_update_node_t update_node, + void *private); + void radix_tree_iter_delete(struct radix_tree_root *, + const struct radix_tree_iter *iter); void *radix_tree_delete_item(struct radix_tree_root *, unsigned long, void *); void *radix_tree_delete(struct radix_tree_root *, unsigned long); void radix_tree_clear_tags(struct radix_tree_root *root,