revert merge commit de68f28 in for-next?

3 messages, 2 authors, 2012-03-06 · open the first message on its own page

revert merge commit de68f28 in for-next?

From: Jason <hidden>
Date: 2012-03-06 14:44:15

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.

revert merge commit de68f28 in for-next?

From: arnd@arndb.de (Arnd Bergmann)
Date: 2012-03-06 16:04:53

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

revert merge commit de68f28 in for-next?

From: Jason <hidden>
Date: 2012-03-06 16:29:47

On Tue, Mar 06, 2012 at 04:04:53PM +0000, Arnd Bergmann wrote:
On Tuesday 06 March 2012, Jason wrote:
quoted
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help