-----Original Message----- From: Mark Brown [mailto:broonie@kernel.org] Sent: Wednesday, March 11, 2015 4:39 AM To: Lu, Han Cc: alsa-devel@alsa-project.org; Girdwood, Liam R Subject: Re: [PATCH v2 1/8] ASoC: Intel: add function to load firmware image
On Tue, Mar 10, 2015 at 10:41:20AM +0800, han.lu@intel.com wrote:
From: "Lu, Han" han.lu@intel.com
Add a general method to load firmware image, and apply to base firmware image loading. With the method, the driver will support loading multiple different modules in order to support different features.
This doesn't apply against current code - you should be sending things against my git tree (or -next is often close enough).
[Han] sorry, I made patches against for-next branch, and I just run $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git $ cd sound $ git checkout origin/for-next -b for-next And apply the patches manually $ patch -p1 < 0001-ASoC-Intel-add-function-to-load-firmware-image.patch $ patch -p1 < 0002-ASoC-Intel-add-function-to-load-sound-effect-module-.patch ... $ patch -p1 < 0008-ASoC-Intel-enable-parameter-restore-for-sound-effect.patch But didn't find conflict. Is there any mistake in my operation, or could you please share the error log so I can correct my patch? Very sorry for inconvenient.