| Message ID | 4FAD0A71.80201@ti.com |
|---|---|
| State | New |
| Headers | show |
Hi, * Cousson, Benoit <b-cousson@ti.com> [120511 05:51]: > Hi Tony, > > Here are some remaining DT patches I was not able to push at 3.4 due to some missing dependency. > It applies now fine on top of lo/dt branch. It seems that there are still patches being discussed for those SoCs and we're pretty much done for this merge window. So unless things drag on to -rc8, I'd say we just need to postpone merging new things and merge them early around -rc2. Regards, Tony > Regards, > Benoit > > > The following changes since commit 40364b9f5a4d167d97bb6a76cd239ca8cfff056a: > Benoit Cousson (1): > arm/dts: omap4-panda: Add LEDs support > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.5/dts/am33xx > > Vaibhav Hiremath (3): > arm/dts: Add support for TI AM335x EVM board > arm/dts: omap3-evm: Add i2c and twl4030 support > arm/dts: Add support for TI AM3517/05 EVM board > > arch/arm/boot/dts/am335x-evm.dts | 39 ++++++++++++++++++++++++++++++++++++++ > arch/arm/boot/dts/am3517-evm.dts | 32 +++++++++++++++++++++++++++++++ > arch/arm/boot/dts/omap3-evm.dts | 28 +++++++++++++++++++++++++++ > 3 files changed, 99 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/boot/dts/am335x-evm.dts > create mode 100644 arch/arm/boot/dts/am3517-evm.dts
On Sat, May 12, 2012 at 01:26:20, Tony Lindgren wrote: > Hi, > > * Cousson, Benoit <b-cousson@ti.com> [120511 05:51]: > > Hi Tony, > > > > Here are some remaining DT patches I was not able to push at 3.4 due to some missing dependency. > > It applies now fine on top of lo/dt branch. > > It seems that there are still patches being discussed for those SoCs > and we're pretty much done for this merge window. So unless things > drag on to -rc8, I'd say we just need to postpone merging new things > and merge them early around -rc2. > Oops... It seems like I missed this merge window as well... Thanks, Vaibhav
* Hiremath, Vaibhav <hvaibhav@ti.com> [120512 01:26]: > On Sat, May 12, 2012 at 01:26:20, Tony Lindgren wrote: > > Hi, > > > > * Cousson, Benoit <b-cousson@ti.com> [120511 05:51]: > > > Hi Tony, > > > > > > Here are some remaining DT patches I was not able to push at 3.4 due to some missing dependency. > > > It applies now fine on top of lo/dt branch. > > > > It seems that there are still patches being discussed for those SoCs > > and we're pretty much done for this merge window. So unless things > > drag on to -rc8, I'd say we just need to postpone merging new things > > and merge them early around -rc2. > > > > Oops... > It seems like I missed this merge window as well... We can still queue these into linux-omap for testing as soon as the patches are ready. In general, for anything more intrusive we want to have the patches sitting in linux-omap master branch and then in linux-next for at least a week. Then merging them into mainline tree is usually safe to do. The reason for this is that mainline kernel is our stable tree, not our development tree. We just need to queue most of things between -rc2 and -rc4 into the arm-soc tree, and have any issues fixed up before the merge window. Trying to cram development branches in around -rc6 just causes us a huge maintenance nightmare trying to fix up things in the mainline tree between -rc1 and -rc4. Cheers, Tony
On Sat, May 12, 2012 at 22:45:04, Tony Lindgren wrote: > * Hiremath, Vaibhav <hvaibhav@ti.com> [120512 01:26]: > > On Sat, May 12, 2012 at 01:26:20, Tony Lindgren wrote: > > > Hi, > > > > > > * Cousson, Benoit <b-cousson@ti.com> [120511 05:51]: > > > > Hi Tony, > > > > > > > > Here are some remaining DT patches I was not able to push at 3.4 due to some missing dependency. > > > > It applies now fine on top of lo/dt branch. > > > > > > It seems that there are still patches being discussed for those SoCs > > > and we're pretty much done for this merge window. So unless things > > > drag on to -rc8, I'd say we just need to postpone merging new things > > > and merge them early around -rc2. > > > > > > > Oops... > > It seems like I missed this merge window as well... > > We can still queue these into linux-omap for testing as > soon as the patches are ready. > > In general, for anything more intrusive we want to have > the patches sitting in linux-omap master branch and then > in linux-next for at least a week. Then merging them into > mainline tree is usually safe to do. The reason for this is > that mainline kernel is our stable tree, not our > development tree. > > We just need to queue most of things between -rc2 and > -rc4 into the arm-soc tree, and have any issues fixed up > before the merge window. Trying to cram development > branches in around -rc6 just causes us a huge maintenance > nightmare trying to fix up things in the mainline tree > between -rc1 and -rc4. > Understood Tony... This time I will try to follow up closely and will make sure that we have everything (especially new development) by rc2-rc4 window. Thanks, Vaibhav
On Fri, May 11, 2012 at 18:17:45, Cousson, Benoit wrote: > Hi Tony, > > Here are some remaining DT patches I was not able to push at 3.4 due to some missing dependency. > It applies now fine on top of lo/dt branch. > > Regards, > Benoit > > > The following changes since commit 40364b9f5a4d167d97bb6a76cd239ca8cfff056a: > Benoit Cousson (1): > arm/dts: omap4-panda: Add LEDs support > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.5/dts/am33xx > > Vaibhav Hiremath (3): > arm/dts: Add support for TI AM335x EVM board > arm/dts: omap3-evm: Add i2c and twl4030 support > arm/dts: Add support for TI AM3517/05 EVM board > > arch/arm/boot/dts/am335x-evm.dts | 39 ++++++++++++++++++++++++++++++++++++++ > arch/arm/boot/dts/am3517-evm.dts | 32 +++++++++++++++++++++++++++++++ > arch/arm/boot/dts/omap3-evm.dts | 28 +++++++++++++++++++++++++++ > 3 files changed, 99 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/boot/dts/am335x-evm.dts > create mode 100644 arch/arm/boot/dts/am3517-evm.dts > Tony (and Benoit), Can this patch merged into your "dt" branch??? And into "master" as well, so that we can be sure that, it goes in next merge window. Thanks, Vaibhav
* Cousson, Benoit <b-cousson@ti.com> [120511 05:51]: > Hi Tony, > > Here are some remaining DT patches I was not able to push at 3.4 due to some missing dependency. > It applies now fine on top of lo/dt branch. Thanks pulling now into dt branch. Tony > Regards, > Benoit > > > The following changes since commit 40364b9f5a4d167d97bb6a76cd239ca8cfff056a: > Benoit Cousson (1): > arm/dts: omap4-panda: Add LEDs support > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.5/dts/am33xx > > Vaibhav Hiremath (3): > arm/dts: Add support for TI AM335x EVM board > arm/dts: omap3-evm: Add i2c and twl4030 support > arm/dts: Add support for TI AM3517/05 EVM board > > arch/arm/boot/dts/am335x-evm.dts | 39 ++++++++++++++++++++++++++++++++++++++ > arch/arm/boot/dts/am3517-evm.dts | 32 +++++++++++++++++++++++++++++++ > arch/arm/boot/dts/omap3-evm.dts | 28 +++++++++++++++++++++++++++ > 3 files changed, 99 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/boot/dts/am335x-evm.dts > create mode 100644 arch/arm/boot/dts/am3517-evm.dts
Hi Tony, Here are some remaining DT patches I was not able to push at 3.4 due to some missing dependency. It applies now fine on top of lo/dt branch. Regards, Benoit The following changes since commit 40364b9f5a4d167d97bb6a76cd239ca8cfff056a: Benoit Cousson (1): arm/dts: omap4-panda: Add LEDs support are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.5/dts/am33xx Vaibhav Hiremath (3): arm/dts: Add support for TI AM335x EVM board arm/dts: omap3-evm: Add i2c and twl4030 support arm/dts: Add support for TI AM3517/05 EVM board arch/arm/boot/dts/am335x-evm.dts | 39 ++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/am3517-evm.dts | 32 +++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap3-evm.dts | 28 +++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 0 deletions(-) create mode 100644 arch/arm/boot/dts/am335x-evm.dts create mode 100644 arch/arm/boot/dts/am3517-evm.dts