From: Felipe Balbi <balbi@ti.com>
To: Greg KH <greg@kroah.com>
Cc: Felipe Balbi <balbi@ti.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
<linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Wolfram Sang <wsa@the-dreams.de>,
Dinh Nguyen <dinguyen@opensource.altera.com>,
Paul Zimmerman <paul.zimmerman@synopsys.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the driver-core tree
Date: Tue, 18 Nov 2014 10:40:07 -0600 [thread overview]
Message-ID: <20141118164007.GC6179@saruman> (raw)
In-Reply-To: <20141118162436.GA1108@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 1032 bytes --]
On Tue, Nov 18, 2014 at 08:24:36AM -0800, Greg KH wrote:
> On Tue, Nov 18, 2014 at 09:25:31AM -0600, Felipe Balbi wrote:
> > Hi,
> >
> > On Tue, Nov 18, 2014 at 06:12:22PM +1100, Stephen Rothwell wrote:
> > > Hi Felipe,
> > >
> > > Today's linux-next merge of the usb-gadget tree got a conflict in
> > > drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 ("usb: dwc2: drop
> > > owner assignment from platform_drivers") from the driver-core tree and
> >
> > why is that commit in the driver-core tree ? It wasn't even acked by
> > Paul Z. It wasn't sent to linux-usb either.
> >
> > Sure, it's minimal, but I'd expect a little cordiality in Ccing driver
> > maintainers ;-)
>
> We fixed up many hundreds of drivers all at once, it was easier to take
> that change through my driver-core tree than try to coordinate in
> everyone's different trees and end up missing some usages.
sure, got that :-) still, no maintainer was Cced :-)
Well, the conflict would've been inevitable anyway.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-11-18 16:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-18 7:12 linux-next: manual merge of the usb-gadget tree with the driver-core tree Stephen Rothwell
2014-11-18 15:25 ` Felipe Balbi
2014-11-18 16:24 ` Greg KH
2014-11-18 16:40 ` Felipe Balbi [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-11-10 5:08 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=20141118164007.GC6179@saruman \
--to=balbi@ti.com \
--cc=dinguyen@opensource.altera.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.zimmerman@synopsys.com \
--cc=sfr@canb.auug.org.au \
--cc=wsa@the-dreams.de \
/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