From owner-svn-src-stable@freebsd.org Sat Apr 14 12:14:38 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63D4AF9AF98 for ; Sat, 14 Apr 2018 12:14:38 +0000 (UTC) (envelope-from bmr@ringman.ch) Received: from mail-yw0-x241.google.com (mail-yw0-x241.google.com [IPv6:2607:f8b0:4002:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 77E076A809 for ; Sat, 14 Apr 2018 12:14:37 +0000 (UTC) (envelope-from bmr@ringman.ch) Received: by mail-yw0-x241.google.com with SMTP id i144so4403334ywc.2 for ; Sat, 14 Apr 2018 05:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ringman-ch.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-transfer-encoding; bh=rY6N3rQI39mrJcyNm9PLXqd1kPsZf4ikha0NChDHXQU=; b=pRdrYG16nWQVvWOv+SJdESkPpC1sdZdKDUYnrNPQya6f2cbgxOusGXawXpxUm5Qg5k AEXJis8zmF0cVKVAxUU00Q6//thF2ODp0yKpDjUm3FvD+K9nCLFnj7oxPzneypNorKv5 J1zMghvXmdsFbapqNP6vzmWhOVVYiM77JLd9Fd/iN/s9XJf72MgM+71LCg6EGBSo0a4+ rAhMfFUGjKwykDsiUGBpl6ndG0s0TUXgyIvcbTa+ES3Yeice4YlLFH5nTQLsfMeTIglz eHruIVgRejPrM5xaHwAgo3E7TNjikeEaTQfqtqr/chpQd6b3slLk1U5Ou2p1zGwOEJPf H8kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:content-transfer-encoding; bh=rY6N3rQI39mrJcyNm9PLXqd1kPsZf4ikha0NChDHXQU=; b=U6FvqgME/RXHdJSFqJ/FKefbCtHbW+9weHOiEF0vBzjuckDL7XpCbwjGmOZfFurHWD OYzk6/hHLGiAFgnFMhZhKNovT3J3uUn/LBNUUWmJfmj3bmf948XAsOHQsGX0l5zOYV+I j9SeycRP4YbzH7xFZh/aoDMquzIU4giAJ8rsKs0v1m/Lrw7Oxb1RfVFGeyMzx3HtKfIy fFkCnKS3O4nN0CGihJlFkI+WpExrEjfbQcGPi/AfMBAFQiwqJz3AZXVx7peIMgiJ/9X1 cOOck3TaGu27ell0itZzMo3OiXnXVCQm1RvfROWQnOtvmD8Hq9JWpnpp/lq2RBMoEVh8 loHA== X-Gm-Message-State: ALQs6tBAC0e14VAzpXD3ZvuH0AmuJftFKZJQHApleKpBC0r5R4Db3tGH 9U1ECek5E0G+nl8RX2RGWlbsxYVzktvok/7uCS5/bg== X-Google-Smtp-Source: AIpwx486PB2fs0L7nZJXd9KvdV81b76W2uah4fEenlwFBtrzwNK2pvnCINlyS5EkZN+VEQHBgk2n1WClPyvXzKihX38= X-Received: by 10.13.216.205 with SMTP id a196mr6787707ywe.442.1523708076965; Sat, 14 Apr 2018 05:14:36 -0700 (PDT) MIME-Version: 1.0 Received: by 10.129.128.133 with HTTP; Sat, 14 Apr 2018 05:14:36 -0700 (PDT) In-Reply-To: <20180414113743.GR63353@albert.catwhisker.org> References: <201804132232.w3DMWSmI019256@repo.freebsd.org> <20180414113743.GR63353@albert.catwhisker.org> From: Magnus Ringman Date: Sat, 14 Apr 2018 14:14:36 +0200 Message-ID: Subject: Re: svn commit: r332493 - stable/11/sys/net To: David Wolfskill , Magnus Ringman , Brooks Davis , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, freebsd-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2018 12:14:38 -0000 I don't think anyone has committed a fix yet (I'm not eligible, just lurking here.) Just manually integrate the missing change. At the top of your src tree: patch -p1 << __EOT --- head/sys/sys/ioccom.h 2017/11/20 19:43:44 326023 +++ head/sys/sys/ioccom.h 2018/03/16 22:23:04 331077 @@ -61,6 +61,10 @@ #define _IOW(g,n,t) _IOC(IOC_IN, (g), (n), sizeof(t)) /* this should be _IORW, but stdio got there first */ #define _IOWR(g,n,t) _IOC(IOC_INOUT, (g), (n), sizeof(t)) +/* Replace length/type in an ioctl command. */ +#define _IOC_NEWLEN(ioc, len) \ + (((~(IOCPARM_MASK << 16)) & (ioc)) | (((len) & IOCPARM_MASK) << 16)) +#define _IOC_NEWTYPE(ioc, type) _IOC_NEWLEN((ioc), sizeof(type)) #ifdef _KERNEL __EOT On Sat, Apr 14, 2018 at 1:37 PM, David Wolfskill wro= te: > On Sat, Apr 14, 2018 at 01:31:28PM +0200, Magnus Ringman wrote: >> Hi Brooks, this MFC missed your r331077 >> (https://reviews.freebsd.org/D14706) thus stable buildkernel currently >> breaks on missing those two macros. >> >> (_IOC_NEWLEN and _IOC_NEWTYPE for searchability) >> >> Sk=C3=A5l, >> Magnus >> .... > > Aye; looks as if that would explain the kernel build failures I had this > morning in stable/11, trying to update from r332465 -> r332496. > > Peace, > david > -- > David H. Wolfskill david@catwhisker.org > Donald Trump's criticism of others comes across as psychological projecti= on. > > See http://www.catwhisker.org/~david/publickey.gpg for my public key.