On Sat, Apr 7, 2018 at 1:44 PM, Al Viro <v...@zeniv.linux.org.uk> wrote: > > Conflicts in arch/sparc/kernel/sys_sparc32.c are not hard to resolve, > but keep in mind that casts to u64 are needed there. I'd pushed a variant of > resolution into #test-merge.
You say "keep in mind that casts to u64 are needed there", but then you seem to be missing them yourself in your test merge (see [f]truncate64). I only noticed because I decided to check my merge against yours. I strive to always do the merge resolution, but if people give me a test merge, I then double-check against it after-the-fack. Hmm? Linus