From: Antonio Quartulli <antonio@meshcoding.com>
To: The list for a Better Approach To Mobile Ad-hoc Networking
<b.a.t.m.a.n@lists.open-mesh.org>
Subject: Re: [B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution
Date: Mon, 24 Feb 2014 07:48:27 +0100 [thread overview]
Message-ID: <530AEB3B.1050501@meshcoding.com> (raw)
In-Reply-To: <1702820.sOKJFjBZI7@diderot>
[-- Attachment #1: Type: text/plain, Size: 871 bytes --]
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.
Cheers,
--
Antonio Quartulli
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-02-24 6:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-23 23:00 [B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution Antonio Quartulli
2014-02-24 0:36 ` Marek Lindner
2014-02-24 6:48 ` Antonio Quartulli [this message]
2014-02-24 8:14 ` Antonio Quartulli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=530AEB3B.1050501@meshcoding.com \
--to=antonio@meshcoding.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox