From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 300F2C282DD for ; Thu, 23 May 2019 14:16:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F36C120863 for ; Thu, 23 May 2019 14:16:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="gFzdV++g" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730831AbfEWOQc (ORCPT ); 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--