rpms/kernel/FC-6 linux-2.6.20.10-unoffical.patch, NONE, 1.1 kernel-2.6.spec, 1.2947, 1.2948

[fedora-cvs-commits at redhat.com]

Author: cebbert

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26747

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.20.10-unoffical.patch 
Log Message:
* Fri Apr 27 2007 Chuck Ebbert <cebbert at redhat.com>		1.2948
- 2.6.20.10 (from mailing list)


linux-2.6.20.10-unoffical.patch:
 Makefile                |    2 +-
 net/ipv4/fib_frontend.c |    4 ++++
 net/ipv6/exthdrs.c      |    1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6.20.10-unoffical.patch ---
diff --git a/Makefile b/Makefile
index 3e7e6c7..b9ba823 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 20
-EXTRAVERSION = .9
+EXTRAVERSION = .10
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index fa2cb8c..30aae76 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -773,6 +773,10 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
 							    .tos = frn->fl_tos,
 							    .scope = frn->fl_scope } } };
 
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+	res.r = NULL;
+#endif
+
 	frn->err = -ENOENT;
 	if (tb) {
 		local_bh_disable();
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 5fd7cf9..de96e1a 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -397,6 +397,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp)
 
 	switch (hdr->type) {
 #ifdef CONFIG_IPV6_MIP6
+	case IPV6_SRCRT_TYPE_2:
 		break;
 #endif
 	case IPV6_SRCRT_TYPE_0:


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2947
retrieving revision 1.2948
diff -u -r1.2947 -r1.2948
--- kernel-2.6.spec	26 Apr 2007 15:04:15 -0000	1.2947
+++ kernel-2.6.spec	27 Apr 2007 22:42:03 -0000	1.2948
@@ -379,16 +379,17 @@
 Patch7: patch-2.6.20.6-7.bz2
 Patch8: patch-2.6.20.7-8.bz2
 Patch9: patch-2.6.20.8-9.bz2
+Patch10: linux-2.6.20.10-unoffical.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 # needed to get utrace patch to apply cleanly
-Patch10: linux-2.6-s390_ptrace_sparse_fixes.patch
-Patch11: linux-2.6-x86_64_ptrace_ck_retval.patch
+Patch50: linux-2.6-s390_ptrace_sparse_fixes.patch
+Patch51: linux-2.6-x86_64_ptrace_ck_retval.patch
 # utrace
-Patch15: linux-2.6-utrace.patch
+Patch55: linux-2.6-utrace.patch
 
 # enable sysrq-c on all kernels, not only kexec
-Patch20: linux-2.6-sysrq-c.patch
+Patch70: linux-2.6-sysrq-c.patch
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1025,18 +1026,19 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
 # Rolands utrace ptrace replacement.
 # needed to get upstream utrace to apply
-%patch10 -p1
-%patch11 -p1
+%patch50 -p1
+%patch51 -p1
 # utrace
-%patch15 -p1
+%patch55 -p1
 
 # sysrq works always
-%patch20 -p1
+%patch70 -p1
 
 # Architecture patches
 
@@ -2292,6 +2294,9 @@
 %endif
 
 %changelog
+* Fri Apr 27 2007 Chuck Ebbert <cebbert at redhat.com>		1.2948
+- 2.6.20.10 (from mailing list)
+
 * Thu Apr 26 2007 Chuck Ebbert <cebbert at redhat.com>		1.2947
 - 2.6.20.8 (official)
 - 2.6.20.9