rpms/kernel/devel patch-2.6.21-rc4-git10.bz2.sign, NONE, 1.1 .cvsignore, 1.592, 1.593 kernel-2.6.spec, 1.3019, 1.3020 linux-2.6-warnings-inline.patch, 1.1, 1.2 sources, 1.555, 1.556 upstream, 1.483, 1.484 patch-2.6.21-rc4-git6.bz2.sign, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Mar 24 23:42:24 UTC 2007 

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-warnings-inline.patch 
	sources upstream 
Added Files:
	patch-2.6.21-rc4-git10.bz2.sign 
Removed Files:
	patch-2.6.21-rc4-git6.bz2.sign 
Log Message:
* Sat Mar 24 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc4-git10



--- NEW FILE patch-2.6.21-rc4-git10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBGBXfbyGugalF9Dw4RAuO/AJoCD5kxMtGXrgbP5ipEDCyH2u7c/gCglX6e
v/dGOdr/BL+pyARTd6oLW10=
=0g3w
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -r1.592 -r1.593
--- .cvsignore	22 Mar 2007 16:47:44 -0000	1.592
+++ .cvsignore	24 Mar 2007 23:42:21 -0000	1.593
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc4.bz2
-patch-2.6.21-rc4-git6.bz2
+patch-2.6.21-rc4-git10.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3019
retrieving revision 1.3020
diff -u -r1.3019 -r1.3020
--- kernel-2.6.spec	23 Mar 2007 19:43:59 -0000	1.3019
+++ kernel-2.6.spec	24 Mar 2007 23:42:21 -0000	1.3020
@@ -305,7 +305,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc4.bz2
-Patch2: patch-2.6.21-rc4-git6.bz2
+Patch2: patch-2.6.21-rc4-git10.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -853,9 +853,6 @@
 
 cp -rl vanilla linux-%{kversion}.%{_target_cpu}
 
-# unpack sparse.
-%setup -T -D -a 3 -q
-
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
@@ -1193,6 +1190,11 @@
 
 cd ..
 
+# unpack sparse.
+if [ ! -d sparse-%{sparsever} ] ; then
+%setup -T -D -a 3 -q
+fi
+
 # Unpack the Xen tarball.
 %if %{includexen}
 cp %{SOURCE2} .
@@ -2107,6 +2109,9 @@
 #  - tux.
 
 %changelog
+* Sat Mar 24 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc4-git10
+
 * Fri Mar 23 2007 Kristian Høgsberg <krh at redhat.com>
 - Update firewire patch with the sysfs attributes work (v2.6.21-rc3-gbbd1494)
 

linux-2.6-warnings-inline.patch:
 arch/i386/oprofile/op_model_p4.c        |    2 +-
 arch/powerpc/kernel/prom_init.c         |    4 ++--
 drivers/acpi/tables/tbfadt.c            |    4 ++--
 drivers/isdn/hardware/eicon/divasmain.c |   12 ++++++------
 drivers/isdn/hardware/eicon/platform.h  |    4 ++--
 drivers/media/common/ir-functions.c     |    2 +-
 drivers/media/video/cx88/cx88-core.c    |   12 ++++++------
 drivers/media/video/cx88/cx88.h         |    4 ++--
 drivers/net/sky2.c                      |    2 +-
 drivers/net/wireless/ipw2200.c          |    2 +-
 drivers/scsi/tmscsim.c                  |   16 ++++++++--------
 drivers/usb/serial/safe_serial.c        |    2 +-
 drivers/video/intelfb/intelfbdrv.c      |    2 +-
 fs/ocfs2/namei.c                        |    2 +-
 include/asm-powerpc/spinlock.h          |   10 +++++-----
 include/linux/cpuset.h                  |    4 ++--
 kernel/mutex.c                          |    2 +-
 sound/drivers/opl4/opl4_lib.c           |    2 +-
 sound/pci/au88x0/au88x0.h               |    4 ++--
 sound/pci/au88x0/au88x0_core.c          |    4 ++--
 20 files changed, 48 insertions(+), 48 deletions(-)

Index: linux-2.6-warnings-inline.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-warnings-inline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-warnings-inline.patch	22 Mar 2007 03:07:51 -0000	1.1
+++ linux-2.6-warnings-inline.patch	24 Mar 2007 23:42:21 -0000	1.2
@@ -422,146 +422,6 @@
  {
  	might_sleep();
  	/*
-diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
-index 4c914df..ecfe8da 100644
---- a/net/bluetooth/hidp/core.c
-+++ b/net/bluetooth/hidp/core.c
-@@ -319,7 +319,7 @@ static int __hidp_send_ctrl_message(struct hidp_session *session,
- 	return 0;
- }
- 
--static int inline hidp_send_ctrl_message(struct hidp_session *session,
-+static inline int hidp_send_ctrl_message(struct hidp_session *session,
- 			unsigned char hdr, unsigned char *data, int size)
- {
- 	int err;
-diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
-index 7712d76..5439a3c 100644
---- a/net/bridge/br_netfilter.c
-+++ b/net/bridge/br_netfilter.c
-@@ -61,7 +61,7 @@ static int brnf_filter_vlan_tagged __read_mostly = 1;
- #define brnf_filter_vlan_tagged 1
- #endif
- 
--static __be16 inline vlan_proto(const struct sk_buff *skb)
-+static inline __be16 vlan_proto(const struct sk_buff *skb)
- {
- 	return vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
- }
-diff --git a/net/core/sock.c b/net/core/sock.c
-index 8d65d64..27c4f62 100644
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -808,7 +808,7 @@ lenout:
-  *
-  * (We also register the sk_lock with the lock validator.)
-  */
--static void inline sock_lock_init(struct sock *sk)
-+static inline void sock_lock_init(struct sock *sk)
- {
- 	sock_lock_init_class_and_name(sk,
- 			af_family_slock_key_strings[sk->sk_family],
-diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index a7fee6b..1b61699 100644
---- a/net/ipv6/addrconf.c
-+++ b/net/ipv6/addrconf.c
-@@ -804,7 +804,7 @@ struct ipv6_saddr_score {
- #define IPV6_SADDR_SCORE_LABEL		0x0020
- #define IPV6_SADDR_SCORE_PRIVACY	0x0040
- 
--static int inline ipv6_saddr_preferred(int type)
-+static inline int ipv6_saddr_preferred(int type)
- {
- 	if (type & (IPV6_ADDR_MAPPED|IPV6_ADDR_COMPATv4|
- 		    IPV6_ADDR_LOOPBACK|IPV6_ADDR_RESERVED))
-@@ -813,7 +813,7 @@ static int inline ipv6_saddr_preferred(int type)
- }
- 
- /* static matching label */
--static int inline ipv6_saddr_label(const struct in6_addr *addr, int type)
-+static inline int ipv6_saddr_label(const struct in6_addr *addr, int type)
- {
-  /*
-   * 	prefix (longest match)	label
-@@ -3318,7 +3318,7 @@ errout:
- 		rtnl_set_sk_err(RTNLGRP_IPV6_IFADDR, err);
- }
- 
--static void inline ipv6_store_devconf(struct ipv6_devconf *cnf,
-+static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
- 				__s32 *array, int bytes)
- {
- 	BUG_ON(bytes < (DEVCONF_MAX * 4));
-diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 0e1f4b2..a6b3117 100644
---- a/net/ipv6/route.c
-+++ b/net/ipv6/route.c
-@@ -308,7 +308,7 @@ static inline void rt6_probe(struct rt6_info *rt)
- /*
-  * Default Router Selection (RFC 2461 6.3.6)
-  */
--static int inline rt6_check_dev(struct rt6_info *rt, int oif)
-+static inline int rt6_check_dev(struct rt6_info *rt, int oif)
- {
- 	struct net_device *dev = rt->rt6i_dev;
- 	int ret = 0;
-@@ -328,7 +328,7 @@ static int inline rt6_check_dev(struct rt6_info *rt, int oif)
- 	return ret;
- }
- 
--static int inline rt6_check_neigh(struct rt6_info *rt)
-+static inline int rt6_check_neigh(struct rt6_info *rt)
- {
- 	struct neighbour *neigh = rt->rt6i_nexthop;
- 	int m = 0;
-diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
-index ee4b84a..93c4223 100644
---- a/net/ipv6/xfrm6_tunnel.c
-+++ b/net/ipv6/xfrm6_tunnel.c
-@@ -58,7 +58,7 @@ static struct kmem_cache *xfrm6_tunnel_spi_kmem __read_mostly;
- static struct hlist_head xfrm6_tunnel_spi_byaddr[XFRM6_TUNNEL_SPI_BYADDR_HSIZE];
- static struct hlist_head xfrm6_tunnel_spi_byspi[XFRM6_TUNNEL_SPI_BYSPI_HSIZE];
- 
--static unsigned inline xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr)
-+static inline unsigned xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr)
- {
- 	unsigned h;
- 
-@@ -70,7 +70,7 @@ static unsigned inline xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr)
- 	return h;
- }
- 
--static unsigned inline xfrm6_tunnel_spi_hash_byspi(u32 spi)
-+static inline unsigned xfrm6_tunnel_spi_hash_byspi(u32 spi)
- {
- 	return spi % XFRM6_TUNNEL_SPI_BYSPI_HSIZE;
- }
-diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
-index e85df07..abc47cc 100644
---- a/net/sched/cls_route.c
-+++ b/net/sched/cls_route.c
-@@ -93,7 +93,7 @@ void route4_reset_fastmap(struct net_device *dev, struct route4_head *head, u32
- 	spin_unlock_bh(&dev->queue_lock);
- }
- 
--static void __inline__
-+static inline void
- route4_set_fastmap(struct route4_head *head, u32 id, int iif,
- 		   struct route4_filter *f)
- {
-diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
-index 9678995..e81e2fb 100644
---- a/net/xfrm/xfrm_user.c
-+++ b/net/xfrm/xfrm_user.c
-@@ -2025,7 +2025,7 @@ nlmsg_failure:
- 	return -1;
- }
- 
--static int inline xfrm_sa_len(struct xfrm_state *x)
-+static inline int xfrm_sa_len(struct xfrm_state *x)
- {
- 	int l = 0;
- 	if (x->aalg)
 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
 index 01997f2..cbc1195 100644
 --- a/sound/drivers/opl4/opl4_lib.c


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -r1.555 -r1.556
--- sources	22 Mar 2007 16:47:44 -0000	1.555
+++ sources	24 Mar 2007 23:42:21 -0000	1.556
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 0d3f9bfb7dab01820b6f54c9a9f33466  patch-2.6.21-rc4.bz2
-d5d91213d21b2d480ec31aba84ec83c6  patch-2.6.21-rc4-git6.bz2
+17ce99fe63d70cb0267ba8f1655eea3f  patch-2.6.21-rc4-git10.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- upstream	22 Mar 2007 16:47:44 -0000	1.483
+++ upstream	24 Mar 2007 23:42:21 -0000	1.484
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc4.bz2
-patch-2.6.21-rc4-git6.bz2
+patch-2.6.21-rc4-git10.bz2


--- patch-2.6.21-rc4-git6.bz2.sign DELETED ---

More information about the fedora-cvs-commits mailing list