Hi Dave,
When I said I had ~6 changes yesterday, I was lying. 3 of those changes were
included in the final misc-next pull and already exist in your tree. So then
there were 3. All quite simple, nothing to write home about.
You'll notice the unsightly backmerges below, this was due to the rockchip patch
being merged to -next-fixes instead of -next weeks earlier. Since I couldn't
fast forward, I had to resort to a series of backmerges to sync everything up. In
hindsight, I should have just rebased -next-fixes and re-applied the patch, but I
chose a preservationist route. Mentally noted for next time, I guess. Anyways,
hopefully this is headache free and things will be cleaner from here on out.
drm-misc-next-fixes-2017-06-27:
Core Changes:
- bridge: return -ve errno in drm_panel_bridge_add (Eric)
Driver Changes:
- rockchip: ensure mm lock is held in error paths (Caesar)
- dw-hdmi: fix formatting in input format table (Jonathan)
Cc: Caesar Wang <wxt@xxxxxxxxxxxxxx>
Cc: Eric Anholt <eric@xxxxxxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
Happy vacation, Sean
The following changes since commit 6d61e70ccc21606ffb8a0a03bd3aba24f659502b:
Backmerge tag 'v4.12-rc7' into drm-next (2017-06-27 08:28:30 +1000)
are available in the git repository at:
git://anongit.freedesktop.org/git/drm-misc tags/drm-misc-next-fixes-2017-06-27
for you to fetch changes up to c048c984de38d906bb0df56ec2ae90eafc123d0a:
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes (2017-06-27 11:36:28 -0400)
----------------------------------------------------------------
Core Changes:
- bridge: return -ve errno in drm_panel_bridge_add (Eric)
Driver Changes:
- rockchip: ensure mm lock is held in error paths (Caesar)
- dw-hdmi: fix formatting in input format table (Jonathan)
Cc: Caesar Wang <wxt@xxxxxxxxxxxxxx>
Cc: Eric Anholt <eric@xxxxxxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
----------------------------------------------------------------
Caesar Wang (1):
drm/rockchip: gem: add the lacks lock and trivial changes
Eric Anholt (1):
bridge: Fix panel-bridge error return on !panel.
Jonathan Corbet (1):
DRM: Fix an incorrectly formatted table
Sean Paul (4):
Merge remote-tracking branch 'origin/master' into drm-misc-next-fixes
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
Merge tag 'drm-misc-next-2017-06-19_0' of git://anongit.freedesktop.org/git/drm-misc into drm-misc-next-fixes
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
drivers/gpu/drm/bridge/panel.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 +-
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 5 ++-
include/drm/bridge/dw_hdmi.h | 70 ++++++++++++++---------------
4 files changed, 40 insertions(+), 39 deletions(-)
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
