From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34294) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYyQb-0000QM-H2 for qemu-devel@nongnu.org; Mon, 28 May 2012 07:48:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SYyQW-0003WJ-Ja for qemu-devel@nongnu.org; Mon, 28 May 2012 07:48:01 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:45736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYyQW-0003Vx-AV for qemu-devel@nongnu.org; Mon, 28 May 2012 07:47:56 -0400 Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate01.web.de (Postfix) with ESMTP id D72E21AEF568B for ; Mon, 28 May 2012 13:46:58 +0200 (CEST) Message-ID: <4FC365AF.7000104@web.de> Date: Mon, 28 May 2012 13:46:55 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <1335565745-22708-1-git-send-email-afaerber@suse.de> <4FC267AF.3060706@web.de> In-Reply-To: <4FC267AF.3060706@web.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigB3E91FB7F3B8F77B8ADDB72F" Subject: Re: [Qemu-devel] [PATCH for-1.1] slirp: Untangle TCPOLEN_* from TCPOPT_* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Cc: Blue Swirl , Lee Essen , qemu-devel@nongnu.org, Anthony Liguori , Paolo Bonzini This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigB3E91FB7F3B8F77B8ADDB72F Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 2012-05-27 19:43, Andreas F=C3=A4rber wrote: > Am 28.04.2012 00:29, schrieb Andreas F=C3=A4rber: >> From: Andreas F=C3=A4rber >> >> Commit b72210568ef0c0fb141a01cffb71a09c4efa0364 (slirp: clean up >> conflicts with system headers) enclosed TCPOLEN_MAXSEG with an #ifdef >> TCPOPT_EOL. This broke the build on illumos, which has TCPOPT_* >> but not TCPOLEN_*. >> >> Move them to their own #ifdef TCPOLEN_MAXSEG section to remedy this. >> >> Cc: Paolo Bonzini >> Signed-off-by: Andreas F=C3=A4rber >=20 > Ping! It seems this patch has not been applied yet despite agreement > between Blue and Jan that we should apply this least-invasive version > for 1.1. Please apply / include in a PULL for rc4. Thanks, queued for 1.1. I'll send a pull as soon as the other small build fixes are available. Jan --------------enigB3E91FB7F3B8F77B8ADDB72F Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/DZa8ACgkQitSsb3rl5xSxqgCgzNZqgLAMiKAEosolT8WXcBKU 3RUAoN5PrXF+QbO+gNebwgwfhMfDrLP2 =vX+8 -----END PGP SIGNATURE----- --------------enigB3E91FB7F3B8F77B8ADDB72F--