On Tue, 2019-07-16 at 10:46 +1000, Benjamin Herrenschmidt wrote:> # Conflicts:> # drivers/nvme/host/pci.c> ---Oops :-) You can strip that or should I resend ? I'll wait forcomments/reviews regardless.Cheers,Ben.