From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (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 87E7A3BA8E for ; Wed, 29 Nov 2017 07:39:24 -0500 (EST) Received: from [192.168.250.101] ([134.76.241.253]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MVZuV-1ecUkw1h7f-00YzHH; Wed, 29 Nov 2017 13:39:21 +0100 Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) From: Sebastian Moeller In-Reply-To: <87k1yaxc65.fsf@nemesis.taht.net> Date: Wed, 29 Nov 2017 13:39:19 +0100 Cc: Kevin Darbyshire-Bryant , Cake List Content-Transfer-Encoding: quoted-printable Message-Id: References: <700AAEDF-6D34-4F0B-8B48-E34A554F5B6D@darbyshire-bryant.me.uk> <87a7z6p7cz.fsf@nemesis.taht.net> <0A71A7BA-0FD6-4F1C-97F2-2024626FC561@darbyshire-bryant.me.uk> <87k1yaxc65.fsf@nemesis.taht.net> To: Dave Taht X-Mailer: Apple Mail (2.3273) X-Provags-ID: V03:K0:wcjqG3u9TKj5tGTKa7edesC6Lg9c2ex1vPa0NLXDNcHkHrFNsQN 8CbWk925jroraV56MwJjjATiRw0EUC4u1i3UivWkB+eb2KJU8U6SsFzWCeMcuXWplHLndQx FUae2Va99e3pS6ZqLZVu0c1lz8HAc47SFgE8J1W22fl7USaaF2XXlKuyLiquCdC50yYE+43 D/EUmANqvcsxdGPEsedog== X-UI-Out-Filterresults: notjunk:1;V01:K0:YQ4emxQ98FU=:PEx2lSBl8BLm3J9T+weQ+E SVtJtRIVi+QJKsnAkmVK2Y0tQgY4aA7moC+ADLX6fsgPjwvGJUIE1+RL6wSO1nzIrOeAv2/x4 TNn/fGmJAi2vIu6ocTWEp++SN8qfbSZUKNuzgwLRQ8U1hiw51c5d9EB6s13JikkwfuvfrXwd+ XTqvtKJ4TwDJ9E4xUzDXlZ6pxFSI4sfsspo6bZfPNrFESu74yXuiRO4SHkcFA1sm+Qw0c4mwl TgLc+DIchiD6e4UElrsL2o4Av1blWnmjK4/ik20pCSeZbCd6JFHgUqtdnvXUB/WHAXxmWr/W7 IwOHDNZgtRcdCBjFrGK0kgaSppw8XpRbcJUMNt06Z+9+jFV8jFcf6fmJx7E/rX+diTPHCmrD7 SFWILAsS0KJ5cVhmh9B8bHW2+/rRHm9W91S8tdJQNVCjmk4dtAmiwl9LrV6R0BsX7laglzIvX uRn2eVfmbmC626bBcf1HWogW0c7eQRt3U+viND6cvM/Mw2welpMDNh+kGgP9U9s0/GYfkVuL7 uq8TdFQ38tS+qLB4L4RsCvsppZqXbMQnvBJi47WL+5bv89uahgBs/XfYit2rvRqOeJ6gpdzEK 4XjWQnmQg/K61+brASlClOpJCESJ6fJBNAnKm4mREciAgQekq6RexpyeZ8htyiggyTi7mRCyC AXNPyno3lxJmSe5DRC3QHWLUecdaRW0ZOLqirDjJhceQO1CinY9zIF7rHxDG9imTsjZx4Q6Wy lrvHxIWM7DrEl2FQwtGC3NlcAVTwS1q5XCSYE+Eqdc5aZ9yShUffUYoUoHXdxx4X8yiy0I0/v G88DnKuVXmGSw/sCgWxbrCMQcLG+TqkPJkDu/41SBWMi5dRTCA= Subject: Re: [Cake] Cake tree unreadable 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: Wed, 29 Nov 2017 12:39:24 -0000 Hi All, > On Nov 28, 2017, at 23:37, Dave Taht wrote: >=20 >=20 > A flag day here is feasible. I will fiddle along the lines you = describe. >=20 > As for other flag days... >=20 > I'm toying with the idea of fixing xstats in a separate branch. I = really > hate the idea of breaking backward compatability here, but I do = suspect > it will be a barrier to upstreaming, and it is, quite inefficient. So if we go and change the statistics could we rename max_len to = maxpacket so that fq_codel and cake report the same information under = the same name. Sure the qdisc statistics are not terribly well = coordinated naming-wise, but maybe cake could show to be a good citizen = here? Best Regards >=20 >=20 > Kevin Darbyshire-Bryant writes: >=20 >>> On 28 Nov 2017, at 18:48, Dave Taht wrote: >>>=20 >>>=20 >>>=20 >>> It sounds like your git-foo is stronger than ours! I'm not even = trying >>> to get head to work, tho my intent would be to promote cobalt to it. >>=20 >> git checkout master >> git pull (does the equivalent of git fetch origin; git merge = origin/master) >> git merge cobalt (this will produce a minor merge conflict in = sch_cake.c) >>=20 >> fix merge conflict >>=20 >> git add sch_cake.c >> git commit (complete the merge - and create a merge commit in = process) >>=20 >> git diff cobalt - should return nothing=E2=80=A6content of master & = cobalt are the same. >>=20 >> git push (send this to github assuming above is true!) >>=20 >> If it were me I=E2=80=99d now restart the cobalt =E2=80=98feature=E2=80= =99 branch from this new =E2=80=98master=E2=80=99 point. >>=20 >> git checkout cobalt >> git reset =E2=80=94hard master (resets =E2=80=98cobalts=E2=80=99 = commit pointer and the current tree on disc to where master is) >> git push -f (send that to github -f means force) >>=20 >> You=E2=80=99ve just created a =E2=80=98new=E2=80=99 history for the = =E2=80=98cobalt=E2=80=99 feature branch, so all >> =E2=80=98clients=E2=80=99 of that branch will see a =E2=80=98forced = update=E2=80=99 message=E2=80=A6.you=E2=80=99ve broken the >> linear git history for that branch, so they=E2=80=99d have to do = something like =E2=80=98git >> checkout cobalt; git reset =E2=80=94hard origin/cobalt=E2=80=99 >>=20 >> I used to be terrified of =E2=80=98git reset=E2=80=99 until I read = https://git-scm.com/blog/2011/07/11/reset.html - at that point I = realised all it (and the whole of git) is about moving pointers = contained in branch names. >>=20 >> Of course I=E2=80=99d advise checking things carefully before doing = force pushes=E2=80=A6.but then I=E2=80=99d imagine many on this list = have forks and hence clones of the git repo in various places so it=E2=80=99= s all recoverable. >>=20 >>=20 >>>=20 >>> I didn't know about the cherry-pick option til now, either. I was = doing >>> a git format-patch thenewcommit, then a git am on my other branch. >> I=E2=80=99ve just sped up your workflow then :-) >>>=20 >>> For example, with this config, git fetch --all doesn't do anything. >> git fetch =E2=80=94all goes and gets all the branches/commits etc = from all configured >> remotes. You=E2=80=99ve only 1 remote (origin=E2=80=A6which points = at github) and it=E2=80=99s likely >> that since it=E2=80=99s not very active that you=E2=80=99ve all the = commits etc already in your >> local git database. >>=20 >> I have several remotes e.g. >>=20 >> [remote "origin"] >> url =3D git@github.com:ldir-EDB0/sch_cake.git >> fetch =3D +refs/heads/*:refs/remotes/origin/* >> [remote "upstream"] >> url =3D git@github.com:dtaht/sch_cake.git >> fetch =3D +refs/heads/*:refs/remotes/upstream/* >> [remote "teg"] >> url =3D git@github.com:tegularius/sch_cake.git >> fetch =3D +refs/heads/*:refs/remotes/teg/* >> [remote "rmounce"] >> url =3D git@github.com:rmounce/sch_cake.git >> fetch =3D +refs/heads/*:refs/remotes/rmounce/* >>=20 >> so my =E2=80=98git fetch =E2=80=94all=E2=80=99 will go and look in = all those places for things I=E2=80=99m >> missing. Origin is my own github base cake repo (a clone/fork of = yours), >> =E2=80=98upstream=E2=80=99 is a pointer directly to your github repo, = =E2=80=98teg=E2=80=99 & =E2=80=98rmounce=E2=80=99 are >> pointers to their forks/clones. >>=20 >> So to bring my master up to date with yours: >>=20 >> git checkout master >> git fetch =E2=80=94all >> git merge upstream/master. (which should do a =E2=80=98fast-forward=E2=80= =99 to where you are since I intentionally don=E2=80=99t do any of my = own work in master) >> git push (update my own fork with all the latest stuff) >>=20 >>=20 >> My own stuff (not that there is any anymore =E2=80=98cos it=E2=80=99s = all in cobalt) would then be rebased on top of the stable (but moving) = master e.g: >>=20 >> git checkout worldpeace (my WIP mega solution branch) >> edit edit edit, commit commit commit >> git rebase master. - replay all of my stuff on top of the updated = master >> edit - fixup any conflicts >> git push -f (force update my worldpeace branch on github) >>=20 >>=20 >> I like git, but I=E2=80=99m by no means a guru on it=E2=80=A6.and it = took me about 2 years to go from =E2=80=98I hate it=E2=80=99 to =E2=80=98a= hhh I get it - sort of=E2=80=99. The git reset article helped. Also = having =E2=80=98git prompt=E2=80=99 enabled was a godsend. >>=20 >>>=20 >>> [core] >>> repositoryformatversion =3D 0 >>> filemode =3D true >>> bare =3D false >>> logallrefupdates =3D true >>> [remote "origin"] >>> url =3D git@github.com:dtaht/sch_cake.git >>> fetch =3D +refs/heads/*:refs/remotes/origin/* >>> [branch "master"] >>> remote =3D origin >>> merge =3D refs/heads/master >>> [branch "for_upstream_4.16"] >>> remote =3D origin >>> merge =3D refs/heads/for_upstream_4.16 >>> [branch "cobalt"] >>> remote =3D origin >>> merge =3D refs/heads/cobalt >>>=20 > _______________________________________________ > Cake mailing list > Cake@lists.bufferbloat.net > https://lists.bufferbloat.net/listinfo/cake