From: David Miller <davem@davemloft.net>
To: ordex@autistici.org
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: [PATCH 0/2 net-next]: fixups for wrong conflict resolution
Date: Mon, 25 Jun 2012 23:55:22 -0700 (PDT) [thread overview]
Message-ID: <20120625.235522.1872081305186028575.davem@davemloft.net> (raw)
In-Reply-To: <1340693391-16434-1-git-send-email-ordex@autistici.org>
From: Antonio Quartulli <ordex@autistici.org>
Date: Tue, 26 Jun 2012 08:49:49 +0200
> here are our two fixes to recover from the little problems introduced during the
> last conflict resolution involving translation-table.c.
> Sorry for the inconvenient.
Both applied, thanks.
next prev parent reply other threads:[~2012-06-26 6:55 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-25 6:54 pull request: batman-adv 2012-06-25 Antonio Quartulli
[not found] ` <1340607284-29950-1-git-send-email-ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
2012-06-25 6:54 ` [PATCH 01/20] batman-adv: Prefix bat_debugfs local static functions with batadv_ Antonio Quartulli
2012-06-25 6:54 ` [PATCH 02/20] batman-adv: Prefix bitarray static inline " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 03/20] batman-adv: Prefix hard-interface " Antonio Quartulli
2012-06-25 23:19 ` pull request: batman-adv 2012-06-25 David Miller
2012-06-26 6:49 ` [PATCH 0/2 net-next]: fixups for wrong conflict resolution Antonio Quartulli
[not found] ` <1340693391-16434-1-git-send-email-ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
2012-06-26 6:49 ` [PATCH 1/2 net-next] batman-adv: fix condition in AP isolation Antonio Quartulli
2012-06-26 6:49 ` [PATCH 2/2 net-next] batman-adv: fix global TT entry deletion Antonio Quartulli
2012-06-26 6:55 ` David Miller [this message]
2012-06-25 6:54 ` [PATCH 04/20] batman-adv: Prefix hash static inline functions with batadv_ Antonio Quartulli
2012-06-25 6:54 ` [PATCH 05/20] batman-adv: Prefix originator " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 06/20] batman-adv: Prefix unicast " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 07/20] batman-adv: Prefix main " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 08/20] batman-adv: Prefix bat_iv_ogm local static " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 09/20] batman-adv: Prefix bat_sysfs " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 10/20] batman-adv: Prefix bridge_loop_avoidance " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 11/20] batman-adv: Prefix gateway_client " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 12/20] batman-adv: Prefix gateway_common " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 13/20] batman-adv: Prefix hard-interface " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 14/20] batman-adv: Prefix hash " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 15/20] batman-adv: Prefix icmp_socket " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 16/20] batman-adv: Prefix originator " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 17/20] batman-adv: Prefix routing " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 18/20] batman-adv: Prefix send " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 19/20] batman-adv: Prefix soft-interface " Antonio Quartulli
2012-06-25 6:54 ` [PATCH 20/20] batman-adv: Prefix translation-table " 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=20120625.235522.1872081305186028575.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=netdev@vger.kernel.org \
--cc=ordex@autistici.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;
as well as URLs for NNTP newsgroup(s).