From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: [B.A.T.M.A.N.] [PATCH-next] batman-adv: Remove unused compat function batadv_free_rcu_softif_vlan
Date: Thu, 23 Apr 2015 08:49:13 +0200 [thread overview]
Message-ID: <1993182.YpbjlS2XkF@bentobox> (raw)
In-Reply-To: <1429729962-5365-1-git-send-email-sven@narfation.org>
On Wednesday 22 April 2015 21:12:42 Sven Eckelmann wrote:
> The commit e78c16c0550c ("batman-adv: Revert "fix var name to keep
> compatibility with old kernels"") should have renamed the function to
> batadv_free_rcu_softif_vlan instead of adding a new function
> batadv_free_rcu_vlan because it was only used in this single place.
>
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> This patch is complete optional and would only silence a build_test warning
> until the master branch becomes the next branch. But this would create a
> merge conflict because batadv_free_rcu_softif_vlan is already removed in
> master.
Just as hint: If only this patch is new in next and you want to merge then you
could merge by ignoring the changes in next to avoid the merge conflict:
git merge -s ours next
Kind regards,
Sven
prev parent reply other threads:[~2015-04-23 6:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-22 19:12 [B.A.T.M.A.N.] [PATCH-next] batman-adv: Remove unused compat function batadv_free_rcu_softif_vlan Sven Eckelmann
2015-04-23 3:17 ` Antonio Quartulli
2015-04-23 6:49 ` Sven Eckelmann [this message]
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=1993182.YpbjlS2XkF@bentobox \
--to=sven@narfation.org \
--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