[kernel/f14/master] Linux 2.6.35.11-rc1
Chuck Ebbert
cebbert at fedoraproject.org
Wed Feb 2 03:16:48 UTC 2011
commit 57d9bc396620579f4fd2d7c0a8e41ef73284e970
Author: Chuck Ebbert <cebbert at redhat.com>
Date: Tue Feb 1 22:15:23 2011 -0500
Linux 2.6.35.11-rc1
Revert patches we already have in the big v4l update:
gspca-sonixj-add-a-flag-in-the-driver_info-table.patch
gspca-sonixj-set-the-flag-for-some-devices.patch
Comment out patches merged upstream:
sched-cure-more-NO_HZ-load-average-woes.patch
posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
mac80211-fix-hard-lockup-in-sta_addba_resp_timer_expired.patch
kernel.spec | 22 ++++++--
linux-2.6-upstream-reverts.patch | 106 ++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 123 insertions(+), 6 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index aa3d4d5..d2c1c3d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
# reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
# scripts/rebase.sh should be made to do that for you, actually.
#
-%global baserelease 81
+%global baserelease 82
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -60,9 +60,9 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 10
+%define stable_update 11
# Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -1501,7 +1501,7 @@ ApplyPatch sched-30-sched-fix-nohz-balance-kick.patch
ApplyPatch sched-35-increment-cache_nice_tries-only-on-periodic-lb.patch
# rhbz#650934
-ApplyPatch sched-cure-more-NO_HZ-load-average-woes.patch
+#ApplyPatch sched-cure-more-NO_HZ-load-average-woes.patch
ApplyPatch btusb-macbookpro-7-1.patch
ApplyPatch btusb-macbookpro-6-2.patch
@@ -1539,7 +1539,7 @@ ApplyPatch inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch
ApplyPatch netlink-make-nlmsg_find_attr-take-a-const-ptr.patch
# rhbz#656264
-ApplyPatch posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
+#ApplyPatch posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
ApplyPatch rtl8180-improve-signal-reporting-for-rtl8185-hardware.patch
ApplyPatch rtl8180-improve-signal-reporting-for-actual-rtl8180-hardware.patch
@@ -1559,7 +1559,7 @@ ApplyPatch orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch
ApplyPatch net-AF_PACKET-vmalloc.patch
# rhbz#667459
-ApplyPatch mac80211-fix-hard-lockup-in-sta_addba_resp_timer_expired.patch
+#ApplyPatch mac80211-fix-hard-lockup-in-sta_addba_resp_timer_expired.patch
# rhbz#652744
ApplyPatch e1000e-cleanup-e1000_sw_lcd_config_ich8lan.patch
@@ -2160,6 +2160,16 @@ fi
# and build.
%changelog
+* Tue Feb 01 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.35.11-82.rc1
+- Linux 2.6.35.11-rc1
+- Revert patches we already have in the big v4l update:
+ gspca-sonixj-add-a-flag-in-the-driver_info-table.patch
+ gspca-sonixj-set-the-flag-for-some-devices.patch
+- Comment out patches merged upstream:
+ sched-cure-more-NO_HZ-load-average-woes.patch
+ posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
+ mac80211-fix-hard-lockup-in-sta_addba_resp_timer_expired.patch
+
* Sun Jan 30 2011 Chuck Ebbert <cebbert at redhat.com>
- Fix oops in sunrpc code (#673207)
diff --git a/linux-2.6-upstream-reverts.patch b/linux-2.6-upstream-reverts.patch
index fba7d24..9eb4848 100644
--- a/linux-2.6-upstream-reverts.patch
+++ b/linux-2.6-upstream-reverts.patch
@@ -1,3 +1,109 @@
+From c6c14330717f9850b4b4c054b81424b9979cd07d Mon Sep 17 00:00:00 2001
+From: Jean-Francois Moine <moinejf at free.fr>
+Date: Tue, 14 Dec 2010 16:15:37 -0300
+Subject: [media] gspca - sonixj: Add a flag in the driver_info table
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Jean-Francois Moine <moinejf at free.fr>
+
+commit c6c14330717f9850b4b4c054b81424b9979cd07d upstream.
+
+Signed-off-by: Jean-François Moine <moinejf at free.fr>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Andi Kleen <ak at linux.intel.com>
+
+---
+ drivers/media/video/gspca/sonixj.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+Index: linux-2.6.35.y/drivers/media/video/gspca/sonixj.c
+===================================================================
+--- linux-2.6.35.y.orig/drivers/media/video/gspca/sonixj.c
++++ linux-2.6.35.y/drivers/media/video/gspca/sonixj.c
+@@ -57,6 +57,7 @@ struct sd {
+ u8 jpegqual; /* webcam quality */
+
+ u8 reg18;
++ u8 flags;
+
+ s8 ag_cnt;
+ #define AG_CNT_START 13
+@@ -1777,7 +1778,8 @@ static int sd_config(struct gspca_dev *g
+ struct cam *cam;
+
+ sd->bridge = id->driver_info >> 16;
+- sd->sensor = id->driver_info;
++ sd->sensor = id->driver_info >> 8;
++ sd->flags = id->driver_info;
+
+ cam = &gspca_dev->cam;
+ if (sd->sensor == SENSOR_ADCM1700) {
+@@ -3001,7 +3003,11 @@ static const struct sd_desc sd_desc = {
+ /* -- module initialisation -- */
+ #define BS(bridge, sensor) \
+ .driver_info = (BRIDGE_ ## bridge << 16) \
+- | SENSOR_ ## sensor
++ | (SENSOR_ ## sensor << 8)
++#define BSF(bridge, sensor, flags) \
++ .driver_info = (BRIDGE_ ## bridge << 16) \
++ | (SENSOR_ ## sensor << 8) \
++ | (flags)
+ static const __devinitdata struct usb_device_id device_table[] = {
+ #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
+ {USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},
+From b2272a49e7df37732d73988f00468ce31e1ebc92 Mon Sep 17 00:00:00 2001
+From: Jean-Francois Moine <moinejf at free.fr>
+Date: Tue, 14 Dec 2010 16:16:16 -0300
+Subject: [media] gspca - sonixj: Set the flag for some devices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Jean-Francois Moine <moinejf at free.fr>
+
+commit b2272a49e7df37732d73988f00468ce31e1ebc92 upstream.
+
+The flag PDN_INV indicates that the sensor pin S_PWR_DN has not the same
+value as other webcams with the same sensor. For now, only two webcams have
+been so detected: the Microsoft's VX1000 and VX3000.
+
+Signed-off-by: Jean-François Moine <moinejf at free.fr>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Andi Kleen <ak at linux.intel.com>
+
+---
+ drivers/media/video/gspca/sonixj.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+Index: linux-2.6.35.y/drivers/media/video/gspca/sonixj.c
+===================================================================
+--- linux-2.6.35.y.orig/drivers/media/video/gspca/sonixj.c
++++ linux-2.6.35.y/drivers/media/video/gspca/sonixj.c
+@@ -88,6 +88,9 @@ enum {
+ u8 jpeg_hdr[JPEG_HDR_SZ];
+ };
+
++/* device flags */
++#define PDN_INV 1 /* inverse pin S_PWR_DN / sn_xxx tables */
++
+ /* V4L2 controls supported by the driver */
+ static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
+ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
+@@ -3004,8 +3007,8 @@ static const __devinitdata struct usb_de
+ {USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},
+ {USB_DEVICE(0x0458, 0x702e), BS(SN9C120, OV7660)},
+ #endif
+- {USB_DEVICE(0x045e, 0x00f5), BS(SN9C105, OV7660)},
+- {USB_DEVICE(0x045e, 0x00f7), BS(SN9C105, OV7660)},
++ {USB_DEVICE(0x045e, 0x00f5), BSF(SN9C105, OV7660, PDN_INV)},
++ {USB_DEVICE(0x045e, 0x00f7), BSF(SN9C105, OV7660, PDN_INV)},
+ {USB_DEVICE(0x0471, 0x0327), BS(SN9C105, MI0360)},
+ {USB_DEVICE(0x0471, 0x0328), BS(SN9C105, MI0360)},
+ {USB_DEVICE(0x0471, 0x0330), BS(SN9C105, MI0360)},
From 615661f3948a066fd22a36fe8ea0c528b75ee373 Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Sun, 22 Aug 2010 20:54:08 +0200
diff --git a/sources b/sources
index 3a177ae..eb4c302 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
0741b3219a009fdfc41c766416007fcf patch-2.6.35.10.bz2
+9fd4da4625204930de2f469cdff52617 patch-2.6.35.11-rc1.bz2
More information about the scm-commits
mailing list