On Saturday, October 14, 2017 4:43:51 PM CEST Russell King - ARM Linux wrote: > On Thu, Sep 28, 2017 at 09:09:42PM +0200, Rafael J. Wysocki wrote: > > On Thu, Sep 28, 2017 at 11:49 AM, Russell King - ARM Linux > > <[email protected]> wrote: > > > On Tue, Sep 26, 2017 at 11:37:40PM +0200, Rafael J. Wysocki wrote: > > >> On Tue, Sep 26, 2017 at 11:28 PM, Russell King - ARM Linux > > >> <[email protected]> wrote: > > >> > On Tue, Sep 26, 2017 at 10:47:10PM +0200, Rafael J. Wysocki wrote: > > >> >> From: Rafael J. Wysocki <[email protected]> > > >> >> > > >> >> None of the sa1111 drivers in the tree implements the suspend and > > >> >> resume callbacks from struct sa1111_driver, so drop them and drop > > >> >> the corresponding callbacks from sa1111_bus_type. > > >> >> > > >> >> Signed-off-by: Rafael J. Wysocki <[email protected]> > > >> > > > >> > This will conflict with some patches I have - would you like me to > > >> > queue > > >> > it along with my changes? > > >> > > >> Yes, please. > > >> > > >> > When would you like to get this merged? > > >> > > >> When possible. :-) > > >> > > >> I would like to drop the legacy suspend/resume callbacks from struct > > >> bus_type eventually, as that's long overdue, and this is needed for > > >> that purpose. Not too urgent, though. > > > > > > Sorry, I'd forgotten that I already had a similar patch: > > > > > > http://git.armlinux.org.uk/cgit/linux-arm.git/commit/?h=sa1100&id=0e4ec3edb1c7e44aba1f48b924ab0c77431fd155 > > > > > > so no need to merge your veresion... I just need to get my version merged. > > > > OK > > As other maintainers have taken patches from my series, I can no longer > merge your patch this cycle, (due to the dependencies involving multiple > trees.) I'll postpone the change until after the next merge window.
That's OK, thanks. > I can't really say about Locomo, having never really been involved with > that stuff. Well, so far no on has been complaining about that patch. :-) Thanks, Rafael

