From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jonathan Corbet <corbet@lwn.net>,
Alan Stern <stern@rowland.harvard.edu>,
Bjorn Helgaas <bhelgaas@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the usb tree with the jc_docs tree
Date: Tue, 22 Aug 2023 13:51:59 +0200 [thread overview]
Message-ID: <2023082254-prognosis-myself-5449@gregkh> (raw)
In-Reply-To: <20230821142148.14b1b4be@canb.auug.org.au>
On Mon, Aug 21, 2023 at 02:21:48PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> Documentation/ABI/testing/sysfs-bus-umc
> Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
>
> between commit:
>
> ebab9426cd73 ("Documentation/ABI: Fix typos")
>
> from the jc_docs tree and commit:
>
> f176638af476 ("USB: Remove Wireless USB and UWB documentation")
>
> from the usb tree.
>
> I fixed it up (I rmeoved the files) 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.
Removal is fine, thanks!
greg k-h
next prev parent reply other threads:[~2023-08-22 11:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-21 4:21 linux-next: manual merge of the usb tree with the jc_docs tree Stephen Rothwell
2023-08-22 11:51 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-04-21 4:28 Stephen Rothwell
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=2023082254-prognosis-myself-5449@gregkh \
--to=greg@kroah.com \
--cc=bhelgaas@google.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=stern@rowland.harvard.edu \
/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