Messages in this thread | | | Date | Tue, 29 May 2018 14:37:33 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the block tree with the vfs tree |
| |
Hi all,
Today's linux-next merge of the block tree got a conflict in:
drivers/block/drbd/drbd_main.c
between commit:
004fd11db1d6 ("drbd: switch to proc_create_single")
from the vfs tree and commit:
5657a819a8d9 ("block drivers/block: Use octal not symbolic permissions")
from the block 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 drivers/block/drbd/drbd_main.c index c2d154faac02,e6ec831ad472..000000000000 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@@ -3010,8 -3010,7 +3010,8 @@@ static int __init drbd_init(void goto fail; err = -ENOMEM; - drbd_proc = proc_create_single("drbd", S_IFREG | S_IRUGO , NULL, - drbd_proc = proc_create_data("drbd", S_IFREG | 0444 , NULL, &drbd_proc_fops, NULL); ++ drbd_proc = proc_create_single("drbd", S_IFREG | 0444 , NULL, + drbd_seq_show); if (!drbd_proc) { pr_err("unable to register proc file\n"); goto fail; [unhandled content-type:application/pgp-signature] | |