[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090423.063800.159642504.davem@davemloft.net>
Date: Thu, 23 Apr 2009 06:38:00 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: ubraun@...ux.vnet.ibm.com
Cc: netdev@...r.kernel.org, linux-s390@...r.kernel.org,
schwidefsky@...ibm.com, heiko.carstens@...ibm.com,
ursula.braun@...ibm.com
Subject: Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1
From: Ursula Braun <ubraun@...ux.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@...ux.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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists