rpms/kernel/devel git-gregkh.patch, 1.2, 1.3 kernel-2.6.spec, 1.2542, 1.2543 linux-2.6-compile-fixes.patch, 1.98, 1.99 linux-2.6-ide-missing-bits.patch, 1.1, NONE linux-2.6-random-patches.patch, 1.19, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Aug 10 01:04:10 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14937
Modified Files:
git-gregkh.patch kernel-2.6.spec linux-2.6-compile-fixes.patch
Removed Files:
linux-2.6-ide-missing-bits.patch
linux-2.6-random-patches.patch
Log Message:
buildfix, update & drop some bits
git-gregkh.patch:
b/Makefile | 23 +
b/drivers/ide/pci/generic.c | 30 +
b/drivers/media/dvb/bt8xx/dst.c | 58 +--
b/drivers/media/dvb/dvb-core/Makefile | 6
b/drivers/media/radio/Kconfig | 12
b/drivers/media/radio/Makefile | 1
b/drivers/media/radio/dsbr100.c | 430 ++++++++++++++++++++++++++
b/drivers/media/video/Kconfig | 12
b/drivers/media/video/Makefile | 2
b/drivers/media/video/compat_ioctl32.c | 32 +
b/drivers/media/video/cx25840/cx25840-core.c | 4
b/drivers/media/video/cx88/cx88-video.c | 4
b/drivers/media/video/msp3400-kthreads.c | 4
b/drivers/media/video/pwc/Kconfig | 2
b/drivers/media/video/pwc/pwc-if.c | 1
b/drivers/media/video/saa7134/saa7134-video.c | 2
b/drivers/media/video/tuner-types.c | 14
b/drivers/media/video/v4l1-compat.c | 4
b/drivers/media/video/v4l2-common.c | 6
b/drivers/media/video/videodev.c | 2
b/drivers/media/video/vivi.c | 4
b/drivers/net/myri10ge/myri10ge.c | 2
b/drivers/net/tg3.c | 51 +--
b/drivers/net/tg3.h | 8
b/drivers/s390/char/tape_class.c | 2
b/drivers/s390/cio/device_fsm.c | 1
b/drivers/s390/cio/device_ops.c | 3
b/drivers/scsi/ata_piix.c | 5
b/drivers/scsi/libata-core.c | 34 --
b/drivers/scsi/libata-scsi.c | 13
b/drivers/scsi/sata_sil24.c | 1
b/fs/jfs/inode.c | 16
b/fs/jfs/jfs_inode.h | 1
b/fs/jfs/super.c | 118 ++++++-
b/include/linux/skbuff.h | 4
b/include/media/v4l2-dev.h | 2
b/net/core/dst.c | 3
b/net/core/pktgen.c | 4
b/net/core/rtnetlink.c | 15
b/net/core/skbuff.c | 4
b/net/core/wireless.c | 24 +
b/net/ipv4/route.c | 2
b/net/ipv4/tcp_output.c | 12
b/net/ipx/af_ipx.c | 10
b/sound/oss/Kconfig | 6
b/sound/pci/Kconfig | 70 ++--
b/usr/Makefile | 3
drivers/media/video/dsbr100.c | 430 --------------------------
48 files changed, 864 insertions(+), 633 deletions(-)
Index: git-gregkh.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-gregkh.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git-gregkh.patch 9 Aug 2006 21:03:07 -0000 1.2
+++ git-gregkh.patch 10 Aug 2006 01:04:06 -0000 1.3
@@ -1,3 +1,16 @@
+commit 79860a9a79a17f1bed0713680a3995467405ba49
+Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
+Date: Wed Aug 9 15:04:58 2006 +0100
+
+ [PATCH] PATCH: 2.6.18 oops on boot fix for IDE
+
+ When the IDE fix for Jmicron went in one piece went walking somewhere
+ (send log shows my end somehow). Without this sometimes you get an oops
+ on boot.
+
+ Signed-off-by: Alan Cox <alan at redhat.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
commit a4657141091c2f975fa35ac1ad28fffdd756091e
Merge: 54f58d6... 7c91767...
Author: Greg Kroah-Hartman <gregkh at suse.de>
@@ -677,6 +690,7 @@
Signed-off-by: Dave Kleikamp <shaggy at austin.ibm.com>
b/Makefile | 24 +
+ b/drivers/ide/pci/generic.c | 30 +
b/drivers/media/dvb/bt8xx/dst.c | 58 +--
b/drivers/media/dvb/dvb-core/Makefile | 6
b/drivers/media/radio/Kconfig | 12
@@ -723,7 +737,7 @@
b/sound/pci/Kconfig | 70 ++--
b/usr/Makefile | 3
drivers/media/video/dsbr100.c | 430 --------------------------
- 47 files changed, 834 insertions(+), 634 deletions(-)
+ 48 files changed, 864 insertions(+), 634 deletions(-)
diff --git a/Makefile b/Makefile
index c2f78a5..c53ed56 100644
@@ -777,6 +791,47 @@
# The all: target is the default when no target is given on the
# command line.
+diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
+index 2f962cf..78810ba 100644
+--- a/drivers/ide/pci/generic.c
++++ b/drivers/ide/pci/generic.c
+@@ -180,6 +180,36 @@ static ide_pci_device_t generic_chipsets
+ .channels = 2,
+ .autodma = AUTODMA,
+ .bootable = OFF_BOARD,
++ },{ /* 15 */
++ .name = "JMB361",
++ .init_hwif = init_hwif_generic,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .bootable = OFF_BOARD,
++ },{ /* 16 */
++ .name = "JMB363",
++ .init_hwif = init_hwif_generic,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .bootable = OFF_BOARD,
++ },{ /* 17 */
++ .name = "JMB365",
++ .init_hwif = init_hwif_generic,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .bootable = OFF_BOARD,
++ },{ /* 18 */
++ .name = "JMB366",
++ .init_hwif = init_hwif_generic,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .bootable = OFF_BOARD,
++ },{ /* 19 */
++ .name = "JMB368",
++ .init_hwif = init_hwif_generic,
++ .channels = 2,
++ .autodma = AUTODMA,
++ .bootable = OFF_BOARD,
+ }
+ };
+
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index d687a14..06ac899 100644
--- a/drivers/media/dvb/bt8xx/dst.c
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2542
retrieving revision 1.2543
diff -u -r1.2542 -r1.2543
--- kernel-2.6.spec 9 Aug 2006 23:58:50 -0000 1.2542
+++ kernel-2.6.spec 10 Aug 2006 01:04:06 -0000 1.2543
@@ -404,7 +404,6 @@
Patch1650: linux-2.6-serial-460800.patch
Patch1660: linux-2.6-hotplug-cpu-workqueue.patch
Patch1670: linux-2.6-softcursor-persistent-alloc.patch
-Patch1680: linux-2.6-ide-missing-bits.patch
Patch1710: linux-2.6-sched-up-migration-cost.patch
Patch1720: linux-2.6-proc-self-maps-fix.patch
Patch1740: linux-2.6-softlockup-disable.patch
@@ -448,10 +447,6 @@
Patch10000: linux-2.6-compile-fixes.patch
-# Little obvious 1-2 liners that fix silly bugs.
-# Do not add anything non-trivial here.
-Patch10001: linux-2.6-random-patches.patch
-
# Xen hypervisor patches
# END OF PATCH DEFINITIONS
@@ -935,8 +930,6 @@
%patch1660 -p1
# Use persistent allocation in softcursor
%patch1670 -p1
-# Add some missing IDE fixes.
-%patch1680 -p1
# Only print migration info on SMP
%patch1710 -p1
# setuid /proc/self/maps fix.
@@ -998,9 +991,6 @@
#
%patch10000 -p1
-# Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
-%patch10001 -p1
-
# END OF PATCH APPLICATIONS
cp %{SOURCE10} Documentation/
@@ -1716,7 +1706,6 @@
- Daily update from GregKH's git tree.
- Unbreak SMP locking in oprofile.
- Fix hotplug CPU locking in workqueue creation.
-- Fix IDE oops on boot.
- K8 EDAC support.
- IPsec labelling enhancements for MLS
- Netlabel: CIPSO labeled networking
linux-2.6-compile-fixes.patch:
b/net/ipx/af_ipx.c | 2 +-
linux-2.6.17.noarch/Makefile | 4 ----
linux-2.6.17.noarch/arch/ia64/kernel/ia64_ksyms.c | 1 +
3 files changed, 2 insertions(+), 5 deletions(-)
Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- linux-2.6-compile-fixes.patch 4 Aug 2006 20:48:12 -0000 1.98
+++ linux-2.6-compile-fixes.patch 10 Aug 2006 01:04:07 -0000 1.99
@@ -22,3 +22,29 @@
#define __KERNEL_SYSCALLS__
#include <asm/unistd.h>
+
+
+commit fff642570dc47ab76491fe81ee6599269c4eb13e
+Author: David S. Miller <davem at sunset.davemloft.net>
+Date: Wed Aug 9 17:36:15 2006 -0700
+
+ [IPX]: Fix typo, ipxhdr() --> ipx_hdr()
+
+ Noticed by Dave Jones.
+
+ Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
+index 4019642..bef3f61 100644
+--- a/net/ipx/af_ipx.c
++++ b/net/ipx/af_ipx.c
+@@ -1645,7 +1645,7 @@ static int ipx_rcv(struct sk_buff *skb,
+ if (!pskb_may_pull(skb, sizeof(struct ipxhdr)))
+ goto drop;
+
+- ipx_pktsize = ntohs(ipxhdr(skb)->ipx_pktsize);
++ ipx_pktsize = ntohs(ipx_hdr(skb)->ipx_pktsize);
+
+ /* Too small or invalid header? */
+ if (ipx_pktsize < sizeof(struct ipxhdr) ||
+
--- linux-2.6-ide-missing-bits.patch DELETED ---
--- linux-2.6-random-patches.patch DELETED ---
More information about the fedora-cvs-commits
mailing list