From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 22 Mar 2022 22:16:25 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/misc'
X-Git-Tag: v5.18-rc1~114^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0888e08938e54b14b4176cd92e527c61ef68e4de;p=thirdparty%2Flinux.git

Merge branch 'remotes/lorenzo/pci/misc'

- Add generic SZ_1T macro instead of a local one in pci-xgene.c (Christophe
  Leroy)

* remotes/lorenzo/pci/misc:
  sizes.h: Add SZ_1T macro
---

0888e08938e54b14b4176cd92e527c61ef68e4de