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>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Saranya Gopal <saranya.gopal@intel.com>,
Balaji Manoharan <m.balaji@intel.com>
Subject: Re: linux-next: manual merge of the usb tree with the pm tree
Date: Fri, 6 Sep 2019 15:43:35 +0200 [thread overview]
Message-ID: <20190906134335.GA5834@kroah.com> (raw)
In-Reply-To: <20190904200929.00cfb98a@canb.auug.org.au>
On Wed, Sep 04, 2019 at 08:09:29PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> drivers/usb/roles/intel-xhci-usb-role-switch.c
>
> between commit:
>
> d2a90ebb6553 ("usb: roles: intel_xhci: Supplying software node for the role mux")
>
> from the pm tree and commit:
>
> 2be1fb64dfeb ("usb: roles: intel: Enable static DRD mode for role switch")
>
> from the usb tree.
Ick, sorry about that, merge looks good to me, thanks!
greg k-h
prev parent reply other threads:[~2019-09-06 13:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-04 10:09 linux-next: manual merge of the usb tree with the pm tree Stephen Rothwell
2019-09-06 13:43 ` Greg KH [this message]
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=20190906134335.GA5834@kroah.com \
--to=greg@kroah.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.balaji@intel.com \
--cc=rjw@rjwysocki.net \
--cc=saranya.gopal@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.