linux-next: import of usb series failed

linux-next: import of usb series failed

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

Hi Greg,

Importing the usb quilt series failed like this:

usb-ftdi_sio-correct-spelling-in-header-files.patch
error: patch failed: drivers/usb/serial/ftdi_sio_ids.h:185
error: drivers/usb/serial/ftdi_sio_ids.h: patch does not apply

I removed that patch for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: import of usb series failed

[Greg KH]

On Thu, Feb 18, 2010 at 10:55:00AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Importing the usb quilt series failed like this:
> 
> usb-ftdi_sio-correct-spelling-in-header-files.patch
> error: patch failed: drivers/usb/serial/ftdi_sio_ids.h:185
> error: drivers/usb/serial/ftdi_sio_ids.h: patch does not apply
> 
> I removed that patch for today.

Very wierd, you must have gotten this just as I updated my tree.  It
should all be fine tomorrow, if not, please let me know.

thanks,

greg k-h

Re: linux-next: import of usb series failed

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

Hi Greg,

On Wed, 17 Feb 2010 16:21:44 -0800 Greg KH <greg@kroah.com> wrote:
>
> Very wierd, you must have gotten this just as I updated my tree.  It

Yeah, that is possible.

> should all be fine tomorrow, if not, please let me know.

Great, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: import of usb series failed

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

Hi Greg,

On Thu, 18 Feb 2010 13:22:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 17 Feb 2010 16:21:44 -0800 Greg KH <greg@kroah.com> wrote:
> >
> > Very wierd, you must have gotten this just as I updated my tree.  It
> 
> Yeah, that is possible.
> 
> > should all be fine tomorrow, if not, please let me know.
> 
> Great, thanks.

I got the same today.  Is this a case of Git being a bit more picky about
applying patches that quilt?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: import of usb series failed

[Greg KH]

On Fri, Feb 19, 2010 at 05:52:18PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Thu, 18 Feb 2010 13:22:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Wed, 17 Feb 2010 16:21:44 -0800 Greg KH <greg@kroah.com> wrote:
> > >
> > > Very wierd, you must have gotten this just as I updated my tree.  It
> > 
> > Yeah, that is possible.
> > 
> > > should all be fine tomorrow, if not, please let me know.
> > 
> > Great, thanks.
> 
> I got the same today.  Is this a case of Git being a bit more picky about
> applying patches that quilt?

Very wierd.  I just ran 'git quiltimport' on my whole tree onto Linus's
latest git tree and it worked just fine.

What is the command you are using here to do this?  Perhaps there is
some other tree modifying this file causing a problem?

odd,

greg k-h

Re: linux-next: import of usb series failed

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 4392 bytes --]

Hi Greg,

[This is a bit long - I wrote it while I was investigating.  Skip to the
end for the possible resolution.]

On Fri, 19 Feb 2010 07:53:43 -0800 Greg KH <greg@kroah.com> wrote:
>
> Very wierd.  I just ran 'git quiltimport' on my whole tree onto Linus's
> latest git tree and it worked just fine.
> 
> What is the command you are using here to do this?  Perhaps there is
> some other tree modifying this file causing a problem?
> 
> odd,

Yes, indeed.

Here is an excerpt from the quilt import log for yesterday:

-------------------------------------------------------------------------
Importing driver-core.current based on 2.6.33-rc8
Unchanged quilt series driver-core.current
Importing tty.current based on quilt/driver-core.current
Unchanged quilt series tty.current
Importing usb.current based on quilt/tty.current
Unchanged quilt series usb.current
Importing staging.current based on quilt/usb.current
Unchanged quilt series staging.current
Importing driver-core based on quilt/staging.current
$ git clone -s -l -n -q . ../quilt-tmp
$ cd ../quilt-tmp
$ git reset --hard 724e6d3fe8003c3f60bf404bf22e4e331327c596
HEAD is now at 724e6d3 Linux 2.6.33-rc8
$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core
kobject-example-spelling-fixes.patch
	.
	.
	.
msi-laptop-depends-on-rfkill.patch
$ cd ../next
$ git fetch -f ../quilt-tmp master:quilt/driver-core
From ../quilt-tmp
 + 3d6a19d...ce9ae3d master     -> quilt/driver-core  (forced update)
Importing tty based on quilt/driver-core
$ cd ../quilt-tmp
$ git reset --hard ce9ae3d4576783400109975a5a25f4bd9202cf7c
HEAD is now at ce9ae3d msi-laptop: depends on RFKILL
$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty
serial-fit-blackfin-uart-over-sport-driver-into-common-uart-infrastructure.patch
	.
	.
	.
tty-fix-the-ldisc-hangup-race.patch
$ cd ../next
$ git fetch -f ../quilt-tmp master:quilt/tty
From ../quilt-tmp
 + d99adec...e686c28 master     -> quilt/tty  (forced update)
Importing usb based on quilt/tty
$ cd ../quilt-tmp
$ git reset --hard e686c28435a750e78ac3eb44ea8295c5a3ce3461
HEAD is now at e686c28 tty: Fix the ldisc hangup race
$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb
usb-mxc-add-i.mx21-specific-usb-host-controller-driver.patch
	.
	.
	.
usb-gadget-add-devtype-support-for-ethernet-functions.patch
usb-serial-eliminate-useless-code.patch
usb-ftdi_sio-correct-spelling-in-header-files.patch
error: patch failed: drivers/usb/serial/ftdi_sio_ids.h:185
error: drivers/usb/serial/ftdi_sio_ids.h: patch does not apply
-------------------------------------------------------------------------

So, since the ".current" series are all empty, I am importing the
driver-core, tty and then usb series on top of v2.6.33-rc8.  I have just
done this again manually and the failure still happens (I have not
refetched your quilt series since yesterday.

At this point, the file drivers/usb/serial/ftdi_sio_ids.h from line 185
looks like this:

#define FTDI_ELV_PCD200_PID	0xF06C	/* PC-Datenlogger (PCD 200) */
#define FTDI_ELV_ULA200_PID	0xF06D	/* USB-LCD-Ansteuerung (ULA 200) */
#define FTDI_ELV_ALC8500_PID	0xF06E	/* ALC 8500 Expert */
#define FTDI_ELV_FHZ1000PC_PID	0xF06F	/* FHZ 1000 PC */
#define FTDI_ELV_UR100_PID	0xFB58	/* USB-RS232-Umsetzer (UR 100) */
#define FTDI_ELV_UM100_PID	0xFB5A	/* USB-Modul UM 100 */

The patch hunk looks like this:

@@ -185,7 +185,7 @@
 #define FTDI_ELV_TFD128_PID	0xE0EC	/* ELV Temperatur-Feuchte-Datenlogger TFD 128 */
 #define FTDI_ELV_FM3RX_PID	0xE0ED	/* ELV Messwertuebertragung FM3 RX */
 #define FTDI_ELV_WS777_PID	0xE0EE	/* Conrad WS 777 */
-#define FTDI_ELV_EM1010PC_PID	0xE0EF	/* Engery monitor EM 1010 PC */
+#define FTDI_ELV_EM1010PC_PID	0xE0EF	/* Energy monitor EM 1010 PC */
 #define FTDI_ELV_CSI8_PID	0xE0F0	/* Computer-Schalt-Interface (CSI 8) */
 #define FTDI_ELV_EM1000DL_PID	0xE0F1	/* PC-Datenlogger fuer Energiemonitor (EM 1000 DL) */
 #define FTDI_ELV_PCK100_PID	0xE0F2	/* PC-Kabeltester (PCK 100) */

Between v2.6.33-rc8 and the head if Linus' tree thee are two patches that
change this file.  So I guess the BASE in the driver-core.current series
files needs updating.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: import of usb series failed

[Greg KH]

On Sat, Feb 20, 2010 at 12:02:07PM +1100, Stephen Rothwell wrote:
> So, since the ".current" series are all empty, I am importing the
> driver-core, tty and then usb series on top of v2.6.33-rc8.  I have just
> done this again manually and the failure still happens (I have not
> refetched your quilt series since yesterday.
> 
> At this point, the file drivers/usb/serial/ftdi_sio_ids.h from line 185
> looks like this:
> 
> #define FTDI_ELV_PCD200_PID	0xF06C	/* PC-Datenlogger (PCD 200) */
> #define FTDI_ELV_ULA200_PID	0xF06D	/* USB-LCD-Ansteuerung (ULA 200) */
> #define FTDI_ELV_ALC8500_PID	0xF06E	/* ALC 8500 Expert */
> #define FTDI_ELV_FHZ1000PC_PID	0xF06F	/* FHZ 1000 PC */
> #define FTDI_ELV_UR100_PID	0xFB58	/* USB-RS232-Umsetzer (UR 100) */
> #define FTDI_ELV_UM100_PID	0xFB5A	/* USB-Modul UM 100 */
> 
> The patch hunk looks like this:
> 
> @@ -185,7 +185,7 @@
>  #define FTDI_ELV_TFD128_PID	0xE0EC	/* ELV Temperatur-Feuchte-Datenlogger TFD 128 */
>  #define FTDI_ELV_FM3RX_PID	0xE0ED	/* ELV Messwertuebertragung FM3 RX */
>  #define FTDI_ELV_WS777_PID	0xE0EE	/* Conrad WS 777 */
> -#define FTDI_ELV_EM1010PC_PID	0xE0EF	/* Engery monitor EM 1010 PC */
> +#define FTDI_ELV_EM1010PC_PID	0xE0EF	/* Energy monitor EM 1010 PC */
>  #define FTDI_ELV_CSI8_PID	0xE0F0	/* Computer-Schalt-Interface (CSI 8) */
>  #define FTDI_ELV_EM1000DL_PID	0xE0F1	/* PC-Datenlogger fuer Energiemonitor (EM 1000 DL) */
>  #define FTDI_ELV_PCK100_PID	0xE0F2	/* PC-Kabeltester (PCK 100) */
> 
> Between v2.6.33-rc8 and the head if Linus' tree thee are two patches that
> change this file.  So I guess the BASE in the driver-core.current series
> files needs updating.

Yes, that seems to be the problem here.

I have been doing the BASE tag as a -rc level tag (or rc-gitX tag), can
I use a SHA1 of Linus's tree to base this against instead?  Would that
work ok with your scripts?

thanks for figureing this out, sorry for the trouble, this was my fault.

greg k-h

Re: linux-next: import of usb series failed

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

Hi Greg,

On Tue, 23 Feb 2010 18:16:24 -0800 Greg KH <greg@kroah.com> wrote:
>
> Yes, that seems to be the problem here.
> 
> I have been doing the BASE tag as a -rc level tag (or rc-gitX tag), can
> I use a SHA1 of Linus's tree to base this against instead?  Would that
> work ok with your scripts?

What ever "git describe" gives you is OK as a BASE.  A SHA1 will work as
well, as does a ...-gitx name.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: import of usb series failed

[Greg KH]

On Wed, Feb 24, 2010 at 03:01:56PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Tue, 23 Feb 2010 18:16:24 -0800 Greg KH <greg@kroah.com> wrote:
> >
> > Yes, that seems to be the problem here.
> > 
> > I have been doing the BASE tag as a -rc level tag (or rc-gitX tag), can
> > I use a SHA1 of Linus's tree to base this against instead?  Would that
> > work ok with your scripts?
> 
> What ever "git describe" gives you is OK as a BASE.  A SHA1 will work as
> well, as does a ...-gitx name.

Ok, I'll work on changing my scripts to use a SHA1 or at least a more
"close" version of what the patches should be against.  Sorry for the
problem.

greg k-h

Re: linux-next: import of usb series failed

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 393 bytes --]

Hi Greg,

On Thu, 25 Feb 2010 09:54:30 -0800 Greg KH <greg@kroah.com> wrote:
>
> Ok, I'll work on changing my scripts to use a SHA1 or at least a more
> "close" version of what the patches should be against.  Sorry for the
> problem.

OK, thanks.  It all looks good today.


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]