Messages in this thread | | | Date | Wed, 24 Jun 2020 20:44:39 -0700 | From | "Paul E. McKenney" <> | Subject | Re: linux-next: manual merge of the rcu tree with the tip tree |
| |
On Thu, Jun 25, 2020 at 12:44:52PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rcu tree got a conflict in: > > include/linux/smp.h > > between commit: > > 380dc20ce843 ("smp, irq_work: Continue smp_call_function*() and irq_work*() integration") > > from the tip tree and commit: > > 7effc6f7b465 ("EXP kernel/smp: Provide CSD lock timeout diagnostics") > > from the rcu tree. > > I have no idea how to fix this up ...
I have an interesting forward-port in my future, it seems.
> I fixed it up (I just effectively reverted the rcu tree commit) and can > carry the fix as necessary. This is now fixed as far as linux-next is > concerned, but any non trivial conflicts should be mentioned to your > upstream maintainer when your tree is submitted for merging. You may > also want to consider cooperating with the maintainer of the conflicting > tree to minimise any particularly complex conflicts.
For the time being, I will move this out of my rcu/next pile.
Thanx, Paul
| |