From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758307AbbEaHWc (ORCPT ); Sun, 31 May 2015 03:22:32 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:41222 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754798AbbEaHWY (ORCPT ); Sun, 31 May 2015 03:22:24 -0400 Date: Sun, 31 May 2015 16:16:34 +0900 From: Greg Kroah-Hartman To: Tony Lindgren Cc: Andreas Fenkart , Felipe Balbi , Huiquan Zhong , Kevin Hilman , NeilBrown , Mika Westerberg , Nishanth Menon , Peter Hurley , Sebastian Andrzej Siewior , Ulf Hansson , Thomas Gleixner , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-omap@vger.kernel.org, "Rafael J. Wysocki" , Alan Stern Subject: Re: [PATCH 3/5] serial: omap: Switch wake-up interrupt to generic wakeirq Message-ID: <20150531071634.GA9051@kroah.com> References: <1431560196-5722-1-git-send-email-tony@atomide.com> <1431560196-5722-4-git-send-email-tony@atomide.com> <20150528145616.GG30984@atomide.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150528145616.GG30984@atomide.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 28, 2015 at 07:56:16AM -0700, Tony Lindgren wrote: > Hi Greg, > > * Tony Lindgren [150513 16:38]: > > We can now use generic wakeirq handling and remove the custom handling > > for the wake-up interrupts. > > How do you prefer to handle the two omap specific serial driver > changes in this series? > > There's a dependency to Rafael's pm-wakeirq branch that contains: > > 4990d4fe327b ("PM / Wakeirq: Add automated device wake IRQ handling") > 56f487c78015 ("PM / Runtime: Update last_busy in rpm_resume") > f6a2fbb903d5 ("PM / runtime: add note about re-calling in during > device probe()") > > The 8250_omap.c driver change also needs to be merged with: > > 9e91597f2423 ("serial: 8250_omap: provide complete custom startup & > shutdown callbacks") > > Not sure if 9e91597f2423 is immutable, but if so then I could: > > a) Send you a pull request for the two serial driver patches > based on Rafael's pm-wakeirq branch merged with 9e91597f2423 to > avoid the merge conflict. > > b) Apply both serial driver patches into omap-for-v4.2/wakeirq > based on Rafael's pm-wakeirq branch merged with 9e91597f2423. That one sounds good to me, feel free to do so and add: Acked-by: Greg Kroah-Hartman It's the easiest for everyone involved, right? thanks, greg k-h