From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>, Jonathan Corbet <corbet@lwn.net>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kees Cook <keescook@chromium.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andreas Noever <andreas.noever@gmail.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the jc_docs tree
Date: Tue, 13 Jun 2017 09:14:50 +0200 [thread overview]
Message-ID: <20170613071450.GA27543@kroah.com> (raw)
In-Reply-To: <20170613162341.627e2095@canb.auug.org.au>
On Tue, Jun 13, 2017 at 04:23:41PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> Documentation/admin-guide/index.rst
>
> between commit:
>
> 504f231cda56 ("doc: ReSTify and split LSM.txt")
>
> from the jc_docs tree and commit:
>
> 163f15115203 ("thunderbolt: Add documentation how Thunderbolt bus can be used")
>
> from the char-misc 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/index.rst
> index e14c374aaf60,6d99a7ce6e21..000000000000
> --- a/Documentation/admin-guide/index.rst
> +++ b/Documentation/admin-guide/index.rst
> @@@ -61,7 -61,7 +61,8 @@@ configure specific aspects of kernel be
> java
> ras
> pm/index
> + LSM/index
> + thunderbolt
Looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2017-06-13 7:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 6:23 linux-next: manual merge of the char-misc tree with the jc_docs tree Stephen Rothwell
2017-06-13 7:14 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-14 4:04 Stephen Rothwell
2017-06-14 4:33 ` Greg KH
2017-07-03 1:27 ` Stephen Rothwell
2023-08-21 4:25 Stephen Rothwell
2023-08-22 11:52 ` Greg KH
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=20170613071450.GA27543@kroah.com \
--to=greg@kroah.com \
--cc=andreas.noever@gmail.com \
--cc=arnd@arndb.de \
--cc=corbet@lwn.net \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).