From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Changbin Du <changbin.du@gmail.com>,
William Breathitt Gray <vilhelm.gray@gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with the pm tree
Date: Tue, 30 Apr 2019 10:13:44 +0200 [thread overview]
Message-ID: <20190430081344.GA8245@kroah.com> (raw)
In-Reply-To: <20190430174829.4f33e8b0@canb.auug.org.au>
On Tue, Apr 30, 2019 at 05:48:29PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> Documentation/driver-api/index.rst
>
> between commit:
>
> 680e6ffa1510 ("Documentation: add Linux ACPI to Sphinx TOC tree")
>
> from the pm tree and commit:
>
> 09e7d4ed8991 ("docs: Add Generic Counter interface documentation")
>
> from the staging 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/driver-api/index.rst
> index aa87075c7846,201247b7c1e8..000000000000
> --- a/Documentation/driver-api/index.rst
> +++ b/Documentation/driver-api/index.rst
> @@@ -56,7 -56,7 +56,8 @@@ available subsections can be seen below
> slimbus
> soundwire/index
> fpga/index
> + acpi/index
> + generic-counter
Looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2019-04-30 8:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 7:48 linux-next: manual merge of the staging tree with the pm tree Stephen Rothwell
2019-04-30 8:13 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-10-12 5:28 Stephen Rothwell
2011-10-12 5:30 ` Stephen Rothwell
2011-10-12 14:53 ` 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=20190430081344.GA8245@kroah.com \
--to=greg@kroah.com \
--cc=changbin.du@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
--cc=vilhelm.gray@gmail.com \
/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).