Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20191125192758.GA13913@infradead.org>
In-Reply-To: <20191125192758.GA13913@infradead.org>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu, 28 Nov 2019 11:01:38 -0800
Message-ID: <CAHk-=whpKDQze+kcCw5e-TK2J4T9-qACQ_o7XAtTO+dD+FJOsw@mail.gmail.com>
Subject: Re: [GIT PULL] generic ioremap for 5.5
To:     Christoph Hellwig <hch@infradead.org>,
        Paul Walmsley <paul.walmsley@sifive.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

[ Added PaulW ]

On Mon, Nov 25, 2019 at 11:28 AM Christoph Hellwig <hch@infradead.org> wrote:
>
> There are two conflicts with the riscv tree - one is a trivial makefile
> context one with the nommu support, and the other is the split of the
> riscv <asm/io.h> which means that the removals in this pull request need
> to be applied to the new location that they were moved to in the riscv
> tree.

The conflict was trivial to fix up, but since I don't do RISC-V
cross-builds, I'd like PaulW to please check that there weren't any
surprising semantic issues too - or that I didn't mess up.

Paul? (It's not actually pushed out yet, it's still building, but the
ioremap merge should be there in a moment)

              Linus