Re: [B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution

[Antonio Quartulli <antonio@meshcoding.com>]

[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]

On 24/02/14 07:48, Antonio Quartulli wrote:
> On 24/02/14 01:36, Marek Lindner wrote:
>> On Monday 24 February 2014 00:00:18 Antonio Quartulli wrote:
>>> --- a/send.c
>>> +++ b/send.c
>>> @@ -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 ?
> 
> 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,

-- 
Antonio Quartulli


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]