[PULL] drm-intel-next

[Dave Airlie]

On 4 May 2018 at 10:29, Dave Airlie <airlied at gmail.com> wrote:
> On 4 May 2018 at 10:19, Dave Airlie <airlied at gmail.com> wrote:
>> On 2 May 2018 at 17:03, Jani Nikula <jani.nikula at intel.com> wrote:
>>>
>>> Hi Dave -
>>>
>>> drm-intel-next-2018-04-13:
>>> First drm/i915 feature batch heading for v4.18:
>>>
>>> - drm-next backmerge to fix build (Rodrigo)
>>> - GPU documentation improvements (Kevin)
>>> - GuC and HuC refactoring, host/GuC communication, logging, fixes, and more
>>>   (mostly Michal and Michał, also Jackie, Michel and Piotr)
>>> - PSR and PSR2 enabling and fixes (DK, José, Rodrigo and Chris)
>>> - Selftest updates (Chris, Daniele)
>>> - DPLL management refactoring (Lucas)
>>> - DP MST fixes (Lyude and DK)
>>> - Watermark refactoring and changes to support NV12 (Mahesh)
>>> - NV12 prep work (Chandra)
>>> - Icelake Combo PHY enablers (Manasi)
>>> - Perf OA refactoring and ICL enabling (Lionel)
>>> - ICL enabling (Oscar, Paulo, Nabendu, Mika, Kelvin, Michel)
>>> - Workarounds refactoring (Oscar)
>>> - HDCP fixes and improvements (Ramalingam, Radhakrishna)
>>> - Power management fixes (Imre)
>>> - Various display fixes (Maarten, Ville, Vidya, Jani, Gaurav)
>>> - debugfs for FIFO underrun clearing (Maarten)
>>> - Execlist improvements (Chris)
>>> - Reset improvements (Chris)
>>> - Plenty of things here and there I overlooked and/or didn't understand... (Everyone)
>>>
>>
>> Just FYI I've started using dim for managing the drm-next tree (step
>> one to a possible group),
>>
>> This pull gets rejected by dim apply-pull for two reasons,
>>
>> One the driver date bump isn't reviewed, and one patch in here the SOB
>> line is different
>> name than the committer, even though they appear to be same person.
>>
>> I've pulled it anyways, but just logging the dim issues for prosperity.
>
> Actually I haven't pulled it, but I think dim just doesn't handle my
> use case very well.
> I do
> dim -f apply-pull < pullreq
>
> It gets merge conflicts and ask me to solve them, but there doesn't seem
> to be a dim apply-pull --resolved type of interface to say, keep going
> and finish the
> dim stuff you were doing before we hit conflicts.
>

I manually did
git commit --amend -s --no-edit
dim add-link drm-next < pullreq

but it would be nice to have a continue or resolved.

Dave.