From owner-svn-src-all@FreeBSD.ORG Fri Dec 13 19:43:32 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB0EED6D for ; Fri, 13 Dec 2013 19:43:32 +0000 (UTC) Received: from mail-qa0-x233.google.com (mail-qa0-x233.google.com [IPv6:2607:f8b0:400d:c00::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6252815E7 for ; Fri, 13 Dec 2013 19:43:32 +0000 (UTC) Received: by mail-qa0-f51.google.com with SMTP id o15so1095877qap.3 for ; Fri, 13 Dec 2013 11:43:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=UzX9zY51GEdntUbSj4lNOAIYXXTPyUkh/lAYK6cuGQc=; b=mPsSCuk5gwz6kXnmhTTxShoT1R4Wq8CXT/0TLGXrEU1/3fUgrkg+v+wm5btkm0yxpL WDhkEW705DLOGwmefZiXqCR1vFiByOaNpWBr5QaukwyP8OmkxdbMyHAELWwjwN9Iqjw5 665D7DV3iF0pi7QLNDwkDU90cqJM/37x8mJ24= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=UzX9zY51GEdntUbSj4lNOAIYXXTPyUkh/lAYK6cuGQc=; b=kPLroU+ACKKoPzEPykqME5+iCRf5JiHoj2MbIQjNuC+f9D6Dlae8t8fSALNma3jHwG 0eUE6oB8zFRy0yRIrfW+snvbHjHNI47rBVmyJnAaJ4L+m0pRmnZL6SgG1Wy/saQds7wX vpgeZSHQ6TFQSR6jNE1AVyfxy9Yw8hQKEnKv2VU/wAylAA+rx2VTE40JNciSa9XcKYDi YUD8irXir842cUpAT4KyrjO+K3ULVw4aovT0NdGKFKJV96nzLAsm+Rk7Y5/sTrwNCqxj z92qaHRZcG1bHiW5dq69Y5kxDWhz9OMMc+CH+Dc8WGst9nA94VxyCrVSsURU2tnoMJfi UVug== X-Gm-Message-State: ALoCoQnHsEPsjNnO6t6nVrSDIlMDBJwokSlqWP958NaZrHfClK8wPzfCTY6Aj3VvvPVNPFQ+FXgi X-Received: by 10.224.28.72 with SMTP id l8mr7521317qac.35.1386963811481; Fri, 13 Dec 2013 11:43:31 -0800 (PST) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.96.86.42 with HTTP; Fri, 13 Dec 2013 11:43:01 -0800 (PST) In-Reply-To: <201312131932.rBDJW3iw088831@svn.freebsd.org> References: <201312131932.rBDJW3iw088831@svn.freebsd.org> From: Eitan Adler Date: Fri, 13 Dec 2013 14:43:01 -0500 X-Google-Sender-Auth: dm7L8m2gMe1JkQg1QjBqWSU2LHA Message-ID: Subject: Re: svn commit: r259326 - stable/10/contrib/tcpdump To: "Pedro F. Giffuni" Content-Type: text/plain; charset=UTF-8 Cc: svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , svn-src-stable-10@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Dec 2013 19:43:32 -0000 On Fri, Dec 13, 2013 at 2:32 PM, Pedro F. Giffuni wrote: > Author: pfg > Date: Fri Dec 13 19:32:02 2013 > New Revision: 259326 > URL: http://svnweb.freebsd.org/changeset/base/259326 > > Log: > MFV r258571: > > Removes strict-aliasing warnings from newer GCC in tcpdump. > > Corresponds to MFC r258573, but for some reason our new pre-commit hooks > will not let us merge it from there. How did you attempt to do this merge? What were the exact commands?