From: David Miller <davem@davemloft.net>
To: ubraun@linux.vnet.ibm.com
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
ursula.braun@de.ibm.com
Subject: Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1
Date: Thu, 23 Apr 2009 06:38:00 -0700 (PDT) [thread overview]
Message-ID: <20090423.063800.159642504.davem@davemloft.net> (raw)
In-Reply-To: <1240492023.11770.5.camel@braunu-laptop>
From: Ursula Braun <ubraun@linux.vnet.ibm.com>
Date: Thu, 23 Apr 2009 15:07:03 +0200
> On Thu, 2009-04-23 at 04:43 -0700, David Miller wrote:
>> From: Ursula Braun <ubraun@linux.vnet.ibm.com>
>> Date: Wed, 22 Apr 2009 13:39:16 +0200
>>
>> > the af_iucv-patches sent today apply to net-next-2.6 without pulling
>> > yesterday's patches for net-2.6.
>> >
>> > If you prefer to pull net-2.6 first (in order to avoid potential future
>> > merge conflicts), I can rebuild and resend today's net-next-2.6 patches
>> > based on yesterday's af_iucv patches for net-2.6.
>>
>> I applied them all, then pulled net-2.6 into net-next-2.6 to
>> resolve the conflicts.
>>
>> Please make sure I did the right thing :-)
>
> Dave,
>
> net/iucv/af_iucv.c in net-next-2.6 is almost correct. 4 lines should
> still be deleted. These are the remaining changes:
Please provide a signoff even for fixes like this next time.
> /* receive/dequeue next skb:
> * the function understands MSG_PEEK and, thus, does not dequeue skb
> */
Newline added by your email client corrupted the patch.
I fixed this up when applying.
next prev parent reply other threads:[~2009-04-23 13:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-22 11:39 [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1 Ursula Braun
2009-04-23 11:43 ` David Miller
2009-04-23 13:07 ` Ursula Braun
2009-04-23 13:38 ` David Miller [this message]
2009-04-24 9:50 ` Ursula Braun
-- strict thread matches above, loose matches on Subject: below --
2009-04-22 9:26 Ursula Braun
2009-04-22 9:48 ` 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=20090423.063800.159642504.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
--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).