linux-kernel - Re: linux-next: manual merge of the drm tree with the net 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] [day] [month] [year] [list]

Message-Id: <20090830.212918.146621489.davem@davemloft.net>
Date:	Sun, 30 Aug 2009 21:29:18 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	airlied@...ux.ie, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, ben@...adent.org.uk, divy@...lsio.com
Subject: Re: linux-next: manual merge of the drm tree with the net tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 31 Aug 2009 14:21:05 +1000

> Hi Dave,
> 
> Today's linux-next merge of the drm tree got a conflict in
> firmware/Makefile between commit 2e8c07c35b3ffee7689406be61fd1448ee45d3cd
> ("cxgb3: use request_firmware() for the EDC registers setup") from the
> net tree and commit ece2be7993cc5e269cbf0cad6442b401a2c31915 ("drm/mga:
> Use request_firmware() to load microcode") from the drm tree.
> 
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

This looks fine, please carry the fix until we all merge this stuff
in during the merge window :-)
--
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/