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 53DA7C43217 for ; Thu, 1 Dec 2022 10:42:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230443AbiLAKmB (ORCPT ); Thu, 1 Dec 2022 05:42:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230422AbiLAKmA (ORCPT ); Thu, 1 Dec 2022 05:42:00 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DAAE54465; Thu, 1 Dec 2022 02:42:00 -0800 (PST) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id BAC3521B21; Thu, 1 Dec 2022 10:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1669891318; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=zrDyVcK51+fIcxn7DpPFqr3mP3lLiCkb6MliQynUwgE=; b=Vv9OVNm79Av0F2QVTn/ISJlH+1QSAWCPU3n+ck/owo40mpoX1wSC8xMZBxkYDWhUTIK9Cc we6uahoEFZFEKt7VMeZZkmE9SFkkKUiglTapUyn/dSKhbyFucKdMDtJEKkoRE8UxHs5svx Uz/oVbkSX9MZ2hmCeOL0a6d2L51x6GM= Received: from suse.cz (unknown [10.100.201.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id C8E9F2C141; Thu, 1 Dec 2022 10:41:57 +0000 (UTC) Date: Thu, 1 Dec 2022 11:41:57 +0100 From: Petr Mladek To: "Paul E. McKenney" Cc: Stephen Rothwell , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the rcu tree with the printk tree Message-ID: References: <20221201105504.71c318f0@canb.auug.org.au> <20221130235959.GE4001@paulmck-ThinkPad-P17-Gen-1> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221130235959.GE4001@paulmck-ThinkPad-P17-Gen-1> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed 2022-11-30 15:59:59, Paul E. McKenney wrote: > On Thu, Dec 01, 2022 at 10:55:04AM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the rcu tree got a conflict in: > > > > kernel/rcu/update.c > > > > between commit: > > > > 64e838679e14 ("rcu: Make SRCU mandatory") > > > > from the printk tree and commit: > > > > 0cd7e350abc4 ("rcu: Make SRCU mandatory") > > > > from the rcu tree. > > > > I fixed it up (I just used the latter - it kept the WARN_ON_ONCE) and > > can carry the fix as necessary. This is now fixed as far as linux-next > > is concerned, but any non trivial conflicts should be mentioned to your > > upstream maintainer when your tree is submitted for merging. You may > > also want to consider cooperating with the maintainer of the conflicting > > tree to minimise any particularly complex conflicts. > > > > Maybe you could share a (non rebasing) topic branch? > > Please accept my apologies for the hassle! > > We are sharing a topic branch, but it recently changed and was therefore > rebased. You saw -rcu providing the updated version to -next, but what > with timezones and all, printk() is still providing the old one. I have rebased the printk tree on top of the updated commit 0cd7e350abc4 ("rcu: Make SRCU mandatory"). All should be fine now. It is great the linux-next exists. Best Regards, Petr