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:50:08 +0530 [thread overview]
Message-ID: <1216192808.3394.12.camel@jaswinder.satnam> (raw)
In-Reply-To: <20080716171336.1a470f75.sfr@canb.auug.org.au>
Hello Stephen,
On Wed, 2008-07-16 at 17:13 +1000, Stephen Rothwell wrote:
> What needs to happen is that Alan's patch needs to be redone based on
> Linus' tree of today.
>
My patch is smaller and simpler as compare to Alan patch.
So can we follow this approach for linux-next tree:-
1. Remove my patch from Linus tree
2. Apply Alan patch first
3. Then I will give you firmware patch based upon yesterday tree which I
installed here :-
http://git.infradead.org/users/jaswinder/linux-next.git
4. Then you apply firmware patch
Thank you,
Jaswinder Singh.
next prev parent reply other threads:[~2008-07-16 7:20 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
2008-07-16 7:13 ` Stephen Rothwell
2008-07-16 7:20 ` Jaswinder Singh [this message]
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=1216192808.3394.12.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).