From: David Miller <davem@davemloft.net>
To: heiko.carstens@de.ibm.com
Cc: frank.blaschka@de.ibm.com, braunu@de.ibm.com,
peter.oberparleiter@de.ibm.com, schwidefsky@de.ibm.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-s390@vger.kernel.org
Subject: Re: [PATCH] iucv: Fix mismerge again.
Date: Tue, 30 Sep 2008 03:06:55 -0700 (PDT) [thread overview]
Message-ID: <20080930.030655.205785115.davem@davemloft.net> (raw)
In-Reply-To: <20080925110907.GA22433@osiris.boeblingen.de.ibm.com>
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.
prev parent reply other threads:[~2008-09-30 10:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-25 11:09 Heiko Carstens
2008-09-30 10:06 ` David Miller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080930.030655.205785115.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=braunu@de.ibm.com \
--cc=frank.blaschka@de.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peter.oberparleiter@de.ibm.com \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®