From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>, netdev@vger•kernel.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andreas Meissner <andreas.meissner@sphairon•com>,
Patrick McHardy <kaber@trash•net>
Subject: linux-next: manual merge of the net tree with Linus' tree
Date: Wed, 12 May 2010 12:26:19 +1000 [thread overview]
Message-ID: <20100512122619.be64cea0.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the net tree got a conflict in
net/ipv4/ipmr.c between commit bbd725435ddb1cac732f7a8c23c21ff67f24c60f
("IPv4: unresolved multicast route cleanup") from Linus' tree and commits
e258beb22f4d3ea3dc88586ffc9c990d0eb03380 ("ipv4: ipmr: move unres_queue
and timer to per-namespace data") and
0c12295a741d3186987f96f518cfbdaf01abb087 ("ipv4: ipmr: move mroute data
into seperate structure") from the net tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc net/ipv4/ipmr.c
index ec19a89,f3f1c6b..0000000
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@@ -750,12 -995,10 +995,11 @@@ ipmr_cache_unresolved(struct mr_table *
return err;
}
- atomic_inc(&net->ipv4.cache_resolve_queue_len);
- c->next = mfc_unres_queue;
- mfc_unres_queue = c;
+ atomic_inc(&mrt->cache_resolve_queue_len);
+ list_add(&c->list, &mrt->mfc_unres_queue);
- mod_timer(&mrt->ipmr_expire_timer, c->mfc_un.unres.expires);
+ if (atomic_read(&net->ipv4.cache_resolve_queue_len) == 1)
- mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
++ mod_timer(&mrt->ipmr_expire_timer, c->mfc_un.unres.expires);
}
/*
next reply other threads:[~2010-05-12 2:26 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-12 2:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-07 21:23 linux-next: manual merge of the net tree with Linus' tree Stephen Rothwell
2022-12-08 6:17 ` Juergen Gross
2021-03-18 21:29 Stephen Rothwell
2021-03-19 15:55 ` Leon Romanovsky
2021-03-20 19:28 ` Marc Kleine-Budde
2021-03-20 19:42 ` Linus Torvalds
2021-03-21 9:14 ` Leon Romanovsky
2020-06-09 23:30 Stephen Rothwell
2020-06-09 23:58 ` Arjun Roy
2019-11-19 21:07 Stephen Rothwell
2019-07-21 23:41 Stephen Rothwell
2018-06-28 22:14 Stephen Rothwell
2017-11-26 22:42 Stephen Rothwell
2016-10-15 21:13 Stephen Rothwell
2016-10-17 11:41 ` Mintz, Yuval
2011-09-22 5:16 Stephen Rothwell
2011-09-19 4:51 Stephen Rothwell
2011-09-19 6:55 ` Dmitry Kravkov
2011-09-19 15:54 ` Joe Perches
2011-09-19 16:04 ` Dmitry Kravkov
2011-09-19 4:41 Stephen Rothwell
2011-07-18 4:41 Stephen Rothwell
2011-07-18 19:33 ` David Miller
2011-04-08 3:45 Stephen Rothwell
2011-04-08 3:49 ` David Miller
2010-12-26 23:41 Stephen Rothwell
2010-12-27 2:21 ` David Miller
2010-10-22 1:19 Stephen Rothwell
2010-07-21 2:04 Stephen Rothwell
2010-07-21 2:31 ` Herbert Xu
2010-07-21 3:27 ` David Miller
2010-07-21 3:44 ` Stephen Rothwell
2010-05-17 2:09 Stephen Rothwell
2010-05-17 5:28 ` David Miller
2010-05-17 6:24 ` Stephen Rothwell
2010-04-27 1:28 Stephen Rothwell
2010-04-27 1:28 Stephen Rothwell
2010-04-28 0:05 ` David Miller
2010-04-28 0:47 ` Stephen Rothwell
2010-04-14 1:45 Stephen Rothwell
2010-04-14 1:47 ` David Miller
2010-04-14 1:52 ` Stephen Rothwell
2010-04-14 2:00 ` David Miller
2010-04-09 0:41 Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 3:20 ` Cong Wang
2010-04-07 5:28 ` Stephen Rothwell
2010-03-01 3:20 Stephen Rothwell
2010-03-01 3:21 ` David Miller
2010-01-11 2:31 Stephen Rothwell
2010-01-11 6:50 ` David Miller
2010-01-11 7:56 ` Stephen Rothwell
2010-01-11 7:59 ` David Miller
2010-01-11 8:49 ` Stephen Rothwell
2009-09-02 3:37 Stephen Rothwell
2009-09-02 7:33 ` David Miller
2009-09-02 8:52 ` Stephen Rothwell
2009-08-07 1:58 Stephen Rothwell
2009-06-03 2:20 Stephen Rothwell
2009-06-03 10:33 ` David Miller
2009-05-19 3:39 Stephen Rothwell
2009-05-19 4:09 ` David Miller
2009-05-19 4:43 ` Stephen Rothwell
2009-02-26 2:48 Stephen Rothwell
2009-02-27 7:17 ` David Miller
2009-02-02 3:13 Stephen Rothwell
2009-02-03 7:51 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100512122619.be64cea0.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andreas.meissner@sphairon$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=kaber@trash$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox