LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: semaphore update merge conflicts
@ 2008-02-29  4:39 Stephen Rothwell
  2008-02-29 10:17 ` Haavard Skinnemoen
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2008-02-29  4:39 UTC (permalink / raw)
  To: Matthew Wilcox; +Cc: linux-next, LKML, Haavard Skinnemoen, Greg KH, Mark Fasheh

[-- 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 --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-02-29 12:30 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-29  4:39 linux-next: semaphore update merge conflicts Stephen Rothwell
2008-02-29 10:17 ` Haavard Skinnemoen
2008-02-29 12:17   ` Stephen Rothwell
2008-02-29 12:25     ` Haavard Skinnemoen
2008-02-29 12:30       ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).