summary refs log tree commit diff stats
path: root/linux-headers/asm-generic
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-06-19 11:44:03 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-06-19 11:44:03 +0100
commit4d285821c5055ed68a6f6b7693fd11a06a1aa426 (patch)
tree66daa6b31cad2cb3d26204f6e60ca3d1ad0b37eb /linux-headers/asm-generic
parent292ef18a38270e1cb8e9a3dc06bca589068f293d (diff)
parent458e056257e67254546e58158f3f74ce040c7ca1 (diff)
downloadfocaccia-qemu-4d285821c5055ed68a6f6b7693fd11a06a1aa426.tar.gz
focaccia-qemu-4d285821c5055ed68a6f6b7693fd11a06a1aa426.zip
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200618' into staging
s390x update:
- update Linux headers to 5.8-rc1 (for vfio-ccw path handling)
- vfio-ccw: add support for path handling
- documentation fix

# gpg: Signature made Thu 18 Jun 2020 16:36:04 BST
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [marginal]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [marginal]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [marginal]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20200618:
  docs/s390x: fix vfio-ap device_del description
  vfio-ccw: Add support for the CRW region and IRQ
  s390x/css: Refactor the css_queue_crw() routine
  vfio-ccw: Refactor ccw irq handler
  vfio-ccw: Add support for the schib region
  vfio-ccw: Refactor cleanup of regions
  Linux headers: update

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/asm-generic')
-rw-r--r--linux-headers/asm-generic/unistd.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-headers/asm-generic/unistd.h b/linux-headers/asm-generic/unistd.h
index 3a3201e461..f4a01305d9 100644
--- a/linux-headers/asm-generic/unistd.h
+++ b/linux-headers/asm-generic/unistd.h
@@ -855,9 +855,11 @@ __SYSCALL(__NR_clone3, sys_clone3)
 __SYSCALL(__NR_openat2, sys_openat2)
 #define __NR_pidfd_getfd 438
 __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd)
+#define __NR_faccessat2 439
+__SYSCALL(__NR_faccessat2, sys_faccessat2)
 
 #undef __NR_syscalls
-#define __NR_syscalls 439
+#define __NR_syscalls 440
 
 /*
  * 32 bit systems traditionally used different