Hi all, Today's linux-next merge of the fs-next tree got a conflict in: fs/proc/kcore.c between commit: 6b20f3da3436e ("proc/kcore: allow disabling /proc/kcore at boot") from the mm-nonmm-unstable tree and commit: 79011a80f0646 ("proc: give kcore, kmsg, the kpage files and profile their own file_operations") from the fs-next 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. diff --cc fs/proc/kcore.c index 4251a9ef868b6,ab7b74efe9754..0000000000000 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@@ -723,20 -722,9 +723,20 @@@ static void __init add_modules_range(vo } #endif +static int __init parse_kcore(char *str) +{ + return kstrtobool(str, &kcore_enabled); +} +early_param("kcore", parse_kcore); + static int __init proc_kcore_init(void) { + if (!kcore_enabled) { + pr_info("/proc/kcore disabled on command line\n"); + return 0; + } + - proc_root_kcore = proc_create("kcore", S_IRUSR, NULL, &kcore_proc_ops); + proc_root_kcore = proc_create_fops("kcore", S_IRUSR, NULL, &kcore_fops); if (!proc_root_kcore) { pr_err("couldn't create /proc/kcore\n"); return 0; /* Always returns 0. */