From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk0-x233.google.com (mail-qk0-x233.google.com [IPv6:2607:f8b0:400d:c09::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 59A9E3B29E for ; Fri, 22 Dec 2017 05:00:56 -0500 (EST) Received: by mail-qk0-x233.google.com with SMTP id g123so2196660qka.3 for ; Fri, 22 Dec 2017 02:00:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=LDFVRgQPvG5ncNeb7GO/ijsCShJvqHs7O0HCeijV2Mo=; b=eQCgFyVfHn3/H25LYm1JaCFbpxJ5tfcRE8VBq+W/OwHvMrA0WpW90UG+SdXG3gVjQm XJoBO6y8fGIu/ZokHN8ftwtr+sQM+DnnTEAlEJLG+sogDq5CJezz9tpJK52tc+212Nq2 chalqa5kzx3BcLu8ZfeiHCF0ayMEOol3wgDRUm3ljPMiTQVNFUaBqfxWjg9NbWMRaDli rMKKsMpcDqEa3Pt6FqsShYA1NH8vqDNfx38oH7ykP3SMfyUYXUDLsIjyw9eUn0A4xq1e eGWJtZu92PmTiD+0d9yWdcM21u5pSQ6jxTQbjpkzpThHPxIgFoLBxZgDqWJa068xHb0f /sSQ== 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:cc; bh=LDFVRgQPvG5ncNeb7GO/ijsCShJvqHs7O0HCeijV2Mo=; b=Gi2n7HCl4pLaM4RYaHDAVEnc1Nx35xvTo93+6BIcF1Y3FWn0tDXlgJAl/QoIuRbQMW +GAWf//87fY1JFCz1lJEV2wLt2iT9s1G6xRD+0wtPZD8GRnLyJBp+5edQTdz6ndU31JE vkjZ8QlCG1gjy+orAE4Zm6EvcYetnunpdpnP2Ldtq+5weo068wB8ah6jjI+/8Qw6DYg+ Fk9bpFewG8XM2PgP9Nu9iSfl2x9SkDlcQPkgRlcC90roUtbPlK353EQVdkBGIZnQZwrO sWbeeKGIASLizVmpH7mBGab0N6KpjzOLmWIge1JO+rYfwnBrKraqhTe+IJ2XxkFW02D6 TR/g== X-Gm-Message-State: AKGB3mJySOET4j21ia318dj/HciXBP/pFk/z61t0AfKHKBiLCrtjnGId bqaazlYcqRu6tCmecjKA6Y+r5Xg2iBMWwUpz7eA= X-Google-Smtp-Source: ACJfBoske8YsatfWqPHDsC5sBuXpE79RVLvH7i66XVBYiQdX2SPnXnisRnCytEFgtVb1SZDvwk9FLonK7nUmmSlTG+Y= X-Received: by 10.55.121.67 with SMTP id u64mr17418534qkc.317.1513936855983; Fri, 22 Dec 2017 02:00:55 -0800 (PST) MIME-Version: 1.0 Received: by 10.140.102.179 with HTTP; Fri, 22 Dec 2017 02:00:54 -0800 (PST) Received: by 10.140.102.179 with HTTP; Fri, 22 Dec 2017 02:00:54 -0800 (PST) In-Reply-To: References: <31d49a5d-02a2-3dc8-a455-52d453b83bdf@gmail.com> <32730842-8E7E-4D9E-BF63-AF320906BB7E@darbyshire-bryant.me.uk> From: Jonathan Morton Date: Fri, 22 Dec 2017 12:00:54 +0200 Message-ID: To: Kevin Darbyshire-Bryant Cc: Andy Furniss , Cake List Content-Type: multipart/alternative; boundary="94eb2c0578d0836b8c0560eae4d4" Subject: Re: [Cake] overheads or rate calculation changed? X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Dec 2017 10:00:56 -0000 --94eb2c0578d0836b8c0560eae4d4 Content-Type: text/plain; charset="UTF-8" Git seems to regularly get confused when similar code changes occur in parallel in different branches. In this case, I had the original version of ingress mode while the public tree had the reconstructed version - almost identical, but still constituting a merge conflict. I really don't know why the 'pad' thing wasn't similarly flagged. If there's an easy way to simply accept the remote version of the file as correct and not bother generating a merge commit, I couldn't find it. In any case I need to thoroughly review all this code before I can sign off on it. That'll also give me an opportunity to sort out the stats somehow. - Jonathan Morton --94eb2c0578d0836b8c0560eae4d4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Git seems to regularly get confused when similar code change= s occur in parallel in different branches.=C2=A0 In this case, I had the or= iginal version of ingress mode while the public tree had the reconstructed = version - almost identical, but still constituting a merge conflict.=C2=A0 = I really don't know why the 'pad' thing wasn't similarly fl= agged.

If there's an easy way to simply accept the remote versi= on of the file as correct and not bother generating a merge commit, I could= n't find it.

In any case I need to thoroughly review all this code before= I can sign off on it.=C2=A0 That'll also give me an opportunity to sor= t out the stats somehow.

- Jonathan Morton

--94eb2c0578d0836b8c0560eae4d4--