linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: import of ttydev failed
@ 2008-08-19  0:49 Stephen Rothwell
  2008-08-19  8:21 ` Alan Cox
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2008-08-19  0:49 UTC (permalink / raw)
  To: Alan Cox; +Cc: linux-next

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

Hi Alan,

Firstly, can you put a line in your series files that looks like this:

# BASE <sha1|git commit identifier>

This could replace the current first line you have or be another line
with the same id in it.

Next, the import failed like this:

tty-remove-resize-special
error: No changes

The same for tty-fix-cdc-acm.

Not a biggy, I just removed those patches from the series file.

-- 
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] 6+ messages in thread

* Re: linux-next: import of ttydev failed
  2008-08-19  0:49 linux-next: import of ttydev failed Stephen Rothwell
@ 2008-08-19  8:21 ` Alan Cox
  2008-08-19  8:44   ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Alan Cox @ 2008-08-19  8:21 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next

On Tue, 19 Aug 2008 10:49:52 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Firstly, can you put a line in your series files that looks like this:
> 
> # BASE <sha1|git commit identifier>
> 
> This could replace the current first line you have or be another line
> with the same id in it.

Its on my todo list - but I need to dig into the innards of stgit to do
that. Fixed the others (forgot to do a clean after merging stuff)

Alan

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

* Re: linux-next: import of ttydev failed
  2008-08-19  8:44   ` Stephen Rothwell
@ 2008-08-19  8:38     ` Alan Cox
  2008-08-19 23:49       ` Stephen Rothwell
  2008-08-20  8:49       ` Takashi Iwai
  0 siblings, 2 replies; 6+ messages in thread
From: Alan Cox @ 2008-08-19  8:38 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next

> If that first line is auto generated by stgit, I can just use it - I
> thought you were putting it in by hand and dind't want to depend on its
> format.  I will add another pattern to my script.

The "series" file is automatically generated by stgit.

Alan

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

* Re: linux-next: import of ttydev failed
  2008-08-19  8:21 ` Alan Cox
@ 2008-08-19  8:44   ` Stephen Rothwell
  2008-08-19  8:38     ` Alan Cox
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2008-08-19  8:44 UTC (permalink / raw)
  To: Alan Cox; +Cc: linux-next

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

Hi Alan,

On Tue, 19 Aug 2008 09:21:57 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> On Tue, 19 Aug 2008 10:49:52 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Firstly, can you put a line in your series files that looks like this:
> > 
> > # BASE <sha1|git commit identifier>
> > 
> > This could replace the current first line you have or be another line
> > with the same id in it.
> 
> Its on my todo list - but I need to dig into the innards of stgit to do
> that. Fixed the others (forgot to do a clean after merging stuff)

If that first line is auto generated by stgit, I can just use it - I
thought you were putting it in by hand and dind't want to depend on its
format.  I will add another pattern to my script.

-- 
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] 6+ messages in thread

* Re: linux-next: import of ttydev failed
  2008-08-19  8:38     ` Alan Cox
@ 2008-08-19 23:49       ` Stephen Rothwell
  2008-08-20  8:49       ` Takashi Iwai
  1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2008-08-19 23:49 UTC (permalink / raw)
  To: Alan Cox; +Cc: linux-next

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

Hi Alan,

On Tue, 19 Aug 2008 09:38:56 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> > If that first line is auto generated by stgit, I can just use it - I
> > thought you were putting it in by hand and dind't want to depend on its
> > format.  I will add another pattern to my script.
> 
> The "series" file is automatically generated by stgit.

OK, I will match what it has, 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] 6+ messages in thread

* Re: linux-next: import of ttydev failed
  2008-08-19  8:38     ` Alan Cox
  2008-08-19 23:49       ` Stephen Rothwell
@ 2008-08-20  8:49       ` Takashi Iwai
  1 sibling, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2008-08-20  8:49 UTC (permalink / raw)
  To: Alan Cox; +Cc: Stephen Rothwell, linux-next

At Tue, 19 Aug 2008 09:38:56 +0100,
Alan Cox wrote:
> 
> > If that first line is auto generated by stgit, I can just use it - I
> > thought you were putting it in by hand and dind't want to depend on its
> > format.  I will add another pattern to my script.
> 
> The "series" file is automatically generated by stgit.

Just wondering - if you are using stgit, why not push it as a git tree
as is?  Once when stgit tree is pushed to the outside, it looks just
like a normal git tree.  You'd need to push with -f at each time (and
ditto for pull), though.


Takashi

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

end of thread, other threads:[~2008-08-20  8:49 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-08-19  0:49 linux-next: import of ttydev failed Stephen Rothwell
2008-08-19  8:21 ` Alan Cox
2008-08-19  8:44   ` Stephen Rothwell
2008-08-19  8:38     ` Alan Cox
2008-08-19 23:49       ` Stephen Rothwell
2008-08-20  8:49       ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).