From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the firmware tree Date: Thu, 26 Jun 2008 23:38:33 +1000 Message-ID: <20080626233833.f78fbd36.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Thu__26_Jun_2008_23_38_33_+1000_bjq+fMblyyv0qMvp" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:41823 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752868AbYFZNi5 (ORCPT ); Thu, 26 Jun 2008 09:38:57 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: David Woodhouse Cc: linux-next@vger.kernel.org, Takashi Iwai --Signature=_Thu__26_Jun_2008_23_38_33_+1000_bjq+fMblyyv0qMvp Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi David, Today's linux-next merge of the firmware tree got conflicts in sound/pci/Kconfig between commits 829808ac06b33cdc678ad7dbd628d71d65f8a9c3 ("[ALSA] Fix AC97 kconfig items") and 03cf8be8c43b8c7febc5aacc110fd6a0bff00aa7 ("sound: Convert to menuconfig") from the sound tree and commits aee133db3305c4eb85a2d024db613ff44e714f20 ("= firmware: convert korg1212 driver to use firmware loader exclusively"), 8fa= 5ae5506e4a5f69a0c662bc499d8992a2e26c8 ("firmware: convert maestro3 driver t= o use firmware loader exclusively") and 62bd53e67f6516ce6ec6c3c40db5d8868c= 7b2487 ("firmware: convert ymfpci driver to use firmware loader exclusively") from the firmware tree. I can carry the obvious fixups for these. I may have previously reported these (erroneously) against sound/Kconfig. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Thu__26_Jun_2008_23_38_33_+1000_bjq+fMblyyv0qMvp Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkhjm9kACgkQTgG2atn1QN9OlACeNX1xShmGlDW+m+gjFz0QUlCj mvAAn3TkFf02haRO4OuHzNulynQ7rdHR =Fkfu -----END PGP SIGNATURE----- --Signature=_Thu__26_Jun_2008_23_38_33_+1000_bjq+fMblyyv0qMvp--