[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CA+55aFwncacH7-hdDdKw7G2CUPP8nioo4m=gYhZC1UO4jpTm0w@mail.gmail.com>
Date: Wed, 14 Sep 2016 09:42:39 -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>
Subject: Re: [git pull] uaccess fixes
On Wed, Sep 14, 2016 at 8:47 AM, Al Viro <viro@...iv.linux.org.uk> wrote:
>
> Conflicts are trivial; I've pushed my variant of conflict resolution into
> #proposed-merge.
Hmm. They may be trivial, but we disagreed about how to resolve the ia64 case.
I think I did a better job, obviously ;)
But if it turns out I screwed up, holler.
Linus
Powered by blists - more mailing lists