Skip to contentSkip to conversation

Merge plans for 2.6.33 merge window

DISCUSSION Tony Lindgren 3 participants 6 messages Dec 3, 2009

lore
Share & tools
lore
#0 lore raw

Hi all,

As 2.6.32 is out, I'm planning to send Linus a pull request for the code we have currently in for-next. That's already a huge pile of code with the 7xx merge, header move, and ioremap changes, pm etc:

Then I'll pile up another set of changes for next week for a second round.

We should try to get in the clock framework changes, especially clock framework for omap4. And the new mux framework. Then there are some new board files, like touchbook and various fixes.

Just FYI in case you're wondering why I'm not merging recently posted code right now.

Regards,

Tony

#1 lore raw

Tony

Quoted 8 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Tony Lindgren
Sent: Thursday, December 03, 2009 11:36 AM
To: [email protected]
Subject: Merge plans for 2.6.33 merge window

Hi all,

<snip>

Quoted 2 lines

Then there are some new board files, like
touchbook and various fixes.

3630 board support (zoom3/sdp3630) is already integrated in for-next. However the only pending patches missing for 3630 boards to boot are these serial patches:

	http://patchwork.kernel.org/patch/61671/
	http://patchwork.kernel.org/patch/61672/

Now there has been much discussion on the approach (errata vs feature). As a moderator, how would you like us to proceed on this?

Regards,
Vikram

#2 lore raw
Quoted 14 lines · Pandita, Vikram

Tony

Quoted 8 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Tony Lindgren
Sent: Thursday, December 03, 2009 11:36 AM
To: [email protected]
Subject: Merge plans for 2.6.33 merge window

Hi all,

<snip>

Quoted 2 lines

Then there are some new board files, like
touchbook and various fixes.

Quoted 7 lines

3630 board support (zoom3/sdp3630) is already integrated in for-next. However the only pending patches missing for 3630 boards to boot are these serial patches:

	http://patchwork.kernel.org/patch/61671/
	http://patchwork.kernel.org/patch/61672/

Now there has been much discussion on the approach (errata vs feature). As a moderator, how would you like us to proceed on this?

The best solution way would be to check the revision register for the serial module if available and then initialize the serial port accordinly.

If this feature cannot be checked in the serial module, and is only needed during the serial init, you might as well implement the test in arch/arm/mach-omap2/serial.c. So probably no need to add that to id.c.

Regards,

Tony

#3 lore raw
Quoted 32 lines

-----Original Message-----
From: Tony Lindgren [mailto:[email protected]]
Sent: Thursday, December 03, 2009 12:45 PM
To: Pandita, Vikram
Cc: [email protected]
Subject: Re: Merge plans for 2.6.33 merge window

Quoted 14 lines · Pandita, Vikram

Tony

Quoted 8 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Tony Lindgren
Sent: Thursday, December 03, 2009 11:36 AM
To: [email protected]
Subject: Merge plans for 2.6.33 merge window

Hi all,

<snip>

Quoted 2 lines

Then there are some new board files, like
touchbook and various fixes.

Quoted 7 lines

3630 board support (zoom3/sdp3630) is already integrated in for-next. However the only pending patches missing for 3630 boards to boot are these serial patches:

	http://patchwork.kernel.org/patch/61671/
	http://patchwork.kernel.org/patch/61672/

Now there has been much discussion on the approach (errata vs feature). As a moderator, how would you like us to proceed on this?

Quoted 8 lines

The best solution way would be to check the revision register for the serial module if available and then initialize the serial port accordinly.

If this feature cannot be checked in the serial module, and is only needed during the serial init, you might as well implement the test in arch/arm/mach-omap2/serial.c. So probably no need to add that to id.c.

Looking into this aspect to override the serial_in() function based on IP version check in mach-omap2/serial.c file.

Quoted 4 lines

Regards,

Tony

#4 lore raw
In reply to Tony Lindgren
Quoted 10 lines · Tony Lindgren

Hi all,

As 2.6.32 is out, I'm planning to send Linus a pull request for the code we have currently in for-next. That's already a huge pile of code with the 7xx merge, header move, and ioremap changes, pm etc:

Then I'll pile up another set of changes for next week for a second round.

Quoted 8 lines

We should try to get in the clock framework changes, especially clock framework for omap4. And the new mux framework. Then there are some new board files, like touchbook and various fixes.

Just FYI in case you're wondering why I'm not merging recently posted code right now.

Any chance of getting the HTC Herald USB patches I submitted a little bit ago in?

Thanks
- Cory

#5 lore raw
Quoted 16 lines · Cory Maccarrone
Quoted 15 lines · Tony Lindgren

Hi all,

As 2.6.32 is out, I'm planning to send Linus a pull request for the code we have currently in for-next. That's already a huge pile of code with the 7xx merge, header move, and ioremap changes, pm etc:

Then I'll pile up another set of changes for next week for a second round.

We should try to get in the clock framework changes, especially clock framework for omap4. And the new mux framework. Then there are some new board files, like touchbook and various fixes.

Quoted 6 lines
Quoted 3 lines

Just FYI in case you're wondering why I'm not merging recently posted code right now.

Any chance of getting the HTC Herald USB patches I submitted a little bit ago in?

Yeah as far as I remember those look OK to me.

Regards,

Tony