[kernel] r12195 - in dists/sid/linux-2.6/debian: . patches/bugfix/all/stable

[Bastian Blank]

Author: waldi
Date: Mon Sep  8 13:24:21 2008
New Revision: 12195

Log:
* debian/changelog: Update.
* debian/patches/bugfix/all/stable/2.6.26.4.patch: Remove broken patch.


Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.26.4.patch

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Sep  8 13:24:21 2008
@@ -24,7 +24,6 @@
     - ipsec: Fix deadlock in xfrm_state management.
     - sctp: fix random memory dereference with SCTP_HMAC_IDENT option.
     - sctp: correct bounds check in sctp_setsockopt_auth_key
-    - net: Unbreak userspace which includes linux/mroute.h
     - sch_prio: Fix nla_parse_nested_compat() regression
     - sctp: add verification checks to SCTP_AUTH_KEY option
     - sctp: fix potential panics in the SCTP-AUTH API.

Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.26.4.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.26.4.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.26.4.patch	Mon Sep  8 13:24:21 2008
@@ -944,18 +944,6 @@
  	state->users = kzalloc(alloc, GFP_KERNEL);
  	if (!state->users)
  		return -ENOMEM;
-diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index 71d70d1..27af0b8 100644
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -293,7 +293,6 @@ unifdef-y += parport.h
- unifdef-y += patchkey.h
- unifdef-y += pci.h
- unifdef-y += personality.h
--unifdef-y += pim.h
- unifdef-y += pktcdvd.h
- unifdef-y += pmu.h
- unifdef-y += poll.h
 diff --git a/include/linux/fb.h b/include/linux/fb.h
 index 72295b0..dd82c76 100644
 --- a/include/linux/fb.h
@@ -970,101 +958,6 @@
  extern void fb_deferred_io_cleanup(struct fb_info *info);
  extern int fb_deferred_io_fsync(struct file *file, struct dentry *dentry,
  				int datasync);
-diff --git a/include/linux/mroute.h b/include/linux/mroute.h
-index de4decf..35a8277 100644
---- a/include/linux/mroute.h
-+++ b/include/linux/mroute.h
-@@ -2,11 +2,7 @@
- #define __LINUX_MROUTE_H
- 
- #include <linux/sockios.h>
--#include <linux/types.h>
--#ifdef __KERNEL__
- #include <linux/in.h>
--#endif
--#include <linux/pim.h>
- 
- /*
-  *	Based on the MROUTING 3.5 defines primarily to keep
-@@ -214,6 +210,27 @@ struct mfc_cache
- #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 --git a/include/linux/pim.h b/include/linux/pim.h
-deleted file mode 100644
-index 236ffd3..0000000
---- a/include/linux/pim.h
-+++ /dev/null
-@@ -1,45 +0,0 @@
--#ifndef __LINUX_PIM_H
--#define __LINUX_PIM_H
--
--#include <asm/byteorder.h>
--
--#ifndef __KERNEL__
--struct pim {
--#if defined(__LITTLE_ENDIAN_BITFIELD)
--	__u8	pim_type:4,		/* PIM message type */
--		pim_ver:4;		/* PIM version */
--#elif defined(__BIG_ENDIAN_BITFIELD)
--	__u8	pim_ver:4;		/* PIM version */
--		pim_type:4;		/* PIM message type */
--#endif
--	__u8	pim_rsv;		/* Reserved */
--	__be16	pim_cksum;		/* Checksum */
--};
--
--#define PIM_MINLEN		8
--#endif
--
--/* 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
--
--#if defined(__KERNEL__)
--#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
--#endif
 diff --git a/include/net/addrconf.h b/include/net/addrconf.h
 index bbd3d58..99ca7cd 100644
 --- a/include/net/addrconf.h