rpms/kernel/devel patch-2.6.31-rc4-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.1102, 1.1103 config-generic, 1.313, 1.314 kernel.spec, 1.1663, 1.1664 linux-2.6-fix-usb-serial-autosuspend.diff, 1.1, 1.2 sources, 1.1060, 1.1061 upstream, 1.974, 1.975

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13519

Modified Files:
	.cvsignore config-generic kernel.spec 
	linux-2.6-fix-usb-serial-autosuspend.diff sources upstream 
Added Files:
	patch-2.6.31-rc4-git2.bz2.sign 
Log Message:
* Tue Jul 28 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.101.rc4.git2
- 2.6.31-rc4-git2
- rebase linux-2.6-fix-usb-serial-autosuspend.diff
- config changes:
 - USB_GSPCA_SN9C20X=m (_EVDEV=y)



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

iD8DBQBKbuthyGugalF9Dw4RArbhAKCT3DrMQa/hOpEDQQXhavc/JVFVwgCfaGA1
fMVyNGa35kAyRtSnK68vF7E=
=3tL8
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1102
retrieving revision 1.1103
diff -u -p -r1.1102 -r1.1103
--- .cvsignore	23 Jul 2009 17:45:33 -0000	1.1102
+++ .cvsignore	28 Jul 2009 13:35:42 -0000	1.1103
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc4.bz2
+patch-2.6.31-rc4-git2.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- config-generic	27 Jul 2009 17:42:04 -0000	1.313
+++ config-generic	28 Jul 2009 13:35:42 -0000	1.314
@@ -2813,6 +2813,8 @@ CONFIG_USB_GSPCA_OV519=m
 CONFIG_USB_GSPCA_OV534=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
 CONFIG_USB_GSPCA_SONIXB=m
 CONFIG_USB_GSPCA_SONIXJ=m
 CONFIG_USB_GSPCA_SPCA500=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1663
retrieving revision 1.1664
diff -u -p -r1.1663 -r1.1664
--- kernel.spec	28 Jul 2009 11:24:17 -0000	1.1663
+++ kernel.spec	28 Jul 2009 13:35:42 -0000	1.1664
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -109,7 +109,7 @@ Summary: The Linux kernel
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -1898,6 +1898,12 @@ fi
 # and build.
 
 %changelog
+* Tue Jul 28 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.101.rc4.git2
+- 2.6.31-rc4-git2
+- rebase linux-2.6-fix-usb-serial-autosuspend.diff
+- config changes:
+ - USB_GSPCA_SN9C20X=m (_EVDEV=y)
+
 * Tue Jul 28 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: cleanup userspace API, various bugfixes.
   Looks worse than it is, register macros got cleaned up, which

linux-2.6-fix-usb-serial-autosuspend.diff:
 usb-serial.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Index: linux-2.6-fix-usb-serial-autosuspend.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-fix-usb-serial-autosuspend.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-fix-usb-serial-autosuspend.diff	18 Jul 2009 22:50:13 -0000	1.1
+++ linux-2.6-fix-usb-serial-autosuspend.diff	28 Jul 2009 13:35:42 -0000	1.2
@@ -7,10 +7,10 @@ Date:   Sat Jul 18 07:19:04 2009 +0200
     the usage counter must be increased only after autoresumption
 
 diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
-index bd7581b..c6f69c0 100644
+index 99188c9..3d1a756 100644
 --- a/drivers/usb/serial/usb-serial.c
 +++ b/drivers/usb/serial/usb-serial.c
-@@ -214,15 +214,13 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
+@@ -216,16 +216,15 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
  		goto bailout_port_put;
  	}
  
@@ -24,10 +24,12 @@ index bd7581b..c6f69c0 100644
  	/* If the console is attached, the device is already open */
 -	if (port->port.count == 1 && !port->console) {
 +	if (!port->port.count && !port->console) {
- 
+ 		first = 1;
++
  		/* lock this module before we call it
  		 * this may fail, which means we must bail out,
-@@ -240,12 +238,16 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
+ 		 * safe because we are called with BKL held */
+@@ -242,6 +241,8 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
  		if (retval)
  			goto bailout_module_put;
  
@@ -36,9 +38,10 @@ index bd7581b..c6f69c0 100644
  		/* only call the device specific open if this
  		 * is the first time the port is opened */
  		retval = serial->type->open(tty, port, filp);
- 		if (retval)
+@@ -249,6 +250,8 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
  			goto bailout_interface_put;
  		mutex_unlock(&serial->disc_mutex);
+ 		set_bit(ASYNCB_INITIALIZED, &port->port.flags);
 +	} else {
 +		++port->port.count;
  	}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1060
retrieving revision 1.1061
diff -u -p -r1.1060 -r1.1061
--- sources	23 Jul 2009 17:45:33 -0000	1.1060
+++ sources	28 Jul 2009 13:35:42 -0000	1.1061
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 879f514ce009b9a7535b743f71cd3c02  patch-2.6.31-rc4.bz2
+a938ea7066785d6cbeba8188aa15c7c8  patch-2.6.31-rc4-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -p -r1.974 -r1.975
--- upstream	23 Jul 2009 17:45:33 -0000	1.974
+++ upstream	28 Jul 2009 13:35:42 -0000	1.975
@@ -1,3 +1,4 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc4.bz2
 
+patch-2.6.31-rc4-git2.bz2