Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp1825939ybm; Thu, 23 May 2019 07:19:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxVw7dFzJ4gvaWYne7im8+X6PKvKnVqRqJAAaT+d/ScJnk6xweQNlJdzbVeeGiV+WJVLc76 X-Received: by 2002:a63:f146:: with SMTP id o6mr97808522pgk.179.1558621164817; Thu, 23 May 2019 07:19:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558621164; cv=none; d=google.com; s=arc-20160816; b=LeeO1UyHcuKdBOdfe3oc+sBE+fBDmG0CBX9bfuu0/dZpZ0w8gcAvAoagVIUG5ctt6H 4o+6POGXkxstkBAcwgFrhYDrlx/geLzQArwS6Fmqvth8La/YHmZP6QwswvVrmM53QANV yppSrSfQIC3BCtWU5Hlnrd4XHD7BGEp75UZLwNga0prAYM1JqfCYTJd3A4yv/icbUqBi DVO/Z9zKJENJKEYYw5VJDVImXxbxEtWAVp2sEVewr4Wu1VMKUZIxdnyuN2gumdO8Ql7y tWUKgUIWNJi7PhpH6M44Jfa+XtN2ClfiZ+qUZka+OWk9GSN+yY0j/sSAwiDHpI+hfc/5 4z+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=/UCPSfwJF9jhaBTCKQhWoaQAf+rH2GeubbKgR0bq2iI=; b=yEM2k+64RacFfxV6t6INdXvOyrclEPG2ABhblJxM0OstTpsxR+oAHE8A7D420m1JdJ kvqg+hpfw1axBC3tjIUZCGQl4TYCdUbTUGC5G5aFnPmkyvf/dTf6ha+qcvGzzFvfDYbw P9NQWQdwBJzHfsTntu71vzTWVNUr9tUEjsIhrRcCVpJ/2SnrAxiPaw8FC42qbxMVcxbl QgcNQjLb03OYjoch2yWRtquUIxPEbuD2BlA8y3kcyVyRpA93hkmFxP9eOYX7hI6ngL+p vyLMoHqwzPQwpHAMhDMWJkCRHOBwTKogZMgKMJ8hnEH6ZcWiq/OPcMdNJmniuAtBvEMK q0fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=gFzdV++g; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u10si28552541pgp.529.2019.05.23.07.19.07; Thu, 23 May 2019 07:19:24 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=gFzdV++g; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730760AbfEWOQc (ORCPT + 99 others); Thu, 23 May 2019 10:16:32 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:37291 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730690AbfEWOQc (ORCPT ); Thu, 23 May 2019 10:16:32 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 458s4X21CBz9s3l; Fri, 24 May 2019 00:16:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1558620989; bh=WsIW0FmrKkBtYx/wiqj3MjiS7Q+nBePddm0LgdfdDwY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=gFzdV++gRIpZ+OXDXht+iOJ1FqRRj3is6qURii94jKbkAUTTuBOKwbY375wVYuGr7 PiI1SCUSKBkQBQf43RzCgzgmavRa8rxI3tXdiIRmChy9J/+gNCoNI+eXqim+8PeDoJ lo8ECVRTwffI7SRzShryohIAJ29JY7ipSPU1Rjr2vGcduf2vtoMlsfrrMM4jg1XKF5 DmsUuVYzL8e6ir3aGglIafJ22zCo1PGV+pD+R58dBW11HbHetG3nBsrn8fVd1cjGFT y7iNg8/MBXY+55LNdTA17w/JklgmaxOwHs8CkOiwJaodxhjffYWNyJVcCfm37mcHpN xx84l5XRfpqKw== Date: Fri, 24 May 2019 00:16:25 +1000 From: Stephen Rothwell To: Daniel Vetter Cc: Maxime Ripard , Intel Graphics , DRI , Linux Kernel Mailing List , Jyri Sarha , Marco Felsch , Linux Next Mailing List , Thierry Reding , Sean Paul Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20190524001625.0b6fecf9@canb.auug.org.au> In-Reply-To: References: <20190521105151.51ffa942@canb.auug.org.au> <20190523115355.joyeqlmbjkufueyn@flea> <20190523230409.31da92b9@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/Lto4Vqh.Sf2uq.agtHE_J7H"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Lto4Vqh.Sf2uq.agtHE_J7H Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Daniel, On Thu, 23 May 2019 15:11:15 +0200 Daniel Vetter w= rote: > > 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. --=20 Cheers, Stephen Rothwell --Sig_/Lto4Vqh.Sf2uq.agtHE_J7H Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlzmqzkACgkQAVBC80lX 0GzjnwgAmiMZYg6ACSWYMNWAUn6//4dvhxdK1F1onb3ap1eSKnfwXy8C27qChOif cNQ0vUXxhpyL+oI7fa0lh1L194r0XosPDfjweNoi2YcKZB/C8Gc0ELbNzLyWAl4Q gwUTl666k2vCwRHtpZPEFCSDV3rvNwOnXqn44n5I4g4w179enkkprQ+Ln/ZJZmVq yk1/n4SnE6GsVBzlKwsI2bjqmLqCL+eWLzELzxH9zYfvvJdJPNuD0TKODL6G5biH UoZHxBpiF5wHr48cqbNyrqwvp/Jlvq/+TNh0gbLxZdi/0Q8ZudMzNlgERqW26jmz NmQSVUCd+zPcdPEveqiZ9436fJG/Gg== =yq0b -----END PGP SIGNATURE----- --Sig_/Lto4Vqh.Sf2uq.agtHE_J7H--