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.8 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 00D5BC4727C for ; Thu, 1 Oct 2020 14:14:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B913F20B1F for ; Thu, 1 Oct 2020 14:14:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="HOsJWxDx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732581AbgJAOOB (ORCPT ); Thu, 1 Oct 2020 10:14:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732569AbgJAONy (ORCPT ); Thu, 1 Oct 2020 10:13:54 -0400 Received: from mail-oo1-xc41.google.com (mail-oo1-xc41.google.com [IPv6:2607:f8b0:4864:20::c41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4614C0613D0 for ; Thu, 1 Oct 2020 07:13:53 -0700 (PDT) Received: by mail-oo1-xc41.google.com with SMTP id z1so1507822ooj.3 for ; Thu, 01 Oct 2020 07:13:53 -0700 (PDT) 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; bh=us8thQANzunB8liJvtH1u9KjYvMWBCN/6ee+Pda/bWA=; b=HOsJWxDxB4xVjDfa1aZ5JJBMlRAfvVPFyyu2Rh+RQ2NPZaSZofBx1uadVQmfF+1xHE 01o0lELbi++17LNc25VmGKUpiJmoJKu0Q67QKXYMG3vp5iZ34cn9XKsV4Vpfa3wk0h8a XkCxyWk1iGK/n7KrvdNWIv3phDHesCb4MRubs= 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=us8thQANzunB8liJvtH1u9KjYvMWBCN/6ee+Pda/bWA=; b=PM93GOPfFvbJdXlQNtJkZoyHqkt64CVAGvbK1sSedPUxkPXL/3Y3ocVEhBKnb09JIa 2o/DngP9bBYSCpDbQThmKYllapHuCLPy9aOXOTMMPL+IOr/9EGRHQ1jYhQM13Lj7RMSD AvHHsadBEtTtzLErFVavuF2HVnGuKYuHjnDYH0hPXYJEImGu8pugM1Vt5SOShJZ4/dUm J8YZxH5Gzg6/7WAqeMtdBy2p2mVo0nBnCETJhdqPV0lq1cjjJwNCWFNRg3Fn0DeKUes8 Ps3SerhrDzVsRwzsu2us4cvGpO5vhwd3nk7Hl2DaanlqYXEPANj6GhJdqvmu6Q05nFMQ U8wA== X-Gm-Message-State: AOAM532n6EUKX3V+2o2ZW3JoDE5P7HjOJXJBx7ZPVRGxAziasItixch8 SF+W46b5CPO8AuS9GkrrNPQsRWLqDmDx3woXmiGQeg== X-Google-Smtp-Source: ABdhPJy+Qa1QnyOeGpgz2tEALV5zV/r+Mw/i+fe/ScEgQVuLKXLkdkccDTrTDmW6x67TiI0MqOdlBgeDXl3v04GVz3k= X-Received: by 2002:a4a:344b:: with SMTP id n11mr5774966oof.89.1601561633049; Thu, 01 Oct 2020 07:13:53 -0700 (PDT) MIME-Version: 1.0 References: <20201001203917.43d46a3d@canb.auug.org.au> <20201001135350.GA14869@lst.de> In-Reply-To: <20201001135350.GA14869@lst.de> From: Daniel Vetter Date: Thu, 1 Oct 2020 16:13:42 +0200 Message-ID: Subject: Re: linux-next: manual merge of the akpm tree with the drm-intel tree To: Christoph Hellwig Cc: Stephen Rothwell , Andrew Morton , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI , Dave Airlie , Chris Wilson , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? > > 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 -- 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.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 42444C4727F for ; Thu, 1 Oct 2020 14:13:57 +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 1005D2137B for ; Thu, 1 Oct 2020 14:13:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="HOsJWxDx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1005D2137B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 520826E8A3; Thu, 1 Oct 2020 14:13:55 +0000 (UTC) Received: from mail-oo1-xc41.google.com (mail-oo1-xc41.google.com [IPv6:2607:f8b0:4864:20::c41]) by gabe.freedesktop.org (Postfix) with ESMTPS id C51F36E8A2 for ; Thu, 1 Oct 2020 14:13:53 +0000 (UTC) Received: by mail-oo1-xc41.google.com with SMTP id m25so1512208oou.0 for ; Thu, 01 Oct 2020 07:13:53 -0700 (PDT) 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; bh=us8thQANzunB8liJvtH1u9KjYvMWBCN/6ee+Pda/bWA=; b=HOsJWxDxB4xVjDfa1aZ5JJBMlRAfvVPFyyu2Rh+RQ2NPZaSZofBx1uadVQmfF+1xHE 01o0lELbi++17LNc25VmGKUpiJmoJKu0Q67QKXYMG3vp5iZ34cn9XKsV4Vpfa3wk0h8a XkCxyWk1iGK/n7KrvdNWIv3phDHesCb4MRubs= 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=us8thQANzunB8liJvtH1u9KjYvMWBCN/6ee+Pda/bWA=; b=fAU8GP9k1PuY9dHk0CNZECRQZAp18PJRHwstzlZrpvc+W8+RDwJIU2txM7jArLXHdN kqIZv505S8WAaRTssjUjRG945UXeVuDNQQiNlB8CfdMLkONj2jWcrFPQCKUHBUiVzESx Z1eW//PTUGkgOeSwuEz4WnvwJCX1lgeW5tP/6cKrkhCLe5D2kOxPaCcFVDHEZjmdW3bP WdWY3t7X7Dy8LziT0XmCsUtT4BJyoMOpPH/s1yh8yvQtKkIU6g/N4WbAT8n7DzxnDM05 KtZ6ptw8oaqFAb9dQDxtmq3dXzXafOAa5Np8w2nAv9Dq5odfyaj0/PDS2//CiETM5Pim Uy+Q== X-Gm-Message-State: AOAM530EgMq960+AfwQ5BwAn2fQRcmWg7Vj9LWV/uxMtNhfasIzk+r9v h3LKnkysdkD9p/ytdt4gXXW36hECnrqqpPW8AD8cmQ== X-Google-Smtp-Source: ABdhPJy+Qa1QnyOeGpgz2tEALV5zV/r+Mw/i+fe/ScEgQVuLKXLkdkccDTrTDmW6x67TiI0MqOdlBgeDXl3v04GVz3k= X-Received: by 2002:a4a:344b:: with SMTP id n11mr5774966oof.89.1601561633049; Thu, 01 Oct 2020 07:13:53 -0700 (PDT) MIME-Version: 1.0 References: <20201001203917.43d46a3d@canb.auug.org.au> <20201001135350.GA14869@lst.de> In-Reply-To: <20201001135350.GA14869@lst.de> From: Daniel Vetter Date: Thu, 1 Oct 2020 16:13:42 +0200 Message-ID: Subject: Re: linux-next: manual merge of the akpm tree with the drm-intel tree To: Christoph Hellwig 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 , Chris Wilson , Linux Next Mailing List , DRI , Rodrigo Vivi , Andrew Morton Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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? > > 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 -- 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.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 85FF6C4727C for ; Thu, 1 Oct 2020 14:13:56 +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 67D1420B1F for ; Thu, 1 Oct 2020 14:13:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="HOsJWxDx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67D1420B1F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 A3E356E15A; Thu, 1 Oct 2020 14:13:54 +0000 (UTC) Received: from mail-oo1-xc44.google.com (mail-oo1-xc44.google.com [IPv6:2607:f8b0:4864:20::c44]) by gabe.freedesktop.org (Postfix) with ESMTPS id C307A6E15A for ; Thu, 1 Oct 2020 14:13:53 +0000 (UTC) Received: by mail-oo1-xc44.google.com with SMTP id k13so1503447oor.2 for ; Thu, 01 Oct 2020 07:13:53 -0700 (PDT) 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; bh=us8thQANzunB8liJvtH1u9KjYvMWBCN/6ee+Pda/bWA=; b=HOsJWxDxB4xVjDfa1aZ5JJBMlRAfvVPFyyu2Rh+RQ2NPZaSZofBx1uadVQmfF+1xHE 01o0lELbi++17LNc25VmGKUpiJmoJKu0Q67QKXYMG3vp5iZ34cn9XKsV4Vpfa3wk0h8a XkCxyWk1iGK/n7KrvdNWIv3phDHesCb4MRubs= 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=us8thQANzunB8liJvtH1u9KjYvMWBCN/6ee+Pda/bWA=; b=AEDGZ5wMXqn7OFSpE75PLPgula1IgoP/vM9NiaQHJFqMfdu7jEWk0xUEf9m+s9SDPn LXolQxqM1FRAzYLWZwZMDudInGS13MhIPPT6wIpM+VQNeRds1rOzfCPtvjH30wUzBxwU GupHPS3v/JtLO0c7CSL5CVR8bRnlLzlXoEovr+RNWFHcxHxuxFhOEOFufdxKR7AvZxzW CB0r4hFK7E8fcSqMtzH7PZiXRVhK+nHbjLX6Wg2+K2gWIMEbr7KrfchgytnzShqt4Fa9 0FjaTXdnjBUPdWXgRCYpw7MnHXdN6xagXQdgd7HnJQ8hFLyQhExuhEMvZRx5Blu3aBlB ypCw== X-Gm-Message-State: AOAM530fNFAUIhXBv6i8fSUHTGpwCZa71VU4wKT/sgDH/Ow+303rYxtb ZAGEVzy14RD5ZFQiE014masLhXGSblvdrKXoKW+tZ0I6SHfGNQ== X-Google-Smtp-Source: ABdhPJy+Qa1QnyOeGpgz2tEALV5zV/r+Mw/i+fe/ScEgQVuLKXLkdkccDTrTDmW6x67TiI0MqOdlBgeDXl3v04GVz3k= X-Received: by 2002:a4a:344b:: with SMTP id n11mr5774966oof.89.1601561633049; Thu, 01 Oct 2020 07:13:53 -0700 (PDT) MIME-Version: 1.0 References: <20201001203917.43d46a3d@canb.auug.org.au> <20201001135350.GA14869@lst.de> In-Reply-To: <20201001135350.GA14869@lst.de> From: Daniel Vetter Date: Thu, 1 Oct 2020 16:13:42 +0200 Message-ID: To: Christoph Hellwig 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 , Chris Wilson , Linux Next Mailing List , DRI , Andrew Morton Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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? > > 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 -- 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