* revert merge commit de68f28 in for-next?
@ 2012-03-06 14:44 Jason
2012-03-06 16:04 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Jason @ 2012-03-06 14:44 UTC (permalink / raw)
To: linux-arm-kernel
Arnd,
As much as I'd love to see this go in right now, I don't think it's the
correct version (from Mar 2). This is the merge commit in question:
de68f2847fa759df54e9d8eb0013a0f8ea959c22
It's missing several fixes, #ifdef CONFIG_OF around struct of_device_id,
marvell -> mrvl in compatible properties, etc.
Would you like me to submit a new pull request, or base my fixes off of
this and submit new patches?
Thanks and sorry for the confusion,
Jason.
^ permalink raw reply [flat|nested] 3+ messages in thread
* revert merge commit de68f28 in for-next?
2012-03-06 14:44 revert merge commit de68f28 in for-next? Jason
@ 2012-03-06 16:04 ` Arnd Bergmann
2012-03-06 16:29 ` Jason
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2012-03-06 16:04 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 06 March 2012, Jason wrote:
> As much as I'd love to see this go in right now, I don't think it's the
> correct version (from Mar 2). This is the merge commit in question:
>
> de68f2847fa759df54e9d8eb0013a0f8ea959c22
>
> It's missing several fixes, #ifdef CONFIG_OF around struct of_device_id,
> marvell -> mrvl in compatible properties, etc.
>
> Would you like me to submit a new pull request, or base my fixes off of
> this and submit new patches?
>
> Thanks and sorry for the confusion,
>
I've marked that branch a 'staging/' branch, which means that it's not
intended for being sent to Linus. Please send a replacement branch instead.
Once something is merged into a next/* branch instead of staging/*, you
should send further patches on top.
Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread
* revert merge commit de68f28 in for-next?
2012-03-06 16:04 ` Arnd Bergmann
@ 2012-03-06 16:29 ` Jason
0 siblings, 0 replies; 3+ messages in thread
From: Jason @ 2012-03-06 16:29 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Mar 06, 2012 at 04:04:53PM +0000, Arnd Bergmann wrote:
> On Tuesday 06 March 2012, Jason wrote:
> > As much as I'd love to see this go in right now, I don't think it's the
> > correct version (from Mar 2). This is the merge commit in question:
> >
> > de68f2847fa759df54e9d8eb0013a0f8ea959c22
> >
> > It's missing several fixes, #ifdef CONFIG_OF around struct of_device_id,
> > marvell -> mrvl in compatible properties, etc.
> >
> > Would you like me to submit a new pull request, or base my fixes off of
> > this and submit new patches?
> >
> > Thanks and sorry for the confusion,
> >
>
> I've marked that branch a 'staging/' branch, which means that it's not
> intended for being sent to Linus. Please send a replacement branch instead.
>
> Once something is merged into a next/* branch instead of staging/*, you
> should send further patches on top.
Thanks for the clarification, I was fired up and crapping my pants at
the same time.
I'll put together a new pull request.
thx,
Jason.
>
> Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-06 16:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-06 14:44 revert merge commit de68f28 in for-next? Jason
2012-03-06 16:04 ` Arnd Bergmann
2012-03-06 16:29 ` Jason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox