linux-next: semaphore update merge conflicts

linux-next: semaphore update merge conflicts

[Stephen Rothwell]

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

Hi Willy,

Not as bad as I thought it might be!  :-)

The merge had the following conflicts:

	Documentation/feature-removal-schedule.txt
		Conflicts with the ocfs2 tree - trivial to fix.
	arch/avr32/kernel/semaphore.c
		the avr32 tree appeared to just change spaces to tabs
		in this file so I removed it (as your changes did).
	include/linux/memory.h
		the driver-core changed the semaphore in here to a mutex,
		so the change from asm/semaphore.h to linux/semaphore.h
		is no longer needed.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: semaphore update merge conflicts

[Haavard Skinnemoen]

On Fri, 29 Feb 2008 15:39:58 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> 	arch/avr32/kernel/semaphore.c
> 		the avr32 tree appeared to just change spaces to tabs
> 		in this file so I removed it (as your changes did).

I yanked that change out of my tree. No point cleaning up that file if
it's going away.

Haavard

Re: linux-next: semaphore update merge conflicts

[Stephen Rothwell]

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

On Fri, 29 Feb 2008 11:17:31 +0100 Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > 	arch/avr32/kernel/semaphore.c
> > 		the avr32 tree appeared to just change spaces to tabs
> > 		in this file so I removed it (as your changes did).
> 
> I yanked that change out of my tree. No point cleaning up that file if
> it's going away.

OK, thanks.

By the way, is there some place I can get a cross compiler to build avr32
kernels (or better yet a recipe for crosstool to make one)?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: semaphore update merge conflicts

[Haavard Skinnemoen]

On Fri, 29 Feb 2008 23:17:04 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> On Fri, 29 Feb 2008 11:17:31 +0100 Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:
> >
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > 	arch/avr32/kernel/semaphore.c
> > > 		the avr32 tree appeared to just change spaces to tabs
> > > 		in this file so I removed it (as your changes did).
> > 
> > I yanked that change out of my tree. No point cleaning up that file if
> > it's going away.
> 
> OK, thanks.
> 
> By the way, is there some place I can get a cross compiler to build avr32
> kernels (or better yet a recipe for crosstool to make one)?

You can get the official toolchain from this page:

http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4118

I'm not sure about crosstool, but you can get a patched version of
buildroot from this page:

http://www.atmel.no/buildroot/

Maybe you can just grab the patches from buildroot and use them with
crosstool? Or I can send them to you if you don't want to download the
whole thing.

Haavard

Re: linux-next: semaphore update merge conflicts

[Stephen Rothwell]

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

On Fri, 29 Feb 2008 13:25:14 +0100 Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:
>
> On Fri, 29 Feb 2008 23:17:04 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > By the way, is there some place I can get a cross compiler to build avr32
> > kernels (or better yet a recipe for crosstool to make one)?
> 
> You can get the official toolchain from this page:
> 
> http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4118
> 
> I'm not sure about crosstool, but you can get a patched version of
> buildroot from this page:
> 
> http://www.atmel.no/buildroot/
> 
> Maybe you can just grab the patches from buildroot and use them with
> crosstool? Or I can send them to you if you don't want to download the
> whole thing.

I'll have a look and let you know.  Thanks.

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

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