Re: [PATCH] iucv: Fix mismerge again.

[David Miller]

From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu, 25 Sep 2008 13:09:07 +0200

> iucv: Fix mismerge again.
 ...
> fb65a7c091529bfffb1262515252c0d0f6241c5c ("iucv: Fix bad merging.") fixed
> a merge error, but in a wrong way. We now end up with the bug below.
> This patch corrects the mismerge like it was intended.
> 
> BUG: scheduling while atomic: swapper/1/0x00000000
 ...
> initcall netiucv_init+0x0/0x2c8 returned with preemption imbalance
> 
> Cc: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
> Cc: Ursula Braun <braunu@xxxxxxxxxx>
> Cc: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>

Applied to net-2.6, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/