Messages in this thread | | | From | Linus Torvalds <> | Date | Sun, 4 Jul 2021 13:44:02 -0700 | Subject | Re: [GIT PULL] RCU changes for v5.14 |
| |
On Sun, Jul 4, 2021 at 1:32 PM Paul E. McKenney <paulmck@kernel.org> wrote: > > Once again, please accept my apologies, and thank you for the explanation. > I should have sent something like the following, correct?
Correct. That
> I have done an example merge here: > > git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git merge-example-rcu
makes it trivial for me to just do that "git fetch" and compare what you did with what I did.
Of course, now I've already pushed out my resolution, so it's too late (and I've forgotten which files were involved, so I'm too lazy to go back and check). But hopefully it matches anyway.
Linus
| |