On Thu, Jan 23, 2025 at 01:01:48PM +0100, Niklas Cassel wrote: > --- > Hello PCI maintainers. > This patch might give a trivial conflict with: > https://lore.kernel.org/linux-pci/20250123095906.3578241-2-cassel@xxxxxxxxxx/T/#u > because the context lines (lines that haven't been changed) > might be different. If there is a conflict, simply look at > this patch by itself, and resolution should be trivial. Note to PCI maintainers: As mentioned in the comment section of this patch, this patch has a trivial conflict with: https://lore.kernel.org/linux-pci/20250123095906.3578241-2-cassel@xxxxxxxxxx/T/#u I noticed that git still manages to apply this patch correctly if applying this patch using: $ git am -3 Kind regards, Niklas
