linux-kernel - linux-next: manual merge of the akpm tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20170109135101.3dfce262@canb.auug.org.au>
Date:   Mon, 9 Jan 2017 13:51:01 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Johannes Weiner <hannes@...xchg.org>,
        Matthew Wilcox <willy@...ux.intel.com>
Subject: linux-next: manual merge of the akpm tree with Linus' tree

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,