linux-next: manual merge of the akpm-current tree with the tip tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  kernel/sched/psi.c

between commit:

  3d817689a62c ("sched/psi: create /proc/pressure and /proc/pressure/{io|memory|cpu} only when psi enabled")

from the tip tree and patch:

  "proc: convert everything to "struct proc_ops""

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.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/sched/psi.c
index db7b50bba3f1,faad3d11b9db..000000000000
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@@ -1280,12 -1280,10 +1280,12 @@@ static const struct proc_ops psi_cpu_pr
  
  static int __init psi_proc_init(void)
  {
 -	proc_mkdir("pressure", NULL);
 -	proc_create("pressure/io", 0, NULL, &psi_io_proc_ops);
 -	proc_create("pressure/memory", 0, NULL, &psi_memory_proc_ops);
 -	proc_create("pressure/cpu", 0, NULL, &psi_cpu_proc_ops);
 +	if (psi_enable) {
 +		proc_mkdir("pressure", NULL);
- 		proc_create("pressure/io", 0, NULL, &psi_io_fops);
- 		proc_create("pressure/memory", 0, NULL, &psi_memory_fops);
- 		proc_create("pressure/cpu", 0, NULL, &psi_cpu_fops);
++		proc_create("pressure/io", 0, NULL, &psi_io_proc_ops);
++		proc_create("pressure/memory", 0, NULL, &psi_memory_proc_ops);
++		proc_create("pressure/cpu", 0, NULL, &psi_cpu_proc_ops);
 +	}
  	return 0;
  }
  module_init(psi_proc_init);

Attachment: pgpCdjBq1vIiT.pgp
Description: OpenPGP digital signature