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;
Date:   Mon, 14 Nov 2022 14:29:01 -0500
From:   Rodrigo Vivi <rodrigo.vivi@intel.com>
To:     Jani Nikula <jani.nikula@linux.intel.com>
CC:     Hans de Goede <hdegoede@redhat.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        DRI <dri-devel@lists.freedesktop.org>
Subject: Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with
 Linus' tree
Message-ID: <Y3KW/aBrF0YQQ8fd@intel.com>
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>
 <878rkd4x49.fsf@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <878rkd4x49.fsf@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aFUznKrb83nwtc0tczV2uXtNHci5/atgzBuyCGBqAQ4O94+9X1MZSiZMxg4G?=
 =?us-ascii?Q?1lpOYfW6tnuA6pm31OtyCrBOiVqF87luNeKm+Fdow9KLRAUdYnGuyRyvGF/h?=
 =?us-ascii?Q?NFcCnB8SF6PyRSFlOACpQZkrVo4KcWCJ2bPH+FU+wgeNiYMp4eW9mR6khLc7?=
 =?us-ascii?Q?wqMpQT3o674eRFyvB3vvjjxvE7TcA7IBqR8uiHtBvbTXNaaPcsjDW23vP7Y+?=
 =?us-ascii?Q?eNOjcqFc8/iT6eFfsZqOoJN/0LPqwPVbSpwKcWVlnw76EQDEXgq87jCRAkpN?=
 =?us-ascii?Q?L5dJS/YmqTy+AaYwJIRGhXMTf5facVW7gBmPn7ecI8JVsN9z3/ritadaFU/A?=
 =?us-ascii?Q?R0oenNmCLVRJSD2dwQO5RKJO8/pyujCXgjhzuZN6g3lNFpyF6NIMbwkhJBcZ?=
 =?us-ascii?Q?8n4n3ChG9lDwAeIDtPIs8lVQHvSHahc1clpw0w8BmD/uNTnXOmXw/11LNcNq?=
 =?us-ascii?Q?LOgXCVX19D5mK2SOt/FSYaTpg5/WymE/fjzx5S7ao4c55Qgmz996/QtnwV9H?=
 =?us-ascii?Q?CGJy1OOAS+IaAx1X4U/DT1IeE9NdXorR8X2pbCITzzCnpO6dmk9IC2X3Gf63?=
 =?us-ascii?Q?4MV9V0fTl4oWf4x5DbiG3HEKC+NuTJezMGJZiNmLXx2U/LeuCmNEhtA81EHU?=
 =?us-ascii?Q?Ouc+48Z8HAWbg2pBmB2IWlyFoVHEiSOv4V+Ot9vPpi9AJ+lwfFA6823CLoYR?=
 =?us-ascii?Q?cAyhljCCFoLO2moFDklGsbE4VUPwEpO5JbpWUY3ouDOnpm9Ewi4ZoFVUudyX?=
 =?us-ascii?Q?bh4UcqVXMJllNu5HLzNV3lTO1OanwU3fekmLT9ExUg7P/BdqNpPu1PlpQzpV?=
 =?us-ascii?Q?UwxscBYe6QfiMDpeVMSA3Z3b0SRPH2OFQfTk0o2MfSRPw4Yu5Mbzw0p+fWB4?=
 =?us-ascii?Q?nkB29Uy2PbzlvD6s5u265wu/usfnpsmw8KFYmqwl7hnQl+ATp2CvRaUBSIfO?=
 =?us-ascii?Q?kMCPNTS27T1QH3MENwGwMOiaFGblkAv24gl2utn7RHe/wjkvhOMZTKtlihdB?=
 =?us-ascii?Q?mumRdi4f/LyblRjsmHT85COcn70ZZr2IUVwRZm5Qqz9ocfysCoF5jHghP9Hv?=
 =?us-ascii?Q?a7Ki5RjYlHQadpRgCCObV4AjvhhvMcek0jXi2rALxglL7jO0daYRAJnJOQLp?=
 =?us-ascii?Q?Mhdn21ECf6U2rfwyG+nExNa+C+gkCAjK2PX7wK2ZfVCAQiLUvQHhyj3YRd5/?=
 =?us-ascii?Q?S/BX8l3RSIh90QwBxPHFL3cjo5vbA523HxwpDdhBJ/4KtPi1FXuSYZS0VvgP?=
 =?us-ascii?Q?qnv8lbB6HSJS/8ej9y516Om4bUdcbASiLud1H03sZwtF6wv5Dd1OTYTwdfie?=
 =?us-ascii?Q?6lddAM1DCf1Ip2HDg11+QePLV62GpjOut1tVQNmQi0b32AUSpa7iRey0++bL?=
 =?us-ascii?Q?1Nbow9+/CXAx1kHwpbFpIGdFwPH1zEs4TgIxEz5ANDq3NiyvB9jFYLy4CT8v?=
 =?us-ascii?Q?lOsfQCNAi0+bVObg7tVY0Zr9VWxjUamQgR15RQTb4a9kS7Oh/zrF14bTY9hZ?=
 =?us-ascii?Q?h1bs1PriEzXXpaFadclXgtbrQOGb6ZvIciSWgWK7/S1jzU5RLTtEIoqqZELi?=
 =?us-ascii?Q?849U5j+NAGmhNzbo7tpsuyRgYHT8VhmQzGcEeG0iku4IQHOke45mrRxMhVnC?=
 =?us-ascii?Q?EQ=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 52dac06a-5402-491b-7370-08dac6767eca
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6059.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2022 19:29:06.4639
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Urjm871euR9dMmbEozZQzaQzFGlW2ZR+UCh2nbVp6C3zwpD/BEz+IkI+RccfSXWcfMMiNvn6lazfJnyfjdrSyA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5110
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Nov 14, 2022 at 01:02:46PM +0200, Jani Nikula wrote:
> On Mon, 14 Nov 2022, Hans de Goede <hdegoede@redhat.com> wrote:
> > Hi,
> >
> > On 11/14/22 11:10, Jani Nikula wrote:
> >> On Mon, 14 Nov 2022, Hans de Goede <hdegoede@redhat.com> 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?

yeap, I'm on it...

> 
> 
> BR,
> Jani.
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center