linux-kernel - Re: [PATCH] iucv: Fix mismerge again.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 30 Sep 2008 03:06:55 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	heiko.carstens@...ibm.com
Cc:	frank.blaschka@...ibm.com, braunu@...ibm.com,
	peter.oberparleiter@...ibm.com, schwidefsky@...ibm.com,
	netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
	linux-s390@...r.kernel.org
Subject: Re: [PATCH] iucv: Fix mismerge again.

From: Heiko Carstens <heiko.carstens@...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@...ibm.com>
> Cc: Ursula Braun <braunu@...ibm.com>
> Cc: Frank Blaschka <frank.blaschka@...ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@...ibm.com>

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/