[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <xhsmh7cd9zc8a.mognet@vschneid-thinkpadt14sgen2i.remote.csb>
Date: Thu, 25 Jul 2024 18:07:49 +0200
From: Valentin Schneider <vschneid@...hat.com>
To: Neeraj Upadhyay <Neeraj.Upadhyay@...nel.org>
Cc: rcu@...r.kernel.org, linux-kernel@...r.kernel.org, Frederic Weisbecker
<frederic@...nel.org>, "Paul E. McKenney" <paulmck@...nel.org>, Peter
Zijlstra <peterz@...radead.org>, Neeraj Upadhyay
<quic_neeraju@...cinc.com>, Joel Fernandes <joel@...lfernandes.org>, Josh
Triplett <josh@...htriplett.org>, Boqun Feng <boqun.feng@...il.com>,
Steven Rostedt <rostedt@...dmis.org>, Mathieu Desnoyers
<mathieu.desnoyers@...icios.com>, Lai Jiangshan <jiangshanlai@...il.com>,
Zqiang <qiang.zhang1211@...il.com>
Subject: Re: [PATCH v3 00/25] context_tracking, rcu: Spring cleaning of
dynticks references
On 25/07/24 20:52, Neeraj Upadhyay wrote:
> On Wed, Jul 24, 2024 at 04:43:00PM +0200, Valentin Schneider wrote:
>> Git info
>> ========
>>
>> The series is based on rcu/next at:
>> f395ae346be5 ("Merge branches 'doc.2024.06.06a', 'fixes.2024.06.06a', 'mb.2024.06.03a', 'nocb.2024.06.03a', 'rcu-tasks.2024.06.06a' and 'rcutorture.2024.06.06a' into HEAD")
>>
>
> Hi Valentin,
>
> I see that this series is based on paulmck/linux-rcu.git next branch,
> whereas the RCU tree has moved to shared tree now [1] and the next
> branch there is pulled for v6.11 (tag: rcu.2024.07.12a). I get merge
> conflicts while applying it. Can you please rebase?
>
My bad, thanks for pointing this out!
Powered by blists - more mailing lists