Merge request for the Thumb-2 branch

Merge request for the Thumb-2 branch

[Catalin Marinas]

Hi Stephen,

Could you please merge the thumb-2 branch into linux-next:

  git://linux-arm.org/linux-2.6.git thumb-2

It adds support for compiling the ARM kernel to the Thumb-2 instruction
set (16 or 32 bit opcodes) and it makes sense to check it doesn't break
other things before the next merging window (it's a bit more intrusive
but limited to arch/arm/* files).

The commits in this branch are:

Catalin Marinas (11):
      Thumb-2: Add some .align statements to the .S files
      Thumb-2: Add macros for the unified assembler syntax
      Thumb-2: Implementation of the unified start-up and exceptions code
      Thumb-2: Implement the unified arch/arm/mm support
      Thumb-2: Implement the unified arch/arm/lib functions
      Thumb-2: Implement the unified VFP support
      Thumb-2: Implement the unified boot code
      Thumb-2: Add support for loadable modules
      Thumb-2: Pass a Thumb-2 address to the secondary CPUs to jump to
      Thumb-2: Make the uImage entry an odd number
      Thumb-2: Add Thumb-2 support to the build files

Thanks.

-- 
Catalin

Re: Merge request for the Thumb-2 branch

[Catalin Marinas]

Hi Stephen and Russell,

On Fri, 2009-06-26 at 17:59 +0100, Catalin Marinas wrote:
> Could you please merge the thumb-2 branch into linux-next:
> 
>   git://linux-arm.org/linux-2.6.git thumb-2
> 
> It adds support for compiling the ARM kernel to the Thumb-2 instruction
> set (16 or 32 bit opcodes) and it makes sense to check it doesn't break
> other things before the next merging window (it's a bit more intrusive
> but limited to arch/arm/* files).

(I'm replying to myself but I'd like to make sure this e-mail wasn't
missed)

Russell - are you OK with getting this branch merged during the next
window, assuming that any new comments are implemented and testing is
fine? If there are other issues, please let me know.

While merging will eventually be done via Russell's ARM tree, should we
first get it into linux-next directly or into Russell's for-next branch
(if such branch exists)?

Thanks.

-- 
Catalin

Re: Merge request for the Thumb-2 branch

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1729 bytes --]

Hi Catalin,

On Wed, 08 Jul 2009 16:34:29 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> On Fri, 2009-06-26 at 17:59 +0100, Catalin Marinas wrote:
> > Could you please merge the thumb-2 branch into linux-next:
> > 
> >   git://linux-arm.org/linux-2.6.git thumb-2
> > 
> > It adds support for compiling the ARM kernel to the Thumb-2 instruction
> > set (16 or 32 bit opcodes) and it makes sense to check it doesn't break
> > other things before the next merging window (it's a bit more intrusive
> > but limited to arch/arm/* files).
> 
> (I'm replying to myself but I'd like to make sure this e-mail wasn't
> missed)

I am sorry, it disappeared into the morass of my inbox. :-(

> Russell - are you OK with getting this branch merged during the next
> window, assuming that any new comments are implemented and testing is
> fine? If there are other issues, please let me know.

>From previous comments that Russell has made, I think he is OK with arm
platforms being in linux-next separately (we already have 2 others), so I
will add this today.

What I tell everyone: all patches/commits in the tree/series must
have been:

	posted to a relevant mailing list
	reviewed
	unit tested
	destined for the next merge window (or the current release)

*before* they are included.  The linux-next tree is for integration
testing and to lower the impact of conflicts between subsystems in the
next merge window.

Basically, this should be just what you would send to Linus, or in this
case, Russell (or ask him to fetch).  It is allowed to be rebased if you
deem it necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: Merge request for the Thumb-2 branch

[Catalin Marinas]

Hi Stephen,

On Thu, 2009-07-09 at 10:06 +1000, Stephen Rothwell wrote:
> On Wed, 08 Jul 2009 16:34:29 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
> >
> > On Fri, 2009-06-26 at 17:59 +0100, Catalin Marinas wrote:
> > > Could you please merge the thumb-2 branch into linux-next:
> > > 
> > >   git://linux-arm.org/linux-2.6.git thumb-2
> > > 
> > > It adds support for compiling the ARM kernel to the Thumb-2 instruction
> > > set (16 or 32 bit opcodes) and it makes sense to check it doesn't break
> > > other things before the next merging window (it's a bit more intrusive
> > > but limited to arch/arm/* files).
[...]
> > Russell - are you OK with getting this branch merged during the next
> > window, assuming that any new comments are implemented and testing is
> > fine? If there are other issues, please let me know.
> 
> From previous comments that Russell has made, I think he is OK with arm
> platforms being in linux-next separately (we already have 2 others), so I
> will add this today.

That's not a new ARM platform, it is affecting the core
arch/arm/kernel/, arch/arm/mm/ etc. files so that they can be compiled
to an alternative instruction set (mostly 16-bit instructions). So it
should eventually be merged via Russell's tree (or get his ack and push
directly)

My intention is indeed to merge this in the upcoming window (unless
Russell has any more comments to the code).

Thanks.

-- 
Catalin

Re: Merge request for the Thumb-2 branch

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 814 bytes --]

Hi Catalin,

On Thu, 09 Jul 2009 09:57:55 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> That's not a new ARM platform, it is affecting the core

My mistake (I must learn to read sometime :-))

> arch/arm/kernel/, arch/arm/mm/ etc. files so that they can be compiled
> to an alternative instruction set (mostly 16-bit instructions). So it
> should eventually be merged via Russell's tree (or get his ack and push
> directly)
> 
> My intention is indeed to merge this in the upcoming window (unless
> Russell has any more comments to the code).

OK, then it will stay in linux-next unless Russell desires otherwise.   I
can even cope if he decides to merges it into his tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]