From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <toke@toke.dk>
Received: from mail.toke.dk (mail.toke.dk [IPv6:2001:470:dc45:1000::1])
 (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by lists.bufferbloat.net (Postfix) with ESMTPS id D84A03CB35
 for <cake@lists.bufferbloat.net>; Mon, 19 Mar 2018 12:52:03 -0400 (EDT)
From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= <toke@toke.dk>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=toke.dk; s=20161023;
 t=1521478322; bh=Rg3WwuxkRP3zsAo/8GaWKK87XrSoT9dx8X2mjnDM+Tw=;
 h=From:To:Subject:In-Reply-To:References:Date:From;
 b=d1LSXA4w5PpaIRmMY2A7tkHF/HpEvxbg9FVvfg9FU40ZqXreqObrru+QZLS1br/aU
 V8FmTJRTUpXNeJk1cNdJ4Sw8kaVtUyBV6jI+g5fAcLXp6MxQDBnwW276AR6lJ9Claf
 vT29UAONfLcYaJDzQxFQLvjch7sT4QlHwdHbgrA/lHDvcM+0d94mBDXOmyuN7Diqih
 XOKPKThnmH3HbfIGoHcPhfaem8OW7Go+BBDx24u3FSbyEYzeBmJHI3BY1+UWmpvSah
 L8xySlfbOAT/aWBYzSx4Mp0r/vRhGl376IFs1m5fiFB7QPFhWDPKz40yY1oMoXFIif
 0ypodmCW5/j2w==
To: Georgios Amanakis <gamanakis@gmail.com>,
 Cake List <cake@lists.bufferbloat.net>
In-Reply-To: <CACvFP_gSCtDaYHdvegMuFumFgYVQLyB4C+yLnKZNe_n1OsMX+Q@mail.gmail.com>
References: <1521403235.24047.7.camel@gmail.com>
 <1521426571.28105.2.camel@gmail.com> <87vadsbcag.fsf@toke.dk>
 <87sh8wbb6s.fsf@toke.dk>
 <CACvFP_ijNbkUU8mRCyAwe16qZ=SYMStq=9QiyTBizNhLx-vZtw@mail.gmail.com>
 <CACvFP_gSCtDaYHdvegMuFumFgYVQLyB4C+yLnKZNe_n1OsMX+Q@mail.gmail.com>
Date: Mon, 19 Mar 2018 17:52:01 +0100
X-Clacks-Overhead: GNU Terry Pratchett
Message-ID: <87k1u89ff2.fsf@toke.dk>
MIME-Version: 1.0
Content-Type: text/plain
Subject: Re: [Cake] Fwd:  Compiling under net-next
X-BeenThere: cake@lists.bufferbloat.net
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Cake - FQ_codel the next generation <cake.lists.bufferbloat.net>
List-Unsubscribe: <https://lists.bufferbloat.net/options/cake>,
 <mailto:cake-request@lists.bufferbloat.net?subject=unsubscribe>
List-Archive: <https://lists.bufferbloat.net/pipermail/cake>
List-Post: <mailto:cake@lists.bufferbloat.net>
List-Help: <mailto:cake-request@lists.bufferbloat.net?subject=help>
List-Subscribe: <https://lists.bufferbloat.net/listinfo/cake>,
 <mailto:cake-request@lists.bufferbloat.net?subject=subscribe>
X-List-Received-Date: Mon, 19 Mar 2018 16:52:04 -0000

Georgios Amanakis <gamanakis@gmail.com> writes:

>  #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
>      err = nla_parse_nested(tb, TCA_CAKE_MAX, opt, cake_policy);
> -#else
> +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
>      err = nla_parse_nested(tb, TCA_CAKE_MAX, opt, cake_policy, NULL);
> +#else
> +    err = nla_parse_nested(tb, TCA_CAKE_MAX, opt, cake_policy, extack);
>  #endif

Yes, exactly!

Could you squash the two patches into one, add a Signed-off-by tag and
send it using git send-email? It's somewhat mangled in transit, it
seems; but otherwise looks good to apply :)

-Toke