On Sat, Apr 04, 2015 at 09:55:09PM +0100, Maciej W. Rozycki wrote:
> Is there a better branch than master of ralf/linux.git to base patches
> submitted against so as to save you from the need to sort out conflicts?
> Let me know if you need help with any unobvious 3-way merge too.
That's a little harder this time. Normally the top of upstream-sfr's
mips-for-linux-next is a good choice for the base but this time I have
another branch, 4.1-fp in upstream-sfr and I want to keep the merge
commit pulling this branch and the 4.0-fixes branch on top which lands
me in a bunch of conflicts.
The conflicts are in
arch/mips/include/asm/asmmacro-32.h
arch/mips/kernel/traps.c
I've tested a number of defconfigs and I'm pushing a new upstream-sfr
now. I'd appreciate if you could test/review the result.
Ralf
