Skip to contentSkip to conversation

SAMSUNG kernel tree merge plans

DISCUSSION Ben Dooks 3 participants 6 messages May 6, 2010 – May 11, 2010 Arm Samsung Exynos

lore
Share & tools
lore

Ben Dooks

author
#0 lore raw

I'm busy sorting out the trees for the next mege window, and should have a new next-samsung out in the next two or three days.

As such, if there is anything that needs to go via Russell's tree, then it needs to be merged as soon as possible. I would like to send a pull before Wednesday.

Anything else, if it is not merged into one of my trees by the end of next week (May 14th) then there is no guarantees that it will be merged.

If everyone interested in this could check my trees after the weekend and make any reminders of other stuff to fix at that point as there is still items being processed.

http://git.fluff.org/gitweb?p=bjdooks/linux.git;a=summary

Signature · 4 lines
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#1 lore raw

Hello,

Quoted 7 lines · Ben Dooks

I'm busy sorting out the trees for the next mege window, and should have a new next-samsung out in the next two or three days.

As such, if there is anything that needs to go via Russell's tree, then it needs to be merged as soon as possible. I would like to send a pull before Wednesday.

Quoted 8 lines

Anything else, if it is not merged into one of my trees by the end of next week (May 14th) then there is no guarantees that it will be merged.

If everyone interested in this could check my trees after the weekend and make any reminders of other stuff to fix at that point as there is still items being processed.

http://git.fluff.org/gitweb?p=bjdooks/linux.git;a=summary

We would really like to merge as much as possible from our current development tree:
http://git.infradead.org/users/kmpark/linux-2.6-samsung/shortlog/refs/heads/SPRC-2.6.34-rc5-opensource

Some of the patches that we depend on are still in the review phase (s5p timer), some should be replaced by the ones that were posted recently. Especially most of our patches depend on S5PV210 GPIO support, so without it we cannot go further. Is there any chance to get it merged quickly? I will rebase our tree asap the mentioned patches get merged.

Best regards
--
Marek Szyprowski
Samsung Poland R&D Center

author
#2 lore raw
Quoted 20 lines · Marek Szyprowski

Hello,

Quoted 7 lines · Ben Dooks

I'm busy sorting out the trees for the next mege window, and should have a new next-samsung out in the next two or three days.

As such, if there is anything that needs to go via Russell's tree, then it needs to be merged as soon as possible. I would like to send a pull before Wednesday.

Quoted 8 lines

Anything else, if it is not merged into one of my trees by the end of next week (May 14th) then there is no guarantees that it will be merged.

If everyone interested in this could check my trees after the weekend and make any reminders of other stuff to fix at that point as there is still items being processed.

http://git.fluff.org/gitweb?p=bjdooks/linux.git;a=summary

Quoted 7 lines

We would really like to merge as much as possible from our current development tree:
http://git.infradead.org/users/kmpark/linux-2.6-samsung/shortlog/refs/heads/SPRC-2.6.34-rc5-opensource

Some of the patches that we depend on are still in the review phase (s5p timer), some should be replaced by the ones that were posted recently. Especially most of our patches depend on S5PV210 GPIO support, so without it we cannot go further. Is there any chance to get it merged quickly? I will rebase our tree asap the mentioned patches get merged.

I'll sort out what can be merged from the items on the list, but I'm not going git-tree diving just at the moment. The firstset will be stuff for Russell's tree, for linus' tree there is a ltitle more time to get prepared.

Signature · 4 lines
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#3 lore raw

Hello,

Quoted 8 lines · Ben Dooks
Quoted 3 lines

We would really like to merge as much as possible from our current development tree:
http://git.infradead.org/users/kmpark/linux-2.6-

samsung/shortlog/refs/heads/SPRC-2.6.34-rc5-opensource

Quoted 2 lines

Some of the patches that we depend on are still in the review phase (s5p

timer), some should be replaced by the ones that were

Quoted 1 line

posted recently. Especially most of our patches depend on S5PV210 GPIO

Quoted 8 lines

support, so without it we cannot go further. Is there any

Quoted 1 line

chance to get it merged quickly? I will rebase our tree asap the

mentioned patches get merged.

I'll sort out what can be merged from the items on the list, but I'm not going git-tree diving just at the moment. The firstset will be stuff for Russell's tree, for linus' tree there is a ltitle more time to get prepared.

Ok, I understand. I've separated the patches into different categories and rebased onto your next-samsung. I hope this will help sorting out these things.

Patches are available at:

http://git.infradead.org/users/kmpark/linux-2.6-samsung

branches:
next-samsung-s5p-fixes - various fixes for s5p SoCs next-samsung-s5pv210 - new features for s5pv210 SoCs next-samsung-s5pc1xx - s5pc1xx cleanup (to be discussed) next-samsung-onenand - platform patch for onenand driver (requires all above patches)

Best regards
--
Marek Szyprowski
Samsung Poland R&D Center

#4 lore raw
In reply to Ben Dooks

? ????????? ?? 6 ??? 2010 08:46:51 ????? Ben Dooks ???????:

Quoted 7 lines

I'm busy sorting out the trees for the next mege window, and should have a new next-samsung out in the next two or three days.

As such, if there is anything that needs to go via Russell's tree, then it needs to be merged as soon as possible. I would like to send a pull before Wednesday.

Quoted 8 lines

Anything else, if it is not merged into one of my trees by the end of next week (May 14th) then there is no guarantees that it will be merged.

If everyone interested in this could check my trees after the weekend and make any reminders of other stuff to fix at that point as there is still items being processed.

http://git.fluff.org/gitweb?p=bjdooks/linux.git;a=summary

Is there any chance that my rx1950-support patch series will be merged? I've almost finished moving to gpiolib and can send series after this weekend. What branch of your tree should I use as base?

Regards
Vasily
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100506/7bd092b8/attachment.sig>

author
#5 lore raw
Quoted 15 lines · Vasily Khoruzhick

?? ?????????????????? ???? 6 ?????? 2010 08:46:51 ?????????? Ben Dooks ??????????????:

Quoted 14 lines

I'm busy sorting out the trees for the next mege window, and should have a new next-samsung out in the next two or three days.

As such, if there is anything that needs to go via Russell's tree, then it needs to be merged as soon as possible. I would like to send a pull before Wednesday.

Anything else, if it is not merged into one of my trees by the end of next week (May 14th) then there is no guarantees that it will be merged.

If everyone interested in this could check my trees after the weekend and make any reminders of other stuff to fix at that point as there is still items being processed.

Quoted 5 lines
Quoted 1 line

http://git.fluff.org/gitweb?p=bjdooks/linux.git;a=summary

Is there any chance that my rx1950-support patch series will be merged? I've almost finished moving to gpiolib and can send series after this weekend. What branch of your tree should I use as base?

At the worst, just use linus' latest and any merge differences can be dealt with when merging. Given that gpiolib mostly works already, it shouldn't be necessary to do any machine changes when merging.

I'll announce a new samsung-next as soon as possible.

Signature · 4 lines
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.