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.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 97B90C433DB for ; Fri, 5 Feb 2021 13:11:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4C01B64F3A for ; Fri, 5 Feb 2021 13:11:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229774AbhBENLA (ORCPT ); Fri, 5 Feb 2021 08:11:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229707AbhBENIq (ORCPT ); Fri, 5 Feb 2021 08:08:46 -0500 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 286D6C061793 for ; Fri, 5 Feb 2021 05:05:33 -0800 (PST) Received: by mail-ot1-x32f.google.com with SMTP id i20so6793019otl.7 for ; Fri, 05 Feb 2021 05:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=meHuzs6N41tZwNz5Z8o9DqX2fcdLCbhLwuuynzEyeWM=; b=caNcsbg+cluV4xsl+wtBGBB0+tBVxphrCq08ie5y62VKKrrvFqHJl4eLA753W6yxcx +DsfIeed0slxZgU+awR4rrvFavZxYfvGEqGNS7qi3cj7ZT7FTuj9kwiuXEmbea+Uklvt S+/Onew+8DaR2I0iNwiG8CXgsWbaVu9d9oMHc= 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:content-transfer-encoding; bh=meHuzs6N41tZwNz5Z8o9DqX2fcdLCbhLwuuynzEyeWM=; b=HIVDpDDGZvz5iO9xBScoPfuQrELitSqtKtWq8eW3632CUTvnrAikg9dD7RbVK3YU25 7O3S7IzUYSIKCb1CMwRb3kkSS6wdxt9XMZ0wNJ5NY/k6T6kWjwr/fU7lrggzdggIMJo4 +g0VPMrqIPNd44vMh6t1hfN/I86dafsiQl7WQg3IReYGUTwS78EslshdizAUXyNuOJiv SZ+MNDs6aFZvhq1EffrRzLBQWp40yvvf3ub8FRmyeT079/uaSQIyQ234QZJS26itQQeO 58nMFaEV8u14RNzpbM4sdldv4DOkym18NpvwB2Qm0hv8iQioK3YKkYaim048XysTLapi Rq+w== X-Gm-Message-State: AOAM533xRTGHSwDPERaDP5MRUU4vlg2GYDQ5tErLIWsoncbXqwDVCr+e RjUf+kHnDR03XgOGBHEVDS2+dmHXCC/bLiY5UnJnzQ== X-Google-Smtp-Source: ABdhPJzng89M/HFnFqHXCqLK/NUEuD1p6NqDzjg+NI3npAgpIIrnhRIkeejWN9f+opFyGRDm7xIyl4Yf2/s72s+33io= X-Received: by 2002:a9d:6c96:: with SMTP id c22mr3221863otr.303.1612530332640; Fri, 05 Feb 2021 05:05:32 -0800 (PST) MIME-Version: 1.0 References: <20210204155846.5aef94a8@canb.auug.org.au> In-Reply-To: From: Daniel Vetter Date: Fri, 5 Feb 2021 14:05:21 +0100 Message-ID: Subject: Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree To: Patrik Jakobsson Cc: Andy Shevchenko , Stephen Rothwell , Hans de Goede , Mark Gross , Intel Graphics , DRI , Andy Shevchenko , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Fri, Feb 5, 2021 at 12:14 PM Patrik Jakobsson wrote: > > On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko > wrote: > > > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > > wrote: > > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an= immutable tag I provided. I think they can pull and resolve conflicts them= selves. Alternatively it would be easy to resolve by Linus by removing Kcon= fig lines along with mentioned files, > > > > Patrik, I have sent a PR again, so you may consider pulling it, thanks! > > Daniel, is this something you can pull into drm or ask one of the > drm-misc maintainers to do? We've already created the conflict, and my understanding is that Linus wants to have visibility into conflict-y stuff and doesn't mind at all resolving conflicts. Hence for 5.12 I think we're fine as-is. Thanks, Daniel --=20 Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch