Re: [GIT PULL rcu/next + tools/memory-model] RCU and LKMM commits for 5.4

From: Paul E. McKenney
Date: Sat Aug 24 2019 - 14:09:49 EST


On Sat, Aug 24, 2019 at 02:01:02PM +0200, Ingo Molnar wrote:
>
> * Paul E. McKenney <paulmck@xxxxxxxxxxxxx> wrote:
>
> > On Thu, Aug 22, 2019 at 08:54:29PM +0200, Ingo Molnar wrote:
> >
> > [ . . . ]
> >
> > > Pulled into tip:core/rcu, thanks a lot Paul!
> >
> > Thank you!
> >
> > > The merge commit is a bit non-standard:
> > >
> > > 07f038a408fb: Merge LKMM and RCU commits
> > >
> > > but clear enough IMHO. Usually we try to keep this format:
> > >
> > > 6c06b66e957c: Merge branch 'X' into Y
> > >
> > > even for internal merge commits.
> >
> > Please accept my apologies! How about as shown below? If this works
> > for you, I will rebase my development commits on top this merge commit
> > in order to make sure I don't revert back to my old format for next
> > merge window.
>
> Looks good - but I don't think we should create a new merge commit just
> for this.

Ah, right -- I need to keep my development commits on top of the old
merge commit to enable the likely additional pull request that I
mentioned below. Good point! ;-)

Thanx, Paul

> > Ah, speaking of reminding me... There is likely to be one more small RCU
> > commit requested by the RISC-V guys. If testing and review goes well,
> > I will send you a pull request for it by the middle of next week.
>
> Thanks!
>
> Ingo