Messages in this thread | | | Date | Fri, 24 May 2019 00:16:25 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the drm-misc tree with Linus' tree |
| |
Hi Daniel,
On Thu, 23 May 2019 15:11:15 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > That commit is on top of drm-misc, and somehow the .txt version has > been resurrect in drm-misc-next (so needs to be re-deleted too).
My mistake, the conflict went away (due to the back merge) so my scripts assumed the file no longer needed deleting. I didn't actually check to see if it was still there.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |