| Message ID | 088001ccc1d7$7c0da460$7428ed20$%kim@samsung.com |
|---|---|
| State | New |
| Headers | show |
On Saturday 24 December 2011, Kukjin Kim wrote: > Please pull the samsung-cleanup-spi for v3.3. > It depends on samsung-devel-spi3 branch... > > If any problems, please let me know. I've applied next-samsung-cleanup-mmc2, next-samsung-devel-spi3 and next-samsung-cleanup-spi4, all into next/cleanup2 now. This was the best solution I could come up with, because strictly following the normal rules would have meant creating an insane number of merge commits and sending out each of your branches separately to Linus, after all the other stuff. I normally try to send out all cleanups before everything else, except when a cleanup has a dependency on another branch, in which case I have to create an extra cleanup branch. What you sent me would have meant doing something like: 1. cleanup all cleanup branches except samsung 2. dt all dt branches 3. devel all devel branches, including devel-ohci but not devel-spi or devel-mmc-spi 4.-10. everything else except samsung 11. cleanup2 only samsung/cleanup-mmc 12. devel2 only samsung/devel-spi 13. cleanup3 only samsung/cleanup-spi 14. devel3 only samsung/devel-mmc-spi I've now squashed samsung/devel-spi into the cleanup2 branch, which also lets me put cleanup-spi in there, and put it right after next/dt. This works because devel-spi can still be considered a cleanup (although you did not consider it that). Right now, the order we have in arm-soc is "fixes-non-critical", "cleanup", "dt", "cleanup2", "soc", "boards", "devel", "drivers", "pm", "timer", "move". There is some flexibility towards the end, but if you use a different order, that creates circular dependencies which we absolutely don't want. Arnd
Arnd Bergmann wrote: > > On Saturday 24 December 2011, Kukjin Kim wrote: > > Please pull the samsung-cleanup-spi for v3.3. > > It depends on samsung-devel-spi3 branch... > > > > If any problems, please let me know. > > I've applied next-samsung-cleanup-mmc2, next-samsung-devel-spi3 and > next-samsung-cleanup-spi4, all into next/cleanup2 now. > OK. > This was the best solution I could come up with, because strictly > following > the normal rules would have meant creating an insane number of merge > commits and sending out each of your branches separately to Linus, after > all the other stuff. > Yes, right. I agree. > I normally try to send out all cleanups before everything else, except > when a cleanup has a dependency on another branch, in which case I have > to create an extra cleanup branch. What you sent me would have > meant doing something like: > > 1. cleanup > all cleanup branches except samsung > > 2. dt > all dt branches > > 3. devel > all devel branches, including devel-ohci but not devel-spi > or devel-mmc-spi > > 4.-10. > everything else except samsung > > 11. cleanup2 > only samsung/cleanup-mmc > > 12. devel2 > only samsung/devel-spi > > 13. cleanup3 > only samsung/cleanup-spi > > 14. devel3 > only samsung/devel-mmc-spi > > I've now squashed samsung/devel-spi into the cleanup2 branch, which also > lets me > put cleanup-spi in there, and put it right after next/dt. This works > because > devel-spi can still be considered a cleanup (although you did not consider > it that). > Hmm...I thought it's a kind of developing but cleanup2 branch and above ordering are ok to me. > Right now, the order we have in arm-soc is "fixes-non-critical", "cleanup", > "dt", > "cleanup2", "soc", "boards", "devel", "drivers", "pm", "timer", "move". > There > is some flexibility towards the end, but if you use a different order, > that creates > circular dependencies which we absolutely don't want. > Yes, we don't :) OK, thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Hi Arnd and Olof, Please pull the samsung-cleanup-spi for v3.3. It depends on samsung-devel-spi3 branch... If any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit a153e31abb01484d0088ac28425dc98204848ad4: ARM: SAMSUNG: Remove SPI bus clocks from platform data (2011-12-23 10:10:46 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next-samsung-cleanup-spi4 Padmavathi Venna (6): ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung ARM: S3C64XX: Modified files for SPI consolidation work ARM: S5PC100: Modified files for SPI consolidation work ARM: S5P64X0: Modified files for SPI consolidation work ARM: S5PV210: Modified files for SPI consolidation work ARM: S3C64XX: Modified according to SPI consolidation work arch/arm/mach-s3c64xx/Kconfig | 8 +- arch/arm/mach-s3c64xx/Makefile | 2 +- arch/arm/mach-s3c64xx/dev-spi.c | 173 ----------------- arch/arm/mach-s3c64xx/include/mach/map.h | 2 + arch/arm/mach-s3c64xx/setup-spi.c | 45 +++++ arch/arm/mach-s5p64x0/Kconfig | 7 +- arch/arm/mach-s5p64x0/Makefile | 2 +- arch/arm/mach-s5p64x0/dev-spi.c | 218 --------------------- arch/arm/mach-s5p64x0/include/mach/map.h | 2 + arch/arm/mach-s5p64x0/setup-spi.c | 55 ++++++ arch/arm/mach-s5pc100/Kconfig | 5 + arch/arm/mach-s5pc100/Makefile | 2 +- arch/arm/mach-s5pc100/dev-spi.c | 220 ---------------------- arch/arm/mach-s5pc100/include/mach/map.h | 3 + arch/arm/mach-s5pc100/setup-spi.c | 65 +++++++ arch/arm/mach-s5pv210/Kconfig | 5 + arch/arm/mach-s5pv210/Makefile | 2 +- arch/arm/mach-s5pv210/dev-spi.c | 169 ----------------- arch/arm/mach-s5pv210/include/mach/map.h | 2 + arch/arm/mach-s5pv210/setup-spi.c | 51 +++++ arch/arm/plat-samsung/Kconfig | 16 ++- arch/arm/plat-samsung/devs.c | 127 +++++++++++++ arch/arm/plat-samsung/include/plat/devs.h | 8 +- arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 22 ++- 24 files changed, 409 insertions(+), 802 deletions(-) delete mode 100644 arch/arm/mach-s3c64xx/dev-spi.c create mode 100644 arch/arm/mach-s3c64xx/setup-spi.c delete mode 100644 arch/arm/mach-s5p64x0/dev-spi.c create mode 100644 arch/arm/mach-s5p64x0/setup-spi.c delete mode 100644 arch/arm/mach-s5pc100/dev-spi.c create mode 100644 arch/arm/mach-s5pc100/setup-spi.c delete mode 100644 arch/arm/mach-s5pv210/dev-spi.c create mode 100644 arch/arm/mach-s5pv210/setup-spi.c