On Tue, Jan 30, 2018 at 02:02:45PM -0800, Linus Torvalds wrote: > On Tue, Jan 30, 2018 at 11:26 AM, Catalin Marinas > <[email protected]> wrote: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux > > tags/arm64-upstream > > I got some fairly trivial conflicts on the merge, and I expect them to > be fine but since I don't do a build/boot test on arm64 somebody > should verify that.
Sorry, I forgot to include my merge resolution with the pull request. Mainline looks fine. Thanks. -- Catalin
