rpms/kernel/devel .cvsignore, 1.1200, 1.1201 config-generic, 1.372, 1.373 kernel.spec, 1.2044, 1.2045 linux-2.6-hotfixes.patch, 1.9, 1.10 sources, 1.1158, 1.1159 upstream, 1.1070, 1.1071 linux-2.6-cantiga-iommu-gfx.patch, 1.2, NONE
Dave Jones
davej at fedoraproject.org
Mon Jun 28 03:49:26 UTC 2010
Author: davej
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29752
Modified Files:
.cvsignore config-generic kernel.spec linux-2.6-hotfixes.patch
sources upstream
Removed Files:
linux-2.6-cantiga-iommu-gfx.patch
Log Message:
2.6.35-rc3-git1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1200
retrieving revision 1.1201
diff -u -p -r1.1200 -r1.1201
--- .cvsignore 23 Jun 2010 04:02:30 -0000 1.1200
+++ .cvsignore 28 Jun 2010 03:49:25 -0000 1.1201
@@ -8,3 +8,4 @@ logs/
kernel-2.6.34
linux-2.6.34.tar.bz2
patch-2.6.35-rc3.bz2
+patch-2.6.35-rc3-git1.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -p -r1.372 -r1.373
--- config-generic 24 Jun 2010 21:19:25 -0000 1.372
+++ config-generic 28 Jun 2010 03:49:25 -0000 1.373
@@ -3713,7 +3713,6 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set
CONFIG_RELAY=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2044
retrieving revision 1.2045
diff -u -p -r1.2044 -r1.2045
--- kernel.spec 28 Jun 2010 00:06:09 -0000 1.2044
+++ kernel.spec 28 Jun 2010 03:49:25 -0000 1.2045
@@ -82,7 +82,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 3
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -650,8 +650,6 @@ Patch681: linux-2.6-mac80211-age-scan-re
Patch800: linux-2.6-crash-driver.patch
-Patch900: linux-2.6-cantiga-iommu-gfx.patch
-
# crypto/
Patch1515: lirc-2.6.33.patch
@@ -1231,9 +1229,6 @@ ApplyPatch linux-2.6-silence-fbcon-logo.
# /dev/crash driver.
ApplyPatch linux-2.6-crash-driver.patch
-# Cantiga chipset b0rkage
-ApplyPatch linux-2.6-cantiga-iommu-gfx.patch
-
# crypto/
# http://www.lirc.org/
@@ -1910,6 +1905,9 @@ fi
# || ||
%changelog
+* Mon Jun 28 2010 Dave Jones <davej at redhat.com>
+- 2.6.35-rc3-git1
+
* Mon Jun 28 2010 Dave Airlie <airlied at redhat.com>
- drm-i915-fix-edp-panels.patch: update to newer version
linux-2.6-hotfixes.patch:
qcserial.c | 1 +
1 file changed, 1 insertion(+)
Index: linux-2.6-hotfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-hotfixes.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- linux-2.6-hotfixes.patch 22 Jun 2010 23:11:06 -0000 1.9
+++ linux-2.6-hotfixes.patch 28 Jun 2010 03:49:26 -0000 1.10
@@ -12,38 +12,4 @@ implicit declaration of function kzalloc
#include <linux/tty_flip.h>
#include <linux/usb.h>
->From 4373374f03bb077beda7d728e49635e74942cdb4 Mon Sep 17 00:00:00 2001
-From: John Fastabend <john.r.fastabend at intel.com>
-Date: Sun, 13 Jun 2010 10:36:30 +0000
-Subject: [PATCH] net: fix deliver_no_wcard regression on loopback device
-
-deliver_no_wcard is not being set in skb_copy_header.
-In the skb_cloned case it is not being cleared and
-may cause the skb to be dropped when the loopback device
-pushes it back up the stack.
-
-Signed-off-by: John Fastabend <john.r.fastabend at intel.com>
-Acked-by: Eric Dumazet <eric.dumazet at gmail.com>
-Tested-by: Markus Trippelsdorf <markus at trippelsdorf.de>
-Signed-off-by: David S. Miller <davem at davemloft.net>
----
- net/core/skbuff.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 9f07e74..bcf2fa3 100644
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -532,6 +532,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
- new->ip_summed = old->ip_summed;
- skb_copy_queue_mapping(new, old);
- new->priority = old->priority;
-+ new->deliver_no_wcard = old->deliver_no_wcard;
- #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
- new->ipvs_property = old->ipvs_property;
- #endif
-_______________________________________________
-kernel mailing list
-kernel at lists.fedoraproject.org
-https://admin.fedoraproject.org/mailman/listinfo/kernel
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1158
retrieving revision 1.1159
diff -u -p -r1.1158 -r1.1159
--- sources 22 Jun 2010 16:02:02 -0000 1.1158
+++ sources 28 Jun 2010 03:49:26 -0000 1.1159
@@ -1,2 +1,3 @@
10eebcb0178fb4540e2165bfd7efc7ad linux-2.6.34.tar.bz2
fd4e7c247199c9178ef4a9c7dc52dd3c patch-2.6.35-rc3.bz2
+8e187162af964e3efb850819a5940f95 patch-2.6.35-rc3-git1.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1070
retrieving revision 1.1071
diff -u -p -r1.1070 -r1.1071
--- upstream 16 May 2010 22:09:00 -0000 1.1070
+++ upstream 28 Jun 2010 03:49:26 -0000 1.1071
@@ -1 +1,3 @@
linux-2.6.34.tar.bz2
+patch-2.6.35-rc3.bz2
+patch-2.6.35-rc3-git1.bz2
--- linux-2.6-cantiga-iommu-gfx.patch DELETED ---
More information about the scm-commits
mailing list