linux-kernel - Re: [GIT]: Networking for 2.6.30

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: <alpine.LFD.2.00.0903261555290.3032@localhost.localdomain>
Date:	Thu, 26 Mar 2009 15:56:24 -0700 (PDT)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	David Miller <davem@...emloft.net>,
	Roland Dreier <rdreier@...co.com>
cc:	Andrew Morton <akpm@...ux-foundation.org>, netdev@...r.kernel.org,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT]: Networking for 2.6.30



On Thu, 26 Mar 2009, David Miller wrote:
> 
> Just FYI, I've just pushed a merge of the changes you pulled in today
> in order to resolve the one merge conflict that arose.

Well, I merged infiniband, and that caused more conflicts. I fixed them 
up, but people need to double-check my fixes.

		Linus
--
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/