linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: semaphot-removal merge conflicts
@ 2008-05-16  3:19 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2008-05-16  3:19 UTC (permalink / raw)
  To: Matthew Wilcox
  Cc: linux-next, Josef 'Jeff' Sipek, Matthias Kaehlcke,
	Andrew Vasquez, James Bottomley, Daniel Walker

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

Hi Willy,

Today's linux-next merge of the semaphore-removal tree git conflicts in
several files because it appears that the semaphore removals have been
done in upstream and scsi-rc-fixes (which should go to upstream soon)
trees.

So I reverted the following commits from the semaphore-removal tree
*before* remerging it:

3029b0c2f226a05f6866bf27cf7e90fbabe348e9 "Convert qla_os to use mutex instead of semaphore"
2c77d192c68a95a188dd326db1315b3492487c41 "9p: Convert from semaphore to spinlock"
de99e091066295ab4abc5a1faec823b040db0ac4 "qla2xxx: Turn vport_sem into vport_mutex"

The conflicting commits (just for completeness):

c1549497e903a1ffa1c5808337a987180e480e7a "9p: use struct mutex instead of struct semaphore"
	(in Linus' tree)
6c2f527cb84cbd7d2d8a668c979e70bf78980ccc "[SCSI] qla2xxx: Convert vport_sem to a mutex"
e1e82b6f0df0c5175ddd3d4f8862507aa71da8e9 "[SCSI] qla2xxx: firmware semaphore to mutex"
	(in the scsi-rc-fixes tree)

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

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-05-16  3:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-16  3:19 linux-next: semaphot-removal merge conflicts 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).