rpms/kernel/devel linux-2.6.24.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.757, 1.758 kernel.spec, 1.383, 1.384 linux-2.6-wireless-reverts.patch, 1.4, 1.5 sources, 1.717, 1.718 upstream, 1.639, 1.640 linux-2.6.23.tar.bz2.sign, 1.1, NONE patch-2.6.24-rc8-git7.bz2.sign, 1.1, NONE patch-2.6.24-rc8.bz2.sign, 1.1, NONE

[Kyle McMartin (kyle)]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14026

Modified Files:
	.cvsignore kernel.spec linux-2.6-wireless-reverts.patch 
	sources upstream 
Added Files:
	linux-2.6.24.tar.bz2.sign 
Removed Files:
	linux-2.6.23.tar.bz2.sign patch-2.6.24-rc8-git7.bz2.sign 
	patch-2.6.24-rc8.bz2.sign 
Log Message:
* Fri Jan 25 2008 Kyle McMartin <kmcmartin at redhat.com>
- Linux 2.6.24



--- NEW FILE linux-2.6.24.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBHmR5WyGugalF9Dw4RAgviAJsF8E19NUBvcgI4inL02JCSMljEHwCbBfsp
fU6wxlRC0o2yQ596/IyRLNI=
=2egt
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.757
retrieving revision 1.758
diff -u -r1.757 -r1.758
--- .cvsignore	24 Jan 2008 17:40:25 -0000	1.757
+++ .cvsignore	25 Jan 2008 15:59:56 -0000	1.758
@@ -2,7 +2,5 @@
 GNUmakefile
 kernel-2.6.*.config
 temp-*
-kernel-2.6.23
-linux-2.6.23.tar.bz2
-patch-2.6.24-rc8.bz2
-patch-2.6.24-rc8-git7.bz2
+kernel-2.6.24
+linux-2.6.24.tar.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- kernel.spec	24 Jan 2008 17:40:25 -0000	1.383
+++ kernel.spec	25 Jan 2008 15:59:56 -0000	1.384
@@ -3,7 +3,7 @@
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%define released_kernel 0
+%define released_kernel 1
 
 # Versions of various parts
 
@@ -26,7 +26,7 @@
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
 # which yields a base_sublevel of 21.
-%define base_sublevel 23
+%define base_sublevel 24
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
@@ -43,9 +43,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 8
+%define rcrev 0
 # The git snapshot level
-%define gitrev 7
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -883,9 +883,12 @@
 # which speeds things up quite a bit.
 
 # Update to latest upstream.
+%if 0%{?released_kernel}
+%define vanillaversion 2.6.%{base_sublevel}
 # released_kernel with stable_update available case
 %if 0%{?stable_update}
 %define vanillaversion 2.6.%{base_sublevel}.%{stable_update}
+%endif
 # non-released_kernel case
 %else
 %if 0%{?rcrev}
@@ -1758,6 +1761,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Fri Jan 25 2008 Kyle McMartin <kmcmartin at redhat.com>
+- Linux 2.6.24
+
 * Thu Jan 24 2008 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.24-rc8-git7
 

linux-2.6-wireless-reverts.patch:

Index: linux-2.6-wireless-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-reverts.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-wireless-reverts.patch	24 Jan 2008 17:40:25 -0000	1.4
+++ linux-2.6-wireless-reverts.patch	25 Jan 2008 15:59:56 -0000	1.5
@@ -94,3 +94,53 @@
  	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
  
  	rc = iwl_hw_nic_init(priv);
+From: Linus Torvalds <torvalds at woody.linux-foundation.org>
+Date: Thu, 24 Jan 2008 21:35:10 +0000 (-0800)
+Subject: Revert "mac80211: warn when receiving frames with unaligned data"
+X-Git-Tag: v2.6.24~2
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=dbcc2ec60fe15448e5dfe4153f7347ac82b4da73
+
+Revert "mac80211: warn when receiving frames with unaligned data"
+
+This reverts commit 81100eb80add328c4d2a377326f15aa0e7236398 for the
+release, to avoid the unnecessary warning noise that is only really
+relevant to wireless driver developers.
+
+The warning will probably go right back in after I cut the release, but
+at least we won't unnecessarily worry users.
+
+Acked-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+
+diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
+index a7263fc..00f908d 100644
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -1443,7 +1443,6 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
+ 	struct ieee80211_sub_if_data *prev = NULL;
+ 	struct sk_buff *skb_new;
+ 	u8 *bssid;
+-	int hdrlen;
+ 
+ 	/*
+ 	 * key references and virtual interfaces are protected using RCU
+@@ -1473,18 +1472,6 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
+ 	rx.fc = le16_to_cpu(hdr->frame_control);
+ 	type = rx.fc & IEEE80211_FCTL_FTYPE;
+ 
+-	/*
+-	 * Drivers are required to align the payload data to a four-byte
+-	 * boundary, so the last two bits of the address where it starts
+-	 * may not be set. The header is required to be directly before
+-	 * the payload data, padding like atheros hardware adds which is
+-	 * inbetween the 802.11 header and the payload is not supported,
+-	 * the driver is required to move the 802.11 header further back
+-	 * in that case.
+-	 */
+-	hdrlen = ieee80211_get_hdrlen(rx.fc);
+-	WARN_ON_ONCE(((unsigned long)(skb->data + hdrlen)) & 3);
+-
+ 	if (type == IEEE80211_FTYPE_DATA || type == IEEE80211_FTYPE_MGMT)
+ 		local->dot11ReceivedFragmentCount++;
+ 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.717
retrieving revision 1.718
diff -u -r1.717 -r1.718
--- sources	24 Jan 2008 17:40:25 -0000	1.717
+++ sources	25 Jan 2008 15:59:56 -0000	1.718
@@ -1,3 +1 @@
-2cc2fd4d521dc5d7cfce0d8a9d1b3472  linux-2.6.23.tar.bz2
-527687c63f4252989dba6fb92baf9707  patch-2.6.24-rc8.bz2
-58ca1752d0308507aa9759ca361683dc  patch-2.6.24-rc8-git7.bz2
+3f23ad4b69d0a552042d1ed0f4399857  linux-2.6.24.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.639
retrieving revision 1.640
diff -u -r1.639 -r1.640
--- upstream	24 Jan 2008 17:40:25 -0000	1.639
+++ upstream	25 Jan 2008 15:59:56 -0000	1.640
@@ -1,3 +1 @@
-linux-2.6.23.tar.bz2
-patch-2.6.24-rc8.bz2
-patch-2.6.24-rc8-git7.bz2
+linux-2.6.24.tar.bz2


--- linux-2.6.23.tar.bz2.sign DELETED ---


--- patch-2.6.24-rc8-git7.bz2.sign DELETED ---


--- patch-2.6.24-rc8.bz2.sign DELETED ---