merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes

diff --cc lib/maple_tree.c
index ffb9d15,f723024..05d5db2
--- 1/lib/maple_tree.c
--- 2/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@@ -4107,12 -4265,16 +4107,16 @@@ static inline unsigned char mas_wr_new_
   * mas_wr_append: Attempt to append
   * @wr_mas: the maple write state
   *
+  * This is currently unsafe in rcu mode since the end of the node may be cached
+  * by readers while the node contents may be updated which could result in
+  * inaccurate information.
+  *
   * Return: True if appended, false otherwise
   */
 -static inline bool mas_wr_append(struct ma_wr_state *wr_mas)
 +static inline bool mas_wr_append(struct ma_wr_state *wr_mas,
 +                               unsigned char new_end)
  {
        unsigned char end = wr_mas->node_end;
 -      unsigned char new_end = end + 1;
        struct ma_state *mas = wr_mas->mas;
        unsigned char node_pivots = mt_pivots[wr_mas->type];
  

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/madvise.c
Simple merge

diff --cc mm/shmem.c
Simple merge