Hi all, Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/sched.h
between commit:
15917dc02841 ("sched: Remove stale PF_MUTEX_TESTER bit")
from the tip tree and commit:
ca299cb98649 ("mm/cma: add PF flag to force non cma alloc")
from the akpm-current 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/sched.h
index bb68abafac29,1ef3995b7564..000000000000
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -1409,6 -1423,8 +1423,7 @@@ extern struct pid *cad_pid
#define PF_UMH 0x02000000 /* I'm an
Usermodehelper process */
#define PF_NO_SETAFFINITY 0x04000000 /* Userland is not allowed to
meddle with cpus_allowed */
#define PF_MCE_EARLY 0x08000000 /* Early kill for mce process
policy */
+ #define PF_MEMALLOC_NOCMA 0x10000000 /* All allocation request will
have _GFP_MOVABLE cleared */
-#define PF_MUTEX_TESTER 0x20000000 /* Thread belongs to
the rt mutex tester */
#define PF_FREEZER_SKIP 0x40000000 /* Freezer should not
count it as freezable */
#define PF_SUSPEND_TASK 0x80000000 /* This thread called
freeze_processes() and should not be frozen */
pgp4DkVDtoumO.pgp
Description: OpenPGP digital signature
