Hi David,

here are the instructions to resolve the conflicts you will get while merging net into net-next.

In net/batman-adv/routing.c

++<<<<<<< HEAD +static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size) ++======= + static int batadv_check_unicast_packet(struct batadv_priv *bat_priv, + struct sk_buff *skb, int hdr_size) ++>>>>>>> maint

Resolves as: /** * batadv_check_unicast_packet - Check for malformed unicast packets * @skb: packet to check * @hdr_size: size of header to pull * * Check for short header and bad addresses in given packet. Returns negative * value when check fails and 0 otherwise. The negative value depends on the * reason: -ENODATA for bad header, -EBADR for broadcast destination or source, * and -EREMOTE for non-local (other host) destination. */ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, int hdr_size) ===============================================================================

++<<<<<<< HEAD + if (!batadv_is_my_mac(ethhdr->h_dest)) + return -EREMOTE; ++======= + if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest)) + return -1; ++>>>>>>> maint

Resolves as: if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest)) return -EREMOTE; ===============================================================================

++<<<<<<< HEAD + /* function returns -EREMOTE for promiscuous packets */ + check = batadv_check_unicast_packet(skb, hdr_size); + + /* Even though the packet is not for us, we might save it to use for + * decoding a later received coded packet + */ + if (check == -EREMOTE) + batadv_nc_skb_store_sniffed_unicast(bat_priv, skb); + + if (check < 0) ++======= + if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0) ++>>>>>>> maint

Resolves as: /* function returns -EREMOTE for promiscuous packets */ check = batadv_check_unicast_packet(bat_priv, skb, hdr_size);

/* Even though the packet is not for us, we might save it to use for * decoding a later received coded packet */ if (check == -EREMOTE) batadv_nc_skb_store_sniffed_unicast(bat_priv, skb);

if (check < 0) ===============================================================================

I'm now going to send a pull request to fix some compile issues generated by the merge.

Cheers,