Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932642AbcJTSJo (ORCPT ); Thu, 20 Oct 2016 14:09:44 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:49316 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932314AbcJTSJm (ORCPT ); Thu, 20 Oct 2016 14:09:42 -0400 Date: Thu, 20 Oct 2016 20:07:12 +0200 (CEST) From: Thomas Gleixner To: Rich Felker cc: Daniel Lezcano , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, Rob Herring , Mark Rutland Subject: Re: [PATCH v9 0/2] J-Core timer support In-Reply-To: Message-ID: References: <20161017093013.GA1703@mai> <20161020012225.GK19318@brightrain.aerifal.cx> <20161020073240.GF1703@mai> <20161020151552.GQ19318@brightrain.aerifal.cx> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1162 Lines: 29 On Thu, 20 Oct 2016, Thomas Gleixner wrote: > Daniel, > > On Thu, 20 Oct 2016, Rich Felker wrote: > > On Thu, Oct 20, 2016 at 09:32:40AM +0200, Daniel Lezcano wrote: > > > Unfortunately it won't happen. v4.9-rc1 is already out. The driver will be > > > in v4.10. > > > > > > If you wanted patches merged for v4.9, they should have been merged in the > > > downstream tree before v4.8-rc5, so they hit the upstream tree for v4.9's merge > > > window. > > > > I've been trying to get what's essentially the same patch merged since > > before the 4.8 merge window. I would be more understanding if this > > were something new that's not upstream, but broken support for the > > hardware (that, from a user perspective, is a bug, since they can > > select the target but then it doesn't boot) has already been in one > > release due to missing core drivers, and the irq patches have already > > been merged in this release (post-rc1 even). > > It's hardware enablement and not a new feature, so it's fine to merge it > now. I'll pick it up later tonight. Daniel, it's the top two commits in your 4.10 branch. So it's not a big deal to zap them. Thanks, tglx