netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* GIT net-2.6 rolled back 8 commits...
@ 2011-05-10 22:08 David Miller
       [not found] ` <20110510.150814.226778453.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2011-05-10 22:08 UTC (permalink / raw)
  To: netdev-u79uwXL29TY76Z2rM5mHXA
  Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netfilter-devel-u79uwXL29TY76Z2rM5mHXA


I made a mistake and applied to net-2.6 a patch from Eric Dumazet that
only is applicable for net-next-2.6

I really don't want to have to toss Linus that commit and a revert commit
just to fix it up.

So I rewound the net-2.6 tree by 8 commits.

So if you've pulled in the past 3 hours, please reset your pull and repull.

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

* Re: GIT net-2.6 rolled back 8 commits...
       [not found] ` <20110510.150814.226778453.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
@ 2011-05-11  3:31   ` Eric Dumazet
  2011-05-11 18:29     ` David Miller
  0 siblings, 1 reply; 4+ messages in thread
From: Eric Dumazet @ 2011-05-11  3:31 UTC (permalink / raw)
  To: David Miller
  Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
	linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netfilter-devel-u79uwXL29TY76Z2rM5mHXA

Le mardi 10 mai 2011 à 15:08 -0700, David Miller a écrit :
> I made a mistake and applied to net-2.6 a patch from Eric Dumazet that
> only is applicable for net-next-2.6
> 
> I really don't want to have to toss Linus that commit and a revert commit
> just to fix it up.
> 
> So I rewound the net-2.6 tree by 8 commits.
> 
> So if you've pulled in the past 3 hours, please reset your pull and repull.
> 

Thanks David

Would it be possible you sync net-next-2.6 and pull net-2.6 in it ?

Eric


--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

* Re: GIT net-2.6 rolled back 8 commits...
  2011-05-11  3:31   ` Eric Dumazet
@ 2011-05-11 18:29     ` David Miller
  2011-05-11 18:31       ` Eric Dumazet
  0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2011-05-11 18:29 UTC (permalink / raw)
  To: eric.dumazet-Re5JQEeQqe8AvxtiuMwx3w
  Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
	linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netfilter-devel-u79uwXL29TY76Z2rM5mHXA

From: Eric Dumazet <eric.dumazet-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Date: Wed, 11 May 2011 05:31:27 +0200

> Would it be possible you sync net-next-2.6 and pull net-2.6 in it ?

I'm taking care of this right now.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

* Re: GIT net-2.6 rolled back 8 commits...
  2011-05-11 18:29     ` David Miller
@ 2011-05-11 18:31       ` Eric Dumazet
  0 siblings, 0 replies; 4+ messages in thread
From: Eric Dumazet @ 2011-05-11 18:31 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-wireless, netfilter-devel

Le mercredi 11 mai 2011 à 11:29 -0700, David Miller a écrit :
> From: Eric Dumazet <eric.dumazet@gmail.com>
> Date: Wed, 11 May 2011 05:31:27 +0200
> 
> > Would it be possible you sync net-next-2.6 and pull net-2.6 in it ?
> 
> I'm taking care of this right now.

Wow excellent timing (for me at least), thanks !



--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

end of thread, other threads:[~2011-05-11 18:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-10 22:08 GIT net-2.6 rolled back 8 commits David Miller
     [not found] ` <20110510.150814.226778453.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2011-05-11  3:31   ` Eric Dumazet
2011-05-11 18:29     ` David Miller
2011-05-11 18:31       ` Eric Dumazet

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