On Fri, Apr 01, 2016 at 01:13:02PM +1000, Dave Airlie wrote: > Can you rebase this onto rc1? since I'm getting conflicts when I pull > it, and I really shouldn't be. > > Dave. Hi Dave, Looks like my maintainership is off with a rocky start. Soon after pulling Alexey's patch another one has landed that fixes it :) I have now pulled Dan Carpenter's patch as well, did the proper sign-off for both patches and updated the branch. This is the updated pull request. Many thanks and sorry for the churn! Liviu The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca: Linux 4.6-rc1 (2016-03-26 16:03:24 -0700) are available in the git repository at: git://linux-arm.org/linux-ld.git for-upstream/hdlcd for you to fetch changes up to 69c2565a3cca3d79572941d62165af7805d72762: drm: ARM HDLCD - fix an error code (2016-04-04 10:11:33 +0100) ---------------------------------------------------------------- Alexey Brodkin (1): drm: ARM HDLCD - get rid of devm_clk_put() Dan Carpenter (1): drm: ARM HDLCD - fix an error code drivers/gpu/drm/arm/hdlcd_drv.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯ _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel