* Re: Linux 2.6.26.4
[not found] <20080908143625.GC7311@suse.de>
@ 2008-09-08 15:12 ` Randy Dunlap
2008-09-08 15:21 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2008-09-08 15:12 UTC (permalink / raw)
To: Greg KH, netdev, davem; +Cc: linux-kernel, Andrew Morton, torvalds, stable
On Mon, 8 Sep 2008 07:36:25 -0700 Greg KH wrote:
> We (the -stable team) are announcing the release of the 2.6.26.4
> kernel.
>
> It contains lots of bugfixes, all over the map. Any users of the 2.6.26
> kernel series should upgrade to this version. For details on the fixes,
> see the changelog entries and the diffstat below.
>
> I'll also be replying to this message with a copy of the patch between
> 2.6.26.3 and 2.6.26.4
>
> The updated 2.6.26.y git tree can be found at:
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.26.y.git
> and can be browsed at the normal kernel.org git web browser:
> http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.26.y.git;a=summary
> include/linux/pim.h | 45 -----------------
That file is still used by ./net/ipv6/ip6mr.c:#include <linux/pim.h>
so there are build errors...
net/ipv6/ip6mr.c:48:23: error: linux/pim.h: No such file or directory
net/ipv6/ip6mr.c:354: error: dereferencing pointer to incomplete type
net/ipv6/ip6mr.c:358: error: dereferencing pointer to incomplete type
net/ipv6/ip6mr.c:358: error: 'PIM_VERSION' undeclared (first use in this function)
net/ipv6/ip6mr.c:358: error: (Each undeclared identifier is reported only once
net/ipv6/ip6mr.c:358: error: for each function it appears in.)
net/ipv6/ip6mr.c:358: error: 'PIM_REGISTER' undeclared (first use in this function)
net/ipv6/ip6mr.c:359: error: dereferencing pointer to incomplete type
net/ipv6/ip6mr.c:359: error: 'PIM_NULL_REGISTER' undeclared (first use in this function)
net/ipv6/ip6mr.c:360: error: dereferencing pointer to incomplete type
net/ipv6/ip6mr.c:366: error: dereferencing pointer to incomplete type
net/ipv6/ip6mr.c:370: error: dereferencing pointer to incomplete type
make[2]: *** [net/ipv6/ip6mr.o] Error 1
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Linux 2.6.26.4
2008-09-08 15:12 ` Linux 2.6.26.4 Randy Dunlap
@ 2008-09-08 15:21 ` Greg KH
2008-09-08 16:38 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2008-09-08 15:21 UTC (permalink / raw)
To: Randy Dunlap; +Cc: netdev, davem, linux-kernel, Andrew Morton, torvalds, stable
On Mon, Sep 08, 2008 at 08:12:53AM -0700, Randy Dunlap wrote:
> On Mon, 8 Sep 2008 07:36:25 -0700 Greg KH wrote:
>
> > We (the -stable team) are announcing the release of the 2.6.26.4
> > kernel.
> >
> > It contains lots of bugfixes, all over the map. Any users of the 2.6.26
> > kernel series should upgrade to this version. For details on the fixes,
> > see the changelog entries and the diffstat below.
> >
> > I'll also be replying to this message with a copy of the patch between
> > 2.6.26.3 and 2.6.26.4
> >
> > The updated 2.6.26.y git tree can be found at:
> > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.26.y.git
> > and can be browsed at the normal kernel.org git web browser:
> > http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.26.y.git;a=summary
>
> > include/linux/pim.h | 45 -----------------
>
> That file is still used by ./net/ipv6/ip6mr.c:#include <linux/pim.h>
> so there are build errors...
Crap, I messed up, David sent me the fixed patch and I forgot it.
I'll go do a new release in a few hours...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Linux 2.6.26.4
2008-09-08 15:21 ` Greg KH
@ 2008-09-08 16:38 ` Greg KH
2008-09-08 16:56 ` Randy Dunlap
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2008-09-08 16:38 UTC (permalink / raw)
To: Randy Dunlap; +Cc: netdev, davem, linux-kernel, Andrew Morton, torvalds, stable
On Mon, Sep 08, 2008 at 08:21:14AM -0700, Greg KH wrote:
> On Mon, Sep 08, 2008 at 08:12:53AM -0700, Randy Dunlap wrote:
> > On Mon, 8 Sep 2008 07:36:25 -0700 Greg KH wrote:
> >
> > > We (the -stable team) are announcing the release of the 2.6.26.4
> > > kernel.
> > >
> > > It contains lots of bugfixes, all over the map. Any users of the 2.6.26
> > > kernel series should upgrade to this version. For details on the fixes,
> > > see the changelog entries and the diffstat below.
> > >
> > > I'll also be replying to this message with a copy of the patch between
> > > 2.6.26.3 and 2.6.26.4
> > >
> > > The updated 2.6.26.y git tree can be found at:
> > > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.26.y.git
> > > and can be browsed at the normal kernel.org git web browser:
> > > http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.26.y.git;a=summary
> >
> > > include/linux/pim.h | 45 -----------------
> >
> > That file is still used by ./net/ipv6/ip6mr.c:#include <linux/pim.h>
> > so there are build errors...
>
> Crap, I messed up, David sent me the fixed patch and I forgot it.
Randy, does the patch below fix the problem? It's an interdiff between
what I applied and what David sent me as the correct patch.
thanks,
greg k-h
-------------
diff -u b/include/linux/mroute.h b/include/linux/mroute.h
--- b/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -2,7 +2,10 @@
#define __LINUX_MROUTE_H
#include <linux/sockios.h>
+#include <linux/types.h>
+#ifdef __KERNEL__
#include <linux/in.h>
+#endif
/*
* Based on the MROUTING 3.5 defines primarily to keep
@@ -126,6 +129,7 @@
*/
#ifdef __KERNEL__
+#include <linux/pim.h>
#include <net/sock.h>
#ifdef CONFIG_IP_MROUTE
@@ -210,27 +214,6 @@
#define IGMPMSG_WHOLEPKT 3 /* For PIM Register processing */
#ifdef __KERNEL__
-
-#define PIM_V1_VERSION __constant_htonl(0x10000000)
-#define PIM_V1_REGISTER 1
-
-#define PIM_VERSION 2
-#define PIM_REGISTER 1
-
-#define PIM_NULL_REGISTER __constant_htonl(0x40000000)
-
-/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
-
-struct pimreghdr
-{
- __u8 type;
- __u8 reserved;
- __be16 csum;
- __be32 flags;
-};
-
-extern int pim_rcv_v1(struct sk_buff *);
-
struct rtmsg;
extern int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait);
#endif
diff -u /dev/null b/include/linux/pim.h
--- /dev/null
+++ b/include/linux/pim.h
@@ -0,0 +1,27 @@
+#ifndef __LINUX_PIM_H
+#define __LINUX_PIM_H
+
+#include <asm/byteorder.h>
+
+/* Message types - V1 */
+#define PIM_V1_VERSION __constant_htonl(0x10000000)
+#define PIM_V1_REGISTER 1
+
+/* Message types - V2 */
+#define PIM_VERSION 2
+#define PIM_REGISTER 1
+
+#define PIM_NULL_REGISTER __constant_htonl(0x40000000)
+
+/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
+struct pimreghdr
+{
+ __u8 type;
+ __u8 reserved;
+ __be16 csum;
+ __be32 flags;
+};
+
+struct sk_buff;
+extern int pim_rcv_v1(struct sk_buff *);
+#endif
only in patch2:
unchanged:
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -115,6 +115,7 @@ struct sioc_mif_req6
#ifdef __KERNEL__
+#include <linux/pim.h>
#include <linux/skbuff.h> /* for struct sk_buff_head */
#ifdef CONFIG_IPV6_MROUTE
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Linux 2.6.26.4
2008-09-08 16:38 ` Greg KH
@ 2008-09-08 16:56 ` Randy Dunlap
2008-09-08 19:33 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2008-09-08 16:56 UTC (permalink / raw)
To: Greg KH; +Cc: netdev, davem, linux-kernel, Andrew Morton, torvalds, stable
On Mon, 8 Sep 2008 09:38:01 -0700 Greg KH wrote:
> On Mon, Sep 08, 2008 at 08:21:14AM -0700, Greg KH wrote:
> > On Mon, Sep 08, 2008 at 08:12:53AM -0700, Randy Dunlap wrote:
> > > On Mon, 8 Sep 2008 07:36:25 -0700 Greg KH wrote:
> > >
> > > > We (the -stable team) are announcing the release of the 2.6.26.4
> > > > kernel.
> > > >
> > > > It contains lots of bugfixes, all over the map. Any users of the 2.6.26
> > > > kernel series should upgrade to this version. For details on the fixes,
> > > > see the changelog entries and the diffstat below.
> > > >
> > > > I'll also be replying to this message with a copy of the patch between
> > > > 2.6.26.3 and 2.6.26.4
> > > >
> > > > The updated 2.6.26.y git tree can be found at:
> > > > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.26.y.git
> > > > and can be browsed at the normal kernel.org git web browser:
> > > > http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.26.y.git;a=summary
> > >
> > > > include/linux/pim.h | 45 -----------------
> > >
> > > That file is still used by ./net/ipv6/ip6mr.c:#include <linux/pim.h>
> > > so there are build errors...
> >
> > Crap, I messed up, David sent me the fixed patch and I forgot it.
>
> Randy, does the patch below fix the problem? It's an interdiff between
> what I applied and what David sent me as the correct patch.
Yes, that fixes the build error. Thanks.
> thanks,
>
> greg k-h
>
> -------------
>
> diff -u b/include/linux/mroute.h b/include/linux/mroute.h
> --- b/include/linux/mroute.h
> +++ b/include/linux/mroute.h
> @@ -2,7 +2,10 @@
> #define __LINUX_MROUTE_H
>
> #include <linux/sockios.h>
> +#include <linux/types.h>
> +#ifdef __KERNEL__
> #include <linux/in.h>
> +#endif
>
> /*
> * Based on the MROUTING 3.5 defines primarily to keep
> @@ -126,6 +129,7 @@
> */
>
> #ifdef __KERNEL__
> +#include <linux/pim.h>
> #include <net/sock.h>
>
> #ifdef CONFIG_IP_MROUTE
> @@ -210,27 +214,6 @@
> #define IGMPMSG_WHOLEPKT 3 /* For PIM Register processing */
>
> #ifdef __KERNEL__
> -
> -#define PIM_V1_VERSION __constant_htonl(0x10000000)
> -#define PIM_V1_REGISTER 1
> -
> -#define PIM_VERSION 2
> -#define PIM_REGISTER 1
> -
> -#define PIM_NULL_REGISTER __constant_htonl(0x40000000)
> -
> -/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
> -
> -struct pimreghdr
> -{
> - __u8 type;
> - __u8 reserved;
> - __be16 csum;
> - __be32 flags;
> -};
> -
> -extern int pim_rcv_v1(struct sk_buff *);
> -
> struct rtmsg;
> extern int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait);
> #endif
> diff -u /dev/null b/include/linux/pim.h
> --- /dev/null
> +++ b/include/linux/pim.h
> @@ -0,0 +1,27 @@
> +#ifndef __LINUX_PIM_H
> +#define __LINUX_PIM_H
> +
> +#include <asm/byteorder.h>
> +
> +/* Message types - V1 */
> +#define PIM_V1_VERSION __constant_htonl(0x10000000)
> +#define PIM_V1_REGISTER 1
> +
> +/* Message types - V2 */
> +#define PIM_VERSION 2
> +#define PIM_REGISTER 1
> +
> +#define PIM_NULL_REGISTER __constant_htonl(0x40000000)
> +
> +/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
> +struct pimreghdr
> +{
> + __u8 type;
> + __u8 reserved;
> + __be16 csum;
> + __be32 flags;
> +};
> +
> +struct sk_buff;
> +extern int pim_rcv_v1(struct sk_buff *);
> +#endif
> only in patch2:
> unchanged:
> --- a/include/linux/mroute6.h
> +++ b/include/linux/mroute6.h
> @@ -115,6 +115,7 @@ struct sioc_mif_req6
>
> #ifdef __KERNEL__
>
> +#include <linux/pim.h>
> #include <linux/skbuff.h> /* for struct sk_buff_head */
>
> #ifdef CONFIG_IPV6_MROUTE
> --
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Linux 2.6.26.4
2008-09-08 16:56 ` Randy Dunlap
@ 2008-09-08 19:33 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2008-09-08 19:33 UTC (permalink / raw)
To: randy.dunlap; +Cc: gregkh, netdev, linux-kernel, akpm, torvalds, stable
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 8 Sep 2008 09:56:08 -0700
> On Mon, 8 Sep 2008 09:38:01 -0700 Greg KH wrote:
>
> > On Mon, Sep 08, 2008 at 08:21:14AM -0700, Greg KH wrote:
> > > On Mon, Sep 08, 2008 at 08:12:53AM -0700, Randy Dunlap wrote:
> > > > On Mon, 8 Sep 2008 07:36:25 -0700 Greg KH wrote:
> > > >
> > > > > We (the -stable team) are announcing the release of the 2.6.26.4
> > > > > kernel.
> > > > >
> > > > > It contains lots of bugfixes, all over the map. Any users of the 2.6.26
> > > > > kernel series should upgrade to this version. For details on the fixes,
> > > > > see the changelog entries and the diffstat below.
> > > > >
> > > > > I'll also be replying to this message with a copy of the patch between
> > > > > 2.6.26.3 and 2.6.26.4
> > > > >
> > > > > The updated 2.6.26.y git tree can be found at:
> > > > > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.26.y.git
> > > > > and can be browsed at the normal kernel.org git web browser:
> > > > > http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.26.y.git;a=summary
> > > >
> > > > > include/linux/pim.h | 45 -----------------
> > > >
> > > > That file is still used by ./net/ipv6/ip6mr.c:#include <linux/pim.h>
> > > > so there are build errors...
> > >
> > > Crap, I messed up, David sent me the fixed patch and I forgot it.
> >
> > Randy, does the patch below fix the problem? It's an interdiff between
> > what I applied and what David sent me as the correct patch.
>
> Yes, that fixes the build error. Thanks.
Sorry for creating such a confusing situation Greg :)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-09-08 19:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20080908143625.GC7311@suse.de>
2008-09-08 15:12 ` Linux 2.6.26.4 Randy Dunlap
2008-09-08 15:21 ` Greg KH
2008-09-08 16:38 ` Greg KH
2008-09-08 16:56 ` Randy Dunlap
2008-09-08 19:33 ` David Miller
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).