[alsa-devel] [PATCH] ASoC: cs42l51: split i2c from codec driver

Austin, Brian Brian.Austin at cirrus.com
Wed Apr 16 03:28:43 CEST 2014



> On Apr 15, 2014, at 18:58, "Mark Brown" <broonie at kernel.org> wrote:
> 
> On Tue, Apr 15, 2014 at 11:25:41PM +0000, Austin, Brian wrote:
>>> On Apr 15, 2014, at 17:58, "Mark Brown" <broonie at kernel.org> wrote:
> 
>>> Applied, thanks but there was some fuzz applying - please check it came
>>> out OK and that you were submitting against current code.
> 
>> Thanks, it was based off of topic/cs42l51. I'll check it now
> 
> Oh, that explains it.  Until I applied that patch there was no
> topic/cs42l51 - when Linus merges a branch I delete it and then start a
> new branch for any new work based off one of his -rcs (or another topic
> branch if there's a dependency).  Your copy of the branch will have been
> pre-merge window.  Since the merge window closed I'd deleted the old
> topic branch, the fuzz will have been due to some subsystem wide patches
> getting merged in.
Ah! That's good to know. I'm not that familiar with that yet, so I will keep better tabs on your branches and stick to for-next for compile tests.

Thanks Mark


More information about the Alsa-devel mailing list