From: Jaswinder Singh <jaswinder@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, Alan Cox <alan@lxorguk.ukuu.org.uk>,
David Woodhouse <dwmw2@infradead.org>
Subject: Re: linux-next: manual merge of the usb tree
Date: Wed, 16 Jul 2008 12:36:17 +0530 [thread overview]
Message-ID: <1216191977.3394.5.camel@jaswinder.satnam> (raw)
In-Reply-To: <20080716120219.a3de00bd.sfr@canb.auug.org.au>
Hello Stephen,
On Wed, 2008-07-16 at 12:02 +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 am checking linux-next tree :
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
I think you already merged alan patch to it but firmware patch is not
installed yet.
So I am going to check alan patch manually.
And after confirmation that alan patch is fully installed then I will
install firmware patch and send to all of you.
Thank you,
Jaswinder Singh.
next prev parent reply other threads:[~2008-07-16 7:07 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
2008-07-16 7:06 ` Jaswinder Singh [this message]
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=1216191977.3394.5.camel@jaswinder.satnam \
--to=jaswinder@infradead.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=dwmw2@infradead.org \
--cc=greg@kroah.com \
--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 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).