Messages in this thread | | | Date | Tue, 15 Mar 2022 18:45:30 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the userns tree with the block tree |
| |
Hi all,
Today's linux-next merge of the userns tree got a conflict in:
block/blk-cgroup.c
between commit:
672fdcf0e7de ("block: partition include/linux/blk-cgroup.h")
from the block tree and commit:
03248addadf1 ("resume_user_mode: Move to resume_user_mode.h")
from the userns 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 block/blk-cgroup.c index fa063c6c0338,4d8be1634bc6..000000000000 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@@ -26,7 -26,9 +26,7 @@@ #include <linux/delay.h> #include <linux/atomic.h> #include <linux/ctype.h> - #include <linux/tracehook.h> -#include <linux/blk-cgroup.h> + #include <linux/resume_user_mode.h> #include <linux/psi.h> #include <linux/part_stat.h> #include "blk.h" [unhandled content-type:application/pgp-signature] | |