All of lore.kernel.org
 help / color / mirror / Atom feed
* pulling net tree into net-next
@ 2013-06-05 17:27 Eric Dumazet
  2013-06-05 23:15 ` David Miller
  0 siblings, 1 reply; 5+ messages in thread
From: Eric Dumazet @ 2013-06-05 17:27 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

Hi David

I have some upcoming HTB patches for net-next, needing a sync, now Linus
pulled your net tree.

Thanks !

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pulling net tree into net-next
  2013-06-05 17:27 pulling net tree into net-next Eric Dumazet
@ 2013-06-05 23:15 ` David Miller
  2013-06-06  4:18   ` Eric Dumazet
  2013-06-06  4:52   ` David Miller
  0 siblings, 2 replies; 5+ messages in thread
From: David Miller @ 2013-06-05 23:15 UTC (permalink / raw)
  To: eric.dumazet; +Cc: netdev

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 05 Jun 2013 10:27:04 -0700

> I have some upcoming HTB patches for net-next, needing a sync, now Linus
> pulled your net tree.

Working on it now, I need to handle some details in the merge commit so
give me some time.

Thanks!

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pulling net tree into net-next
  2013-06-05 23:15 ` David Miller
@ 2013-06-06  4:18   ` Eric Dumazet
  2013-06-06  4:26     ` Eric Dumazet
  2013-06-06  4:52   ` David Miller
  1 sibling, 1 reply; 5+ messages in thread
From: Eric Dumazet @ 2013-06-06  4:18 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

On Wed, 2013-06-05 at 16:15 -0700, David Miller wrote:

> Working on it now, I need to handle some details in the merge commit so
> give me some time.

Thanks David, it seems nicely done ;)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pulling net tree into net-next
  2013-06-06  4:18   ` Eric Dumazet
@ 2013-06-06  4:26     ` Eric Dumazet
  0 siblings, 0 replies; 5+ messages in thread
From: Eric Dumazet @ 2013-06-06  4:26 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

On Wed, 2013-06-05 at 21:18 -0700, Eric Dumazet wrote:
> On Wed, 2013-06-05 at 16:15 -0700, David Miller wrote:
> 
> > Working on it now, I need to handle some details in the merge commit so
> > give me some time.
> 
> Thanks David, it seems nicely done ;)
> 
> 

Oh well, my machines do not work anymore...

Seems to be related to this commit, because I do have 32bit user
programs (and a 64bit kernel)

commit 1be374a0518a288147c6a7398792583200a67261
Author: Andy Lutomirski <luto@amacapital.net>
Date:   Wed May 22 14:07:44 2013 -0700

    net: Block MSG_CMSG_COMPAT in send(m)msg and recv(m)msg
    

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pulling net tree into net-next
  2013-06-05 23:15 ` David Miller
  2013-06-06  4:18   ` Eric Dumazet
@ 2013-06-06  4:52   ` David Miller
  1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2013-06-06  4:52 UTC (permalink / raw)
  To: eric.dumazet; +Cc: netdev

From: David Miller <davem@davemloft.net>
Date: Wed, 05 Jun 2013 16:15:11 -0700 (PDT)

> From: Eric Dumazet <eric.dumazet@gmail.com>
> Date: Wed, 05 Jun 2013 10:27:04 -0700
> 
>> I have some upcoming HTB patches for net-next, needing a sync, now Linus
>> pulled your net tree.
> 
> Working on it now, I need to handle some details in the merge commit so
> give me some time.

This is now done.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-06-06  4:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-05 17:27 pulling net tree into net-next Eric Dumazet
2013-06-05 23:15 ` David Miller
2013-06-06  4:18   ` Eric Dumazet
2013-06-06  4:26     ` Eric Dumazet
2013-06-06  4:52   ` David Miller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.