lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CA+i0qc7+Q416voe3sQLd3WUbu2kWRcduw9ayVq9+R+eL4zPEbA@mail.gmail.com>
Date:	Tue, 30 Jul 2013 01:16:38 +0300
From:	Tomas Winkler <tomasw@...il.com>
To:	Greg KH <greg@...ah.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Arnd Bergmann <arnd@...db.de>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the char-misc tree with Linus' tree

>> (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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ