Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp5336034rwb; Mon, 14 Nov 2022 03:08:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf5nTSOcKsqaiHgh6GvfPNrNLEebLKcMOoWfb2v5tpE+DXRMCGUEkosBbnqyBBSuvLnINSVJ X-Received: by 2002:a17:90a:5294:b0:20a:7c09:7993 with SMTP id w20-20020a17090a529400b0020a7c097993mr13611492pjh.149.1668424111793; Mon, 14 Nov 2022 03:08:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668424111; cv=none; d=google.com; s=arc-20160816; b=Ylft4GgovUZZWCvXlWdmVvTLGQJIEpMny2wI1O4hxmPlFnJVcnraMqN5aNr67Hc1P5 JTvpIVv4XX3bDxKuu/NG4O7v3wp71NPYdsb+M2k8QdaWzrZf/EHh6HPfMlby9alIS3MB fxAH8wWfWl1i+dii3wteVaG1tEw8OuYnASLLahqmv26LqrgN7HWQmwagpGrDfwo9Vt/X A6Lz/1TVP+jircuaAVaIDjRVIOBLDNqzCZHyCLJBEWxtcn1XYe6pGklmTixS8bqrGGcK I8ioStTcZcnDSL7KxgLpnYEw1S/WzXqwx5Kd9XVDnMMDJ8Mf1vatxQ6bz0WzsHRsanKA pyiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:references :organization:in-reply-to:subject:cc:to:from:dkim-signature; bh=irFcixTYAJbVMTcekzGnfW+gqzDjChg8TyinjDL5SKA=; b=iTWk3wJwgYpQJPBkfEmd6uRBaEQLO/DUZA8/WjZ4yWa73YZE2Zy1HZ0xgahzLf3IJj 7TEnJnskfQWjdDOzwuBYI/rqbXR//IoTU/mA/yDd80ofYIDN5Sc7uvoGkifV5xFmE5Qt h58iC8DbNvq3E01JkmpJPKcOBqKteQCyj5UfWOpBETOve9KEK04F8Y8xyJSKTRDPr7I1 XYyNHiDRJHBkoEgpa22otuRHZnDUUvhy6sXXKZQlLbTnTW/cL8btX6uwiKoqh3xDvprC yE7JLIra/IZWbIjZJz2UwgRyyBIGJnosl4So7qJDmxGvsG+Wc7Jk3u2SQtQG1PRZivpD I4jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LOlu3Fgl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l22-20020a62be16000000b0056e109212d8si8511355pff.287.2022.11.14.03.08.20; Mon, 14 Nov 2022 03:08:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LOlu3Fgl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236236AbiKNKMu (ORCPT + 88 others); Mon, 14 Nov 2022 05:12:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236567AbiKNKMB (ORCPT ); Mon, 14 Nov 2022 05:12:01 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E0BD2037F; Mon, 14 Nov 2022 02:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668420643; x=1699956643; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=Zc1y8BWK7mjmeSrhkG74pWOJjIpoWMU+QYmFu9YybfI=; b=LOlu3FglsgA6OizjvqDy2TC1E2My0RUfvkLc3UmgUU8kuPSmulMHTetd t+/VqQbkcYQKYhMySqrUrpr2VTErTEtTlMyPE756QVM9RYvGc1WK7bycz FpowoQ/XQTrnDQP7bby5FZNCPT9E4vUqrjfY808zm8n4p/qD8zaepnIeU ozWhOb652J4mWESn7PR2DkO2tA0cWqwn4RT1suaetBgWiGo95OzqqYEHe kWuB5iVLxAsGVhOgTZK7ayUxWP1ZQuZzQnpx8GY9CUtkJeCABB4ExUdtj 0TPQrRfijJ8RlwkoN/ZsmXK5cT9gxKKgx75Uw8+k/gniTyUoIpvD6GOJK w==; X-IronPort-AV: E=McAfee;i="6500,9779,10530"; a="313078939" X-IronPort-AV: E=Sophos;i="5.96,161,1665471600"; d="scan'208";a="313078939" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2022 02:10:42 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10530"; a="589312433" X-IronPort-AV: E=Sophos;i="5.96,161,1665471600"; d="scan'208";a="589312433" Received: from dsmahang-mobl.ger.corp.intel.com (HELO localhost) ([10.252.59.240]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2022 02:10:39 -0800 From: Jani Nikula To: Hans de Goede , Stephen Rothwell , Daniel Vetter , Joonas Lahtinen , Rodrigo Vivi Cc: Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree In-Reply-To: <33ef1207-aad7-b7cd-61ac-327e9afb0699@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20221114102327.6d53341e@canb.auug.org.au> <33ef1207-aad7-b7cd-61ac-327e9afb0699@redhat.com> Date: Mon, 14 Nov 2022 12:10:37 +0200 Message-ID: <87cz9p4zj6.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center