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=-5.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 CBF08C433E0 for ; Tue, 2 Jun 2020 22:14:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8D2520678 for ; Tue, 2 Jun 2020 22:14:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="M2QrFy/u" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A8D2520678 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F35E6E215; Tue, 2 Jun 2020 22:14:30 +0000 (UTC) Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DD7C6E215 for ; Tue, 2 Jun 2020 22:14:29 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id z18so161935lji.12 for ; Tue, 02 Jun 2020 15:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=LLGNp0bYqdgoODnvR5dT8Alq+1KnKRZvTkwH6Z7/c6A=; b=M2QrFy/uhcAqgs+stRlkgrzMXz/FWWJpJ5dKW1BGDexrTXGHHVMZmsouEZMEH+k6At 40O3iTvokENTGG6qULnrnjBRquHj5u8RPumGZHE1lWNorzc8sz3ZcexmrYgX+oqMyTE4 bIaWbyJDbvrfvBVKL8D2l1wicRwTaRrctwaZM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=LLGNp0bYqdgoODnvR5dT8Alq+1KnKRZvTkwH6Z7/c6A=; b=KTN635D1+JWzwjZE4iV2dK/GpEAtSwNPYc0R/TH20GUMCDjknhyaaUyCgzLm80nB/i +sa8qKUae0vn220fFDh7OhbBPoeFGU1/87yDTId5kr8tXqIQHjeO8QhBjvPkxilxKTly I6ZBJ71w1vHkTgZVKrt+lXV2UbsRGzEKb+XHIFSWHw1up1Y17ovnpRhWFuCrDPRKsAs1 UxMnzGhW8hCFxfK16D0iFcvfU1283Mwl6G9uXWrzaZuca/rdwfPjTv+2gf0qn9rklaoN np4f3W9lkH3SMKSDgnNNo+Cl9zKQvGVFI4U8oKc0LmWHXC3Oh+Aok5/5UlD8JLMglAIB uDlw== X-Gm-Message-State: AOAM530IRrvPGwsMl/IghLjB9GMVUm2lqGRZcejhu7n2YQQYg3v7vRPK MM4yWOsc/aS5JvIFSQrcDM5UwhCzjNw= X-Google-Smtp-Source: ABdhPJxKyrMMOptDt8g1dLI8F9ZMj767yPZCGPdLLCZNV04mTWe3rI3BNBUBxKsHfoZfQFhdxnh8fA== X-Received: by 2002:a05:651c:93:: with SMTP id 19mr585633ljq.245.1591136066753; Tue, 02 Jun 2020 15:14:26 -0700 (PDT) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com. [209.85.167.44]) by smtp.gmail.com with ESMTPSA id s28sm88966lfs.3.2020.06.02.15.14.25 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Jun 2020 15:14:26 -0700 (PDT) Received: by mail-lf1-f44.google.com with SMTP id c21so33822lfb.3 for ; Tue, 02 Jun 2020 15:14:25 -0700 (PDT) X-Received: by 2002:a05:6512:7b:: with SMTP id i27mr294066lfo.30.1591136065530; Tue, 02 Jun 2020 15:14:25 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Linus Torvalds Date: Tue, 2 Jun 2020 15:14:09 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [git pull] drm for 5.8-rc1 To: Dave Airlie X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , LKML , dri-devel Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, Jun 1, 2020 at 11:06 PM Dave Airlie wrote: > > I've pushed a merged by me tree here, which I think gets them all > correct, but please let me know if you think different. > https://cgit.freedesktop.org/~airlied/linux/log/?h=drm-5.8-merged Ok, I get the same result, except my resolution to the simple encoder issue was slightly different. I removed the simple helper header include too as part of basically undoing the whole simple encoder conversion. But other than that we're identical, which is a good sign. Apparently the drm mis-merge in the middle got fixed up. Linus _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel