TL;DR: what exactly should I resend and when?
On Mon, 2015-02-09 at 14:07 +0800, Mark Brown wrote:
On Sat, Feb 07, 2015 at 09:38:04AM +0100, Paul Bolle wrote:
Patches 2/4, 3/4, and 4/4 didn't apply. Locally I carry them in a tree that constantly rebases on top of linux-next. So locally I carry these patches on top of next-20150204.
What's posted doesn't apply against -next.
That's because of trivial conflicts with commit a59aa180ea56 ("ASoC: samsung: Replace depends on REGMAP_I2C with depends on I2C"). That commit landed in next-20150127 (ie, eight days after I sent this short series). I guess I resolved these conflicts in the local version of these patches and promptly forgot about them, as they were so trivial.
What tree would you like me to rebase this onto?
As ever submit against the tree listed in MAINTAINERS
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Which is not entirely obvious, since this series only touches files below sound/soc/samsung/. That directory is mentioned in MAINTAINERS under "ARM/SAMSUNG EXYNOS ARM ARCHITECTURES" and under "SAMSUNG AUDIO (ASoC) DRIVERS". (Why does that directory need two entries?) Neither entry mention a repository.
Anyhow, this entire series will probably now apply to your for-next branch. That's because your for-next branch doesn't contain commit a59aa180ea56 ("ASoC: samsung: Replace depends on REGMAP_I2C with depends on I2C"), which I mentioned above, or commit 6cf2cf315075 ("ASoC: samsung: Remove goni or aquila with the WM8994"), which is 1/4 of this series, anymore.
See, it turns out there are two sound.git#for-next branches in linux-next. One is done by Takashi, the other by you. Yours is called sound-asoc in Next/Trees, the other sound. sound-asoc contained the two commits I just mentioned in next-20150209. It has dropped both, it seems, by next-20150210, but by then they were already included in Takashi's sound. So these two commits are now in linux-next through that branch. Figuring this all out required quite a bit of head-scratching.
And now I wonder what I should resend: the three patches 2/4, 3/4, and 4/4 with the trivial conflicts resolved or the entire series? And when do you prefer I resend?
Thanks,
Paul Bolle