[Letux-kernel] diffs between linus/master and letux-base
andreas at kemnade.info
Sun Feb 12 22:19:53 CET 2017
On Tue, 7 Feb 2017 15:25:05 +0100
"H. Nikolaus Schaller" <hns at goldelico.com> wrote:
> > Which procedure should be followed to revert stuff to mainline
> > For the files I clean up, should I myself revert the file in
> > letux-base and then add the remaining, still needed stuff into a
> > branch?
> The standard procedure I do is to revert in the feature branch first
> (git checkout linus/master; git commit -sm 'revert' -a), and then
> revert this manual revert, split and fix this revert revert until it
> fits... This should ideally result in the same code after merging as
> If everything is still ok, the first revert goes to the
> work/for-next-letux-base branch. This is merged every now and then so
> the revert finally goes to letux-base. And then a rebase letux-base
> makes it disappear everywhere else, i.e. also in the feature branch.
> But this means you shouldn't commit to letux-base or
> work/for-next-letux-base yourself since it may mix up my activities
> in unpredictable manner... And even worse I do a git push -f for
> So just let me know when you have such a patch branch ready. Then I
> can cherry-pick the revert and do the rebase and everything else.
work/kemnade/phy-twl is one such branch.
First patch is a revert to linus/master
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 819 bytes
Desc: OpenPGP digital signature
More information about the Letux-kernel