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=-3.7 required=3.0 tests=BAYES_00, 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 6736FC4363D for ; Fri, 2 Oct 2020 10:18:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1EF15206FA for ; Fri, 2 Oct 2020 10:18:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387713AbgJBKSJ convert rfc822-to-8bit (ORCPT ); Fri, 2 Oct 2020 06:18:09 -0400 Received: from mga07.intel.com ([134.134.136.100]:39471 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726181AbgJBKSI (ORCPT ); Fri, 2 Oct 2020 06:18:08 -0400 IronPort-SDR: UPtcRLHPIFbbRcJe8g+gBokhr3U33Rt+Ej3SldYT96T5NTfSBlbRmJVYMgIOO15e0aozbe88N0 BtZg+5EaZ4pA== X-IronPort-AV: E=McAfee;i="6000,8403,9761"; a="227086149" X-IronPort-AV: E=Sophos;i="5.77,327,1596524400"; d="scan'208";a="227086149" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2020 03:18:05 -0700 IronPort-SDR: Kpb/rqFqmSgxMZ4YWprkCaqyOLxzOBf8PbxJHor6TSCx8aEaj9za0YElyU6zOOTrndHXeMhDe9 epkoor/PzNvA== X-IronPort-AV: E=Sophos;i="5.77,327,1596524400"; d="scan'208";a="507888968" Received: from dkiely1x-mobl1.ger.corp.intel.com (HELO localhost) ([10.251.86.194]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2020 03:18:01 -0700 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT In-Reply-To: References: <20201001203917.43d46a3d@canb.auug.org.au> <20201001135350.GA14869@lst.de> <87h7rem1aj.fsf@intel.com> Subject: Re: linux-next: manual merge of the akpm tree with the drm-intel tree From: Joonas Lahtinen Cc: Christoph Hellwig , Stephen Rothwell , Andrew Morton , Rodrigo Vivi , Intel Graphics , DRI , Dave Airlie , Chris Wilson , Linux Kernel Mailing List , Linux Next Mailing List To: Daniel Vetter , Jani Nikula Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Message-ID: <160163387773.9343.3110431248747048197@jlahtine-mobl.ger.corp.intel.com> User-Agent: alot/0.8.1 Date: Fri, 02 Oct 2020 13:17:58 +0300 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Quoting Daniel Vetter (2020-10-01 18:13:26) > On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula wrote: > > > > On Thu, 01 Oct 2020, Daniel Vetter wrote: > > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig wrote: > > >> > > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > > >> > Hi all, > > >> > > > >> > Today's linux-next merge of the akpm tree got a conflict in: > > >> > > > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > >> > > > >> > between commit: > > >> > > > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > > >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > > > > > Uh these patches shouldn't be in linux-next because they're for 5.11, > > > not the 5.10 merge window that will open soon. Joonas? > > > > I don't know anything else, but both are tagged Cc: stable. > > Uh right I got confused, they're on -fixes now. Well -next-fixes, > which seems like the wrong one for a cc: stable, I guess this should > go into 5.9 even. Apologies for my confusion. Yep, they happen to be Fixes: (Cc: stable even) so I asked Rodrigo to pull them to drm-intel-next-fixes. If they weren't Fixes: then indeed they would only have been queued for 5.11. With regards to 5.9, due to the hiccup of doing the split PR, all the -fixes for GT area were in limbo until -rc7. We didn't feel comfortable including all the new commits this late in the cycle, so we agreed stable porting those will be more appropriate. Regards, Joonas > -Daniel > > > > > BR, > > Jani. > > > > > > > >> > from the drm-intel tree and patch: > > >> > > > >> > "drm/i915: use vmap in i915_gem_object_map" > > >> > > > >> > from the akpm tree. > > >> > > > >> > I fixed it up (I just dropped the changes in the former commits) and > > >> > > >> Sigh. The solution is a bit more complicated, but I just redid my > > >> patches to not depend on the above ones. I can revert back to the old > > >> version, though. Andrew, let me know what works for you. > > > > > > Imo ignore, rebasing onto linux-next without those intel patches was > > > the right thing for the 5.10 merge window. > > > -Daniel > > > > -- > > Jani Nikula, Intel Open Source Graphics Center > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch 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=-3.7 required=3.0 tests=BAYES_00, 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 3F306C47423 for ; Fri, 2 Oct 2020 10:18:12 +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 E001E206FA for ; Fri, 2 Oct 2020 10:18:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E001E206FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.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 63A426E923; Fri, 2 Oct 2020 10:18:10 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id A508B6E923; Fri, 2 Oct 2020 10:18:08 +0000 (UTC) IronPort-SDR: vsLLzEcRyiOJQFP2ADTC2YoURzTGVMSLXSBxUH1qfrd8Dk8ajvxKdKAC2xqkpA7Se9y1a2d/Pk PgX+IihfOOYA== X-IronPort-AV: E=McAfee;i="6000,8403,9761"; a="227086150" X-IronPort-AV: E=Sophos;i="5.77,327,1596524400"; d="scan'208";a="227086150" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2020 03:18:05 -0700 IronPort-SDR: Kpb/rqFqmSgxMZ4YWprkCaqyOLxzOBf8PbxJHor6TSCx8aEaj9za0YElyU6zOOTrndHXeMhDe9 epkoor/PzNvA== X-IronPort-AV: E=Sophos;i="5.77,327,1596524400"; d="scan'208";a="507888968" Received: from dkiely1x-mobl1.ger.corp.intel.com (HELO localhost) ([10.251.86.194]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2020 03:18:01 -0700 MIME-Version: 1.0 In-Reply-To: References: <20201001203917.43d46a3d@canb.auug.org.au> <20201001135350.GA14869@lst.de> <87h7rem1aj.fsf@intel.com> Subject: Re: linux-next: manual merge of the akpm tree with the drm-intel tree From: Joonas Lahtinen To: Daniel Vetter , Jani Nikula Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Message-ID: <160163387773.9343.3110431248747048197@jlahtine-mobl.ger.corp.intel.com> User-Agent: alot/0.8.1 Date: Fri, 02 Oct 2020 13:17:58 +0300 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 , Dave Airlie , Intel Graphics , Linux Kernel Mailing List , DRI , Chris Wilson , Linux Next Mailing List , Rodrigo Vivi , Andrew Morton , Christoph Hellwig Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Quoting Daniel Vetter (2020-10-01 18:13:26) > On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula wrote: > > > > On Thu, 01 Oct 2020, Daniel Vetter wrote: > > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig wrote: > > >> > > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > > >> > Hi all, > > >> > > > >> > Today's linux-next merge of the akpm tree got a conflict in: > > >> > > > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > >> > > > >> > between commit: > > >> > > > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > > >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > > > > > Uh these patches shouldn't be in linux-next because they're for 5.11, > > > not the 5.10 merge window that will open soon. Joonas? > > > > I don't know anything else, but both are tagged Cc: stable. > > Uh right I got confused, they're on -fixes now. Well -next-fixes, > which seems like the wrong one for a cc: stable, I guess this should > go into 5.9 even. Apologies for my confusion. Yep, they happen to be Fixes: (Cc: stable even) so I asked Rodrigo to pull them to drm-intel-next-fixes. If they weren't Fixes: then indeed they would only have been queued for 5.11. With regards to 5.9, due to the hiccup of doing the split PR, all the -fixes for GT area were in limbo until -rc7. We didn't feel comfortable including all the new commits this late in the cycle, so we agreed stable porting those will be more appropriate. Regards, Joonas > -Daniel > > > > > BR, > > Jani. > > > > > > > >> > from the drm-intel tree and patch: > > >> > > > >> > "drm/i915: use vmap in i915_gem_object_map" > > >> > > > >> > from the akpm tree. > > >> > > > >> > I fixed it up (I just dropped the changes in the former commits) and > > >> > > >> Sigh. The solution is a bit more complicated, but I just redid my > > >> patches to not depend on the above ones. I can revert back to the old > > >> version, though. Andrew, let me know what works for you. > > > > > > Imo ignore, rebasing onto linux-next without those intel patches was > > > the right thing for the 5.10 merge window. > > > -Daniel > > > > -- > > Jani Nikula, Intel Open Source Graphics Center > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch _______________________________________________ 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=-3.7 required=3.0 tests=BAYES_00, 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 03455C4363D for ; Fri, 2 Oct 2020 10:18:17 +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 9CA7A206FA for ; Fri, 2 Oct 2020 10:18:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CA7A206FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.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 CC54D6E926; Fri, 2 Oct 2020 10:18:10 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id A508B6E923; Fri, 2 Oct 2020 10:18:08 +0000 (UTC) IronPort-SDR: vsLLzEcRyiOJQFP2ADTC2YoURzTGVMSLXSBxUH1qfrd8Dk8ajvxKdKAC2xqkpA7Se9y1a2d/Pk PgX+IihfOOYA== X-IronPort-AV: E=McAfee;i="6000,8403,9761"; a="227086150" X-IronPort-AV: E=Sophos;i="5.77,327,1596524400"; d="scan'208";a="227086150" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2020 03:18:05 -0700 IronPort-SDR: Kpb/rqFqmSgxMZ4YWprkCaqyOLxzOBf8PbxJHor6TSCx8aEaj9za0YElyU6zOOTrndHXeMhDe9 epkoor/PzNvA== X-IronPort-AV: E=Sophos;i="5.77,327,1596524400"; d="scan'208";a="507888968" Received: from dkiely1x-mobl1.ger.corp.intel.com (HELO localhost) ([10.251.86.194]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2020 03:18:01 -0700 MIME-Version: 1.0 In-Reply-To: References: <20201001203917.43d46a3d@canb.auug.org.au> <20201001135350.GA14869@lst.de> <87h7rem1aj.fsf@intel.com> From: Joonas Lahtinen To: Daniel Vetter , Jani Nikula Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Message-ID: <160163387773.9343.3110431248747048197@jlahtine-mobl.ger.corp.intel.com> User-Agent: alot/0.8.1 Date: Fri, 02 Oct 2020 13:17:58 +0300 Subject: Re: [Intel-gfx] linux-next: manual merge of the akpm tree with the drm-intel 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 , Dave Airlie , Intel Graphics , Linux Kernel Mailing List , DRI , Chris Wilson , Linux Next Mailing List , Andrew Morton , Christoph Hellwig Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Quoting Daniel Vetter (2020-10-01 18:13:26) > On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula wrote: > > > > On Thu, 01 Oct 2020, Daniel Vetter wrote: > > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig wrote: > > >> > > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > > >> > Hi all, > > >> > > > >> > Today's linux-next merge of the akpm tree got a conflict in: > > >> > > > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > >> > > > >> > between commit: > > >> > > > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > > >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > > > > > Uh these patches shouldn't be in linux-next because they're for 5.11, > > > not the 5.10 merge window that will open soon. Joonas? > > > > I don't know anything else, but both are tagged Cc: stable. > > Uh right I got confused, they're on -fixes now. Well -next-fixes, > which seems like the wrong one for a cc: stable, I guess this should > go into 5.9 even. Apologies for my confusion. Yep, they happen to be Fixes: (Cc: stable even) so I asked Rodrigo to pull them to drm-intel-next-fixes. If they weren't Fixes: then indeed they would only have been queued for 5.11. With regards to 5.9, due to the hiccup of doing the split PR, all the -fixes for GT area were in limbo until -rc7. We didn't feel comfortable including all the new commits this late in the cycle, so we agreed stable porting those will be more appropriate. Regards, Joonas > -Daniel > > > > > BR, > > Jani. > > > > > > > >> > from the drm-intel tree and patch: > > >> > > > >> > "drm/i915: use vmap in i915_gem_object_map" > > >> > > > >> > from the akpm tree. > > >> > > > >> > I fixed it up (I just dropped the changes in the former commits) and > > >> > > >> Sigh. The solution is a bit more complicated, but I just redid my > > >> patches to not depend on the above ones. I can revert back to the old > > >> version, though. Andrew, let me know what works for you. > > > > > > Imo ignore, rebasing onto linux-next without those intel patches was > > > the right thing for the 5.10 merge window. > > > -Daniel > > > > -- > > Jani Nikula, Intel Open Source Graphics Center > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx