linux-next: manual merge of the akpm-current tree with the tip tree
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/sched.h
between commits:
5567d11c21a1 ("x86/mce: Send #MC singal from task work")
from the tip tree and commit:
e87f27165be1 ("fs/buffer.c: add debug print for __getblk_gfp() stall problem")
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.
Signature · 29 lines
Cheers, Stephen Rothwell diff --cc include/linux/sched.h index 5216bd5ff4fb,98060427c53f..000000000000 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@@ -1303,14 -1293,13 +1307,21 @@@ struct task_struct unsigned long prev_lowest_stack; #endif +#ifdef CONFIG_X86_MCE + u64 mce_addr; + __u64 mce_ripv : 1, + mce_whole_page : 1, + __mce_reserved : 62; + struct callback_head mce_kill_me; +#endif + + #ifdef CONFIG_DEBUG_AID_FOR_SYZBOT + unsigned long getblk_stamp; + unsigned int getblk_executed; + unsigned int getblk_bh_count; + unsigned long getblk_bh_state; + #endif + /* * New fields for task_struct should be added above here, so that * they are included in the randomized portion of task_struct.