Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1

Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1

[Ursula Braun]

>Do I need to pull net-2.6 into net-next-2.6 for this stuff
>to apply properly?
>
>Just checking.

Dave,

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.

Regards, Ursula Braun

Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1

[David Miller]

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 :-)

Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1

[Ursula Braun]

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:
---
 net/iucv/af_iucv.c |    4 ----
 1 file changed, 4 deletions(-)

Index: net-next-2.6-uschi/net/iucv/af_iucv.c
===================================================================
--- net-next-2.6-uschi.orig/net/iucv/af_iucv.c
+++ net-next-2.6-uschi/net/iucv/af_iucv.c
@@ -982,8 +982,6 @@ static int iucv_sock_recvmsg(struct kioc
 	if (flags & (MSG_OOB))
 		return -EOPNOTSUPP;
 
-	target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
-
 	/* receive/dequeue next skb:
 	 * the function understands MSG_PEEK and, thus, does not dequeue skb
*/
 	skb = skb_recv_datagram(sk, flags, noblock, &err);
@@ -1429,8 +1427,6 @@ static void iucv_callback_rx(struct iucv
 	iucv_process_message(sk, skb, path, msg);
 	goto out_unlock;
 
-	return;
-
 save_message:
 	save_msg = kzalloc(sizeof(struct sock_msg_q), GFP_ATOMIC | GFP_DMA);
 	if (!save_msg)

Thanks a lot for your effort.

Regards, Ursula Braun

Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1

[David Miller]

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.

Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1

[Ursula Braun]

On Thu, 2009-04-23 at 06:38 -0700, David Miller wrote:
> Please provide a signoff even for fixes like this next time.
> 
> Newline added by your email client corrupted the patch.
> I fixed this up when applying.

Thanks, Dave, net/iucv/af_iucv.c in net-next-2.6 is now in good shape.
I will keep in mind to provide a signoff for such kind of fixes in
future.

Regards, Ursula Braun

Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1

[David Miller]

From: Ursula Braun <ursula.braun@de.ibm.com>
Date: Wed, 22 Apr 2009 11:26:19 +0200

> thanks for applying our critical af_iucv bug fixes to net-2.6.
> Here is now the series of iucv / af_iucv patches for the current
> development cycle.
> The patches are based on top of the current net-next-2.6 kernel
> (2.6.30-rc1).

Do I need to pull net-2.6 into net-next-2.6 for this stuff
to apply properly?

Just checking.

[patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1

[Ursula Braun]

Dave,

thanks for applying our critical af_iucv bug fixes to net-2.6.
Here is now the series of iucv / af_iucv patches for the current
development cycle.
The patches are based on top of the current net-next-2.6 kernel
(2.6.30-rc1).

Hendrik Brueckner (7)
    af_iucv: sync sk shutdown flag if iucv path is quiesced
    af_iucv: add sockopt() to enable/disable use of IPRM_DATA msgs
    af_iucv: Support data in IUCV msg parameter lists (IPRMDATA)
    af_iucv: Modify iucv msg target class using control msghdr
    af_iucv: Provide new socket type SOCK_SEQPACKET
    af_iucv: cleanup and refactor recvmsg() EFAULT handling
    af_iucv: New socket option for setting IUCV MSGLIMITs

Ursula Braun (1):
    iucv: provide second per-cpu IUCV command parameter block

Kind regards,
Ursula Braun