Hi Stephane,
Today's linux-next merge of the perfmon3 tree got a conflict in
include/linux/sched.h between commit
f8d570a4745835f2238a33b537218a1bb03fc671 ("net: Fix recursive descent in
__scm_destroy()") from Linus' tree and commit
dab167960a632d29ef819adfa2d4c76a2ee3b26b ("perfmon: base code") from the
perfmon3 tree.
Just overlapping additions. I fixed it up (see below) and you should fix
it in your tree by merging in Linus' tree and doing the same fixup in the
merge commit.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc include/linux/sched.h
index 755b570,16bf42d..0000000
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -1304,8 -1349,9 +1304,11 @@@ struct task_struct
*/
unsigned long timer_slack_ns;
unsigned long default_timer_slack_ns;
+
+ struct list_head *scm_work_list;
+ #ifdef CONFIG_PERFMON_V20
+ struct pfm_context *pfm_context;
+ #endif
};
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
