* + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree
@ 2008-03-24 22:31 akpm
2008-03-24 22:56 ` David Miller
0 siblings, 1 reply; 8+ messages in thread
From: akpm @ 2008-03-24 22:31 UTC (permalink / raw)
To: mm-commits; +Cc: rpjday
The patch titled
netdev: cassini: use shorter list_splice_init() macro for brevity
has been added to the -mm tree. Its filename is
netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
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>
---
drivers/net/cassini.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff -puN drivers/net/cassini.c~netdev-cassini-use-shorter-list_splice_init-macro-for-brevity drivers/net/cassini.c
--- a/drivers/net/cassini.c~netdev-cassini-use-shorter-list_splice_init-macro-for-brevity
+++ a/drivers/net/cassini.c
@@ -532,8 +532,7 @@ static void cas_spare_free(struct cas *c
/* free spare buffers */
INIT_LIST_HEAD(&list);
spin_lock(&cp->rx_spare_lock);
- list_splice(&cp->rx_spare_list, &list);
- INIT_LIST_HEAD(&cp->rx_spare_list);
+ list_splice_init(&cp->rx_spare_list, &list);
spin_unlock(&cp->rx_spare_lock);
list_for_each_safe(elem, tmp, &list) {
cas_page_free(cp, list_entry(elem, cas_page_t, list));
@@ -546,13 +545,11 @@ static void cas_spare_free(struct cas *c
* lock than used everywhere else to manipulate this list.
*/
spin_lock(&cp->rx_inuse_lock);
- list_splice(&cp->rx_inuse_list, &list);
- INIT_LIST_HEAD(&cp->rx_inuse_list);
+ list_splice_init(&cp->rx_inuse_list, &list);
spin_unlock(&cp->rx_inuse_lock);
#else
spin_lock(&cp->rx_spare_lock);
- list_splice(&cp->rx_inuse_list, &list);
- INIT_LIST_HEAD(&cp->rx_inuse_list);
+ list_splice_init(&cp->rx_inuse_list, &list);
spin_unlock(&cp->rx_spare_lock);
#endif
list_for_each_safe(elem, tmp, &list) {
@@ -573,8 +570,7 @@ static void cas_spare_recover(struct cas
/* make a local copy of the list */
INIT_LIST_HEAD(&list);
spin_lock(&cp->rx_inuse_lock);
- list_splice(&cp->rx_inuse_list, &list);
- INIT_LIST_HEAD(&cp->rx_inuse_list);
+ list_splice_init(&cp->rx_inuse_list, &list);
spin_unlock(&cp->rx_inuse_lock);
list_for_each_safe(elem, tmp, &list) {
_
Patches currently in -mm which might be from rpjday@crashcourse.ca are
origin.patch
git-ieee1394.patch
lapb-use-the-shorter-list_head-form-for-brevity.patch
bluetooth-replace-deprecated-rw_lock_unlocked-macros.patch
git-nfsd.patch
git-sparc64.patch
xtensa-warn-about-including-asm-rwsemh-directly.patch
xtensa-use-newer-__spin_lock_unlocked-macro.patch
kernel-explicitly-include-required-header-files-under-kernel.patch
remove-superfluous-include-of-stringh-from-percpuh.patch
kbuild-remove-duplicate-conflicting-entry-for-oomh.patch
kbuild-move-files-that-dont-check-__kernel__.patch
isdn-fix-obvious-cut-and-paste-error-in-st5481_usbc.patch
keys-explicitly-include-required-slabh-header-file.patch
generalize-asm-generic-ioctlh-to-allow-overriding-values.patch
edac-use-the-shorter-list_head-for-brevity.patch
afs-use-the-shorter-list_head-for-brevity.patch
netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree
2008-03-24 22:31 + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree akpm
@ 2008-03-24 22:56 ` David Miller
2008-03-24 23:10 ` Andrew Morton
0 siblings, 1 reply; 8+ messages in thread
From: David Miller @ 2008-03-24 22:56 UTC (permalink / raw)
To: linux-kernel, akpm; +Cc: mm-commits, rpjday
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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree
2008-03-24 22:56 ` David Miller
@ 2008-03-24 23:10 ` Andrew Morton
2008-03-24 23:21 ` David Miller
0 siblings, 1 reply; 8+ messages in thread
From: Andrew Morton @ 2008-03-24 23:10 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, rpjday
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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree
2008-03-24 23:10 ` Andrew Morton
@ 2008-03-24 23:21 ` David Miller
2008-03-24 23:31 ` Andrew Morton
0 siblings, 1 reply; 8+ messages in thread
From: David Miller @ 2008-03-24 23:21 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, rpjday
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree
2008-03-24 23:21 ` David Miller
@ 2008-03-24 23:31 ` Andrew Morton
2008-03-24 23:48 ` David Miller
0 siblings, 1 reply; 8+ messages in thread
From: Andrew Morton @ 2008-03-24 23:31 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, rpjday
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?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree
2008-03-24 23:31 ` Andrew Morton
@ 2008-03-24 23:48 ` David Miller
2008-03-25 0:00 ` Andrew Morton
0 siblings, 1 reply; 8+ messages in thread
From: David Miller @ 2008-03-24 23:48 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, rpjday
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 :-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree
2008-03-24 23:48 ` David Miller
@ 2008-03-25 0:00 ` Andrew Morton
2008-03-25 0:14 ` David Miller
0 siblings, 1 reply; 8+ messages in thread
From: Andrew Morton @ 2008-03-25 0:00 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, rpjday
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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree
2008-03-25 0:00 ` Andrew Morton
@ 2008-03-25 0:14 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2008-03-25 0:14 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, rpjday
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 :-)
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-03-25 0:14 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-24 22:31 + netdev-cassini-use-shorter-list_splice_init-macro-for-brevity.patch added to -mm tree akpm
2008-03-24 22:56 ` David Miller
2008-03-24 23:10 ` Andrew Morton
2008-03-24 23:21 ` David Miller
2008-03-24 23:31 ` Andrew Morton
2008-03-24 23:48 ` David Miller
2008-03-25 0:00 ` Andrew Morton
2008-03-25 0:14 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.