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=-2.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 59B87C433E0 for ; Fri, 5 Feb 2021 23:56:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1AE5F65006 for ; Fri, 5 Feb 2021 23:56:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231288AbhBEXzf (ORCPT ); Fri, 5 Feb 2021 18:55:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231814AbhBEOCL (ORCPT ); Fri, 5 Feb 2021 09:02:11 -0500 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E038BC061793; Fri, 5 Feb 2021 06:01:30 -0800 (PST) Received: by mail-pl1-x62d.google.com with SMTP id b17so3601853plz.6; Fri, 05 Feb 2021 06:01:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=9mVRXJ1/m2Ab7utnhdbSusiRKnV59wpCtJPbJHx3VCk=; b=XztMZPDU58th5eKVyXGkC00fgRrKZery2vGPxOREgC14W+PUEVDSGLDwsjZ3pbtnIb VK5gp1AbMy7mYgt4Yqm6J4GA9C1jEZty2d5ivJ93u2V3At0j/aXiopwlr6JUEd0+wTmP vgR8ia4Eou83XBKtXoo5kWmJC6mwXExeiAfx2Ch9KMEisFmqTbUjmpyPAvzY5kU4YCv0 waLHPzY2kaKLl0S8IRHw4IziqfcV0YMuYHZ3eObaLh/oR2J2WiA38y4wP/X6ABcqmyKb zPs1v+kHpaQ4vStCh4rGN4egOcLdT6LTfZ5Qb0xK5dmwgg7Ml+yvz7faVLRLN4TbeEun L0KQ== 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=9mVRXJ1/m2Ab7utnhdbSusiRKnV59wpCtJPbJHx3VCk=; b=K9DGH7qrzgyW6ggjJVt9naezcx5JLMGtooeCHlWuRDulPM5W+IaXyCDldQ7WEhOqhU q+El/UxBhlQG2DlyCAtQtyvGJuFzoiL13X/zSB+FEsaDAST9BfIa/sPvYBHvAixLETBH 1DAVSRA6l4fkeQBb+HkdkQIrHzD7KMi1OoMN5YZBH75GBn7hppOfPovxqS1+/Zm+c51X ucexnp7Y3kmP//odTpccCifAQAvwaMDVC71kdJI9KhztTXC72sWhx1nRDIZNixDRUP6r vB2SR7ITqf6dYMolbO5fGruNFpqHDmNSF/0ss4Y/sKab+zlZK78WxsGfYn24AYPzg2m+ F4Bw== X-Gm-Message-State: AOAM530usJgPHrw0EjdXhNpAQyHK63vnFkpYRsm5+sak1SNrHQ9W7HzG ZRewRdJWR2lHOsRtPWi5u+Ks45s2r0WK4P7Ld6o= X-Google-Smtp-Source: ABdhPJzn7icLqSpYWC8pI6O41q0nqM43UZ+wkg65n4fjCOQg3z1XI8OGZBa87lh+5WCg8R+RKOLLNMVPvzeSiQ5Q0mQ= X-Received: by 2002:a17:90a:644a:: with SMTP id y10mr4470679pjm.129.1612533689048; Fri, 05 Feb 2021 06:01:29 -0800 (PST) MIME-Version: 1.0 References: <20210204155846.5aef94a8@canb.auug.org.au> In-Reply-To: From: Andy Shevchenko Date: Fri, 5 Feb 2021 16:01:12 +0200 Message-ID: Subject: Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree To: Daniel Vetter Cc: Patrik Jakobsson , 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-kernel@vger.kernel.org On Fri, Feb 5, 2021 at 3:05 PM Daniel Vetter wrote= : > 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 th= emselves. Alternatively it would be easy to resolve by Linus by removing Kc= onfig lines along with mentioned files, > > > > > > Patrik, I have sent a PR again, so you may consider pulling it, thank= s! > > > > 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. Fine with me! --=20 With Best Regards, Andy Shevchenko 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=-0.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 5BCFEC433E6 for ; Fri, 5 Feb 2021 14:01:33 +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 EA55264DDB for ; Fri, 5 Feb 2021 14:01:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EA55264DDB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 060336F44B; Fri, 5 Feb 2021 14:01:32 +0000 (UTC) Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by gabe.freedesktop.org (Postfix) with ESMTPS id D53EE6F448; Fri, 5 Feb 2021 14:01:30 +0000 (UTC) Received: by mail-pl1-x62a.google.com with SMTP id a16so3598795plh.8; Fri, 05 Feb 2021 06:01:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=9mVRXJ1/m2Ab7utnhdbSusiRKnV59wpCtJPbJHx3VCk=; b=XztMZPDU58th5eKVyXGkC00fgRrKZery2vGPxOREgC14W+PUEVDSGLDwsjZ3pbtnIb VK5gp1AbMy7mYgt4Yqm6J4GA9C1jEZty2d5ivJ93u2V3At0j/aXiopwlr6JUEd0+wTmP vgR8ia4Eou83XBKtXoo5kWmJC6mwXExeiAfx2Ch9KMEisFmqTbUjmpyPAvzY5kU4YCv0 waLHPzY2kaKLl0S8IRHw4IziqfcV0YMuYHZ3eObaLh/oR2J2WiA38y4wP/X6ABcqmyKb zPs1v+kHpaQ4vStCh4rGN4egOcLdT6LTfZ5Qb0xK5dmwgg7Ml+yvz7faVLRLN4TbeEun L0KQ== 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=9mVRXJ1/m2Ab7utnhdbSusiRKnV59wpCtJPbJHx3VCk=; b=XLs9sTl+VnYD6fgwI33rM8Hnhsz4MeGKGUsqY8WJzXmE7yK1i+BTF/dOpx2ArrVynA CO4WSRYA7m4U2QYZA4sMnANkIoLQxyKMMUo3O+kpnMzLqWzivzOHTzSEH5kVaIhriB3B gOOOIwxNHUPUCnj+kFLNEg3+DpZN9JzSstuFYS6wDS7+LDQ20MWo/He5PRFMLEVJGXtu DHmfIkFsK5eCWju7OnqaJwXVbSR9huGwlXIvok4OMcCuZAKnNirjkhJWxqgs+Vj05VH+ sQxuta2ww2fZD2rTX5gnxLVWRwaxEUdcLpdIDq4jwl/kDYJN4hn/f88ZIjViV4qcJ0sv 9OHA== X-Gm-Message-State: AOAM530wJCoQPnVSe1pDS92gcK8brgnPyzgvnXvfCkQhS6lVLd+eTOwu c3P0qhCt1KlEM7Zbl+h8ZiKoujGwoq4Ojl+JfP8= X-Google-Smtp-Source: ABdhPJzn7icLqSpYWC8pI6O41q0nqM43UZ+wkg65n4fjCOQg3z1XI8OGZBa87lh+5WCg8R+RKOLLNMVPvzeSiQ5Q0mQ= X-Received: by 2002:a17:90a:644a:: with SMTP id y10mr4470679pjm.129.1612533689048; Fri, 05 Feb 2021 06:01:29 -0800 (PST) MIME-Version: 1.0 References: <20210204155846.5aef94a8@canb.auug.org.au> In-Reply-To: From: Andy Shevchenko Date: Fri, 5 Feb 2021 16:01:12 +0200 Message-ID: Subject: Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree To: Daniel Vetter 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: Stephen Rothwell , Mark Gross , Intel Graphics , Linux Kernel Mailing List , DRI , Hans de Goede , Linux Next Mailing List , Thomas Zimmermann , Andy Shevchenko Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, Feb 5, 2021 at 3:05 PM Daniel Vetter wrote: > 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 themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig 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. Fine with me! -- With Best Regards, Andy Shevchenko _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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=-0.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 C431FC433DB for ; Fri, 5 Feb 2021 14:01:32 +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 5A1D864DDB for ; Fri, 5 Feb 2021 14:01:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A1D864DDB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B372F6F448; Fri, 5 Feb 2021 14:01:31 +0000 (UTC) Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by gabe.freedesktop.org (Postfix) with ESMTPS id D53EE6F448; Fri, 5 Feb 2021 14:01:30 +0000 (UTC) Received: by mail-pl1-x62a.google.com with SMTP id a16so3598795plh.8; Fri, 05 Feb 2021 06:01:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=9mVRXJ1/m2Ab7utnhdbSusiRKnV59wpCtJPbJHx3VCk=; b=XztMZPDU58th5eKVyXGkC00fgRrKZery2vGPxOREgC14W+PUEVDSGLDwsjZ3pbtnIb VK5gp1AbMy7mYgt4Yqm6J4GA9C1jEZty2d5ivJ93u2V3At0j/aXiopwlr6JUEd0+wTmP vgR8ia4Eou83XBKtXoo5kWmJC6mwXExeiAfx2Ch9KMEisFmqTbUjmpyPAvzY5kU4YCv0 waLHPzY2kaKLl0S8IRHw4IziqfcV0YMuYHZ3eObaLh/oR2J2WiA38y4wP/X6ABcqmyKb zPs1v+kHpaQ4vStCh4rGN4egOcLdT6LTfZ5Qb0xK5dmwgg7Ml+yvz7faVLRLN4TbeEun L0KQ== 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=9mVRXJ1/m2Ab7utnhdbSusiRKnV59wpCtJPbJHx3VCk=; b=XLs9sTl+VnYD6fgwI33rM8Hnhsz4MeGKGUsqY8WJzXmE7yK1i+BTF/dOpx2ArrVynA CO4WSRYA7m4U2QYZA4sMnANkIoLQxyKMMUo3O+kpnMzLqWzivzOHTzSEH5kVaIhriB3B gOOOIwxNHUPUCnj+kFLNEg3+DpZN9JzSstuFYS6wDS7+LDQ20MWo/He5PRFMLEVJGXtu DHmfIkFsK5eCWju7OnqaJwXVbSR9huGwlXIvok4OMcCuZAKnNirjkhJWxqgs+Vj05VH+ sQxuta2ww2fZD2rTX5gnxLVWRwaxEUdcLpdIDq4jwl/kDYJN4hn/f88ZIjViV4qcJ0sv 9OHA== X-Gm-Message-State: AOAM530wJCoQPnVSe1pDS92gcK8brgnPyzgvnXvfCkQhS6lVLd+eTOwu c3P0qhCt1KlEM7Zbl+h8ZiKoujGwoq4Ojl+JfP8= X-Google-Smtp-Source: ABdhPJzn7icLqSpYWC8pI6O41q0nqM43UZ+wkg65n4fjCOQg3z1XI8OGZBa87lh+5WCg8R+RKOLLNMVPvzeSiQ5Q0mQ= X-Received: by 2002:a17:90a:644a:: with SMTP id y10mr4470679pjm.129.1612533689048; Fri, 05 Feb 2021 06:01:29 -0800 (PST) MIME-Version: 1.0 References: <20210204155846.5aef94a8@canb.auug.org.au> In-Reply-To: From: Andy Shevchenko Date: Fri, 5 Feb 2021 16:01:12 +0200 Message-ID: To: Daniel Vetter Subject: Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , Mark Gross , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Thomas Zimmermann , Andy Shevchenko Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Feb 5, 2021 at 3:05 PM Daniel Vetter wrote: > 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 themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig 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. Fine with me! -- With Best Regards, Andy Shevchenko _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx