From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <toke@toke.dk>
Received: from mail2.tohojo.dk (mail2.tohojo.dk [77.235.48.147])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by huchra.bufferbloat.net (Postfix) with ESMTPS id 23F9221F77B
	for <cake@lists.bufferbloat.net>; Mon,  5 Oct 2015 02:55:12 -0700 (PDT)
X-Virus-Scanned: amavisd-new at mail2.tohojo.dk
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=toke.dk; s=201310;
	t=1444038910; bh=CjhRZyO5lzm/janeioEaTRhpLcFG45k/auc7P20J1BQ=;
	h=From:To:Cc:Subject:In-Reply-To:References:Date;
	b=Nm/FoNPK5nAtSBzuc5tJIOgPsIXgBx2Bxz05N+EEkmZ7+Zn2jBE8vWNa/xlt72Z1E
	BVxTsi7401qpvUn47Uu/tBfhxajwpepWl8JJPhPTKkD8EwWvRfLlvIZDsXIX51SWfb
	GioOBg1JthaXKnYPxCNn9rqyQhxzwOEMh5pgXheA=
Sender: toke@toke.dk
Received: by alrua-kau.kau.toke.dk (Postfix, from userid 1000)
	id 41601C400F4; Mon,  5 Oct 2015 11:55:09 +0200 (CEST)
From: =?utf-8?Q?Toke_H=C3=B8iland-J=C3=B8rgensen?= <toke@toke.dk>
To: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
In-Reply-To: <561246DC.1050507@darbyshire-bryant.me.uk> (Kevin
	Darbyshire-Bryant's message of "Mon, 5 Oct 2015 10:46:04 +0100")
References: <CAA93jw6nTUK89aU=Zmj4bUj9oH8ZWB+bNTSeqP_aiOJQSwV5yA@mail.gmail.com>
	<56123BD1.2040902@darbyshire-bryant.me.uk>
	<5612415E.5000209@darbyshire-bryant.me.uk>
	<CAA93jw4x8CWrds41UxVds7OdLr0c-VsyE+kOprV894jALL=7Qw@mail.gmail.com>
	<561246DC.1050507@darbyshire-bryant.me.uk>
Date: Mon, 05 Oct 2015 11:55:09 +0200
X-Clacks-Overhead: GNU Terry Pratchett
Message-ID: <87zizx3aiq.fsf@toke.dk>
MIME-Version: 1.0
Content-Type: text/plain
Cc: cake@lists.bufferbloat.net
Subject: Re: [Cake] cake stats 1+ stuff not big on
X-BeenThere: cake@lists.bufferbloat.net
X-Mailman-Version: 2.1.13
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, 05 Oct 2015 09:55:35 -0000

Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> writes:

> On 05/10/15 10:34, Dave Taht wrote:
>> also please, stay clear of sch_cake today. I am about 3/4s done
>> through fixing checkpatch... it's painful...
> Sorry Dave.  Definitely wasn't going to touch sch_cake today!  A simple
> 'throw-away' change to tc-adv I thought just about permissible.
> Kevin has push mode disabled...honest.

If only there existed some kind of 'system' to keep track of (maybe
'control') the changes (or 'revisions') that people do to the code to
avoid these kinds of conflicts... ;)

-Toke