Hi Linus,
Please pull to get fixes for the m68knommu arch.
Regards
Greg
The following changes since commit 769f3e8c384795cc350e2aae27de2a12374d19d4:
Linus Torvalds (1):
Merge branch 'printk-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus
Greg Ungerer (16):
m68knommu: fix system reset for ColdFire 527x family
m68knommu: merge system reset for code ColdFire 523x family
m68knommu: add CPU reset code for the 5307 ColdFire
m68knommu: add CPU reset code for the 5407 ColdFire
m68knommu: add CPU reset code for the 5206 ColdFire
m68knommu: add CPU reset code for the 5206e ColdFire
m68knommu: add CPU reset code for the 5249 ColdFire
m68knommu: add CPU reset code for the 532x ColdFire
m68knommu: move CPU reset code for the 520x ColdFire into its platform code
m68knommu: move CPU reset code for the 523x ColdFire into its platform code
m68knommu: move CPU reset code for the 527x ColdFire into its platform code
m68knommu: move CPU reset code for the 528x ColdFire into its platform code
m68knommu: move CPU reset code for the 5272 ColdFire into its platform code
m68knommu: remove obsolete reset code
m68knommu: enumerate INIT_THREAD fields properly
m68knommu: remove unecessary include of thread_info.h in entry.S
Jaswinder Singh Rajput (1):
headers_check fix: m68k, swab.h
Joe Perches (1):
arch/m68knommu: Convert #ifdef DEBUG printk(KERN_DEBUG to pr_debug(
arch/m68k/include/asm/m520xsim.h | 9 +++
arch/m68k/include/asm/m523xsim.h | 9 +++
arch/m68k/include/asm/m527xsim.h | 9 +++
arch/m68k/include/asm/m528xsim.h | 8 ++
arch/m68k/include/asm/m532xsim.h | 12 +++
arch/m68k/include/asm/processor_no.h | 8 +-
arch/m68k/include/asm/swab.h | 2 +-
arch/m68k/include/asm/system_no.h | 107 ----------------------------
arch/m68knommu/kernel/entry.S | 1 -
arch/m68knommu/kernel/setup.c | 16 ++---
arch/m68knommu/mm/init.c | 4 +-
arch/m68knommu/platform/5206/config.c | 18 +++--
arch/m68knommu/platform/5206e/config.c | 18 +++--
arch/m68knommu/platform/520x/config.c | 15 +++--
arch/m68knommu/platform/523x/config.c | 14 ++--
arch/m68knommu/platform/5249/config.c | 18 +++--
arch/m68knommu/platform/5272/config.c | 18 ++++-
arch/m68knommu/platform/527x/config.c | 15 +++--
arch/m68knommu/platform/528x/config.c | 13 +++-
arch/m68knommu/platform/5307/config.c | 16 +++-
arch/m68knommu/platform/532x/config.c | 12 +++-
arch/m68knommu/platform/5407/config.c | 16 +++-
arch/m68knommu/platform/coldfire/vectors.c | 7 --
23 files changed, 178 insertions(+), 187 deletions(-)
On Fri, Jun 12, 2009 at 03:14, Greg Ungerer<[email protected]> wrote:
> Please pull to get fixes for the m68knommu arch.
> Jaswinder Singh Rajput (1):
> headers_check fix: m68k, swab.h
Thanks!
Probably I won't have time to handle and submit any m68k patches
during this merge window,
so if anyone needs anything to be in 2.6.31, it would be nice if
somebody else could take care of
it.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Geert,
Geert Uytterhoeven wrote:
> On Fri, Jun 12, 2009 at 03:14, Greg Ungerer<[email protected]> wrote:
>> Please pull to get fixes for the m68knommu arch.
>
>> Jaswinder Singh Rajput (1):
>> headers_check fix: m68k, swab.h
>
> Thanks!
No problem :-)
> Probably I won't have time to handle and submit any m68k patches
> during this merge window,
> so if anyone needs anything to be in 2.6.31, it would be nice if
> somebody else could take care of
> it.
I have a few more header file re-merges that I have had sitting
around for a while, any chance you can review them? (Or maybe I
just send them to the m68k-linux mailing list?)
Currently they are on the branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git includes
The easy ones are done, so the re-joining now is not completely
trivial. This set (of 5) is reasonably strait forward though.
Regards
Greg
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: [email protected]
SnapGear Group, McAfee PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
On Fri, Jun 12, 2009 at 05:02:44PM +1000, Greg Ungerer wrote:
> Hi Geert,
>
> Geert Uytterhoeven wrote:
> >On Fri, Jun 12, 2009 at 03:14, Greg Ungerer<[email protected]> wrote:
> >>Please pull to get fixes for the m68knommu arch.
> >
> >>Jaswinder Singh Rajput (1):
> >> headers_check fix: m68k, swab.h
> >
> >Thanks!
>
> No problem :-)
>
>
> >Probably I won't have time to handle and submit any m68k patches
> >during this merge window,
> >so if anyone needs anything to be in 2.6.31, it would be nice if
> >somebody else could take care of
> >it.
>
> I have a few more header file re-merges that I have had sitting
> around for a while, any chance you can review them? (Or maybe I
> just send them to the m68k-linux mailing list?)
Please copy lkml too.
Sam