batman-adv: fix merge resolution
PATCH 1/1 batman-adv: fix merge resolution
While resolving a merge conflict a variable declaration was accidentally moved onto another line.
Move it back to its original location to avoid messing up with the in-kernel source code.
Introduced by merge commitfbe649dfdd07d871f5b47b5e8ea1b03d104feb9d
--- send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
send.c +1 -1
@@ -255,8 +255,8 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, unsigned short vid) { -struct batadv_unicast_packet *unicast_packet;struct ethhdr *ethhdr; +struct batadv_unicast_packet *unicast_packet;int ret =NET_XMIT_DROP ;if (!orig_node)
Signature · 1 line
1.8.4.5
send.c int batadv_send_skb_unicast(struct batadv_priv · line 262
Quoted 12 lines · On Monday 24 February 2014 00:00:18 Antonio Quartulli wrote:
send.c +1
-1@@ -255,8 +255,8 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, unsigned short vid) { -struct batadv_unicast_packet *unicast_packet;struct ethhdr *ethhdr; +struct batadv_unicast_packet *unicast_packet;int ret =NET_XMIT_DROP ;if (!orig_node)
Don't we want longer declarations before shorter declarations ?
Cheers,
Marek
Quoted 12 lines · Marek Lindner
Quoted 11 lines · On Monday 24 February 2014 00:00:18 Antonio Quartulli wrote:
send.c +1
-1@@ -255,8 +255,8 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, unsigned short vid) { -struct batadv_unicast_packet *unicast_packet;struct ethhdr *ethhdr; +struct batadv_unicast_packet *unicast_packet;int ret =NET_XMIT_DROP ;
Quoted 3 lines
send.c int batadv_send_skb_unicast(struct batadv_priv *bat_priv, · line 262
Quoted 1 line
send.c +0
-0if (!orig_node)Don't we want longer declarations before shorter declarations ?
Yes, but the point is that there is no patch doing this change. This line was moved during a merge...
If you want to rearrange the variable declaration I'd suggest to do it with one patch changing them all.
Cheers,
Signature · 1 line
Antonio Quartulli
Quoted 17 lines · Antonio Quartulli
Quoted 12 lines · Marek Lindner
Quoted 11 lines · On Monday 24 February 2014 00:00:18 Antonio Quartulli wrote:
send.c +1
-1@@ -255,8 +255,8 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, unsigned short vid) { -struct batadv_unicast_packet *unicast_packet;struct ethhdr *ethhdr; +struct batadv_unicast_packet *unicast_packet;int ret =NET_XMIT_DROP ;Quoted 3 lines
send.c int batadv_send_skb_unicast(struct batadv_priv *bat_priv, · line 262
Quoted 1 line
send.c +0
-0if (!orig_node)Don't we want longer declarations before shorter declarations ?
Quoted 5 lines
Yes, but the point is that there is no patch doing this change. This line was moved during a merge...
If you want to rearrange the variable declaration I'd suggest to do it with one patch changing them all.
Ok, as agreed on IRC you can drop this patch. I'll slightly change my kernel tree to adapt it to the master branch :)
Cheers,
Signature · 1 line
Antonio Quartulli