netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [README] Two merges pending...
@ 2012-05-22 19:28 David Miller
  2012-05-23 10:45 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: David Miller @ 2012-05-22 19:28 UTC (permalink / raw)
  To: netdev-u79uwXL29TY76Z2rM5mHXA
  Cc: pablo-Cap9r6Oaw4JrovVCs/uTlw, linville-2XuSBdqkA4R54TAoqtyWWQ,
	netfilter-devel-u79uwXL29TY76Z2rM5mHXA,
	linux-wireless-u79uwXL29TY76Z2rM5mHXA


After some discussion with John Linville I'm going to let him do
one more wireless merge to me.

I only decided to do this because the changes in his tree were in
his tree before he went away for a week, and therefore have gotten
lots of exposure in -next before the merge window even openned.

Which is more than I can say for some of this shit landing in Linus's
tree the past few days.

Pablo also has a prearranged netfilter merge pending.

DO NOT use this as some sort of sign that if you have some last minute
thing you want merged I can be coaxed into allowing it too.  I very
nearly told John no, and I'm going to tell you no too.

The rest of you stick to bug fixes and maybe a few device ID
additions.

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] 2+ messages in thread

* Re: [README] Two merges pending...
  2012-05-22 19:28 [README] Two merges pending David Miller
@ 2012-05-23 10:45 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2012-05-23 10:45 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linville, netfilter-devel, linux-wireless

Hi David,

On Tue, May 22, 2012 at 03:28:40PM -0400, David Miller wrote:
[...]
> Pablo also has a prearranged netfilter merge pending.

I give up on that merge that I requested.

I thought that some namespace changes for conntrack that have been
lying on the table for one week could be merged. But they are not ready
yet, they require another spin.

That means they'll have to wait until window opens again, they need
some extra time.

I'll stick to one pull request for bugfixes then.

Thanks!

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

end of thread, other threads:[~2012-05-23 10:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-22 19:28 [README] Two merges pending David Miller
2012-05-23 10:45 ` Pablo Neira Ayuso

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