[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CA+55aFyzdWyGZoczjCQE0rK1Bp9fq54DHNv-TqEeBvZ-C00VtQ@mail.gmail.com>
Date: Sat, 7 Apr 2018 14:37:24 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Al Viro <viro@...iv.linux.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
sparclinux@...r.kernel.org,
Dominik Brodowski <linux@...inikbrodowski.net>
Subject: Re: [git pull] sparc syscall stuff
On Sat, Apr 7, 2018 at 1:44 PM, Al Viro <viro@...iv.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
Powered by blists - more mailing lists