LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@kernel.org>,
	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>,
	Hanjie Lin <hanjie.lin@amlogic.com>,
	Yue Wang <yue.wang@amlogic.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb tree
Date: Mon, 16 Mar 2020 09:18:36 +0100	[thread overview]
Message-ID: <20200316081836.GA3131812@kroah.com> (raw)
In-Reply-To: <20200316142309.19cb3aa8@canb.auug.org.au>

On Mon, Mar 16, 2020 at 02:23:09PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in:
> 
>   drivers/usb/dwc3/dwc3-meson-g12a.c
> 
> between commit:
> 
>   bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")
> 
> from the usb tree and commit:
> 
>   1e355f21d3fb ("usb: dwc3: Add Amlogic A1 DWC3 glue")
> 
> from the usb-gadget 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.

Thanks, this matched up with my merge, I've now done this in my tree.

greg k-h

  parent reply	other threads:[~2020-03-16  8:18 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-16  3:23 Stephen Rothwell
2020-03-16  7:25 ` Greg KH
2020-03-16  8:18 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-21  7:21 Stephen Rothwell
2018-05-17  4:03 Stephen Rothwell
2018-05-17  7:07 ` Greg KH
2017-10-18 14:49 Mark Brown
2017-10-18 15:40 ` Kees Cook
2017-10-18 16:04   ` Mark Brown
2017-10-18 14:42 Mark Brown
2017-10-18 15:40 ` Kees Cook
2017-10-19  7:37   ` Felipe Balbi
2017-04-07  4:45 Stephen Rothwell
2017-04-07  4:41 Stephen Rothwell
2014-11-06  3:58 Stephen Rothwell
2014-11-06  4:59 ` Felipe Balbi
2014-04-28  5:20 Stephen Rothwell
2014-04-28 16:11 ` Felipe Balbi
2013-08-02  6:38 Stephen Rothwell
2013-08-02  7:23 ` Felipe Balbi
2013-04-04  4:18 Stephen Rothwell
2013-04-04  6:27 ` Thierry Reding
2013-04-04  7:08   ` Felipe Balbi

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=20200316081836.GA3131812@kroah.com \
    --to=greg@kroah.com \
    --cc=balbi@kernel.org \
    --cc=hanjie.lin@amlogic.com \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=yue.wang@amlogic.com \
    --subject='Re: linux-next: manual merge of the usb-gadget tree with the usb tree' \
    /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

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).