[lkml]   [2017]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: 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.


Andrew, please drop that patch. And the x86 out-of-line of __atomic_add_unless().

 \ /
  Last update: 2017-03-31 08:43    [W:0.057 / U:0.780 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site