From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: batman-adv merge-conflict
Date: Mon, 22 Apr 2013 20:40:24 -0400 (EDT)
Message-ID: <20130422.204024.29103974581251401.davem@davemloft.net>
References: <20130419082651.GA13226@ritirata.org>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
To: ordex@autistici.org
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([149.20.54.216]:40658 "EHLO
	shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752616Ab3DWAkZ (ORCPT
	<rfc822;netdev@vger.kernel.org>); Mon, 22 Apr 2013 20:40:25 -0400
In-Reply-To: <20130419082651.GA13226@ritirata.org>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Antonio Quartulli <ordex@autistici.org>
Date: Fri, 19 Apr 2013 10:26:51 +0200

> here are the instructions to resolve the conflicts you will get
> while merging net into net-next.

Thanks.

> I'm now going to send a pull request to fix some compile issues
> generated by the merge.

We never fix such breakage separately.

We put these kinds of things in the merge commit, so proper bisecting
is possible over the merge.  And that's what I did just now.