summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-09-14 13:46:30 +0200
committerDavid S. Miller <davem@davemloft.net>2021-09-14 13:46:30 +0200
commitf787e3cfeaa62fba8077ae6b0087d12122ea7af8 (patch)
treeaf161ca0bbd565771762abc51b138d051981ae4a /include/uapi
parentMerge branch 'mlxsw-next' (diff)
parents390/ism: switch from 'pci_' to 'dma_' API (diff)
downloadlinux-f787e3cfeaa62fba8077ae6b0087d12122ea7af8.tar.xz
linux-f787e3cfeaa62fba8077ae6b0087d12122ea7af8.zip
Merge branch 's390-next'
Karsten Graul says: ==================== s390/net: updates 2021-09-14 Please apply the following patches to netdev's net-next tree. Stop using the wrappers in include/linux/pci-dma-compat.h, and fix warnings about incorrect kernel-doc comments. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
0 files changed, 0 insertions, 0 deletions