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 75260C4332F for ; Mon, 14 Nov 2022 08:20:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235846AbiKNIUr (ORCPT ); Mon, 14 Nov 2022 03:20:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236301AbiKNIUq (ORCPT ); Mon, 14 Nov 2022 03:20:46 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 592531A81E for ; Mon, 14 Nov 2022 00:19:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668413989; 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=+Yxpc0+M0IPWKSXHEyC3cyneUXB0jkXapCGIc8Lc3oY=; b=coBZKsLASCJ0W/Xri/PP4k349+TObPPC4zYd6ZRM/AFPd/0Qtm8VKVFxg+zxoIvq9U0aJy 5x1PEuaEWTos3ftUy6CEhv0x0HrwoHJ4vVejmvybjMC1zd3HMitdIQpThfPJQjLfPjrdqo rpfwCjOXvI5Ix/eyowuEP+H1lt4cj6A= 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-101-zyFtCNwgOD6uT0iVwr0rBg-1; Mon, 14 Nov 2022 03:19:48 -0500 X-MC-Unique: zyFtCNwgOD6uT0iVwr0rBg-1 Received: by mail-ej1-f70.google.com with SMTP id sb4-20020a1709076d8400b007ae596eac08so5073439ejc.22 for ; Mon, 14 Nov 2022 00:19:47 -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:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+Yxpc0+M0IPWKSXHEyC3cyneUXB0jkXapCGIc8Lc3oY=; b=PGMv15IonV5AmShdyBUmMk6WYuZcrqKQsLrLD6zF+UQ76UvAZXCOp/BCPZZRsI4USx GwvXEoilvvIWW1GXj3A01uAiU+On85wrO2wtI1MLfb5rNWnOn8tb9je3x8qX9lAEffhv j1On8HYfwQrukMHdY8QZXSoDWrha7RtVPWtotAFmWyjnDJZYeMHXONZGkyXvqtF3Ioau gt/i6WqvvTaeU8bbV2yTiQaM1H4eQJcIUG4xsIvd4wfmfIa35Lpi5VI5mEuwdn5BY5f8 RBQZrQsk+c9dO2U4A9uJ/MeoSVDPHzB/8mBy0dw5aLXK28Qvfj6PYjOwYeBz8OoCT3Zj UG4Q== X-Gm-Message-State: ANoB5pmBFm248z6Wbwph6qcNC6LKfXATAyPTWerDBXmORGHSQswa3TCr gSJ/mg18UzqOlCKXar4WFLbDoPgEjT5QitX/ji7/8kMaNXTl3Gr09GfJAXZ+h0wVHpEcfZFBxQD NvO4l7jadefIQQ3jr8cUEJw== X-Received: by 2002:a17:906:5a6f:b0:7ad:8bd5:b7df with SMTP id my47-20020a1709065a6f00b007ad8bd5b7dfmr9198466ejc.57.1668413986800; Mon, 14 Nov 2022 00:19:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf51p2NOcFiZ3Q4gnFIwqjGdYGaCfgTUB0YvTQf/RWWvsQXFVt45qefdd8RjE0Fo2ogYIQGtEA== X-Received: by 2002:a17:906:5a6f:b0:7ad:8bd5:b7df with SMTP id my47-20020a1709065a6f00b007ad8bd5b7dfmr9198451ejc.57.1668413986549; Mon, 14 Nov 2022 00:19:46 -0800 (PST) Received: from [10.40.98.142] ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id o6-20020a170906768600b007a6c25819f1sm3897632ejm.145.2022.11.14.00.19.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Nov 2022 00:19:45 -0800 (PST) Message-ID: <33ef1207-aad7-b7cd-61ac-327e9afb0699@redhat.com> Date: Mon, 14 Nov 2022 09:19:44 +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: Stephen Rothwell , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: Intel Graphics , DRI , Jani Nikula , Linux Kernel Mailing List , Linux Next Mailing List References: <20221114102327.6d53341e@canb.auug.org.au> Content-Language: en-US From: Hans de Goede In-Reply-To: <20221114102327.6d53341e@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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 ? Regards, Hans