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 0C24DC433E0 for ; Tue, 2 Jun 2020 21:22:14 +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 AD1682081A for ; Tue, 2 Jun 2020 21:22:13 +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="ABcLIDWz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD1682081A 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 6950E6E20A; Tue, 2 Jun 2020 21:22:12 +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 99E3D6E20A for ; Tue, 2 Jun 2020 21:22:11 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id o9so56909ljj.6 for ; Tue, 02 Jun 2020 14:22:11 -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=3SbTnu2Joe/UmPFYZAmB5Tz+5GBec7GBEWVsnaWkdrg=; b=ABcLIDWzz1tu1GxHTVMe7bjHac2QIuX7rTxa1aa3QDOFpZ/9DRCPuAFOILb1zcCXs0 7oUcgqs5wDu6bDImq/IzRWVqXPzk1Z2lJmThYxYj/arN3jC60c31M2tmQB5Ue9KM6qt/ pb18/JsW9x4nynCcy3hfXBohGrqvWxPqFBFSE= 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=3SbTnu2Joe/UmPFYZAmB5Tz+5GBec7GBEWVsnaWkdrg=; b=Wphdm7gO85AkSUuGvo5LFmQBWdj8gdYOYQCGf/DKZhCIo2KzrsrKxvJj2P++9NgMNz rQELR3SxAyt1alDku1iI7N2/dL53apQC952pCQICTAWMRERBbVClInGvyr+AfJ1NV5nW o8iZXvqmQ5zfN2rYiBeMZiSnECxvZI6jFOoeSZ6JmiTRXPfONnQ60ZGqC0HnyXDn/qMm NHU4nNyXYZ0tRleUD3iuISaiNb3oLzmRR3AIMHzjESP7YQlF68R1zZGCuylrNo28HZCC 7k7H3lWIm1ooc5IgJqSqGnP9MojvyZuTSCeOSnGkDuX2FyHPjlEJKCp/ETLrEdltX4gE hYGA== X-Gm-Message-State: AOAM532fGsYXd9/7ULQPr9RS43oNcafjQBIDX1LdPQCOUxdK9kK93Edx g/I/npyC1//r6Rc5WPfPGsj82++r3/U= X-Google-Smtp-Source: ABdhPJzzKvj41ROhFlBZxa3GYT8mmLjuqr1wGkYn9TOI104srNWLekGZHGJdsinjzn2yIJgTAFWjTA== X-Received: by 2002:a2e:6a11:: with SMTP id f17mr455972ljc.109.1591132929205; Tue, 02 Jun 2020 14:22:09 -0700 (PDT) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com. [209.85.208.179]) by smtp.gmail.com with ESMTPSA id f16sm58856lfa.10.2020.06.02.14.22.07 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Jun 2020 14:22:08 -0700 (PDT) Received: by mail-lj1-f179.google.com with SMTP id 9so44468ljc.8 for ; Tue, 02 Jun 2020 14:22:07 -0700 (PDT) X-Received: by 2002:a2e:b5d9:: with SMTP id g25mr252353ljn.285.1591132927271; Tue, 02 Jun 2020 14:22:07 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Linus Torvalds Date: Tue, 2 Jun 2020 14:21:51 -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: > > This tree is a bit conflicty, the i915 ones are probably the hairy > ones, but amdgpu has a bunch as well, along with smattering of others. Hmm. Some of them are due to your previous mis-merges. Your commit 937eea297e26 ("Merge tag 'amd-drm-next-5.8-2020-04-24' of git://people.freedesktop.org/~agd5f/linux into drm-next") seems to have mis-merged the CONFIG_DEBUG_FS thing in drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c. I'm still working through the rest of the merge, so far that was the only one that made me go "Whaa?". Linus _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel