rpms/kernel/devel linux-2.6-wireless-reverts.patch, 1.2, 1.3 patch-2.6.24-rc8-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.755, 1.756 kernel.spec, 1.378, 1.379 sources, 1.715, 1.716 upstream, 1.637, 1.638 patch-2.6.24-rc8-git4.bz2.sign, 1.1, NONE
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Wed Jan 23 20:38:08 UTC 2008
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14183
Modified Files:
.cvsignore kernel.spec sources upstream
Added Files:
linux-2.6-wireless-reverts.patch
patch-2.6.24-rc8-git6.bz2.sign
Removed Files:
patch-2.6.24-rc8-git4.bz2.sign
Log Message:
* Wed Jan 23 2008 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.24-rc8-git6
linux-2.6-wireless-reverts.patch:
Index: linux-2.6-wireless-reverts.patch
===================================================================
RCS file: linux-2.6-wireless-reverts.patch
diff -N linux-2.6-wireless-reverts.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ linux-2.6-wireless-reverts.patch 23 Jan 2008 20:37:52 -0000 1.3
@@ -0,0 +1,42 @@
+Apply with -R to revert:
+
+Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=632041f306707df94110441f55b1458ebeb096db
+Commit: 632041f306707df94110441f55b1458ebeb096db
+Parent: a7da60f41551abb3c520b03d42ec05dd7decfc7f
+Author: Eric Paris <eparis at redhat.com>
+AuthorDate: Sun Jan 13 16:20:56 2008 -0500
+Committer: David S. Miller <davem at davemloft.net>
+CommitDate: Sun Jan 20 20:31:36 2008 -0800
+
+ rfkill: call rfkill_led_trigger_unregister() on error
+
+ Code inspection turned up that error cases in rfkill_register() do not
+ call rfkill_led_trigger_unregister() even though we have already
+ registered.
+
+ Signed-off-by: Eric Paris <eparis at redhat.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ net/rfkill/rfkill.c | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
+index 4469a7b..d06d338 100644
+--- a/net/rfkill/rfkill.c
++++ b/net/rfkill/rfkill.c
+@@ -392,11 +392,14 @@ int rfkill_register(struct rfkill *rfkill)
+ rfkill_led_trigger_register(rfkill);
+
+ error = rfkill_add_switch(rfkill);
+- if (error)
++ if (error) {
++ rfkill_led_trigger_unregister(rfkill);
+ return error;
++ }
+
+ error = device_add(dev);
+ if (error) {
++ rfkill_led_trigger_unregister(rfkill);
+ rfkill_remove_switch(rfkill);
+ return error;
+ }
--- NEW FILE patch-2.6.24-rc8-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBHludcyGugalF9Dw4RAgjeAJ9ZlKyEo6m94EXtExUAdtEEKFLkUACfXwgh
QUFXK07RNsDEYWeLOPE4HBQ=
=LXGM
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.755
retrieving revision 1.756
diff -u -r1.755 -r1.756
--- .cvsignore 21 Jan 2008 23:09:20 -0000 1.755
+++ .cvsignore 23 Jan 2008 20:37:52 -0000 1.756
@@ -5,4 +5,4 @@
kernel-2.6.23
linux-2.6.23.tar.bz2
patch-2.6.24-rc8.bz2
-patch-2.6.24-rc8-git4.bz2
+patch-2.6.24-rc8-git6.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- kernel.spec 23 Jan 2008 20:08:21 -0000 1.378
+++ kernel.spec 23 Jan 2008 20:37:52 -0000 1.379
@@ -45,7 +45,7 @@
# The rc snapshot level
%define rcrev 8
# The git snapshot level
-%define gitrev 4
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -620,6 +620,7 @@
Patch610: linux-2.6-defaults-fat-utf8.patch
Patch660: linux-2.6-libata-ali-atapi-dma.patch
Patch670: linux-2.6-ata-quirk.patch
+Patch679: linux-2.6-wireless-reverts.patch
Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
Patch690: linux-2.6-at76.patch
@@ -1124,6 +1125,7 @@
# ia64 ata quirk
ApplyPatch linux-2.6-ata-quirk.patch
+ApplyPatch linux-2.6-wireless-reverts.patch -R
# wireless patches headed for 2.6.24
ApplyPatch linux-2.6-wireless.patch
# wireless patches headed for 2.6.25
@@ -1750,6 +1752,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Wed Jan 23 2008 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.24-rc8-git6
+
* Wed Jan 23 2008 Jarod Wilson <jwilson at redhat.com>
- improve locking in firewire config rom read routines
to fix (most?) 'giving up on config rom' problems (#429598)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.715
retrieving revision 1.716
diff -u -r1.715 -r1.716
--- sources 21 Jan 2008 23:09:20 -0000 1.715
+++ sources 23 Jan 2008 20:37:52 -0000 1.716
@@ -1,3 +1,3 @@
2cc2fd4d521dc5d7cfce0d8a9d1b3472 linux-2.6.23.tar.bz2
527687c63f4252989dba6fb92baf9707 patch-2.6.24-rc8.bz2
-21bf79423e7593b0759f7e715c02aa45 patch-2.6.24-rc8-git4.bz2
+7b9870740b9fd71a14c9f5a2fdbee0e1 patch-2.6.24-rc8-git6.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -r1.637 -r1.638
--- upstream 21 Jan 2008 23:09:20 -0000 1.637
+++ upstream 23 Jan 2008 20:37:52 -0000 1.638
@@ -1,3 +1,3 @@
linux-2.6.23.tar.bz2
patch-2.6.24-rc8.bz2
-patch-2.6.24-rc8-git4.bz2
+patch-2.6.24-rc8-git6.bz2
--- patch-2.6.24-rc8-git4.bz2.sign DELETED ---
More information about the fedora-extras-commits
mailing list