All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	JiebingLi <jiebing.li@intel.com>, Joe Perches <joe@perches.com>,
	Jiri Kosina <jkosina@suse.cz>
Subject: Re: linux-next: manual merge of the usb tree with the trivial tree
Date: Wed, 1 Sep 2010 20:26:04 -0700	[thread overview]
Message-ID: <20100902032604.GB27598@kroah.com> (raw)
In-Reply-To: <20100902130118.add62d4a.sfr@canb.auug.org.au>

On Thu, Sep 02, 2010 at 01:01:18PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/gadget/langwell_udc.c between commit
> 7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
> unnecessary return's from void functions") from the trivial tree and
> commit 0f92bbacd2d1a26e8bf863d2cc05572df43bf7fb ("USB: langwell: USB
> Client driver code cleanup") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> while necessary.  Though, if that trivial tree commit was in the usb tree,
> the conflict could be resolved there ...

Joe, care to break this one change out and have me take it through the
usb tree?

thanks,

greg k-h

  reply	other threads:[~2010-09-02  3:26 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-02  3:01 linux-next: manual merge of the usb tree with the trivial tree Stephen Rothwell
2010-09-02  3:26 ` Greg KH [this message]
2010-09-02 14:34   ` Jiri Kosina
2010-09-02 20:06     ` Greg KH
2010-09-14  2:28 Stephen Rothwell
2010-09-14  4:08 ` Greg KH
2010-10-06  3:14 Stephen Rothwell
2010-10-06  3:35 ` Greg KH
2010-10-06  6:19 ` Felipe Balbi
2010-10-06 14:05   ` Greg KH
2010-10-07  7:39     ` Felipe Balbi
2010-10-06  9:36 ` Jiri Kosina

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=20100902032604.GB27598@kroah.com \
    --to=greg@kroah.com \
    --cc=jiebing.li@intel.com \
    --cc=jkosina@suse.cz \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.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 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.