Hi,

there are some patches in maint (7ad001a18d1a6e2fd19969fdd671efe99d75920f) which should have been sent to upstream. I have taken them and rebased/squashed all patches on top of net.git (c5dfd654d0ec0a28fe81e7bd4d4fd984a9855e09). The commit messages were adjusted (upstream commit ids, minor changes after squashing a patch, ...) and sent through sparse + checkpatch.

Antonio Quartulli (1): batman-adv: avoid DAT to mess up LAN state

Linus Lüssing (6): batman-adv: Make DAT capability changes atomic batman-adv: Make NC capability changes atomic batman-adv: Make TT capability changes atomic batman-adv: Make MCAST capability changes atomic batman-adv: Fix potential synchronization issues in mcast tvlv handler batman-adv: Fix potentially broken skb network header access

Marek Lindner (3): batman-adv: fix kernel crash due to missing NULL checks batman-adv: protect tt_local_entry from concurrent delete events batman-adv: protect tt request from double deletion

Ruben Wisniewski (1): batman-adv: Avoid u32 overflow during gateway select

Simon Wunderlich (2): batman-adv: initialize up/down values when adding a gateway batman-adv: remove broadcast packets scheduled for purged outgoing if

Sven Eckelmann (1): batman-adv: Replace gw_reselect divisor with simple shift

I know that the 2015.1 release was not done and thus the master branch is not yet merged into the next branch. But I've merged the above mentioned patches into net-next.git (045a0fa0c5f5ea0f16c009f924ea579634afbba8) and rebased the patches from master (with some "merge conflict" fixes). They were also sent through the same build tests.

Marek Lindner (6): batman-adv: update kernel doc of batadv_tt_global_del_orig_entry() batman-adv: rename batadv_new_tt_req_node to batadv_tt_req_node_new batman-adv: convert orig_node->vlan_list to hlist batman-adv: prevent potential hlist double deletion batman-adv: convert bat_priv->tt.req_list to hlist batman-adv: beautify supported routing algorithm list

Sven Eckelmann (9): batman-adv: Replace C99 int types with kernel type batman-adv: Fix kerneldoc over 80 column lines batman-adv: Remove multiple assignment per line batman-adv: Remove batadv_ types forward declarations batman-adv: Return EINVAL on invalid gw_bandwidth change batman-adv: Fix gw_bandwidth calculation on 32 bit systems batman-adv: Annotate deleting functions with external lock via lockdep batman-adv: Add lockdep_asserts for documented external locks batman-adv: Fix conditional statements indentation

Kind regards, Sven