* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the sched tree got a conflict in
> kernel/Makefile between commit
> 65ecc14a30ad21bed9aabdfd6a2ae1a1aaaa6a00 ("Remove -mno-spe flags as
> they dont belong") from Linus' tree and commit
> 8bb8c4386d08f2cc5d871d22f220d35032213f84 ("sched, ftrace: trace
> sched.c") from the sched tree.
>
> I fixed it up (see below) and can carry it for a short while.
i did a similar conflict resolution yesterday. I have pushed out a new
tip/auto-sched-next branch - you should not see this conflict in the
future.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
