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, Alan Cox <alan@lxorguk.ukuu.org.uk>,
	Jaswinder Singh <jaswinder@infradead.org>
Subject: Re: linux-next: manual merge of the usb tree
Date: Tue, 15 Jul 2008 19:30:13 -0700	[thread overview]
Message-ID: <20080716023013.GA7052@kroah.com> (raw)
In-Reply-To: <20080716120219.a3de00bd.sfr@canb.auug.org.au>

On Wed, Jul 16, 2008 at 12:02:19PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/io_ti.c between commit
> d12b219a228efe92f0778ed3af21305e65fbb052 ("edgeport-ti: use
> request_firmware()") from Linus' tree and commit
> 1f023570c8d00d3511799ccad21dc3525a6160e1 ("USB: io_ti: FIrst cut at a big
> clean up") from the usb tree.
> 
> This conflict used to be in the firmware tree and my solution then was to
> remove the commit now in Linus' tree because the fixup was going to take
> to long.  Now my solution is to remove the commit from the usb tree.

I'll fix this up by hand, I'm lagging right now due to work issues (am
traveling right now), but hope to get this cleaned up by Friday so that
I can push the USB and driver core trees to Linus by then.

thanks for the heads up and sorry to cause you problems here.  Keep up
the great work.

greg k-h

  reply	other threads:[~2008-07-16  3:13 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-16  2:02 linux-next: manual merge of the usb tree Stephen Rothwell
2008-07-16  2:30 ` Greg KH [this message]
2008-07-16  7:06 ` Jaswinder Singh
2008-07-16  7:13   ` Stephen Rothwell
2008-07-16  7:20     ` Jaswinder Singh
2008-07-16  7:45       ` Stephen Rothwell
2008-07-16  7:49         ` Jaswinder Singh
2008-07-16  7:58           ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the usb tree Thierry Reding
2013-10-22 18:02   ` Srinivas Pandruvada
2008-11-10  1:06 Stephen Rothwell
2008-11-10  1:40 ` Greg KH
2008-10-14  3:53 Stephen Rothwell
2008-10-14  3:47 Stephen Rothwell
2008-10-14  3:37 Stephen Rothwell
2008-10-14  3:31 Stephen Rothwell
2008-10-14  5:44 ` Alexey Klimov
2008-10-14  3:27 Stephen Rothwell
2008-07-17  0:54 Stephen Rothwell
2008-07-17  7:04 ` Greg KH
2008-07-07  3:09 Stephen Rothwell
2008-07-07 14:09 ` Alan Stern
2008-07-07 16:09   ` 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=20080716023013.GA7052@kroah.com \
    --to=greg@kroah.com \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=jaswinder@infradead.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.