rpms/kernel/devel git-gregkh.patch, 1.1, 1.2 kernel-2.6.spec, 1.2534, 1.2535 linux-2.6-sata-ata_device_add-oops.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Aug 9 21:03:20 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11281
Modified Files:
git-gregkh.patch kernel-2.6.spec
Removed Files:
linux-2.6-sata-ata_device_add-oops.patch
Log Message:
more greg bits
git-gregkh.patch:
b/Makefile | 23 +
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 --------------------------
47 files changed, 834 insertions(+), 633 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 git-gregkh.patch
Index: git-gregkh.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-gregkh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-gregkh.patch 8 Aug 2006 19:28:09 -0000 1.1
+++ git-gregkh.patch 9 Aug 2006 21:03:07 -0000 1.2
@@ -1,3 +1,730 @@
+commit a4657141091c2f975fa35ac1ad28fffdd756091e
+Merge: 54f58d6... 7c91767...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date: Wed Aug 9 11:49:13 2006 -0700
+
+ Merge gregkh at master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
+
+commit 54f58d6c4f15f3bdf15d43fa640ca6de9487f50e
+Merge: 897e11a... 013b68b...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date: Wed Aug 9 11:46:30 2006 -0700
+
+ Merge branch 'upstream-greg' of gregkh at master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
+
+commit 897e11a40baf24224bd0edc948f908ed07c5675d
+Merge: ad55269... 22aac08...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date: Wed Aug 9 11:45:59 2006 -0700
+
+ Merge branch 'upstream-greg' of gregkh at master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
+
+commit 7c91767a6b701543c93ebcd611dab61deff3dad1
+Author: Dmitry Mishin <dim at openvz.org>
+Date: Wed Aug 9 02:25:54 2006 -0700
+
+ [NET]: add_timer -> mod_timer() in dst_run_gc()
+
+ Patch from Dmitry Mishin <dim at openvz.org>:
+
+ Replace add_timer() by mod_timer() in dst_run_gc
+ in order to avoid BUG message.
+
+ CPU1 CPU2
+ dst_run_gc() entered dst_run_gc() entered
+ spin_lock(&dst_lock) .....
+ del_timer(&dst_gc_timer) fail to get lock
+ .... mod_timer() <--- puts
+ timer back
+ to the list
+ add_timer(&dst_gc_timer) <--- BUG because timer is in list already.
+
+ Found during OpenVZ internal testing.
+
+ At first we thought that it is OpenVZ specific as we
+ added dst_run_gc(0) call in dst_dev_event(),
+ but as Alexey pointed to me it is possible to trigger
+ this condition in mainstream kernel.
+
+ F.e. timer has fired on CPU2, but the handler was preeempted
+ by an irq before dst_lock is tried.
+ Meanwhile, someone on CPU1 adds an entry to gc list and
+ starts the timer.
+ If CPU2 was preempted long enough, this timer can expire
+ simultaneously with resuming timer handler on CPU1, arriving
+ exactly to the situation described.
+
+ Signed-off-by: Dmitry Mishin <dim at openvz.org>
+ Signed-off-by: Kirill Korotaev <dev at openvz.org>
+ Signed-off-by: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
+ Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit 22aac0896b1b0b8cabaf00714c55dd12f25d5738
+Author: Tejun Heo <htejun at gmail.com>
+Date: Tue Aug 8 14:08:59 2006 +0900
+
+ [PATCH] libata: clear sdev->locked on door lock failure
+
+ SCSI EH locks door if sdev->locked is set. Sometimes door lock
+ command fails continuously (e.g. when medium is not present) and as
+ libata uses EH to acquire sense data, this easily creates a loop where
+ a failed lock door invokes EH and EH issues lock door on completion.
+
+ This patch clears sdev->locked on door lock failure to break this
+ loop. This problem has been spotted and diagnosed by Unicorn Chang
+ <uchang at tw.ibm.com>.
+
+ Signed-off-by: Tejun Heo <htejun at gmail.com>
+ Signed-off-by: Jeff Garzik <jeff at garzik.org>
+
+commit 85455dd34219376dcc7dce94bea67058f0b7d731
+Author: Keith Owens <kaos at ocs.com.au>
+Date: Tue Aug 8 13:51:02 2006 +1000
+
+ [PATCH] Fix compile problem when sata debugging is on
+
+ Fix a sata debug print statement that still uses an old variable name.
+
+ Signed-off-by: Keith Owens <kaos at ocs.com.au>
+ Signed-off-by: Jeff Garzik <jeff at garzik.org>
+
+commit 013b68bf7cb4edfb8753aac9bde3cb60c84bc067
+Author: Brice Goglin <brice at myri.com>
+Date: Wed Aug 9 00:07:53 2006 -0400
+
+ [PATCH] myri10ge: always re-enable dummy rdmas in myri10ge_resume
+
+ Dummy RDMA are always enabled on device startup since commit
+ 9a71db721a2cbb9921b929b2699ab181f5a3c6c0 (to work around buggy
+ PCIe chipsets which do not implement resending properly). But,
+ we also need to always re-enable them when resuming the device.
+
+ Signed-off-by: Brice Goglin <brice at myri.com>
+ Signed-off-by: Jeff Garzik <jeff at garzik.org>
+
+commit c71d6be54e92c4b2d31faf51850354aff22b82b0
+Merge: 9f73763... 77f3f87...
+Author: Jeff Garzik <jeff at garzik.org>
+Date: Tue Aug 8 23:59:39 2006 -0400
+
+ Merge branch 'tj-upstream-fixes' of git://htj.dyndns.org/libata-tj into upstream-fixes
+
+commit 2f96740c26f1dcff9111dca3e01379ab12aafde5
+Merge: 9f73763... 782a667...
+Author: Jeff Garzik <jeff at garzik.org>
+Date: Tue Aug 8 23:48:48 2006 -0400
+
+ Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
+
+commit 7b1ba8de569460894efa892457af7a37c0d574f9
+Author: Stephen Hemminger <shemminger at osdl.org>
+Date: Tue Aug 8 16:48:51 2006 -0700
+
+ [IPX]: Another nonlinear receive fix
+
+ Need to check some more cases in IPX receive. If the skb is purely
+ fragments, the IPX header needs to be extracted. The function
+ pskb_may_pull() may in theory invalidate all the pointers in the skb,
+ so references to ipx header must be refreshed.
+
+ Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
+ Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit 70f8e78e150425b01c1099087ad3decacf7e4ccf
+Author: David S. Miller <davem at sunset.davemloft.net>
+Date: Tue Aug 8 16:47:37 2006 -0700
+
+ [RTNETLINK]: Fix IFLA_ADDRESS handling.
+
+ The ->set_mac_address handlers expect a pointer to a
+ sockaddr which contains the MAC address, whereas
+ IFLA_ADDRESS provides just the MAC address itself.
+
+ So whip up a sockaddr to wrap around the netlink
+ attribute for the ->set_mac_address call.
+
+ Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit ad552692a4489917fa4b71f9c6a91baae4aee799
+Merge: 20dbfad... 0851fb4...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date: Tue Aug 8 14:19:23 2006 -0700
+
+ Merge gregkh at master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
+
+commit 0851fb48486c044476b019029245cb9b348fca33
+Author: Yeasah Pell <yeasah at schwide.com>
+Date: Tue Aug 8 09:10:18 2006 -0300
+
+ V4L/DVB (4431): Add several error checks to dst
+
+ Signed-off-by: Yeasah Pell <yeasah at shwide.com>
+ Signed-off-by: Manu Abraham <manu at linuxtv.org>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
+
+commit eafa98177a388700d613c187c7716e11869b7171
+Author: Diego Calleja <diegocg at gmail.com>
+Date: Tue Aug 8 09:10:17 2006 -0300
+
+ V4L/DVB (4430): Quickcam_messenger compilation fix
+
+ In bugzilla #6943, Maxim Britov reported:
+ "I can enable Logitech quickcam support in .config, but it want be compile.
+ I have to add into drivers/media/video/Makefile:
+ obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/"
+ He's right, just enable that driver as module while disabling every other
+ driver that gets into that directory, nothing will get compiled.
+ This patch fixes the Makefile.
+
+ Signed-off-by: Diego Calleja <diegocg at gmail.com>
+ Acked-by: Michael Krufky <mkrufky at linuxtv.org>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
+
+commit 8a016dcc8383bedc731bca9fdedae77ff52a6ad7
+Author: Mauro Carvalho Chehab <mchehab at infradead.org>
+Date: Tue Aug 8 09:10:16 2006 -0300
+
+ V4L/DVB (4427): Fix V4L1 Compat for VIDIOCGPICT ioctl
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
+
+commit 43c560fa59ef2688d891f6431e972b7763b73a00
[...2665 lines suppressed...]
+ if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+ goto out;
+
+- ipx = ipx_hdr(skb);
+- ipx_pktsize = ntohs(ipx->ipx_pktsize);
++ if (!pskb_may_pull(skb, sizeof(struct ipxhdr)))
++ goto drop;
++
++ ipx_pktsize = ntohs(ipxhdr(skb)->ipx_pktsize);
+
+ /* Too small or invalid header? */
+- if (ipx_pktsize < sizeof(struct ipxhdr) || ipx_pktsize > skb->len)
++ if (ipx_pktsize < sizeof(struct ipxhdr) ||
++ !pskb_may_pull(skb, ipx_pktsize))
+ goto drop;
+
++ ipx = ipx_hdr(skb);
+ if (ipx->ipx_checksum != IPX_NO_CHECKSUM &&
+ ipx->ipx_checksum != ipx_cksum(ipx, ipx_pktsize))
+ goto drop;
+diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
+index f4980ca..1b7c3df 100644
+--- a/sound/oss/Kconfig
++++ b/sound/oss/Kconfig
+@@ -31,7 +31,7 @@ config SOUND_EMU10K1
+ For more information on this driver and the degree of support for
+ the different card models please check:
+
+- <http://sourceforge.net/projects/emu10k1/>
++ <http://sourceforge.net/projects/emu10k1/>
+
+ It is now possible to load dsp microcode patches into the EMU10K1
+ chip. These patches are used to implement real time sound
+@@ -140,7 +140,7 @@ config SOUND_TRIDENT
+ system support" and "Sysctl support", and after the /proc file
+ system has been mounted, executing the command
+
+- command what is enabled
++ command what is enabled
+
+ echo 0>/proc/ALi5451 pcm out is also set to S/PDIF out. (Default).
+
+@@ -838,7 +838,7 @@ config SOUND_WAVEARTIST
+
+ config SOUND_TVMIXER
+ tristate "TV card (bt848) mixer support"
+- depends on SOUND_PRIME && I2C
++ depends on SOUND_PRIME && I2C && VIDEO_V4L1
+ help
+ Support for audio mixer facilities on the BT848 TV frame-grabber
+ card.
+diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
+index d7ad32f..e49c0fe 100644
+--- a/sound/pci/Kconfig
++++ b/sound/pci/Kconfig
+@@ -16,16 +16,16 @@ config SND_AD1889
+ will be called snd-ad1889.
+
+ config SND_ALS300
+- tristate "Avance Logic ALS300/ALS300+"
+- depends on SND
+- select SND_PCM
+- select SND_AC97_CODEC
+- select SND_OPL3_LIB
+- help
+- Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
++ tristate "Avance Logic ALS300/ALS300+"
++ depends on SND
++ select SND_PCM
++ select SND_AC97_CODEC
++ select SND_OPL3_LIB
++ help
++ Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
+
+- To compile this driver as a module, choose M here: the module
+- will be called snd-als300
++ To compile this driver as a module, choose M here: the module
++ will be called snd-als300
+
+ config SND_ALS4000
+ tristate "Avance Logic ALS4000"
+@@ -78,49 +78,49 @@ config SND_ATIIXP_MODEM
+ will be called snd-atiixp-modem.
+
+ config SND_AU8810
+- tristate "Aureal Advantage"
+- depends on SND
++ tristate "Aureal Advantage"
++ depends on SND
+ select SND_MPU401_UART
+ select SND_AC97_CODEC
+- help
++ help
+ Say Y here to include support for Aureal Advantage soundcards.
+
+ Supported features: Hardware Mixer, SRC, EQ and SPDIF output.
+- 3D support code is in place, but not yet useable. For more info,
+- email the ALSA developer list, or <mjander at users.sourceforge.net>.
++ 3D support code is in place, but not yet useable. For more info,
++ email the ALSA developer list, or <mjander at users.sourceforge.net>.
+
+ To compile this driver as a module, choose M here: the module
+ will be called snd-au8810.
+-
++
+ config SND_AU8820
+- tristate "Aureal Vortex"
+- depends on SND
++ tristate "Aureal Vortex"
++ depends on SND
+ select SND_MPU401_UART
+ select SND_AC97_CODEC
+- help
++ help
+ Say Y here to include support for Aureal Vortex soundcards.
+
+- Supported features: Hardware Mixer and SRC. For more info, email
+- the ALSA developer list, or <mjander at users.sourceforge.net>.
++ Supported features: Hardware Mixer and SRC. For more info, email
++ the ALSA developer list, or <mjander at users.sourceforge.net>.
+
+ To compile this driver as a module, choose M here: the module
+ will be called snd-au8820.
+-
++
+ config SND_AU8830
+- tristate "Aureal Vortex 2"
+- depends on SND
++ tristate "Aureal Vortex 2"
++ depends on SND
+ select SND_MPU401_UART
+ select SND_AC97_CODEC
+- help
++ help
+ Say Y here to include support for Aureal Vortex 2 soundcards.
+
+- Supported features: Hardware Mixer, SRC, EQ and SPDIF output.
+- 3D support code is in place, but not yet useable. For more info,
+- email the ALSA developer list, or <mjander at users.sourceforge.net>.
++ Supported features: Hardware Mixer, SRC, EQ and SPDIF output.
++ 3D support code is in place, but not yet useable. For more info,
++ email the ALSA developer list, or <mjander at users.sourceforge.net>.
+
+ To compile this driver as a module, choose M here: the module
+ will be called snd-au8830.
+-
++
+ config SND_AZT3328
+ tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)"
+ depends on SND && EXPERIMENTAL
+@@ -135,10 +135,10 @@ config SND_AZT3328
+ will be called snd-azt3328.
+
+ config SND_BT87X
+- tristate "Bt87x Audio Capture"
+- depends on SND
++ tristate "Bt87x Audio Capture"
++ depends on SND
+ select SND_PCM
+- help
++ help
+ If you want to record audio from TV cards based on
+ Brooktree Bt878/Bt879 chips, say Y here and read
+ <file:Documentation/sound/alsa/Bt87x.txt>.
+@@ -209,7 +209,7 @@ config SND_CS46XX
+ config SND_CS46XX_NEW_DSP
+ bool "Cirrus Logic (Sound Fusion) New DSP support"
+ depends on SND_CS46XX
+- default y
++ default y
+ help
+ Say Y here to use a new DSP image for SPDIF and dual codecs.
+
+@@ -225,7 +225,7 @@ config SND_CS5535AUDIO
+ referred to as NS CS5535 IO or AMD CS5535 IO companion in
+ various literature. This driver also supports the CS5536 audio
+ device. However, for both chips, on certain boards, you may
+- need to use ac97_quirk=hp_only if your board has physically
++ need to use ac97_quirk=hp_only if your board has physically
+ mapped headphone out to master output. If that works for you,
+ send lspci -vvv output to the mailing list so that your board
+ can be identified in the quirks list.
+@@ -468,11 +468,13 @@ config SND_FM801_TEA575X_BOOL
+ FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media
+ Forte SF256-PCS-02) into the snd-fm801 driver.
+
++ This will enable support for the old V4L1 API.
++
+ config SND_FM801_TEA575X
+ tristate
+ depends on SND_FM801_TEA575X_BOOL
+ default SND_FM801
+- select VIDEO_DEV
++ select VIDEO_V4L1
+
+ config SND_HDA_INTEL
+ tristate "Intel HD Audio"
diff --git a/usr/Makefile b/usr/Makefile
index e938242..5b31c0b 100644
--- a/usr/Makefile
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2534
retrieving revision 1.2535
diff -u -r1.2534 -r1.2535
--- kernel-2.6.spec 9 Aug 2006 18:43:56 -0000 1.2534
+++ kernel-2.6.spec 9 Aug 2006 21:03:07 -0000 1.2535
@@ -426,8 +426,7 @@
# SATA Bits
Patch2200: linux-2.6-sata-promise-pata-ports.patch
-Patch2201: linux-2.6-sata-ata_device_add-oops.patch
-Patch2202: linux-2.6-sata-ahci-suspend.patch
+Patch2201: linux-2.6-sata-ahci-suspend.patch
# ACPI bits
@@ -960,10 +959,8 @@
# Enable PATA ports on Promise SATA.
%patch2200 -p1
-# Fix oops on startup
-%patch2201 -p1
# Fix AHCI Suspend.
-%patch2202 -p1
+%patch2201 -p1
# ACPI patches
@@ -1696,6 +1693,7 @@
* Wed Aug 9 2006 Dave Jones <davej at redhat.com>
- Another lockdep fix for networking.
- Change some hotplug PCI options.
+- Daily update from GregKH's git tree.
* Tue Aug 8 2006 Roland McGrath <roland at redhat.com>
- Fix utrace/ptrace interactions with SELinux.
--- linux-2.6-sata-ata_device_add-oops.patch DELETED ---
More information about the fedora-cvs-commits
mailing list