The annotated tag, v3.0-rc1 has been created
at 2a23a510142a1ab597f0214e4fadb3c7350bbb8d (tag)
tagging 55922c9d1b84b89cb946c777fddccb3247e7df2c (commit)
replaces v2.6.39
tagged by Linus Torvalds
on Sun May 29 17:45:31 2011 -0700
- Shortlog ------------------------------------------------------------
Linux 3.0-rc1
Version numbers? We can increment them!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
iEYEABECAAYFAk3i6MYACgkQF3YsRnbiHLunGwCfXfMDDvDv025tyC368DQm1sIL
LQUAoIZGzaBGvHijM+KutlYhWI1lbnx7
=pnaH
-----END PGP SIGNATURE-----
Andrew Lunn (1):
batman-adv: Set the txqueuelen to zero when creating soft interface
Antonio Quartulli (4):
batman-adv: orig_hash_find() manages rcu_lock/unlock internally
batman-adv: Move definition of atomic_dec_not_zero() into main.h
batman-adv: fix gw_node_update() and gw_election()
batman-adv: rename everything from *hna* into *tt* (translation table)
Daniele Furlan (1):
batman-adv: remove duplicate code from function is_bidirectional_neigh()
David Decotigny (1):
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
David S. Miller (4):
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Linus Lüssing (5):
batman-adv: Move bonding / iface alternating router search to own functions
batman-adv: Make gateway_get_selected type safe
batman-adv: Simplify gw_check_election(), use gw_get_selected()
batman-adv: Make orig_node->router an rcu protected pointer
batman-adv: Protect global TQ window with a spinlock
Linus Torvalds (1):
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
Marek Lindner (6):
batman-adv: concentrate all curr_gw related rcu operations in select/deselect functions
batman-adv: Make bat_priv->primary_if an rcu protected pointer
batman-adv: remove misplaced comment
batman-adv: multi vlan support for bridge loop detection
batman-adv: Fix refcount imbalance in find_router
batman-adv: reset broadcast flood protection on error
Michał Mirosław (1):
net: batman-adv: remove rx_csum ethtool_ops
Paul E. McKenney (3):
batman,rcu: convert call_rcu(gw_node_free_rcu) to kfree_rcu
batman,rcu: convert call_rcu(neigh_node_free_rcu) to kfree()
batman,rcu: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu
Simon Wunderlich (1):
batman-adv: protect softif_neigh by rcu
Sven Eckelmann (4):
batman-adv: Remove unnecessary hardif_list_lock
batman-adv: Avoid deadlock between rtnl_lock and s_active
batman-adv: Remove multiline comments from line ending
batman-adv: Add missing hardif_free_ref in forw_packet_free
-----------------------------------------------------------------------
--
linux integration
The following commit has been merged in the master branch:
commit a726fdad131019166a46bace12da4653c1a592b3
Author: Antonio Quartulli <ordex(a)autistici.org>
Date: Sun May 29 00:26:17 2011 +0200
batman-adv: correct !x & y in !(x & y)
This error was introduced with: 4dea0274b8edeab50bfeb6685ef33362e3ec9299
Signed-off-by: Antonio Quartulli <ordex(a)autistici.org>
Acked-by: Sven Eckelmann <sven(a)narfation.org>
diff --git a/translation-table.c b/translation-table.c
index 464569e..f0d8857 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -724,7 +724,7 @@ static void tt_global_roam_purge(struct bat_priv *bat_priv)
spin_lock_bh(list_lock);
hlist_for_each_entry_safe(tt_global_entry, node, node_tmp,
head, hash_entry) {
- if (!tt_global_entry->flags & TT_GLOBAL_ROAM)
+ if (!(tt_global_entry->flags & TT_GLOBAL_ROAM))
continue;
if (!is_out_of_time(tt_global_entry->roam_at,
TT_GLOBAL_ROAM_TIMEOUT * 1000))
--
batman-adv