From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Trond Myklebust <trond.myklebust@fys•uio.no>
Cc: "Linux-Next Mailing List" <linux-next@vger•kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Hans-Christian Noren Egtvedt" <egtvedt@samfundet•no>,
"Håvard Skinnemoen" <hskinnemoen@gmail•com>,
"Nicolas Ferre" <nicolas.ferre@microchip•com>,
"Christoph Hellwig" <hch@lst•de>
Subject: linux-next: manual merge of the nfs tree with Linus' tree
Date: Wed, 3 May 2017 10:07:02 +1000 [thread overview]
Message-ID: <20170503100702.2defccb8@canb.auug.org.au> (raw)
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]
next reply other threads:[~2017-05-03 0:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-03 0:07 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-12-05 0:19 linux-next: manual merge of the nfs tree with Linus' tree Stephen Rothwell
2025-12-05 0:34 ` Trond Myklebust
2025-12-05 1:11 ` Mike Snitzer
2020-12-15 0:24 Stephen Rothwell
2020-12-15 0:30 ` Trond Myklebust
2016-05-19 0:40 Stephen Rothwell
2016-05-19 1:18 ` Weston Andros Adamson
2012-05-22 2:10 Stephen Rothwell
2009-04-02 0:41 Stephen Rothwell
2009-04-02 8:56 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170503100702.2defccb8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=egtvedt@samfundet$(echo .)no \
--cc=hch@lst$(echo .)de \
--cc=hskinnemoen@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nicolas.ferre@microchip$(echo .)com \
--cc=trond.myklebust@fys$(echo .)uio.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox