| Message ID | 20090527140153.GE1652@psychotron.englab.brq.redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Jiri Pirko <jpirko@redhat.com> Date: Wed, 27 May 2009 16:01:53 +0200 > [PATCH] net: correct a comment for the final #endif > > Signed-off-by: Jiri Pirko <jpirko@redhat.com> Applied to net-next-2.6 (to which this didn't apply cleanly BTW). -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thu, May 28, 2009 at 12:49:11AM CEST, davem@davemloft.net wrote: >From: Jiri Pirko <jpirko@redhat.com> >Date: Wed, 27 May 2009 16:01:53 +0200 > >> [PATCH] net: correct a comment for the final #endif >> >> Signed-off-by: Jiri Pirko <jpirko@redhat.com> > >Applied to net-next-2.6 (to which this didn't apply cleanly >BTW). I generated the patch against net-2.6. I thought you will apply it there. Btw how do you choose what patch to apply to what tree? Thanks Jirka -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jiri Pirko <jpirko@redhat.com> Date: Thu, 28 May 2009 07:47:13 +0200 > Btw how do you choose what patch to apply to what tree? It depends upon where we are in the development cycle and the nature of your patch. Right now we're only applying the most critical bug fixes to net-2.6, anything else goes to net-next-2.6 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller a écrit : > From: Jiri Pirko <jpirko@redhat.com> > Date: Thu, 28 May 2009 07:47:13 +0200 > >> Btw how do you choose what patch to apply to what tree? > > It depends upon where we are in the development cycle and the > nature of your patch. > > Right now we're only applying the most critical bug fixes > to net-2.6, anything else goes to net-next-2.6 > I append here some extra stuff net-2.6 is the tree for pending patches for Linus, for the about to be released version (2.6.30 as today) As the merge window (for 2.6.30) is now closed, only bug fixes are allowed. For cleanups, and new network stuff (possibly introducing new bugs), net-next-2.6 is the right tree. This gives time for various testers to discover bugs so we can fix them before hitting public release. When Linus releases 2.6.30, opening merge window of one week, then all patches pending in net-next-2.6 will take their way to Linus tree for 2.6.31 Some exceptions are allowed, but this is the general idea. Hope this helps -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thu, May 28, 2009 at 08:39:35AM CEST, eric.dumazet@gmail.com wrote: >David Miller a écrit : >> From: Jiri Pirko <jpirko@redhat.com> >> Date: Thu, 28 May 2009 07:47:13 +0200 >> >>> Btw how do you choose what patch to apply to what tree? >> >> It depends upon where we are in the development cycle and the >> nature of your patch. >> >> Right now we're only applying the most critical bug fixes >> to net-2.6, anything else goes to net-next-2.6 >> > >I append here some extra stuff > >net-2.6 is the tree for pending patches for Linus, for the about to be >released version (2.6.30 as today) > >As the merge window (for 2.6.30) is now closed, only bug fixes are allowed. > >For cleanups, and new network stuff (possibly introducing new bugs), >net-next-2.6 is the right tree. This gives time for various testers >to discover bugs so we can fix them before hitting public release. > >When Linus releases 2.6.30, opening merge window of one week, then all patches >pending in net-next-2.6 will take their way to Linus tree for 2.6.31 > >Some exceptions are allowed, but this is the general idea. > >Hope this helps Fine, thanks you both guys. > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5a96a1a..aab9a4e 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1910,4 +1910,4 @@ static inline int skb_bond_should_drop(struct sk_buff *skb) extern struct pernet_operations __net_initdata loopback_net_ops; #endif /* __KERNEL__ */ -#endif /* _LINUX_DEV_H */ +#endif /* _LINUX_NETDEVICE_H */
[PATCH] net: correct a comment for the final #endif Signed-off-by: Jiri Pirko <jpirko@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html