linux-kernel - Re: linux-next: manual merge of the drm tree with Linus' tree

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.DEB.2.00.0910080437120.14330@skynet.skynet.ie>
Date:	Thu, 8 Oct 2009 04:38:04 +0100 (IST)
From:	Dave Airlie <airlied@...ux.ie>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jerome Glisse <jglisse@...hat.com>
Subject: Re: linux-next: manual merge of the drm tree with Linus' tree


> 
> Got similar conflicts today ... any way you can sort this out, please?

I'm testing the result of a merge at the moment, but I don't want to be 
premature with pushing it out.

hopefully be there tomorrow.

Dave.
--
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/