Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree

Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree

[David Miller]

From: akpm@linux-foundation.org
Date: Mon, 24 Mar 2008 15:31:06 -0700

> Subject: netdev: cassini: use shorter list_splice_init() macro for brevity
> From: "Robert P. J. Day" <rpjday@crashcourse.ca>
> 
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

This was applied to net-2.6.26 yesterday, please drop.

Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree

[Andrew Morton]

On Mon, 24 Mar 2008 15:56:52 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:

> From: akpm@linux-foundation.org
> Date: Mon, 24 Mar 2008 15:31:06 -0700
> 
> > Subject: netdev: cassini: use shorter list_splice_init() macro for brevity
> > From: "Robert P. J. Day" <rpjday@crashcourse.ca>
> > 
> > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 
> This was applied to net-2.6.26 yesterday,

It wasn't in
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git two
hours ago.

> please drop.

That's OK - I'll routinely apply patches which might have already been applied
elsewhere and I'll drop them again when they turn up in a pull.  It turns
out to be less work this way than scrabbling around in mailing lists and
git trees on a per-patch basis.

Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree

[David Miller]

From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 24 Mar 2008 16:10:45 -0700

> On Mon, 24 Mar 2008 15:56:52 -0700 (PDT)
> David Miller <davem@davemloft.net> wrote:
> 
> > From: akpm@linux-foundation.org
> > Date: Mon, 24 Mar 2008 15:31:06 -0700
> > 
> > > Subject: netdev: cassini: use shorter list_splice_init() macro for brevity
> > > From: "Robert P. J. Day" <rpjday@crashcourse.ca>
> > > 
> > > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
> > > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> > 
> > This was applied to net-2.6.26 yesterday,
> 
> It wasn't in
> git+ssh://master.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git two
> hours ago.

"net-2.6.26" not "net-2.6", this patch is not a bug fix but
rather a feature

net-2.6.26 is what is going into the linux-next tree

Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree

[Andrew Morton]

On Mon, 24 Mar 2008 16:21:38 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:

> From: Andrew Morton <akpm@linux-foundation.org>
> Date: Mon, 24 Mar 2008 16:10:45 -0700
> 
> > On Mon, 24 Mar 2008 15:56:52 -0700 (PDT)
> > David Miller <davem@davemloft.net> wrote:
> > 
> > > From: akpm@linux-foundation.org
> > > Date: Mon, 24 Mar 2008 15:31:06 -0700
> > > 
> > > > Subject: netdev: cassini: use shorter list_splice_init() macro for brevity
> > > > From: "Robert P. J. Day" <rpjday@crashcourse.ca>
> > > > 
> > > > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
> > > > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> > > 
> > > This was applied to net-2.6.26 yesterday,
> > 
> > It wasn't in
> > git+ssh://master.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git two
> > hours ago.
> 
> "net-2.6.26" not "net-2.6", this patch is not a bug fix but
> rather a feature
> 
> net-2.6.26 is what is going into the linux-next tree

urgh.  I wish I had some algorithm for detecting when net-2.6.x+1 appears.

Perhaps you could create it on the day 2.6.x is released and leave it empty
for a while.  That way I'll notice when net-2.6.x vanishes and I can switch
to 2.6.x+1 immediately?

Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree

[David Miller]

From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 24 Mar 2008 16:31:05 -0700

> On Mon, 24 Mar 2008 16:21:38 -0700 (PDT)
> David Miller <davem@davemloft.net> wrote:
> 
> > net-2.6.26 is what is going into the linux-next tree
> 
> urgh.  I wish I had some algorithm for detecting when net-2.6.x+1 appears.
> 
> Perhaps you could create it on the day 2.6.x is released and leave it empty
> for a while.  That way I'll notice when net-2.6.x vanishes and I can switch
> to 2.6.x+1 immediately?

Sure, but in this case you were using plain "net-2.6" which is only
for bug fixes and is synced fairly rapidly to Linus, so I don't
see how this is relevant here.

net-2.6 is always just a sync mechanism, rarely generating merge
conflicts with other people, and not something people other than say
Jeff Garzik and John Linville (people who actively push to me) should
generally follow unless they want to.  It's just the same to follow
Linus's tree especially as the -rcX process winds down.

If you had been using net-2.6.24 or something like that, yeah I
could see the issue :-)

Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree

[Andrew Morton]

On Mon, 24 Mar 2008 16:48:10 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:

> From: Andrew Morton <akpm@linux-foundation.org>
> Date: Mon, 24 Mar 2008 16:31:05 -0700
> 
> > On Mon, 24 Mar 2008 16:21:38 -0700 (PDT)
> > David Miller <davem@davemloft.net> wrote:
> > 
> > > net-2.6.26 is what is going into the linux-next tree
> > 
> > urgh.  I wish I had some algorithm for detecting when net-2.6.x+1 appears.
> > 
> > Perhaps you could create it on the day 2.6.x is released and leave it empty
> > for a while.  That way I'll notice when net-2.6.x vanishes and I can switch
> > to 2.6.x+1 immediately?
> 
> Sure, but in this case you were using plain "net-2.6" which is only
> for bug fixes and is synced fairly rapidly to Linus, so I don't
> see how this is relevant here.

The relevance is that I should have net-2.6.26 in my lineup, but I don't
because I didn't know that it was available, and I didn't think to check.

If I _did_ have net-2.6.26 here, I'd have immediately seen that you'd
already applied this patch.

> net-2.6 is always just a sync mechanism, rarely generating merge
> conflicts with other people, and not something people other than say
> Jeff Garzik and John Linville (people who actively push to me) should
> generally follow unless they want to.  It's just the same to follow
> Linus's tree especially as the -rcX process winds down.
> 
> If you had been using net-2.6.24 or something like that, yeah I
> could see the issue :-)

I dropped net-2.6.24 when its git-fetch started failing.  But I have no
automatable way of knowing when to start picking up net-2.6.25.

Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree

[David Miller]

From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 24 Mar 2008 17:00:48 -0700

> I dropped net-2.6.24 when its git-fetch started failing.  But I have no
> automatable way of knowing when to start picking up net-2.6.25.

I'll try to remember to create the next net tree at a suitable
time or move over to a more predictable naming convention,
perhaps something like net-next-2.6 :-)