From: Greg KH <gregkh@linuxfoundation.org>
To: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Seth Jennings <sjenning@linux.vnet.ibm.com>,
Nitin Gupta <ngupta@vflare.org>,
Konrad Wilk <konrad.wilk@oracle.com>
Subject: Re: linux-next: build failure after merge of the staging tree
Date: Tue, 14 Feb 2012 18:33:31 -0800 [thread overview]
Message-ID: <20120215023331.GA28786@kroah.com> (raw)
In-Reply-To: <e0be2242-530b-46cd-ad3a-d49fd60345ab@default>
On Tue, Feb 14, 2012 at 04:54:37PM -0800, Dan Magenheimer wrote:
> > From: Greg KH [mailto:gregkh@linuxfoundation.org]
> > Subject: Re: linux-next: build failure after merge of the staging tree
> >
> > > > Ok, now reverted, what a mess...
> > > >
> > > > greg k-h
> > >
> > > OK, I have just posted the ramster v5 patchset which applies against
> > > linux-3.2. I've test-built it against linux-next... it only gets
> > > the normal minor merge conflicts for adding a line to
> > > drivers/staging/Makefile and Kconfig.
> >
> > Please resend after fixing that conflict, as it would require me to edit
> > it by hand in order to apply this. As you have already redone the
> > patch, there's no reason I should have to do this, right?
>
> OK. I'm not quite sure how to generate a patchset or a
> git commit-set that applies cleanly against two different
> trees (3.2 and linux-next), but I guess common sense should
> tell me that, since the patches have to go through staging-next
> first and you are applying patches rather than git-pull'ing,
> staging-next should be my preferred choice for a base.
Exactly, how could I apply them to two trees? For that case, how can I
go back in time and apply them to 3.2?
> Do you want me to resend all 6 patches? The only patch
> affected is patch 6 of 6. All others apply cleanly.
> Let me know and I will resend one or all tomorrow.
All would be best, also please thread them properly, 'git send-email'
will do this for you, please use it.
greg k-h
next prev parent reply other threads:[~2012-02-15 2:33 UTC|newest]
Thread overview: 143+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-10 4:58 linux-next: build failure after merge of the staging tree Stephen Rothwell
2012-02-10 5:29 ` Greg KH
2012-02-10 17:21 ` Dan Magenheimer
2012-02-10 17:43 ` Greg KH
2012-02-10 18:22 ` Seth Jennings
2012-02-14 23:43 ` Dan Magenheimer
2012-02-15 0:03 ` Greg KH
2012-02-15 0:54 ` Dan Magenheimer
2012-02-15 2:33 ` Greg KH [this message]
2012-02-15 16:14 ` Dan Magenheimer
-- strict thread matches above, loose matches on Subject: below --
2021-10-08 4:15 Stephen Rothwell
2021-10-08 5:39 ` Sergio Paracuellos
2021-08-16 3:52 Stephen Rothwell
2021-08-16 5:24 ` Greg KH
2021-08-16 15:10 ` Greg KH
2021-08-16 21:46 ` Stephen Rothwell
2021-03-29 5:55 Stephen Rothwell
2021-03-29 6:14 ` Greg KH
2021-03-29 7:25 ` Alexandru Ardelean
2021-04-26 14:41 ` Mark Brown
2021-04-26 16:23 ` Greg KH
2021-04-26 16:40 ` Mark Brown
2021-04-26 1:29 ` Stephen Rothwell
2021-04-26 22:07 ` Stephen Rothwell
2020-12-07 5:46 Stephen Rothwell
2020-12-07 9:26 ` Greg KH
2020-12-07 9:45 ` Stephen Rothwell
2020-12-14 20:27 ` Stephen Rothwell
2019-10-08 2:49 Stephen Rothwell
2019-10-08 12:46 ` Greg KH
2019-06-24 7:38 Stephen Rothwell
2019-06-24 8:46 ` Greg KH
2018-07-30 6:16 Stephen Rothwell
2018-07-30 6:31 ` Gao Xiang
2018-08-01 9:09 ` Chao Yu
2018-08-01 15:07 ` Stephen Rothwell
2018-08-02 6:12 ` Chao Yu
2018-08-02 6:15 ` Greg KH
2018-08-02 7:01 ` Chao Yu
2018-08-02 7:14 ` Greg KH
2018-08-02 7:48 ` Chao Yu
2018-07-30 9:47 ` David Howells
2018-07-30 10:45 ` Gao Xiang
2018-07-30 11:18 ` David Howells
2018-07-30 11:23 ` Gao Xiang
2018-07-17 6:28 Stephen Rothwell
2018-07-17 6:49 ` Ivan Safonov
2018-07-17 8:06 ` Greg KH
2017-09-26 3:54 Stephen Rothwell
2017-09-26 6:15 ` Jonathan Cameron
2017-05-01 4:42 Stephen Rothwell
2017-05-04 23:41 ` Greg KH
2017-04-27 4:20 Stephen Rothwell
2017-04-30 12:15 ` Greg KH
2017-04-18 5:53 Stephen Rothwell
2017-04-18 7:04 ` Johannes Berg
2017-04-18 5:32 Stephen Rothwell
2017-04-18 5:54 ` Greg KH
2017-04-18 6:26 ` Stephen Rothwell
2017-04-18 11:16 ` Greg KH
2017-04-11 5:04 Stephen Rothwell
2017-04-11 5:15 ` Greg KH
2017-04-11 5:38 ` Greg KH
2017-04-11 5:48 ` Stephen Rothwell
2017-04-10 5:10 Stephen Rothwell
2017-03-07 1:25 Stephen Rothwell
2017-03-07 4:46 ` Greg KH
2017-03-07 8:47 ` Greg KH
2017-03-07 9:49 ` Stephen Rothwell
2017-03-07 12:24 ` Greg KH
2016-05-13 3:15 Stephen Rothwell
2016-05-13 8:36 ` Greg KH
2015-06-03 7:16 Stephen Rothwell
2015-06-03 7:23 ` Johannes Berg
2015-03-10 5:07 Stephen Rothwell
2015-03-10 15:08 ` Greg KH
2015-03-10 15:53 ` Sudip Mukherjee
2015-03-10 20:57 ` Stephen Rothwell
2014-09-30 8:04 Stephen Rothwell
2014-10-02 16:31 ` Greg KH
2014-08-17 22:47 Stephen Rothwell
2014-06-20 4:18 Stephen Rothwell
2014-06-20 16:53 ` Greg KH
2014-07-10 0:27 ` Stephen Rothwell
2014-07-10 3:09 ` Greg KH
2014-09-22 10:25 ` Geert Uytterhoeven
2014-01-24 2:01 Stephen Rothwell
2014-01-24 2:34 ` Greg KH
2014-01-24 3:53 ` Greg KH
2014-01-24 4:04 ` Stephen Rothwell
2014-01-24 4:08 ` Greg KH
2013-07-26 6:02 Stephen Rothwell
2013-07-26 21:03 ` Greg KH
2013-07-26 21:22 ` Eli Billauer
2013-07-26 21:56 ` Greg KH
2013-07-26 22:54 ` Eli Billauer
2013-07-26 23:28 ` Greg KH
2013-07-27 13:30 ` Eli Billauer
2013-07-25 3:19 Stephen Rothwell
2013-07-25 4:25 ` Greg KH
2013-06-04 4:57 Stephen Rothwell
2013-06-04 5:42 ` Greg KH
2013-06-04 8:55 ` Peng Tao
2013-01-08 2:23 Stephen Rothwell
2013-01-08 4:27 ` Greg KH
2013-01-08 4:29 ` Stephen Rothwell
2013-01-08 16:46 ` H Hartley Sweeten
2012-09-12 6:07 Stephen Rothwell
2012-09-12 16:13 ` Greg KH
2012-09-14 7:55 ` Samuel Ortiz
2012-09-18 20:40 ` Jonathan Cameron
2012-02-17 4:10 Stephen Rothwell
2012-02-17 17:04 ` Greg KH
2012-02-17 17:23 ` Dan Magenheimer
2012-02-16 4:23 Stephen Rothwell
2012-02-16 5:15 ` Greg KH
2012-02-16 14:39 ` Dan Magenheimer
2012-02-16 21:25 ` Stephen Rothwell
2012-02-16 21:49 ` Dan Magenheimer
2012-02-16 23:39 ` Stephen Rothwell
2012-02-17 0:17 ` Greg KH
2012-02-17 16:01 ` Konrad Rzeszutek Wilk
2011-08-25 5:02 Stephen Rothwell
2011-08-25 5:15 ` Larry Finger
2011-08-25 15:39 ` Greg KH
2011-07-25 5:21 Stephen Rothwell
2011-07-16 13:18 Stephen Rothwell
2011-07-17 9:13 ` Greg KH
2011-07-16 13:15 Stephen Rothwell
2011-07-16 23:39 ` Alan Cox
2011-07-17 9:15 ` Greg KH
2011-07-06 5:09 Stephen Rothwell
2011-07-06 15:12 ` Greg KH
2011-07-06 5:02 Stephen Rothwell
2011-07-06 15:12 ` Greg KH
2010-04-27 4:12 Stephen Rothwell
2010-04-27 15:13 ` Greg KH
2010-04-28 6:14 ` Stephen Rothwell
2010-04-28 15:28 ` Greg KH
2010-05-01 15:42 ` Tobias Klauser
2010-05-03 16:17 ` Tobias Klauser
2010-05-05 2:37 ` Stephen Rothwell
2010-05-05 8:39 ` Tobias Klauser
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=20120215023331.GA28786@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=dan.magenheimer@oracle.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ngupta@vflare.org \
--cc=sfr@canb.auug.org.au \
--cc=sjenning@linux.vnet.ibm.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 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).