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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D4F92C4332F for ; Mon, 14 Nov 2022 10:36:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FD7D89664; Mon, 14 Nov 2022 10:36:05 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id E1CB289664 for ; Mon, 14 Nov 2022 10:36:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668422161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=24zRJBMMX5r7D0TfP9H8IpSMNGkPGaDlufPYAnb9o3c=; b=I8O2Ni5fm5YhkBFZyMitiZmoyGg10HLrXJXSI8Tx28JMkOoc/JzGIB3TKLk/0UdisINQsn V2OBBMJsgQ12XsV9ZueiVKniYSbGRgwx6bBSG+lV5FQF+2kI+vni0sBE5WdOi7lTERnmaZ rXHWq3CrqgGySvqiP/We7Y5K8rZXCpA= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-609-JlJr_H-mOM685RPv8-laSw-1; Mon, 14 Nov 2022 05:35:59 -0500 X-MC-Unique: JlJr_H-mOM685RPv8-laSw-1 Received: by mail-ej1-f70.google.com with SMTP id qf25-20020a1709077f1900b0078c02a23da3so5142109ejc.0 for ; Mon, 14 Nov 2022 02:35:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=24zRJBMMX5r7D0TfP9H8IpSMNGkPGaDlufPYAnb9o3c=; b=KhAIYy0rrqDmO7tu1DbmYFo+RjAgIAz/9iNGVChlgnnPb52Ts06GgA4Ln9vC+QcRXF cz+bo70VecsWft4vplsTSHRZZQg900whOTOK28XKPDP1LVIJJK12cOa9AMa058oIvGEV jfNQH+PkE1ingVrBikdFWBeVWL5cb2YuEyykf3UFQgvsik9aV3LANz3x3CSXDyzbsU3B MEJNC939HywJ6RQdfUjpZeuz0ilMU+lshniTc65DzTWVXSDppE+9AjtB5M5Wuj9K6sHP bQnLlCTfWiDuylJLeh0LRdsJVIe7AfiHjq9c/fzpyOuRjymW55ZgMukgl8GHQAUq2NpK XXWA== X-Gm-Message-State: ANoB5plkm0Zszon5J2USDC9ctHSfLNTQVLxz+kzocQ+KAxv32HqHAMN4 X7K6J9VQ4UneacLea0x16RCJagp7NDUmLfILdA8ASJbANhIqGrMZDkdv/LjEv50Vv4Sq9ryTeK/ x9AFVWEjQjsp+chZhj354woqyVVmh X-Received: by 2002:a05:6402:519:b0:467:6847:1ea7 with SMTP id m25-20020a056402051900b0046768471ea7mr9673847edv.237.1668422158719; Mon, 14 Nov 2022 02:35:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf6ICCUSIbjUZ6xW1wwVWfNHWXpBEQHv6D03VDE1/OpgXEDSGOrXtsDchrX5iVx343T8ZpJuMQ== X-Received: by 2002:a05:6402:519:b0:467:6847:1ea7 with SMTP id m25-20020a056402051900b0046768471ea7mr9673827edv.237.1668422158530; Mon, 14 Nov 2022 02:35:58 -0800 (PST) Received: from [10.40.98.142] ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id eg25-20020a056402289900b00457b5ba968csm4581792edb.27.2022.11.14.02.35.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Nov 2022 02:35:57 -0800 (PST) Message-ID: <57f57c29-cf48-67c1-b6b3-0e50e7105031@redhat.com> Date: Mon, 14 Nov 2022 11:35:57 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree To: Jani Nikula , Stephen Rothwell , Daniel Vetter , Joonas Lahtinen , Rodrigo Vivi References: <20221114102327.6d53341e@canb.auug.org.au> <33ef1207-aad7-b7cd-61ac-327e9afb0699@redhat.com> <87cz9p4zj6.fsf@intel.com> From: Hans de Goede In-Reply-To: <87cz9p4zj6.fsf@intel.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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: Intel Graphics , Linux Next Mailing List , Linux Kernel Mailing List , DRI Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, On 11/14/22 11:10, Jani Nikula wrote: > On Mon, 14 Nov 2022, Hans de Goede wrote: >> Hi, >> >> On 11/14/22 00:23, Stephen Rothwell wrote: >>> Hi all, >>> >>> Today's linux-next merge of the drm-intel tree got a conflict in: >>> >>> drivers/gpu/drm/i915/display/intel_backlight.c >>> >>> between commit: >>> >>> b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight should be used (v2)") >>> >>> from Linus' tree and commit: >>> >>> 801543b2593b ("drm/i915: stop including i915_irq.h from i915_trace.h") >>> >>> from the drm-intel tree. >> >> This is weird, because the: >> >> b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight should be used (v2)") >> >> commit is in 6.1-rc1, so there can only be a conflict it 6.1-rc1 has not >> been back-merged into drm-intel yet ? > > That's the reason it *is* a conflict, right? Right what I was trying to say is that I am surprised that 6.1-rc1 has not been back-merged into drm-intel yet even though it has been released 4 weeks ago. I thought it was more or less standard process to backmerge rc1 soon after it is released ? Regards, Hans 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8D86C4332F for ; Mon, 14 Nov 2022 10:37:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235779AbiKNKg7 (ORCPT ); Mon, 14 Nov 2022 05:36:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236080AbiKNKgz (ORCPT ); Mon, 14 Nov 2022 05:36:55 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35DFF1D65B for ; Mon, 14 Nov 2022 02:36:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668422161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=24zRJBMMX5r7D0TfP9H8IpSMNGkPGaDlufPYAnb9o3c=; b=I8O2Ni5fm5YhkBFZyMitiZmoyGg10HLrXJXSI8Tx28JMkOoc/JzGIB3TKLk/0UdisINQsn V2OBBMJsgQ12XsV9ZueiVKniYSbGRgwx6bBSG+lV5FQF+2kI+vni0sBE5WdOi7lTERnmaZ rXHWq3CrqgGySvqiP/We7Y5K8rZXCpA= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-440-Eev_oxOoNVml0XdOGSSw9w-1; Mon, 14 Nov 2022 05:35:59 -0500 X-MC-Unique: Eev_oxOoNVml0XdOGSSw9w-1 Received: by mail-ej1-f72.google.com with SMTP id hp16-20020a1709073e1000b007adf5a83df7so5184095ejc.1 for ; Mon, 14 Nov 2022 02:35:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=24zRJBMMX5r7D0TfP9H8IpSMNGkPGaDlufPYAnb9o3c=; b=nIx4ooQeK0c9MbGirlc4pWEdEO2yknv3fGNMzl/R672iVg3puRp2eaFz6xNK5AZdGy VA0zyipyJruGA8cJlxoXad+yKB0AvpMT1iL00b+h3PU5LLfoLiw7DGs+DqUKh3eIm/ig E2+7l4EFPFeQX/unO47cDz2FvpNEGOclQfgvT6diOgfoaZMMvWETbfVcdZ1rmrdX1eOy lloy06JZu6wA+vX5S0DZhalmQiUPcBupvf/8X35+4K7dIGC8AecIfEg3edu5UhqsmBfq TZBcVp6ixqOTFtzXgsuxx6G7lO7PhO9ZftxbQTTRfpFuPS+9fNke5acvZz/H921E67qt IXow== X-Gm-Message-State: ANoB5pkPWoeI2Wo/jbi68CMj7gIxGCDkd2XXccE7dL+mcZalgt6UWVUI l4Ro4iTkqaakwHDN9tS5z3WSDnFtoly5DZlqFcIqilzlGwhZDJoxOHCKQfh6BbY94GciANFkhU5 QWt/Lhtgci0mtSUQ2NYgGPqCC X-Received: by 2002:a05:6402:519:b0:467:6847:1ea7 with SMTP id m25-20020a056402051900b0046768471ea7mr9673840edv.237.1668422158680; Mon, 14 Nov 2022 02:35:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf6ICCUSIbjUZ6xW1wwVWfNHWXpBEQHv6D03VDE1/OpgXEDSGOrXtsDchrX5iVx343T8ZpJuMQ== X-Received: by 2002:a05:6402:519:b0:467:6847:1ea7 with SMTP id m25-20020a056402051900b0046768471ea7mr9673827edv.237.1668422158530; Mon, 14 Nov 2022 02:35:58 -0800 (PST) Received: from [10.40.98.142] ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id eg25-20020a056402289900b00457b5ba968csm4581792edb.27.2022.11.14.02.35.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Nov 2022 02:35:57 -0800 (PST) Message-ID: <57f57c29-cf48-67c1-b6b3-0e50e7105031@redhat.com> Date: Mon, 14 Nov 2022 11:35:57 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree Content-Language: en-US To: Jani Nikula , Stephen Rothwell , Daniel Vetter , Joonas Lahtinen , Rodrigo Vivi Cc: Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List References: <20221114102327.6d53341e@canb.auug.org.au> <33ef1207-aad7-b7cd-61ac-327e9afb0699@redhat.com> <87cz9p4zj6.fsf@intel.com> From: Hans de Goede In-Reply-To: <87cz9p4zj6.fsf@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 11/14/22 11:10, Jani Nikula wrote: > On Mon, 14 Nov 2022, Hans de Goede wrote: >> Hi, >> >> On 11/14/22 00:23, Stephen Rothwell wrote: >>> Hi all, >>> >>> Today's linux-next merge of the drm-intel tree got a conflict in: >>> >>> drivers/gpu/drm/i915/display/intel_backlight.c >>> >>> between commit: >>> >>> b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight should be used (v2)") >>> >>> from Linus' tree and commit: >>> >>> 801543b2593b ("drm/i915: stop including i915_irq.h from i915_trace.h") >>> >>> from the drm-intel tree. >> >> This is weird, because the: >> >> b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight should be used (v2)") >> >> commit is in 6.1-rc1, so there can only be a conflict it 6.1-rc1 has not >> been back-merged into drm-intel yet ? > > That's the reason it *is* a conflict, right? Right what I was trying to say is that I am surprised that 6.1-rc1 has not been back-merged into drm-intel yet even though it has been released 4 weeks ago. I thought it was more or less standard process to backmerge rc1 soon after it is released ? Regards, Hans 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B9D31C4332F for ; Mon, 14 Nov 2022 10:36:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D38DC10E011; Mon, 14 Nov 2022 10:36:07 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3846410E011 for ; Mon, 14 Nov 2022 10:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668422161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=24zRJBMMX5r7D0TfP9H8IpSMNGkPGaDlufPYAnb9o3c=; b=I8O2Ni5fm5YhkBFZyMitiZmoyGg10HLrXJXSI8Tx28JMkOoc/JzGIB3TKLk/0UdisINQsn V2OBBMJsgQ12XsV9ZueiVKniYSbGRgwx6bBSG+lV5FQF+2kI+vni0sBE5WdOi7lTERnmaZ rXHWq3CrqgGySvqiP/We7Y5K8rZXCpA= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-119-61AQlZgDO6GnAyGNhoyXZA-1; Mon, 14 Nov 2022 05:35:59 -0500 X-MC-Unique: 61AQlZgDO6GnAyGNhoyXZA-1 Received: by mail-ej1-f72.google.com with SMTP id ga41-20020a1709070c2900b007aef14e8fd7so1152876ejc.21 for ; Mon, 14 Nov 2022 02:35:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=24zRJBMMX5r7D0TfP9H8IpSMNGkPGaDlufPYAnb9o3c=; b=BvWrbE/+XUYwrCmIdAVj9mm2L37KsXV97dRqblDEgQa6WNh7U27ddxEtSOXkxC8VJg YEh3f7PZ80O5IAukEbfmE8+tT2/plNEJQYn3J58lR+BpraaZHCoKegrspZscRq//jfsu 9LffbunsyT9NIB6zwCYXfl1alMTSsiLFytzV9VOy2RKC/fYU0J/DMjxp8L18YHR9BWsB MKVKZ7X4YmfhRhazKPtHks5ba3J30gEFgUXkHPn7Qg0qT2XfSiZj7d7QypftMqGCk18K 7HA+lGSSJo1wCFN0etVcA0k1TnhCGsTi9vj6o1PPlXoF7q69jl3EO2zRmNhqdVOBipkE kJwg== X-Gm-Message-State: ANoB5pn0eoynrKEP2WP6eAAo9LGnmuYYeAouNUl7QNYmFBvsE5lVZ9Ze 5M8ePa3csxDnETk5O/UIu18h+XZYYrioPNee40gStpiYHT5hipaepzjlVVS/NKcKPlz8bS/FKEZ 1+eGqy5WLIT27qDG1d29m0BbeOraC X-Received: by 2002:a05:6402:519:b0:467:6847:1ea7 with SMTP id m25-20020a056402051900b0046768471ea7mr9673842edv.237.1668422158681; Mon, 14 Nov 2022 02:35:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf6ICCUSIbjUZ6xW1wwVWfNHWXpBEQHv6D03VDE1/OpgXEDSGOrXtsDchrX5iVx343T8ZpJuMQ== X-Received: by 2002:a05:6402:519:b0:467:6847:1ea7 with SMTP id m25-20020a056402051900b0046768471ea7mr9673827edv.237.1668422158530; Mon, 14 Nov 2022 02:35:58 -0800 (PST) Received: from [10.40.98.142] ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id eg25-20020a056402289900b00457b5ba968csm4581792edb.27.2022.11.14.02.35.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Nov 2022 02:35:57 -0800 (PST) Message-ID: <57f57c29-cf48-67c1-b6b3-0e50e7105031@redhat.com> Date: Mon, 14 Nov 2022 11:35:57 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 To: Jani Nikula , Stephen Rothwell , Daniel Vetter , Joonas Lahtinen , Rodrigo Vivi References: <20221114102327.6d53341e@canb.auug.org.au> <33ef1207-aad7-b7cd-61ac-327e9afb0699@redhat.com> <87cz9p4zj6.fsf@intel.com> From: Hans de Goede In-Reply-To: <87cz9p4zj6.fsf@intel.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' 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: Intel Graphics , Linux Next Mailing List , Linux Kernel Mailing List , DRI Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi, On 11/14/22 11:10, Jani Nikula wrote: > On Mon, 14 Nov 2022, Hans de Goede wrote: >> Hi, >> >> On 11/14/22 00:23, Stephen Rothwell wrote: >>> Hi all, >>> >>> Today's linux-next merge of the drm-intel tree got a conflict in: >>> >>> drivers/gpu/drm/i915/display/intel_backlight.c >>> >>> between commit: >>> >>> b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight should be used (v2)") >>> >>> from Linus' tree and commit: >>> >>> 801543b2593b ("drm/i915: stop including i915_irq.h from i915_trace.h") >>> >>> from the drm-intel tree. >> >> This is weird, because the: >> >> b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight should be used (v2)") >> >> commit is in 6.1-rc1, so there can only be a conflict it 6.1-rc1 has not >> been back-merged into drm-intel yet ? > > That's the reason it *is* a conflict, right? Right what I was trying to say is that I am surprised that 6.1-rc1 has not been back-merged into drm-intel yet even though it has been released 4 weeks ago. I thought it was more or less standard process to backmerge rc1 soon after it is released ? Regards, Hans