| Message ID | pull-1351286620-406688 |
|---|---|
| State | New |
| Headers | show |
On Fri, Oct 26, 2012 at 02:23:40PM -0700, Tony Lindgren wrote: > The following changes since commit 3d82cbbb3aadb4f8a30e3f614e51be96574a0855: > > ARM: OMAP: Split plat/serial.h for omap1 and omap2+ (2012-10-24 13:34:31 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-headers-part3-signed > > for you to fetch changes up to a0212796b58061a9716178d261f318925c246643: > > Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700) > > ---------------------------------------------------------------- > > Here is the third set of plat header removal for omap2+. > > This is based on the following minimal topic branches > coordinated with the related driver maintainers: > > omap-for-v3.8/cleanup-headers-usb > omap-for-v3.8/cleanup-headers-menelaus > > In addition to that, there are few fixes to the previously > merged patches that can show up with customized configs. Thanks, I pulled in the two branches above as explicit dependencies, and resolved the conflicts the same way you did. New branches are: depends/omap-cleanup-headers-menelaus depends/omap-cleanup-headers-usb omap/cleanup-headers-3 -Olof
The following changes since commit 3e9a6321f9895eac9a3d241d3126e44021e7102b: Merge tag 'omap-for-v3.8/cleanup-headers-signed' into omap-for-v3.8/cleanup-headers-serial-take2 (2012-10-24 13:25:44 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-headers-serial-take2-signed for you to fetch changes up to 3d82cbbb3aadb4f8a30e3f614e51be96574a0855: ARM: OMAP: Split plat/serial.h for omap1 and omap2+ (2012-10-24 13:34:31 -0700) ---------------------------------------------------------------- These changes remove plat/serial.h usage for omap2+. Note that this branch is based on a tty commit 3e9a6321 (tty/serial/8250: Make omap hardware workarounds local to 8250.h) merged with omap-for-v3.8/cleanup-headers-signed. The tty commit is needed to keep things compiling for omaps, and omap-for-v3.8/cleanup-headers-signed is needed to avoid multiple merge conflicts with the includes. I've verified with Greg KH that the tty commit above is immutable and OK to use as a base. ---------------------------------------------------------------- Tony Lindgren (2): ARM: OMAP: Split uncompress.h to mach-omap1 and mach-omap2 ARM: OMAP: Split plat/serial.h for omap1 and omap2+ arch/arm/mach-omap1/include/mach/debug-macro.S | 2 +- arch/arm/mach-omap1/include/mach/hardware.h | 2 +- arch/arm/mach-omap1/include/mach/serial.h | 53 +++++ arch/arm/mach-omap1/include/mach/uncompress.h | 121 +++++++++++- arch/arm/mach-omap2/board-rm680.c | 1 - arch/arm/mach-omap2/common.h | 3 +- arch/arm/mach-omap2/include/mach/debug-macro.S | 2 +- arch/arm/mach-omap2/include/mach/uncompress.h | 175 ++++++++++++++++- arch/arm/mach-omap2/io.c | 2 +- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 + .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 2 - .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 1 - .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 3 +- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 3 +- arch/arm/mach-omap2/serial.c | 2 +- .../include/plat => mach-omap2}/serial.h | 11 -- arch/arm/plat-omap/include/plat/uncompress.h | 204 -------------------- 18 files changed, 354 insertions(+), 235 deletions(-) create mode 100644 arch/arm/mach-omap1/include/mach/serial.h rename arch/arm/{plat-omap/include/plat => mach-omap2}/serial.h (91%) delete mode 100644 arch/arm/plat-omap/include/plat/uncompress.h