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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54F15C433FE for ; Tue, 9 Nov 2021 09:16:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3BCA961175 for ; Tue, 9 Nov 2021 09:16:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243497AbhKIJTV (ORCPT ); Tue, 9 Nov 2021 04:19:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237882AbhKIJTT (ORCPT ); Tue, 9 Nov 2021 04:19:19 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A24DAC061208 for ; Tue, 9 Nov 2021 01:16:30 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id d72-20020a1c1d4b000000b00331140f3dc8so1738791wmd.1 for ; Tue, 09 Nov 2021 01:16:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=Yjma5mRrb82FaHeqwEGkttg2XiFg5zhxGRY3Wmkbjxk=; b=fKFTVCySyPMePSh7mhupGnzSoJoGvjq1KyxBEzABecEN+XHEN+WMQOhWsEzkGtRmid 9iqVwP//G3abSfqk+rIgkTn5yXuk0Mo3f5OlFYwtq9LaFWTjU8N9nNL55Cz3Nf/+UZuI ZcQxS2ta7waGRCAMMNIigaBfF2L2we8y7YaxA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=Yjma5mRrb82FaHeqwEGkttg2XiFg5zhxGRY3Wmkbjxk=; b=YUfvyrnb5Xpd3V21+1YmtOt5D391jHG5pV6ji7i/pqXkNcRMmETYX6uj7/C9+Es0re Ln7MtSAG24ry3TAlRVwzohbjfNGzufBPFBR2e8cQDdIL/GblSniQzbTU2fXpM22JkOF8 mpIUc7AR0MF4V0Sf9yaHeIuzgHLOctnkrGHIXUMibMKpCa6LF3SMyw7owtu0UpYvvTFR 1Gjsompac5hSZEXLRGHZW8fQE2bX55SKdW/ltSt6yG3P7fzHoq8nfwxBn9fN7AzkkddA 4KTxXmGcmrv9tU+ZKguuGIxnsIWHR7Xx+PPaGIV9Tz38y0hOmO2QlPfGniqYLitCV3wN WSHA== X-Gm-Message-State: AOAM530IP2QJHoFJTjOEs8MVXoTPaa+NME8EY913P9cehhn0Y4qp5eyJ wtgLz4MMgImYy4BmQSHQk+KFWg== X-Google-Smtp-Source: ABdhPJz7q+uhfnvfEH4DwVgZJaCEKFC1hKgEx5TjbsATOUhrI19DS7lgDXeUqtwj6dIwUW3QWcXnJA== X-Received: by 2002:a05:600c:3b83:: with SMTP id n3mr5338933wms.116.1636449389206; Tue, 09 Nov 2021 01:16:29 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id h13sm19842564wrx.82.2021.11.09.01.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 01:16:28 -0800 (PST) Date: Tue, 9 Nov 2021 10:16:27 +0100 From: Daniel Vetter To: Jani Nikula Cc: Stephen Rothwell , Dave Airlie , Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Thomas Zimmermann , Maxime Ripard , Maarten Lankhorst Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: Mail-Followup-To: Jani Nikula , Stephen Rothwell , Dave Airlie , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Thomas Zimmermann , Maxime Ripard , Maarten Lankhorst References: <20211015202648.258445ef@canb.auug.org.au> <20211101194223.749197c5@canb.auug.org.au> <20211105171517.287de894@canb.auug.org.au> <874k8qampc.fsf@intel.com> <20211106133314.42e3e308@canb.auug.org.au> <87zgqd6alj.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87zgqd6alj.fsf@intel.com> X-Operating-System: Linux phenom 5.10.0-8-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote: > On Sat, 06 Nov 2021, Stephen Rothwell wrote: > > Hi Jani, > > > > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula wrote: > >> > >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix > >> __stack_depot_* name conflict") to drm-misc-next-fixes. > > > > Please do so as builds will start failing otherwise :-( > > Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes? Yeah just do, for drm-misc this is considered in committer purview. I think we should add a section to the docs about "What if a patch is in the wrong branch" which tells you to just cherry-pick -x or whatever. -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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F89FC433EF for ; Tue, 9 Nov 2021 09:16: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 24A6B61184 for ; Tue, 9 Nov 2021 09:16:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 24A6B61184 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 73D8789ECD; Tue, 9 Nov 2021 09:16:31 +0000 (UTC) Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C4C989ECD for ; Tue, 9 Nov 2021 09:16:30 +0000 (UTC) Received: by mail-wm1-x32b.google.com with SMTP id g191-20020a1c9dc8000000b0032fbf912885so1725688wme.4 for ; Tue, 09 Nov 2021 01:16:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=Yjma5mRrb82FaHeqwEGkttg2XiFg5zhxGRY3Wmkbjxk=; b=fKFTVCySyPMePSh7mhupGnzSoJoGvjq1KyxBEzABecEN+XHEN+WMQOhWsEzkGtRmid 9iqVwP//G3abSfqk+rIgkTn5yXuk0Mo3f5OlFYwtq9LaFWTjU8N9nNL55Cz3Nf/+UZuI ZcQxS2ta7waGRCAMMNIigaBfF2L2we8y7YaxA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=Yjma5mRrb82FaHeqwEGkttg2XiFg5zhxGRY3Wmkbjxk=; b=PFuCUja8QVvuC4mVmj7PXB9iAN2ebjwHlMMWIR58NAs18CRWJQRkgCosPp/qViQMjS 4frBLqPU+dosiI1tildGu/DHALsYSc/oxBUGuLs7r3jeHMI2vOYC9NVr4okxbn4h19FJ LWEp7MtFpT/58GdTTjez9dwS0TyuUppf8Qezvc57jEosSzRlsUKESSdExvnHeOJrZ/E8 +KpijAlUqsuugwxLQzk/TbsaWtbEnxJvwtITMozSGyZljvMI2CN6KpqLCWbUDvwHhz+H rNXuGgEXi4nPwXy8HB7XY6zD37MMY7QwkIUpVCZLW27L3pzHuAW+AL6Gd87irdk/MzaG h2+A== X-Gm-Message-State: AOAM530DpatrU5qFfyawWDSji02W2PyflPstNS9T295gTsBNLT66whaU w8rjl3TOI7j/sEmmUfKaJEGahg== X-Google-Smtp-Source: ABdhPJz7q+uhfnvfEH4DwVgZJaCEKFC1hKgEx5TjbsATOUhrI19DS7lgDXeUqtwj6dIwUW3QWcXnJA== X-Received: by 2002:a05:600c:3b83:: with SMTP id n3mr5338933wms.116.1636449389206; Tue, 09 Nov 2021 01:16:29 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id h13sm19842564wrx.82.2021.11.09.01.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 01:16:28 -0800 (PST) Date: Tue, 9 Nov 2021 10:16:27 +0100 From: Daniel Vetter To: Jani Nikula Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: Mail-Followup-To: Jani Nikula , Stephen Rothwell , Dave Airlie , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Thomas Zimmermann , Maxime Ripard , Maarten Lankhorst References: <20211015202648.258445ef@canb.auug.org.au> <20211101194223.749197c5@canb.auug.org.au> <20211105171517.287de894@canb.auug.org.au> <874k8qampc.fsf@intel.com> <20211106133314.42e3e308@canb.auug.org.au> <87zgqd6alj.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87zgqd6alj.fsf@intel.com> X-Operating-System: Linux phenom 5.10.0-8-amd64 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 , Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote: > On Sat, 06 Nov 2021, Stephen Rothwell wrote: > > Hi Jani, > > > > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula wrote: > >> > >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix > >> __stack_depot_* name conflict") to drm-misc-next-fixes. > > > > Please do so as builds will start failing otherwise :-( > > Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes? Yeah just do, for drm-misc this is considered in committer purview. I think we should add a section to the docs about "What if a patch is in the wrong branch" which tells you to just cherry-pick -x or whatever. -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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 933F7C433F5 for ; Tue, 9 Nov 2021 09:16:35 +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 5C0F261184 for ; Tue, 9 Nov 2021 09:16:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5C0F261184 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C52E6E849; Tue, 9 Nov 2021 09:16:32 +0000 (UTC) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by gabe.freedesktop.org (Postfix) with ESMTPS id A05F46E7D7 for ; Tue, 9 Nov 2021 09:16:30 +0000 (UTC) Received: by mail-wm1-x334.google.com with SMTP id a20-20020a1c7f14000000b003231d13ee3cso1319742wmd.3 for ; Tue, 09 Nov 2021 01:16:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=Yjma5mRrb82FaHeqwEGkttg2XiFg5zhxGRY3Wmkbjxk=; b=fKFTVCySyPMePSh7mhupGnzSoJoGvjq1KyxBEzABecEN+XHEN+WMQOhWsEzkGtRmid 9iqVwP//G3abSfqk+rIgkTn5yXuk0Mo3f5OlFYwtq9LaFWTjU8N9nNL55Cz3Nf/+UZuI ZcQxS2ta7waGRCAMMNIigaBfF2L2we8y7YaxA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=Yjma5mRrb82FaHeqwEGkttg2XiFg5zhxGRY3Wmkbjxk=; b=umIpodeSdmKWLKWsY+T3qXj0Sge4EQwR6qk9IcivmhGigqo+ls13MmTN7DvExv8dE7 zvoZEYcZfgidSC1HjejKD3SWJnepw2ebt8b5xOF9qaCFNBRM5FWbNxLh1D9cW4Ap8j29 ihFnQYL6hdUYe0hmLW4FhkowhWqI0LnuuUhV7sOh80cfk92uHF7oEgSaBA4zhVamAGx6 vvKq8j8TLn5k1hU7nsPKwqR3/3S/BvJt5iTbFnStYYPy7xKycSu+pgMkc7BZxXubM9eQ ARa6oBZYij0liRK5Jla5DkS6x6kIvvVjpxzH5KCtNqfxVazM9L2Gs5zsvR2YsuidKM00 W5FA== X-Gm-Message-State: AOAM531+k4hnNtehELZe+GnnkMcm9oQoSLPI+sWmrHvaKZnTOgstS3Va lWVdidTHaNJFhK1nu9KDFgFQNw== X-Google-Smtp-Source: ABdhPJz7q+uhfnvfEH4DwVgZJaCEKFC1hKgEx5TjbsATOUhrI19DS7lgDXeUqtwj6dIwUW3QWcXnJA== X-Received: by 2002:a05:600c:3b83:: with SMTP id n3mr5338933wms.116.1636449389206; Tue, 09 Nov 2021 01:16:29 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id h13sm19842564wrx.82.2021.11.09.01.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 01:16:28 -0800 (PST) Date: Tue, 9 Nov 2021 10:16:27 +0100 From: Daniel Vetter To: Jani Nikula Message-ID: Mail-Followup-To: Jani Nikula , Stephen Rothwell , Dave Airlie , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Thomas Zimmermann , Maxime Ripard , Maarten Lankhorst References: <20211015202648.258445ef@canb.auug.org.au> <20211101194223.749197c5@canb.auug.org.au> <20211105171517.287de894@canb.auug.org.au> <874k8qampc.fsf@intel.com> <20211106133314.42e3e308@canb.auug.org.au> <87zgqd6alj.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87zgqd6alj.fsf@intel.com> X-Operating-System: Linux phenom 5.10.0-8-amd64 Subject: Re: [Intel-gfx] linux-next: build failure after merge of 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 , Dave Airlie , Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Maxime Ripard , Thomas Zimmermann Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote: > On Sat, 06 Nov 2021, Stephen Rothwell wrote: > > Hi Jani, > > > > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula wrote: > >> > >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix > >> __stack_depot_* name conflict") to drm-misc-next-fixes. > > > > Please do so as builds will start failing otherwise :-( > > Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes? Yeah just do, for drm-misc this is considered in committer purview. I think we should add a section to the docs about "What if a patch is in the wrong branch" which tells you to just cherry-pick -x or whatever. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch