Messages in this thread | | | Date | Fri, 31 Mar 2017 08:42:28 +0200 | From | Peter Zijlstra <> | Subject | Re: linux-next: manual merge of the akpm tree with the tip tree |
| |
On Fri, Mar 31, 2017 at 04:44:51PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm tree got a conflict in: > > kernel/sched/fair.c > > between commit: > > 0ccb977f4c80 ("sched/fair: Explicitly generate __update_load_avg() instances") > > from the tip tree and patch: > > "kernel/sched/fair.c: uninline __update_load_avg()" > > from the akpm tree. > > I fixed it up (see below) 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.
Argh!
Andrew, please drop that patch. And the x86 out-of-line of __atomic_add_unless().
| |