From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ordex@autistici.org>
Date: Tue, 23 Apr 2013 06:49:43 +0200
From: Antonio Quartulli <ordex@autistici.org>
Message-ID: <20130423044943.GG5732@ritirata.org>
References: <20130419082651.GA13226@ritirata.org>
 <20130422.204024.29103974581251401.davem@davemloft.net>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="mXDO3udm/xYWQeMQ"
Content-Disposition: inline
In-Reply-To: <20130422.204024.29103974581251401.davem@davemloft.net>
Subject: Re: [B.A.T.M.A.N.] batman-adv merge-conflict
Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking
 <b.a.t.m.a.n@lists.open-mesh.org>
List-Id: The list for a Better Approach To Mobile Ad-hoc Networking
 <b.a.t.m.a.n.lists.open-mesh.org>
List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>,
 <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe>
List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n/>
List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org>
List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help>
List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>,
 <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org


--mXDO3udm/xYWQeMQ
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Apr 22, 2013 at 08:40:24PM -0400, David Miller wrote:
> From: Antonio Quartulli <ordex@autistici.org>
> Date: Fri, 19 Apr 2013 10:26:51 +0200
>=20
> > here are the instructions to resolve the conflicts you will get
> > while merging net into net-next.
>=20
> Thanks.
>=20
> > I'm now going to send a pull request to fix some compile issues
> > generated by the merge.
>=20
> We never fix such breakage separately.
>=20
> 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.


Ok. Thanks a lot David!

Regards,

--=20
Antonio Quartulli

=2E.each of us alone is worth nothing..
Ernesto "Che" Guevara

--mXDO3udm/xYWQeMQ
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAEBCAAGBQJRdhLnAAoJEADl0hg6qKeO/nYP/0bwO/ERZr33EYyupZwl/mqB
5/B+ZzIMZMbncQnf576YhFxe/S/obPkfmK9hTJfCig/9BAmfk7/9p7rAWnVq8km4
PE/SJFgZuJxA4G2jHmBfRTztaTu8ufmYfpquQmAGmb4UWmzjJ+VybyY7xNphRveX
1pZKZPRvgZXyy4YjIVjRtKCRMxEO5tb5B1bPqrI7k2GhiJns3x9vXU6a6Q8EZEuZ
c38K92cX8CISqjzqk94l++gAT9AE1iKemoEoVxJBZk7ekiUhp2lyU251CiGttJOn
LsAfdURsJYxpxDZcdUMHI3hxq5ULeQxeC61MUcEaSTwCSz56Wi14Lolw1KbT+BTE
o9qDj84TnTF5iuAvot92tTcCUvy/50CnF8FIfAtaAHSATRGwNpX61eiGR8jRMm1R
Kld2tK3fuS/xEGL/Vt2qXoZeVvo+LarT0g7EXApar6braFEYZVhMGrHrqkhQggaV
UNSMY45kylIQlkvn20Tk4B8w3Z9jmSE9XGZt7WPpwpca5rIdbhGkuQdGWSDKSQsG
hN7jO65sHIYaKUHEY9hqObp5p+Q4A+COK1sefbR45/UF16gsIn0NzFEc3N57G/8s
u/qiUE6KxmNktqADxIahpehgM/iZqC9zX1BrRGss4TPQ100mOOJi1UY5mDFccaTY
1+nKh1ldDC5GybwYDitg
=8exc
-----END PGP SIGNATURE-----

--mXDO3udm/xYWQeMQ--