Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 1 insertions, 2 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 78062ab641ff..959a8b8c7350 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1979,8 +1979,7 @@ int __mpol_equal(struct mempolicy *a, struct mempolicy *b)
         case MPOL_INTERLEAVE:
                 return nodes_equal(a->v.nodes, b->v.nodes);
         case MPOL_PREFERRED:
-                return a->v.preferred_node == b->v.preferred_node &&
-                        a->flags == b->flags;
+                return a->v.preferred_node == b->v.preferred_node;
         default:
                 BUG();
                 return 0;