From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Changbin Du <changbin.du@gmail.com>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Subject: Re: linux-next: manual merge of the usb tree with the pci tree
Date: Mon, 24 Jun 2019 15:34:43 +0800 [thread overview]
Message-ID: <20190624073443.GA13830@kroah.com> (raw)
In-Reply-To: <20190624171229.6415ca4f@canb.auug.org.au>
On Mon, Jun 24, 2019 at 05:12:29PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> Documentation/index.rst
>
> between commit:
>
> c42eaffa1656 ("Documentation: add Linux PCI to Sphinx TOC tree")
>
> from the pci tree and commit:
>
> ecefae6db042 ("docs: usb: rename files to .rst and add them to drivers-api")
>
> from the usb 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.
>
No patch "below", but I'm sure the fixup is fine :)
thanks,
greg k-h
next prev parent reply other threads:[~2019-06-24 7:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 7:12 linux-next: manual merge of the usb tree with the pci tree Stephen Rothwell
2019-06-24 7:34 ` Greg KH [this message]
2019-06-24 7:47 ` Stephen Rothwell
2019-07-08 23:58 ` Stephen Rothwell
2019-07-09 6:35 ` Greg KH
2019-07-09 6:53 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-09-21 5:18 Stephen Rothwell
2020-09-21 15:50 ` Greg KH
2020-10-15 21:47 ` Stephen Rothwell
2020-10-16 7:26 ` Jim Quinlan
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=20190624073443.GA13830@kroah.com \
--to=greg@kroah.com \
--cc=bhelgaas@google.com \
--cc=changbin.du@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--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