lkml.org 
[lkml]   [2008]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] iucv: Fix mismerge again.
From
From: Heiko Carstens <heiko.carstens@de.ibm.com>
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@de.ibm.com>
> Cc: Ursula Braun <braunu@de.ibm.com>
> Cc: Frank Blaschka <frank.blaschka@de.ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

Applied to net-2.6, thanks.


\
 
 \ /
  Last update: 2008-09-30 12:09    [W:0.027 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site