Messages in this thread | | | Date | Tue, 30 Jul 2013 01:16:38 +0300 | Subject | Re: linux-next: manual merge of the char-misc tree with Linus' tree | From | Tomas Winkler <> |
| |
>> (Unrelated white space changes are a pest :-() >> >> I fixed it up (see below) and can carry the fix as necessary (no action >> is required). > > Thanks, I've merged the char-misc-next branch into 3.11-rc3, so this > merge problem should no longer be there.
I've preferred the blank line there as these ifs became a bit dense nevertheless thanks for taking care of it.
Tomas
PS: sorry for the previous HTML mistake.
| |