public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

* linux-next: import of ide quilt series failed
@ 2009-03-12 22:30 Stephen Rothwell
  2009-03-12 22:41 ` Bartlomiej Zolnierkiewicz
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2009-03-12 22:30 UTC (permalink / raw)
  To: Bartlomiej Zolnierkiewicz; +Cc: linux-next

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

Hi Bart,

Today's import of the ide tree failed like this:

ide-floppy-do-not-map-dataless-cmds-to-an-sg.patch
fatal: corrupt patch at line 52

Even patch(1) did not like that patch:

$ patch -p1 -E <.git/rebase-apply/patch 
patching file drivers/ide/ide-atapi.c
patching file drivers/ide/ide-floppy.c
patch unexpectedly ends in middle of line

I will use yesterday's ide tree for today.

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

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

• * Re: linux-next: import of ide quilt series failed
    2009-03-12 22:30 linux-next: import of ide quilt series failed Stephen Rothwell
  @ 2009-03-12 22:41 ` Bartlomiej Zolnierkiewicz
    2009-03-12 23:28   ` Stephen Rothwell
    0 siblings, 1 reply; 4+ messages in thread
  From: Bartlomiej Zolnierkiewicz @ 2009-03-12 22:41 UTC (permalink / raw)
    To: Stephen Rothwell; +Cc: linux-next
  
  On Thursday 12 March 2009, Stephen Rothwell wrote:
  > Hi Bart,
  > 
  > Today's import of the ide tree failed like this:
  > 
  > ide-floppy-do-not-map-dataless-cmds-to-an-sg.patch
  > fatal: corrupt patch at line 52
  > 
  > Even patch(1) did not like that patch:
  > 
  > $ patch -p1 -E <.git/rebase-apply/patch 
  > patching file drivers/ide/ide-atapi.c
  > patching file drivers/ide/ide-floppy.c
  > patch unexpectedly ends in middle of line
  > 
  > I will use yesterday's ide tree for today.
  
  No idea what is wrong as it applies fine here...
  
  I just refreshed the patch in hope that this will fix the issue. :)
  
  Thanks,
  Bart
  
  ^ permalink raw reply	[flat|nested] 4+ messages in thread

• • * Re: linux-next: import of ide quilt series failed
      2009-03-12 22:41 ` Bartlomiej Zolnierkiewicz
    @ 2009-03-12 23:28   ` Stephen Rothwell
      2009-03-13  0:00     ` Stephen Rothwell
      0 siblings, 1 reply; 4+ messages in thread
    From: Stephen Rothwell @ 2009-03-12 23:28 UTC (permalink / raw)
      To: Bartlomiej Zolnierkiewicz; +Cc: linux-next
    
    [-- Attachment #1: Type: text/plain, Size: 438 bytes --]
    
    Hi Bart,
    
    On Thu, 12 Mar 2009 23:41:56 +0100 Bartlomiej Zolnierkiewicz <bzolnier@gmail•com> wrote:
    >
    > No idea what is wrong as it applies fine here...
    
    I think it was just missing a trailing newline.
    
    > I just refreshed the patch in hope that this will fix the issue. :)
    
    I will refetch and see if it works.
    
    Thanks.
    -- 
    Cheers,
    Stephen Rothwell                    sfr@canb•auug.org.au
    http://www.canb.auug.org.au/~sfr/
    
    [-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
    
    ^ permalink raw reply	[flat|nested] 4+ messages in thread

  • • * Re: linux-next: import of ide quilt series failed
        2009-03-12 23:28   ` Stephen Rothwell
      @ 2009-03-13  0:00     ` Stephen Rothwell
        0 siblings, 0 replies; 4+ messages in thread
      From: Stephen Rothwell @ 2009-03-13  0:00 UTC (permalink / raw)
        To: Bartlomiej Zolnierkiewicz; +Cc: linux-next
      
      [-- Attachment #1: Type: text/plain, Size: 264 bytes --]
      
      Hi Bart,
      
      On Fri, 13 Mar 2009 10:28:03 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
      >
      > I will refetch and see if it works.
      
      That fixed it.
      
      -- 
      Cheers,
      Stephen Rothwell                    sfr@canb•auug.org.au
      http://www.canb.auug.org.au/~sfr/
      
      [-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
      
      ^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2009-03-13  0:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-12 22:30 linux-next: import of ide quilt series failed Stephen Rothwell
2009-03-12 22:41 ` Bartlomiej Zolnierkiewicz
2009-03-12 23:28   ` Stephen Rothwell
2009-03-13  0:00     ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox