Hi Tejun,
Today's linux-next merge of the cgroup tree got a conflict in
include/linux/res_counter.h between commit ebf47beb660e
("include/linux/res_counter.h needs errno.h") from Linus' tree and commit
9259826ccb81 ("res_counter: remove include of cgroup.h from
res_counter.h") from the cgroup tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc include/linux/res_counter.h index c230994,a83a849..0000000 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h @@@ -13,8 -13,7 +13,8 @@@ * info about what this counter is. */ - #include <linux/cgroup.h> +#include <linux/errno.h> + #include <linux/spinlock.h> /* * The core object. the cgroup that wishes to account for some
pgpc2NyeeKts6.pgp
Description: PGP signature
