Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in
include/linux/mempolicy.h and mm/mempolicy.c between commit 42288fe366c4
("mm: mempolicy: Convert shared_policy mutex to spinlock") from Linus'
tree and commit "mm, mempolicy: introduce spinlock to read shared policy
tree" from the akpm tree.These two commits seem to be fixing the same problem, so I dropped the akpm tree commit. -- Cheers, Stephen Rothwell [email protected]
pgpUpyal0kLmk.pgp
Description: PGP signature
