[Letux-kernel] diffs between linus/master and letux-base

H. Nikolaus Schaller hns at goldelico.com
Mon Feb 13 10:23:31 CET 2017

> Am 12.02.2017 um 22:19 schrieb Andreas Kemnade <andreas at kemnade.info>:
> 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
>> before.
>> 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
>> those.
>> 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

added and I will rebase to 4.10-rc8 asap.
I had to remove one blank line to avoid merge problems with some other branch.

BR and thanks,

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.goldelico.com/pipermail/letux-kernel/attachments/20170213/376f1b1c/attachment.asc>

More information about the Letux-kernel mailing list