lkml.org 
[lkml]   [2018]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [git pull] sparc syscall stuff
On Sat, Apr 7, 2018 at 1:44 PM, Al Viro <viro@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

\
 
 \ /
  Last update: 2018-04-07 23:38    [W:0.036 / U:0.592 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site