* [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2
@ 2012-10-26 21:23 Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2
[not found] <508affc9.8f07320a.16f0.0ac0SMTPIN_ADDED@mx.google.com>
@ 2012-11-05 18:11 ` Olof Johansson
0 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2012-11-05 18:11 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-omap, linux-arm-kernel
On Fri, Oct 26, 2012 at 02:23:39PM -0700, Tony Lindgren wrote:
> 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.
Thanks, pulled into next/headers, and I kept an explicit dependency on Greg's
tree as depends/tty so we can keep track of it.
-Olof
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2
@ 2012-11-05 18:11 ` Olof Johansson
0 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2012-11-05 18:11 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 26, 2012 at 02:23:39PM -0700, Tony Lindgren wrote:
> 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.
Thanks, pulled into next/headers, and I kept an explicit dependency on Greg's
tree as depends/tty so we can keep track of it.
-Olof
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2
@ 2012-10-26 21:23 Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-arm-kernel, linux-omap
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2
@ 2012-10-26 21:23 Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-11-05 18:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-26 21:23 [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2 Tony Lindgren
[not found] <508affc9.8f07320a.16f0.0ac0SMTPIN_ADDED@mx.google.com>
2012-11-05 18:11 ` Olof Johansson
2012-11-05 18:11 ` Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
2012-10-26 21:23 Tony Lindgren
2012-10-26 21:23 Tony Lindgren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.