linux-next: semaphore-removal/scsi-rc-fixes merge conflicts

linux-next: semaphore-removal/scsi-rc-fixes merge conflicts

[Stephen Rothwell]

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

Hi Willy,

Today's linux-next merge of the semaphore-removal tree got conflicts in
drivers/scsi/qla2xxx/{qla_attr.c,qla_def.h,qla_mbx.c,qla_mid.c,qla_os.c}
between commits e1e82b6f0df0c5175ddd3d4f8862507aa71da8e9 ("[SCSI]
qla2xxx: firmware semaphore to mutex") and
6c2f527cb84cbd7d2d8a668c979e70bf78980ccc ("[SCSI] qla2xxx: Convert
vport_sem to a mutex") from the scsi-rc-fixes tree and commits
5469811b8b0085c0f19fd3aaad29cde59761e243 ("qla2xxx: Turn vport_sem into
vport_mutex") and e2c6f1aa2f67c585ffcb879d32ff3e74b53faf25 ("Convert
qla_os to use mutex instead of semaphore") from the semaphore-removal
tree.

These pairs of commits did the same thing except for
	a change of name (vport_lock v. vport_mutex).
	a use of mutex_lock() instead of mutex_lock_killable()

I took the versions from scsi-rc_fixes (since they will probably be
submitted to Linus for 2.6.26 - Is that correct James?) except the use of
mutex_lock_killable() from the semaphore-removal tree in
drivers/scsi/qla2xxx/qla_os.c.

Please check what I did.

If its OK, then Willy should remove "qla2xxx: Turn vport_sem into
vport_mutex" from the semaphore-removal tree.  And someone should decide
about the use of mutex_lock_killable().

Also, Willy, I think "9p: Convert from mutex to spinlock" can be removed
as well as a very similar change has been merged upstream (commit
c1549497e903a1ffa1c5808337a987180e480e7a "9p: use struct mutex instead of
struct semaphore").

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

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

Re: linux-next: semaphore-removal/scsi-rc-fixes merge conflicts

[Stephen Rothwell]

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

Hi Willy,

On Mon, 2 Jun 2008 17:12:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the semaphore-removal tree got conflicts in
> drivers/scsi/qla2xxx/{qla_attr.c,qla_def.h,qla_mbx.c,qla_mid.c,qla_os.c}
> between commits e1e82b6f0df0c5175ddd3d4f8862507aa71da8e9 ("[SCSI]
> qla2xxx: firmware semaphore to mutex") and
> 6c2f527cb84cbd7d2d8a668c979e70bf78980ccc ("[SCSI] qla2xxx: Convert
> vport_sem to a mutex") from the scsi-rc-fixes tree and commits
> 5469811b8b0085c0f19fd3aaad29cde59761e243 ("qla2xxx: Turn vport_sem into
> vport_mutex") and e2c6f1aa2f67c585ffcb879d32ff3e74b53faf25 ("Convert
> qla_os to use mutex instead of semaphore") from the semaphore-removal
> tree.
> 
> These pairs of commits did the same thing except for
> 	a change of name (vport_lock v. vport_mutex).
> 	a use of mutex_lock() instead of mutex_lock_killable()
> 
> I took the versions from scsi-rc_fixes (since they will probably be
> submitted to Linus for 2.6.26 - Is that correct James?) except the use of
> mutex_lock_killable() from the semaphore-removal tree in
> drivers/scsi/qla2xxx/qla_os.c.
> 
> Please check what I did.
> 
> If its OK, then Willy should remove "qla2xxx: Turn vport_sem into
> vport_mutex" from the semaphore-removal tree.  And someone should decide
> about the use of mutex_lock_killable().

The two commits from the scsi-rc-fixes tree above have indeed been merged
in 2.6.26-rc5.  So, willy, can I ask you to redo the semaphore-removal
tree based on that - or just merge Linus' tree into the semaphore removal
tree. 

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

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