Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20190208122744.4a63bec0@canb.auug.org.au> <20190208085333.GH23159@phenom.ffwll.local>
 <20190208202555.3aa6473c@canb.auug.org.au>
In-Reply-To: <20190208202555.3aa6473c@canb.auug.org.au>
From:   Daniel Vetter <daniel@ffwll.ch>
Date:   Fri, 8 Feb 2019 10:34:22 +0100
Message-ID: <CAKMK7uGxXxFXLt2m5_3y2a2zi09WyUCkSMTnYQv7doswQZUbqg@mail.gmail.com>
Subject: Re: linux-next: manual merge of the drm-misc tree with the drm tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Dave Airlie <airlied@linux.ie>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Sam Ravnborg <sam@ravnborg.org>,
        Chris Wilson <chris@chris-wilson.co.uk>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, Feb 8, 2019 at 10:26 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Daniel,
>
> On Fri, 8 Feb 2019 09:53:33 +0100 Daniel Vetter <daniel@ffwll.ch> wrote:
> >
> > There isn't a "below" afaics ....
>
> Oops :-(  However the merge diff is not very enlightening in this case
> anyway.  It makes more sense to look at the final result when I finish
> up in a while.

Yeah conflict isn't too bad either, and we have it in the drm rr-cache
already. So not worried, just wanted to check whether there's more.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch