Subject: linux-next: manual merge of the nfs tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 3 May 2017 10:07:02 +1000

Hi Trond,

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

  Documentation/admin-guide/kernel-parameters.txt

between commit:

  c0c74acbb60b ("docs: remove all references to AVR32 architecture")

from Linus' tree and commit:

  6d22323b2e9f ("nfs: remove the objlayout driver")

from the nfs 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 Documentation/admin-guide/kernel-parameters.txt
index 8d676d2a48ac,17156d66b124..000000000000
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -2419,13 -2419,7 +2419,7 @@@
  			and gids from such clients.  This is intended to ease
  			migration from NFSv2/v3.
  
- 	objlayoutdriver.osd_login_prog=
- 			[NFS] [OBJLAYOUT] sets the pathname to the program which
- 			is used to automatically discover and login into new
- 			osd-targets. Please see:
- 			Documentation/filesystems/pnfs.txt for more explanations
- 
 -	nmi_debug=	[KNL,AVR32,SH] Specify one or more actions to take
 +	nmi_debug=	[KNL,SH] Specify one or more actions to take
  			when a NMI is triggered.
  			Format: [state][,regs][,debounce][,die]