lkml.org 
[lkml]   [2019]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 0/5] drm/i915/dsi: Control panel and backlight enable GPIOs from VBT
    From
    Date
    Hi,

    On 16-12-2019 11:26, Linus Walleij wrote:
    > On Sun, Dec 15, 2019 at 5:38 PM Hans de Goede <hdegoede@redhat.com> wrote:
    >
    >> Linus, this series starts with the already discussed pinctrl change to
    >> export the function to unregister a pinctrl-map. We can either merge this
    >> through drm-intel, or you could pick it up and then provide an immutable
    >> branch with it for merging into drm-intel-next. Which option do you prefer?
    >
    > I have created an immutable branch with these changes and pulled it
    > to my "devel" branch for v5.6:
    > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=ib-pinctrl-unreg-mappings
    >
    > Please pull this in and put the other patches on top of that.

    Great, thank you.

    Jani, a question about how I am supposed to push this (when this has been
    also reviewed by some i915 devs and passes CI), can I just do:

    dim backmerge drm-intel-next-queued linux-pinctrl/ib-pinctrl-unreg-mappings
    cat other-patches | dim apply-branch drm-intel-next-queued
    dim push-branch drm-intel-next-queued

    Or I guess that dim backmerge is reserved for other drm branches only and I
    should do:

    dim checkout drm-intel-next-queued
    git merge linux-pinctrl/ib-pinctrl-unreg-mappings
    cat other-patches | dim apply-branch drm-intel-next-queued
    dim push-branch drm-intel-next-queued

    Or should I leave merging linux-pinctrl/ib-pinctrl-unreg-mappings into
    drm-intel-next-queued up to you?

    > I had a bit of mess in my subsystems last kernel cycle so I
    > want to avoid that by strictly including all larger commits
    > in my trees.

    I understand.

    Regards,

    Hans

    \
     
     \ /
      Last update: 2019-12-16 12:01    [W:2.365 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site