linux-next: manual merge of the tip tree with the vfs-brauner tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]

Hi all,

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

  include/linux/proc_fs.h

between commit:

  ef104443bffa ("procfs: consolidate arch_report_meminfo declaration")

from the vfs-brauner tree and commit:

  eec387cbf905 ("x86: Expose thread features in /proc/$PID/status")

from the tip 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 include/linux/proc_fs.h
index 253f2676d93a,80ff8e533cbd..000000000000
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@@ -158,8 -158,8 +158,10 @@@ int proc_pid_arch_status(struct seq_fil
  			struct pid *pid, struct task_struct *task);
  #endif /* CONFIG_PROC_PID_ARCH_STATUS */
  
 +void arch_report_meminfo(struct seq_file *m);
 +
+ void arch_proc_pid_thread_features(struct seq_file *m, struct task_struct *task);
+ 
  #else /* CONFIG_PROC_FS */
  
  static inline void proc_root_init(void)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]