dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Sean Paul <seanpaul@chromium.org>
To: Dave Airlie <airlied@gmail.com>
Cc: Jonathan Corbet <corbet@lwn.net>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	Caesar Wang <wxt@rock-chips.com>
Subject: [PULL] drm-misc-next-fixes
Date: Tue, 27 Jun 2017 16:53:20 -0400	[thread overview]
Message-ID: <20170627205320.bt3mie265ehdyovk@art_vandelay> (raw)

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@rock-chips.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Jonathan Corbet <corbet@lwn.net>

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@rock-chips.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Jonathan Corbet <corbet@lwn.net>

----------------------------------------------------------------
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2017-06-27 20:53 UTC|newest]

Thread overview: 125+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-27 20:53 Sean Paul [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-21 16:19 [PULL] drm-misc-next-fixes Thomas Zimmermann
2024-03-14  8:28 Thomas Zimmermann
2024-03-07 12:46 Thomas Zimmermann
2024-02-29  8:53 Thomas Zimmermann
2024-01-19 12:13 Maxime Ripard
2024-01-11 10:11 Maxime Ripard
2024-01-04 14:45 Maxime Ripard
2023-12-21  8:36 Maxime Ripard
2023-11-02 13:31 Maarten Lankhorst
2023-09-11 14:19 Thomas Zimmermann
2023-09-01  7:01 Thomas Zimmermann
2023-08-24 18:12 Thomas Zimmermann
2023-08-17 13:18 Thomas Zimmermann
2023-07-06 11:31 Thomas Zimmermann
2023-06-29 11:38 Thomas Zimmermann
2023-06-15 11:40 Thomas Zimmermann
2023-04-26  6:04 Maarten Lankhorst
2023-02-28  9:13 Thomas Zimmermann
2023-02-23 18:25 Maarten Lankhorst
2023-02-23 18:48 ` Maxime Ripard
2023-02-21 12:36 Thomas Zimmermann
2023-02-16 10:39 Thomas Zimmermann
2023-02-09  9:17 Thomas Zimmermann
2023-02-02  8:14 Thomas Zimmermann
2023-01-03 14:49 Maxime Ripard
2023-01-03 20:03 ` Daniel Vetter
2022-12-08  8:40 Maxime Ripard
2022-08-10 10:41 Thomas Zimmermann
2022-07-21  7:06 Thomas Zimmermann
2022-07-14 14:09 Thomas Zimmermann
2022-05-19  8:05 Maxime Ripard
2022-04-07 10:56 Maarten Lankhorst
2022-04-07 11:52 ` Maxime Ripard
2022-03-24 13:18 Maarten Lankhorst
2022-03-24 13:15 Maarten Lankhorst
2022-01-21  8:27 Thomas Zimmermann
2022-01-14 14:24 Thomas Zimmermann
2022-01-14 15:39 ` Daniel Vetter
2022-01-13  8:29 Thomas Zimmermann
2022-01-14 13:24 ` Daniel Vetter
2021-12-23  9:23 Thomas Zimmermann
2021-11-10  8:21 Maxime Ripard
2021-11-05  7:43 Maxime Ripard
2021-09-09  8:25 Maarten Lankhorst
2021-09-03  9:38 Maarten Lankhorst
2021-07-01  9:08 Thomas Zimmermann
2021-06-24  7:16 Thomas Zimmermann
2021-06-18  8:58 Thomas Zimmermann
2021-06-16 18:30 Thomas Zimmermann
2021-06-18  2:26 ` Dave Airlie
2021-06-18  2:30   ` Dave Airlie
2021-06-18  8:58     ` Daniel Vetter
2021-06-18  2:30   ` Lyude Paul
2021-05-06 12:27 Maxime Ripard
2021-04-29  9:03 Maxime Ripard
2021-04-22 16:33 Maxime Ripard
2021-04-22 16:40 ` Alex Deucher
2021-04-26  7:35   ` Maxime Ripard
2021-04-28 20:57     ` Alex Deucher
2021-04-29  9:32       ` Maxime Ripard
2021-02-25  9:25 Maarten Lankhorst
2021-02-11 15:44 Maarten Lankhorst
2020-12-22 19:13 Thomas Zimmermann
2021-01-04  8:05 ` Thomas Zimmermann
2020-12-15 13:04 Thomas Zimmermann
2020-12-15 16:27 ` Daniel Vetter
2020-10-20 14:14 Maxime Ripard
2020-10-13  6:57 Maxime Ripard
2020-10-09  7:53 Maxime Ripard
2020-10-02  6:52 Maxime Ripard
2020-08-05 10:00 Maarten Lankhorst
2020-06-11  7:50 Thomas Zimmermann
2020-05-27  8:01 Thomas Zimmermann
2020-04-09  9:14 Maxime Ripard
2020-04-04  9:00 Maxime Ripard
2020-03-26 13:04 Maxime Ripard
2020-02-07  9:43 Maarten Lankhorst
2019-12-12 14:04 Sean Paul
2019-12-04 21:22 Sean Paul
2019-11-20 20:49 Sean Paul
2019-11-20 20:49 ` Sean Paul
2019-11-13 21:10 Sean Paul
2019-11-13 21:10 ` Sean Paul
2019-11-06 20:27 Sean Paul
2019-09-23 16:09 Maxime Ripard
2019-09-18 14:09 Maxime Ripard
2019-09-06  7:05 Maxime Ripard
2019-07-18 15:14 Sean Paul
2019-07-12  8:33 Maarten Lankhorst
2019-06-27 13:03 Maarten Lankhorst
2019-05-15 20:17 Sean Paul
2019-05-08 20:51 Sean Paul
2019-05-01 19:09 Sean Paul
2019-04-24 21:06 Sean Paul
2019-03-13 19:21 Maxime Ripard
2019-03-06 10:54 Maxime Ripard
2019-01-02 17:26 Maarten Lankhorst
2018-10-31 20:19 Sean Paul
2018-10-17 20:07 Sean Paul
2018-10-10 20:39 Sean Paul
2018-08-22 19:38 Sean Paul
2018-08-02 11:17 Gustavo Padovan
2018-06-15  8:11 Maarten Lankhorst
2018-05-31  8:11 Maarten Lankhorst
2018-04-11 14:03 Sean Paul
2018-04-04 19:14 Sean Paul
2018-03-28 19:13 Sean Paul
2018-01-31 15:09 Gustavo Padovan
2018-01-18 17:09 Gustavo Padovan
2017-11-23 19:45 Daniel Vetter
2017-11-08 13:00 Daniel Vetter
2017-11-07 13:44 Daniel Vetter
2017-08-28 21:22 Sean Paul
2017-07-10 19:58 Sean Paul
2017-04-20 20:11 Sean Paul
2017-04-20 21:50 ` Daniel Vetter
2017-04-21 15:29   ` Sumit Semwal
2017-04-21 18:10   ` Sean Paul
2017-04-12 22:58 Sean Paul
2017-02-27 15:52 Daniel Vetter
2017-02-15 13:54 Jani Nikula
2017-02-16  9:39 ` Jani Nikula
2017-02-09  8:43 Daniel Vetter
2016-12-10 21:52 Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170627205320.bt3mie265ehdyovk@art_vandelay \
    --to=seanpaul@chromium.org \
    --cc=airlied@gmail.com \
    --cc=corbet@lwn.net \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=wxt@rock-chips.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).