On Thu, May 28, 2015 at 07:56:16AM -0700, Tony Lindgren wrote: > Hi Greg, > > * Tony Lindgren <tony@xxxxxxxxxxx> [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 <gregkh@xxxxxxxxxxxxxxxxxxx> It's the easiest for everyone involved, right? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html