All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jiri Kosina <jkosina@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Joe Perches <joe@perches.com>,
	Sergei Shtylyov <sshtylyov@ru.mvista.com>,
	Felipe Balbi <balbi@ti.com>
Subject: Re: linux-next: manual merge of the usb tree with the trivial tree
Date: Wed, 6 Oct 2010 11:36:13 +0200 (CEST)	[thread overview]
Message-ID: <alpine.LNX.2.00.1010061135370.29535@pobox.suse.cz> (raw)
In-Reply-To: <20101006141414.abf7431f.sfr@canb.auug.org.au>

On Wed, 6 Oct 2010, Stephen Rothwell wrote:

> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/musb/musb_gadget.c between commit
> 7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
> unnecessary return's from void functions") from the trivial tree and
> commit 82cccbf2458e50dabf8b9946b3f0ef0e8d31711f ("usb: musb: gadget: kill
> unreachable code in musb_g_rx()") from the usb tree.
> 
> The latter also fixes the problem fixed in the former, so I just used the
> latter.

I have reverted the hunk in question in my tree, so the conflict should be 
gone now.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

  parent reply	other threads:[~2010-10-06  9:36 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-06  3:14 linux-next: manual merge of the usb tree with the trivial tree 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 [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-09-14  2:28 Stephen Rothwell
2010-09-14  4:08 ` Greg KH
2010-09-02  3:01 Stephen Rothwell
2010-09-02  3:26 ` Greg KH
2010-09-02 14:34   ` Jiri Kosina
2010-09-02 20:06     ` Greg KH

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=alpine.LNX.2.00.1010061135370.29535@pobox.suse.cz \
    --to=jkosina@suse.cz \
    --cc=balbi@ti.com \
    --cc=greg@kroah.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=sshtylyov@ru.mvista.com \
    /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.