From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@kernel.org>
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 91835C433FE
	for <linux-kernel@archiver.kernel.org>; Tue, 15 Mar 2022 23:02:39 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1352472AbiCOXDu (ORCPT
        <rfc822;linux-kernel@archiver.kernel.org>);
        Tue, 15 Mar 2022 19:03:50 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56050 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1352465AbiCOXDs (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 15 Mar 2022 19:03:48 -0400
Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93A225D655;
        Tue, 15 Mar 2022 16:02:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
        d=infradead.org; s=bombadil.20210309; h=Sender:In-Reply-To:
        Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID:
        Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description;
        bh=nXUiSJnw39LzfU6KtBZXkXRWVC6rLAnFMW3xW6PdEto=; b=WYYT0ddfZoDelK5Y7/l0KM8hgz
        0gc+qy2FR1lntA5GXYQiBEMpXnnO4SP1ZtN7cdSFUNbN5vn3iDhejVSWvFjGU4WbVtKqFYIMVZ1FS
        p5bCQzMFKVQ/7OO8HeXG6uzV8WDV5f3orU553OlALrZPYE/YqOZOsbT+cVc47Vy7/Lysc/jEeCWxv
        bA+dU6wqi6fF9IajgjD79QJsiwtqC3G6Eg+2jbrm0sWBA8fFwZME4oyDDWO++yAUnyzh6Dztc4DBS
        /LJXGXrOOzd3kYnPOoJTvLFrIWWGBWzZ8hyvSfMya5tYDbugAIUGvv6ZVRlSclNgI7ojKeWPn9uZQ
        vyOO17+Q==;
Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux))
        id 1nUGBO-00ApGW-8i; Tue, 15 Mar 2022 23:02:26 +0000
Date:   Tue, 15 Mar 2022 16:02:26 -0700
From:   Luis Chamberlain <mcgrof@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Peter Zijlstra <peterz@infradead.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Dietmar Eggemann <dietmar.eggemann@arm.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Zhen Ni <nizhen@uniontech.com>
Subject: Re: linux-next: manual merge of the sysctl tree with the tip tree
Message-ID: <YjEbAo2126TjKNeE@bombadil.infradead.org>
References: <20220315201840.6146f234@canb.auug.org.au>
 <YjD0Z7UQ0psJT7b0@bombadil.infradead.org>
 <20220316080215.46eb8cd5@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <20220316080215.46eb8cd5@canb.auug.org.au>
Sender: Luis Chamberlain <mcgrof@infradead.org>
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Mar 16, 2022 at 08:02:15AM +1100, Stephen Rothwell wrote:
> Hi Luis,
>=20
> On Tue, 15 Mar 2022 13:17:43 -0700 Luis Chamberlain <mcgrof@kernel.org> w=
rote:
> >
> > On Tue, Mar 15, 2022 at 08:18:40PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >=20
> > > Today's linux-next merge of the sysctl tree got a conflict in:
> > >=20
> > >   kernel/sched/deadline.c
> > >=20
> > > between commit:
> > >=20
> > >   eb77cf1c151c ("sched/deadline: Remove unused def_dl_bandwidth")
> > >=20
> > > from the tip tree and commit:
> > >=20
> > >   ebb891f03580 ("sched: Move deadline_period sysctls to deadline.c")
> > >=20
> > > from the sysctl tree. =20
> >=20
> > Peter,
> >=20
> > to help avoid conflicts I spinned up a sysctl-next tree to collect
> > different cleanups going on kernel/sysctl.c. I can drop=20
> > ebb891f03580 ("sched: Move deadline_period sysctls to deadline.c")
> > but I think we'd still run into conflicts as other sysctls are
> > trimmed out. Would you be OK in me taking in eb77cf1c151c
> > ("sched/deadline: Remove unused def_dl_bandwidth") to avoid this
> > conflict?
>=20
> Its really a trivial conflict and just needs to be mentioned to Linus
> in the pull requests.

Ah alrighty! Thanks!

  Luis