Wed Jul 23 19:51:55 UTC 2008

Author: davej

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

Modified Files:
	.cvsignore config-generic config-ia64-generic config-powerpc64 
	config-x86-generic kernel.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.26-git10.bz2.sign 
Removed Files:
	linux-2.6-net-8139-pio-mmio-fallback.patch 
	linux-2.6-net-8139-pio-modparam.patch 
	linux-2.6-net-8139-pio-oqo2.patch linux-2.6-netdev-atl1e.patch 
	patch-2.6.26-git9.bz2.sign 
Log Message:
2.6.26-git10

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

iD8DBQBIhteHyGugalF9Dw4RAjtJAKCOCRtrAd+yLs5sY4zdohfygmsZiwCeOkjS
cm3XjYpPmVHtW1cesDE9Nwc=
=JV7O
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.874
retrieving revision 1.875
diff -u -r1.874 -r1.875
--- .cvsignore	22 Jul 2008 13:06:24 -0000	1.874
+++ .cvsignore	23 Jul 2008 19:51:09 -0000	1.875
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.26
 linux-2.6.26.tar.bz2
-patch-2.6.26-git9.bz2
+patch-2.6.26-git10.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- config-generic	21 Jul 2008 22:22:11 -0000	1.137
+++ config-generic	23 Jul 2008 19:51:09 -0000	1.138
@@ -3536,6 +3536,7 @@
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_SMX=m
+CONFIG_UIO_PDRV=m
 
 CONFIG_INSTRUMENTATION=y
 CONFIG_MARKERS=y
@@ -3618,3 +3619,5 @@
 
 CONFIG_OPTIMIZE_INLINING=y
 
+# FIXME: This should be x86/ia64 only
+# CONFIG_HP_ILO is not set


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-ia64-generic	14 Jul 2008 19:38:29 -0000	1.13
+++ config-ia64-generic	23 Jul 2008 19:51:09 -0000	1.14
@@ -204,3 +204,5 @@
 
 CONFIG_UTRACE=n
 CONFIG_UTRACE_PTRACE=n
+
+CONFIG_HP_ILO=m


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-powerpc64	21 Jul 2008 19:45:13 -0000	1.17
+++ config-powerpc64	23 Jul 2008 19:51:09 -0000	1.18
@@ -171,3 +171,6 @@
 
 CONFIG_SERIO_XILINX_XPS_PS2=m
 
+CONFIG_PPC_IBM_CELL_RESETBUTTON=y
+CONFIG_PPC_IBM_CELL_POWERBUTTON=m
+CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- config-x86-generic	21 Jul 2008 19:45:13 -0000	1.41
+++ config-x86-generic	23 Jul 2008 19:51:09 -0000	1.42
@@ -394,3 +394,6 @@
 # CONFIG_MMIOTRACE is not set
 
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+
+CONFIG_HP_ILO=m
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -r1.790 -r1.791
--- kernel.spec	22 Jul 2008 13:06:24 -0000	1.790
+++ kernel.spec	23 Jul 2008 19:51:09 -0000	1.791
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 9
+%define gitrev 10
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -606,9 +606,6 @@
 Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 Patch420: linux-2.6-squashfs.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
-Patch440: linux-2.6-net-8139-pio-modparam.patch
-Patch441: linux-2.6-net-8139-pio-oqo2.patch
-Patch442: linux-2.6-net-8139-pio-mmio-fallback.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
@@ -648,8 +645,6 @@
 
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
-# atl1e network driver
-Patch2021: linux-2.6-netdev-atl1e.patch
 
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
@@ -1092,12 +1087,6 @@
 # Networking
 # Disable easy to trigger printk's.
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
-# Make 8139too PIO/MMIO a module parameter
-ApplyPatch linux-2.6-net-8139-pio-modparam.patch
-# OQO2 needs PIO
-ApplyPatch linux-2.6-net-8139-pio-oqo2.patch
-# PIO fallback
-ApplyPatch linux-2.6-net-8139-pio-mmio-fallback.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1150,7 +1139,6 @@
 ApplyPatch linux-2.6-sata-eeepc-faster.patch
 
 # atl1e & atl2 network drivers
-ApplyPatch linux-2.6-netdev-atl1e.patch
 ApplyPatch linux-2.6-netdev-atl2.patch
 
 # Nouveau DRM + drm fixes
@@ -1780,6 +1768,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Jul 23 2008 Dave Jones <davej at redhat.com>
+- 2.6.26-git10
+
 * Tue Jul 22 2008 Dave Jones <davej at redhat.com>
 - 2.6.26-git9
 

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- linux-2.6-compile-fixes.patch	21 Jul 2008 22:49:00 -0000	1.170
+++ linux-2.6-compile-fixes.patch	23 Jul 2008 19:51:09 -0000	1.171
@@ -5,258 +5,3 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
-Warning(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//include/linux/netdevice.h:1006): No description found for parameter 'dev_queue'
-Warning(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//include/linux/netdevice.h:1033): No description found for parameter 'dev_queue'
-Warning(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//include/linux/netdevice.h:1067): No description found for parameter 'dev_queue'
-Warning(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//include/linux/netdevice.h:1093): No description found for parameter 'dev_queue'
-Warning(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//include/linux/netdevice.h:1474): No description found for parameter 'txq'
-
---- linux-2.6.26.noarch/include/linux/netdevice.h~	2008-07-21 16:46:36.000000000 -0400
-+++ linux-2.6.26.noarch/include/linux/netdevice.h	2008-07-21 16:48:53.000000000 -0400
-@@ -996,17 +996,17 @@ static inline void netif_tx_schedule_all
- 		netif_schedule_queue(netdev_get_tx_queue(dev, i));
- }
- 
-+static inline void netif_tx_start_queue(struct netdev_queue *dev_queue)
-+{
-+	clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
-+}
-+
- /**
-  *	netif_start_queue - allow transmit
-  *	@dev: network device
-  *
-  *	Allow upper layers to call the device hard_start_xmit routine.
-  */
--static inline void netif_tx_start_queue(struct netdev_queue *dev_queue)
--{
--	clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
--}
--
- static inline void netif_start_queue(struct net_device *dev)
- {
- 	netif_tx_start_queue(netdev_get_tx_queue(dev, 0));
-@@ -1022,13 +1022,6 @@ static inline void netif_tx_start_all_qu
- 	}
- }
- 
--/**
-- *	netif_wake_queue - restart transmit
-- *	@dev: network device
-- *
-- *	Allow upper layers to call the device hard_start_xmit routine.
-- *	Used for flow control when transmit resources are available.
-- */
- static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue)
- {
- #ifdef CONFIG_NETPOLL_TRAP
-@@ -1041,6 +1034,13 @@ static inline void netif_tx_wake_queue(s
- 		__netif_schedule(dev_queue->qdisc);
- }
- 
-+/**
-+ *	netif_wake_queue - restart transmit
-+ *	@dev: network device
-+ *
-+ *	Allow upper layers to call the device hard_start_xmit routine.
-+ *	Used for flow control when transmit resources are available.
-+ */
- static inline void netif_wake_queue(struct net_device *dev)
- {
- 	netif_tx_wake_queue(netdev_get_tx_queue(dev, 0));
-@@ -1056,6 +1056,11 @@ static inline void netif_tx_wake_all_que
- 	}
- }
- 
-+static inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)
-+{
-+	set_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
-+}
-+
- /**
-  *	netif_stop_queue - stop transmitted packets
-  *	@dev: network device
-@@ -1063,11 +1068,6 @@ static inline void netif_tx_wake_all_que
-  *	Stop upper layers calling the device hard_start_xmit routine.
-  *	Used for flow control when transmit resources are unavailable.
-  */
--static inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)
--{
--	set_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
--}
--
- static inline void netif_stop_queue(struct net_device *dev)
- {
- 	netif_tx_stop_queue(netdev_get_tx_queue(dev, 0));
-@@ -1083,17 +1083,17 @@ static inline void netif_tx_stop_all_que
- 	}
- }
- 
-+static inline int netif_tx_queue_stopped(const struct netdev_queue *dev_queue)
-+{
-+	return test_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
-+}
-+
- /**
-  *	netif_queue_stopped - test if transmit queue is flowblocked
-  *	@dev: network device
-  *
-  *	Test if transmit queue on device is currently unable to send.
-  */
--static inline int netif_tx_queue_stopped(const struct netdev_queue *dev_queue)
--{
--	return test_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
--}
--
- static inline int netif_queue_stopped(const struct net_device *dev)
- {
- 	return netif_tx_queue_stopped(netdev_get_tx_queue(dev, 0));
-@@ -1463,13 +1463,6 @@ static inline void netif_rx_complete(str
- 	local_irq_restore(flags);
- }
- 
--/**
-- *	netif_tx_lock - grab network device transmit lock
-- *	@dev: network device
-- *	@cpu: cpu number of lock owner
-- *
-- * Get network device transmit lock
-- */
- static inline void __netif_tx_lock(struct netdev_queue *txq, int cpu)
- {
- 	spin_lock(&txq->_xmit_lock);
-@@ -1482,6 +1475,13 @@ static inline void __netif_tx_lock_bh(st
- 	txq->xmit_lock_owner = smp_processor_id();
- }
- 
-+/**
-+ *	netif_tx_lock - grab network device transmit lock
-+ *	@dev: network device
-+ *	@cpu: cpu number of lock owner
-+ *
-+ * Get network device transmit lock
-+ */
- static inline void netif_tx_lock(struct net_device *dev)
- {
- 	int cpu = smp_processor_id();
-
-
-Error(/mnt/data/src/fedora/kernel/devel/kernel-2.6.26/linux-2.6.26.noarch//net/core/dev.c:1674): cannot understand prototype: 'u32 simple_tx_hashrnd; '
-
---- linux-2.6.26.noarch/net/core/dev.c~	2008-07-21 16:49:10.000000000 -0400
-+++ linux-2.6.26.noarch/net/core/dev.c	2008-07-21 16:49:47.000000000 -0400
-@@ -1645,32 +1645,6 @@ out_kfree_skb:
- 	return 0;
- }
- 
--/**
-- *	dev_queue_xmit - transmit a buffer
-- *	@skb: buffer to transmit
-- *
-- *	Queue a buffer for transmission to a network device. The caller must
-- *	have set the device and priority and built the buffer before calling
-- *	this function. The function can be called from an interrupt.
-- *
-- *	A negative errno code is returned on a failure. A success does not
-- *	guarantee the frame will be transmitted as it may be dropped due
-- *	to congestion or traffic shaping.
-- *
-- * -----------------------------------------------------------------------------------
-- *      I notice this method can also return errors from the queue disciplines,
-- *      including NET_XMIT_DROP, which is a positive value.  So, errors can also
-- *      be positive.
-- *
-- *      Regardless of the return value, the skb is consumed, so it is currently
-- *      difficult to retry a send to this method.  (You can bump the ref count
-- *      before sending to hold a reference for retry if you are careful.)
-- *
-- *      When calling this method, interrupts MUST be enabled.  This is because
-- *      the BH enable code must have IRQs enabled so that it will not deadlock.
-- *          --BLG
-- */
--
- static u32 simple_tx_hashrnd;
- static int simple_tx_hashrnd_initialized = 0;
- 
-@@ -1738,6 +1712,31 @@ static struct netdev_queue *dev_pick_tx(
- 	return netdev_get_tx_queue(dev, queue_index);
- }
- 
-+/**
-+ *	dev_queue_xmit - transmit a buffer
-+ *	@skb: buffer to transmit
-+ *
-+ *	Queue a buffer for transmission to a network device. The caller must
-+ *	have set the device and priority and built the buffer before calling
-+ *	this function. The function can be called from an interrupt.
-+ *
-+ *	A negative errno code is returned on a failure. A success does not
-+ *	guarantee the frame will be transmitted as it may be dropped due
-+ *	to congestion or traffic shaping.
-+ *
-+ * -----------------------------------------------------------------------------------
-+ *      I notice this method can also return errors from the queue disciplines,
-+ *      including NET_XMIT_DROP, which is a positive value.  So, errors can also
-+ *      be positive.
-+ *
-+ *      Regardless of the return value, the skb is consumed, so it is currently
-+ *      difficult to retry a send to this method.  (You can bump the ref count
-+ *      before sending to hold a reference for retry if you are careful.)
-+ *
-+ *      When calling this method, interrupts MUST be enabled.  This is because
-+ *      the BH enable code must have IRQs enabled so that it will not deadlock.
-+ *          --BLG
-+ */
- int dev_queue_xmit(struct sk_buff *skb)
- {
- 	struct net_device *dev = skb->dev;
-drivers/serial/serial_txx9.c: In function 'receive_chars':
-drivers/serial/serial_txx9.c:275: error: 'struct uart_info' has no member named 'tty'
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.26.noarch/drivers/serial/serial_txx9.c~	2008-07-21 17:13:21.000000000 -0400
-+++ linux-2.6.26.noarch/drivers/serial/serial_txx9.c	2008-07-21 17:13:37.000000000 -0400
-@@ -272,7 +272,7 @@ static void serial_txx9_initialize(struc
- static inline void
- receive_chars(struct uart_txx9_port *up, unsigned int *status)
- {
--	struct tty_struct *tty = up->port.info->tty;
-+	struct tty_struct *tty = up->port.info->port.tty;
- 	unsigned char ch;
- 	unsigned int disr = *status;
- 	int max_count = 256;
-
-drivers/serial/icom.c: In function 'recv_interrupt':
-drivers/serial/icom.c:733: error: 'struct uart_info' has no member named 'tty'
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.26.noarch/drivers/serial/icom.c~	2008-07-21 18:08:30.000000000 -0400
-+++ linux-2.6.26.noarch/drivers/serial/icom.c	2008-07-21 18:13:00.000000000 -0400
-@@ -730,7 +730,7 @@ static void xmit_interrupt(u16 port_int_
- static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
- {
- 	short int count, rcv_buff;
--	struct tty_struct *tty = icom_port->uart_port.info->tty;
-+	struct tty_struct *tty = icom_port->uart_port.info->port.tty;
- 	unsigned short int status;
- 	struct uart_icount *icount;
- 	unsigned long offset;
-
-drivers/net/mv643xx_eth.c: In function 'mv643xx_eth_netpoll':
-drivers/net/mv643xx_eth.c:2115: error: 'INT_CAUSE_EXT' undeclared (first use in this function)
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.26.noarch/drivers/net/mv643xx_eth.c~	2008-07-21 18:47:33.000000000 -0400
-+++ linux-2.6.26.noarch/drivers/net/mv643xx_eth.c	2008-07-21 18:47:55.000000000 -0400
-@@ -2112,7 +2112,7 @@ static void mv643xx_eth_netpoll(struct n
- 
- 	mv643xx_eth_irq(dev->irq, dev);
- 
--	wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_CAUSE_EXT);
-+	wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | (INT_CAUSE_EXT(mp->port_num)));
- }
- #endif
- 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.835
retrieving revision 1.836
diff -u -r1.835 -r1.836
--- sources	22 Jul 2008 13:06:24 -0000	1.835
+++ sources	23 Jul 2008 19:51:09 -0000	1.836
@@ -1,2 +1,2 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
-b0ac744ce758d4803eea09c74e581201  patch-2.6.26-git9.bz2
+5de8b6532393677ffa0ceb647213370d  patch-2.6.26-git10.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.752
retrieving revision 1.753
diff -u -r1.752 -r1.753
--- upstream	22 Jul 2008 13:06:24 -0000	1.752
+++ upstream	23 Jul 2008 19:51:09 -0000	1.753
@@ -1,2 +1,2 @@
 linux-2.6.26.tar.bz2
-patch-2.6.26-git9.bz2
+patch-2.6.26-git10.bz2


--- linux-2.6-net-8139-pio-mmio-fallback.patch DELETED ---


--- linux-2.6-net-8139-pio-modparam.patch DELETED ---


--- linux-2.6-net-8139-pio-oqo2.patch DELETED ---


--- linux-2.6-netdev-atl1e.patch DELETED ---


--- patch-2.6.26-git9.bz2.sign DELETED ---


