diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:13:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:13:52 +0100 |
| commit | fdddcfd9c93c6db006004fa5ba7fd9380e721c3f (patch) | |
| tree | 4d029f3bd29be07eac87bcfad3bd7e3012fb9428 /arch/m68k | |
| parent | mbcs: add .owner to mbcs struct file_operations (diff) | |
| parent | Linux 5.0-rc4 (diff) | |
| download | linux-dev-fdddcfd9c93c6db006004fa5ba7fd9380e721c3f.tar.xz linux-dev-fdddcfd9c93c6db006004fa5ba7fd9380e721c3f.zip | |
Merge 5.0-rc4 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/uapi/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 960bf1e4be53..b8b3525271fa 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -2,3 +2,4 @@ include include/uapi/asm-generic/Kbuild.asm generated-y += unistd_32.h generic-y += kvm_para.h +generic-y += shmparam.h |