On Sun, Oct 08, 2017 at 11:30:13AM +0100, Jonathan Cameron wrote: > On Wed, 04 Oct 2017 21:53:07 +0100 Jonathan Cameron <jic23@xxxxxxxxxxxxxxxxxxxxx> wrote: > > On 4 October 2017 20:50:37 BST, Lukas Wunner <lukas@xxxxxxxxx> wrote: > > > Just a gentle reminder, this patch isn't on your kernel.org branches > > > yet. I assumed the reason was a dependency / merge conflict with my > > > two patches on the fixes-togreg branch and you were waiting for them > > > to be in upstream. > > > They have landed in Linus' tree yesterday, I'm not sure if anything > > > else is necessary (backmerge or some such). > > OK. Looks like you were correct - this is waiting on the fixes to work > their way back into my tree. After the next rc is out (first one with these > in as they aren't in rc3) I'll ask Greg if he is willing to do a merge > with mainline as I have a load of ST patches queued up waiting for > some fixes as well. Right now I'm deliberately not pushing out a non > rebasing branch like I normally would - so as to be able to rebase on > these fixes when they become available in Greg's tree. Greg merged 4.14-rc4 into staging-next 48 minutes ago, so ready to go now. Thanks, Lukas -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
