From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50063.outbound.protection.outlook.com [40.107.5.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 522543CB35 for ; Fri, 22 Dec 2017 07:58:16 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=dMcSUgO3HOm/NQngX6iWueSQgs6ZXSwwzbMHS2/tySc=; b=GMBObBWAg3G6AsBuscVkqdbDzAWqe2yki5U24orPqzCnKVh6jTENstcsdZTxgQhMLo3LF96z/uLqoIXrKIC+x1TetlBNMWYTEl+A/5fVx5Go+sL1Omw/wYxLqFcfSpMqDmAnJEXEF8y4lOmehhQOBQo5qL1+zmQx4ugMHuyLIsw= Received: from AM0PR0702MB3730.eurprd07.prod.outlook.com (52.133.51.23) by AM0PR0702MB3585.eurprd07.prod.outlook.com (52.133.50.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.3; Fri, 22 Dec 2017 12:58:14 +0000 Received: from AM0PR0702MB3730.eurprd07.prod.outlook.com ([fe80::d1fe:f3ea:349d:cb9a]) by AM0PR0702MB3730.eurprd07.prod.outlook.com ([fe80::d1fe:f3ea:349d:cb9a%13]) with mapi id 15.20.0366.003; Fri, 22 Dec 2017 12:58:14 +0000 From: Kevin Darbyshire-Bryant To: Jonathan Morton CC: Andy Furniss , Cake List Thread-Topic: [Cake] overheads or rate calculation changed? Thread-Index: AQHTeD9kTHg0L/CIjUSYhLop9ZdEVaNM/AuAgAHyiYCAABYiAIAAIlaOgAAxgoA= Date: Fri, 22 Dec 2017 12:58:14 +0000 Message-ID: <10958FF4-DEEC-4546-BE6D-5B2F382A8393@darbyshire-bryant.me.uk> References: <31d49a5d-02a2-3dc8-a455-52d453b83bdf@gmail.com> <32730842-8E7E-4D9E-BF63-AF320906BB7E@darbyshire-bryant.me.uk> In-Reply-To: Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [2a02:c7f:1232:22b::dc83] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR0702MB3585; 6:PCYimk+plTdlFiIRpqmo7tyJpCs0k9pPboJtDPTHFv4E4iTm4Mo+3r8FB6dFmJZXAJDC3Rmhu0Xmhrne98QrVocmzZo1nc2BY8cykm9FOTeauNWGNUtw99yjKm7bxZP3WA5PFcZuZmQ4Gnb6xY3JKbt1A7XIpIfCl15cDDVXcLi9YOP52MHHVGfNlUrbgwTIY/vlsjBs/4nNDxtNfFPV3CTSOMZOz+nK9k2PQl3KVdeDxApQENfFlgUVUWLWXu9OJHskWVc5nsUseZjlfc4ExG4C3RJP22D8AP3vmrRleMmSmLUegznfqSGW9+nFB9BCkhtE+/6Ngslyn/a0mpBQdK4X9q7hc38qWYdzNZRgvYI=; 5:Swr0gj2rtqn79v/J1eI2kc7Gw9RDfzu8zrmgSy2MSDL9kvmLvNkFFF9SbjwLF1TQUB+vN3UKkXiZ4v8NoiBspcv+BiZgkJ0+Q4Su+4CKiKY8XYmSk31KKybohTA9VQENeGUmrPy8VK+0HQ7innKCqBJ0fgsQG1xFrGST0lrYy/A=; 24:4V18e5mrwS9fCzcAlCzxD0uChECcb1kkj7IklifUigeYnpJId8Tb/MEj9xtA1SeP5LfOv5rhLlCdiDmYmL7lNKIZME6bBLLFGKaJVGYyRRU=; 7:VPQe6P0sLJVStQ5oQIViuUWCSXwYm+0MS7ekzp0AQsuSb5YXSY+nAldmrFQzjNooFoUh1VeMVEkXVt7ZCd+3LMIAUaN+RgZNtwHmzLcndbOug0oUp+FA79AJLhSgdnWnIRkFytOuMeeAXs61Dmz0HqWPLsdX1+7PgUgrkhSwmXZGP8M1hfL2vquFQJICrO9LR5vYQb0GWRvTSuAOeU/vz+w+/Gsn5kb81h9CliSpFdra+F8cskGpxNVTbN0krTZO x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-correlation-id: 41a9d0ae-3403-48b4-9c06-08d5493ba9e3 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020020)(7021020)(4534040)(7022020)(4602075)(4603075)(4627136)(201702281549075)(7023020)(5600026)(4604075)(3008031)(2017052603307)(7153060)(49563074); SRVR:AM0PR0702MB3585; x-ms-traffictypediagnostic: AM0PR0702MB3585: authentication-results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(102415395)(6040470)(2401047)(5005006)(8121501046)(10201501046)(3231023)(944501042)(93006095)(93001095)(3002001)(6041268)(20161123562045)(2016111802025)(20161123564045)(201703131423095)(201702281528075)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(6072148)(6043046)(201708071742011); SRVR:AM0PR0702MB3585; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM0PR0702MB3585; x-forefront-prvs: 05299D545B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(39830400003)(376002)(39380400002)(366004)(24454002)(189003)(199004)(2950100002)(305945005)(81156014)(6436002)(6916009)(7736002)(42882006)(5250100002)(2900100001)(36756003)(6512007)(14454004)(6116002)(53936002)(102836004)(229853002)(81166006)(478600001)(6486002)(8676002)(39060400002)(25786009)(53546011)(106356001)(74482002)(54906003)(6506007)(76176011)(316002)(8936002)(97736004)(2906002)(105586002)(3280700002)(3660700001)(4326008)(93886005)(1411001)(6246003)(83716003)(68736007)(86362001)(33656002)(5660300001)(82746002)(99286004)(99936001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0702MB3585; H:AM0PR0702MB3730.eurprd07.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: multipart/signed; boundary="Apple-Mail=_34A60686-6A50-4375-9694-CE451EA84EED"; protocol="application/pgp-signature"; micalg=pgp-sha256 MIME-Version: 1.0 X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-Network-Message-Id: 41a9d0ae-3403-48b4-9c06-08d5493ba9e3 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Dec 2017 12:58:14.3707 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0702MB3585 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 12:58:16 -0000 --Apple-Mail=_34A60686-6A50-4375-9694-CE451EA84EED Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 22 Dec 2017, at 10:00, Jonathan Morton = wrote: >=20 > 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. >=20 > 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. I=E2=80=99ve been unable to discern what distribution/branch/merge = strategy is being aimed for here so can=E2=80=99t offer constructive = advice. Git has always done what it=E2=80=99s supposed to for me, that = may have been not quite what I expected but it=E2=80=99s always been = logical. >=20 > 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. >=20 > - Jonathan Morton Cheers, Kevin D-B 012C ACB2 28C6 C53E 9775 9123 B3A2 389B 9DE2 334A --Apple-Mail=_34A60686-6A50-4375-9694-CE451EA84EED Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="signature.asc" Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEASyssijGxT6XdZEjs6I4m53iM0oFAlo9AWUACgkQs6I4m53i M0o5cRAAq0A5Rg0gOJDR/sFOaIrq7VtoH4rDHO1pA/YQ0UCHHwya1D8WE2wesTrU rf6IIMXb6VevZudC3stK7elzcBxJsbjcbuXkrM2hQTpHAQ6SfTNppITzeyDbYxoO aUtlC02ej/3tVdTcUcs/KGXCEZK5rtgCNAGiDKXqHTOfsBEvfzmni36m4UaiZs/7 N9QXqnJhzKhkT0RMKdQZIko2/oGdbtMmYoAFsXLlS5wwP7S8PtOxwuGj5xii63Kr wkZWlR8T7nbm2gLL4CFVufgd4VfjL5c6C3tyRx2Qkqdhgflxdt9mOkK6Y/qb2rRc pD2Kavdr8EV3lgcYKMaakCIrY3mIq7T3bznCTk36YtXk9ZjfVWaVKOuvX8Za45Cc 2mndlv7Rbm77FzpibrqvwzgH8ous8Pas3B2FShcClIlcaK84IX2AQNtP0Kr9J4IL JD6cmhH70IXWZ+kWc4TWDR+FwIVs3f+dSgos5O0hpzaJzE+bN0e33VkZrW3Fp4NR fnfH39C0gHy9XvBe2kvacA+waxcmRbvNlaeM5+T03YNemcAR+Lg1UA0ICb69iYPa JXd9t+KtsEZMX5D95xUHCW7Bujo237ydWyg109GBmEpbHnsMJvZySgyhn9qE63NQ ES0drQL4B5I6jTHlzTZ0oEuIowEMzKZH5f4+GOQhhx5KgrKaevw= =Nk1Y -----END PGP SIGNATURE----- --Apple-Mail=_34A60686-6A50-4375-9694-CE451EA84EED--