Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Sat, 13 Feb 2021 13:05:18 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Frederic Weisbecker <frederic@kernel.org>,
        "Paul E. McKenney" <paulmck@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the rcu tree with the block tree
Message-ID: <20210213130518.3747a678@canb.auug.org.au>
In-Reply-To: <858e7874-83c9-e4b9-a0a9-31be5a0c853e@kernel.dk>
References: <20210211164852.7489b87d@canb.auug.org.au>
        <20210212151853.GC94816@lothringen>
        <858e7874-83c9-e4b9-a0a9-31be5a0c853e@kernel.dk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/I2YT3FdOFfP0ik0SKo8Ba3u";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/I2YT3FdOFfP0ik0SKo8Ba3u
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 12 Feb 2021 08:30:27 -0700 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 2/12/21 8:18 AM, Frederic Weisbecker wrote:
> > On Thu, Feb 11, 2021 at 04:48:52PM +1100, Stephen Rothwell wrote: =20
> >> Hi all,
> >>
> >> Today's linux-next merge of the rcu tree got conflicts in:
> >>
> >>   include/linux/rcupdate.h
> >>   kernel/rcu/tree.c
> >>   kernel/rcu/tree_plugin.h
> >>
> >> between commits:
> >>
> >>   3a7b5c87a0b2 ("rcu/nocb: Perform deferred wake up before last idle's=
 need_resched() check")
> >>   e4234f21d2ea ("rcu: Pull deferred rcuog wake up to rcu_eqs_enter() c=
allers")
> >>   14bbd41d5109 ("entry/kvm: Explicitly flush pending rcuog wakeup befo=
re last
> >>   rescheduling point")
> >> from the block tree and commits: =20
> >=20
> > Isn't it tip:/sched/core instead of block? =20
>=20
> It must be, maybe block just got merged first? It's just sched/core in a
> topic branch, to satisfy a dependency.

Well, yes, it is a topic branch merge into the block tree.  However,
that topic branch has not been merged into the tip/auto-latest branch
which is what linux-next pulls in as the tip tree.  (And the tip tree
and block trees were both merged before the rcu tree.)

--=20
Cheers,
Stephen Rothwell

--Sig_/I2YT3FdOFfP0ik0SKo8Ba3u
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAnM94ACgkQAVBC80lX
0Gx7Agf9EoLO6f4jX0seNCyDmYzGJ9dPRMu1V08p0HvcfRJ71r/iLUg4iw4iSBVd
h9yMLTxxYuQlzdwSqZTY/ABu1H9jletypGDa1LKmqTP5IaQYBXYvdo38Wo/qBDhM
2ojeiRsf5/Pj08vnn1Sfzk48gu/c+zniDZ3uTkyON0cRHFKoxiFeLvrYMwF1bUlT
M7gmsBf2Id3JOfymSI01o7QAVGj0Eqct3EZ+Cht+/hUp211hnXMUgXP+Nf2W7zCU
548EGdv57rG1m/l4MRpZ7Yw9GGe4PSBtz+0OLzG6dM+fvrV9V+Wjmr/RgHeUVaep
C3o6961PnB67oyQ+/cdiBzY4NLUFyg==
=kQd+
-----END PGP SIGNATURE-----

--Sig_/I2YT3FdOFfP0ik0SKo8Ba3u--