From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: David Miller <davem@davemloft.net>
Cc: ubraun@linux.vnet.ibm.com, ursula.braun@de.ibm.com,
netdev@vger.kernel.org, linux-s390@vger.kernel.org,
heiko.carstens@de.ibm.com
Subject: Re: [patch 0/2] af_iucv patches for linux-2.6.31
Date: Fri, 19 Jun 2009 09:04:26 +0200 [thread overview]
Message-ID: <20090619090426.19969a0b@skybase> (raw)
In-Reply-To: <20090618.111957.70533925.davem@davemloft.net>
Hi David,
On Thu, 18 Jun 2009 11:19:57 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:
> From: Ursula Braun <ubraun@linux.vnet.ibm.com>
> Date: Thu, 18 Jun 2009 14:44:54 +0200
>
> > sorry, I did a git pull on linux-2.6.git first, and the af_iucv patches
> > applied cleanly on my system.
>
> It couldn't have applied to Linus's tree because all the IUCV
> bits you submitted to me for 2.6.31 are in his tree and that is
> what created the conflicts.
Now I am confused. I just tested the two patches Uschi sent with todays
upstream tree. The patches apply fine. Where is the problem, wrong tree?
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
next prev parent reply other threads:[~2009-06-19 7:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-18 7:54 [patch 0/2] af_iucv patches for linux-2.6.31 Ursula Braun
2009-06-18 7:54 ` [patch 1/2] [PATCH] af_iucv: Change if condition in sendmsg() for more readability Ursula Braun
2009-06-18 7:54 ` [patch 2/2] [PATCH] af_iucv: Return -EAGAIN if iucv msg limit is exceeded Ursula Braun
2009-06-18 8:34 ` [patch 0/2] af_iucv patches for linux-2.6.31 David Miller
2009-06-18 12:44 ` Ursula Braun
2009-06-18 18:19 ` David Miller
2009-06-19 7:04 ` Martin Schwidefsky [this message]
2009-06-19 7:11 ` David Miller
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=20090619090426.19969a0b@skybase \
--to=schwidefsky@de.ibm.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ubraun@linux.vnet.ibm.com \
--cc=ursula.braun@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;
as well as URLs for NNTP newsgroup(s).