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 D4555C4332F for ; Mon, 14 Nov 2022 11:02:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235874AbiKNLCz (ORCPT ); Mon, 14 Nov 2022 06:02:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236444AbiKNLCy (ORCPT ); Mon, 14 Nov 2022 06:02:54 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 596CF1E73D; Mon, 14 Nov 2022 03:02:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668423772; x=1699959772; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=/FDzgq0LlS6mMw/MubQxFSGMoNYe/6uINUBW5zC8k2A=; b=XFUHwklUZHe+5XeBUKMxHwEokcpccI/3wWiPSVnFoZDGJhpoh/UI61mE BwJQOSq60yfjHYsXjNyz+TpdGI4D53rznVWrOkRXKq5BqnfKyHXjnT/IE 046VfgVGjnncu6fU3MfPAsJ/kD7dpphP7BZ/eU/rd+A4F+PzCYgdfClzf 1E3YQyXqq3D4ixyKNs0/jD0Tk+P0hQkW8Fq1AqcDfxrhYCxLNYr7w63/C 5kPwi62OpthIYvn+M8Hl8II86ktNq6mravQnrN91UOZWnSqv2G2hd8mHb TpfxS/o1ojMMHwCbooE/vX0Y00uxBRtQvMPXOBYBzGLQew+eG49x93xor w==; X-IronPort-AV: E=McAfee;i="6500,9779,10530"; a="313087650" X-IronPort-AV: E=Sophos;i="5.96,161,1665471600"; d="scan'208";a="313087650" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2022 03:02:52 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10530"; a="763436230" X-IronPort-AV: E=Sophos;i="5.96,161,1665471600"; d="scan'208";a="763436230" Received: from dsmahang-mobl.ger.corp.intel.com (HELO localhost) ([10.252.59.240]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2022 03:02:49 -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: <57f57c29-cf48-67c1-b6b3-0e50e7105031@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> <87cz9p4zj6.fsf@intel.com> <57f57c29-cf48-67c1-b6b3-0e50e7105031@redhat.com> Date: Mon, 14 Nov 2022 13:02:46 +0200 Message-ID: <878rkd4x49.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, 14 Nov 2022, Hans de Goede wrote: > 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. Right, -ENOCOFFEE at my end. > I thought it was more or less standard process to backmerge rc1 soon after > it is released ? The delay may be because v6.1-rc1 brought in more regressions for us than any other -rc1 in recent memory. Our CI's been suffering, and our folks have been spending a lot of time debugging, bisecting and reporting. (And before you ask, yes, we're going to be more proactive in reporting issues we find in linux-next.) That said, Rodrigo's been in charge of drm-intel-next this cycle, maybe it's time to backmerge drm-next? BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center