netdev - net-2.6 and net-2.6.26 merged

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>] [day] [month] [year] [list]

Message-Id: <20080318.005225.50500035.davem@davemloft.net>
Date:	Tue, 18 Mar 2008 00:52:25 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	netdev@...r.kernel.org
Subject: net-2.6 and net-2.6.26 merged


As I eluded to in a reply I just made to John Linville
wrt. wireless merging, I did a lot of upstream
pulling into my trees.

I pulled Linus's current tree into net-2.6

Next, I pulled net-2.6 into the net-2.6.26 tree and
resolved all conflicts.  I did an "allmodconfig" build
on sparc64 and that went without any build errors.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html