tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'sh-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux

Pull sh updates from John Paul Adrian Glaubitz:
"Two patches from Thomas Zimmermann, one by Tim Bird and one by Thomas
Weißschuh.

The first patch by Thomas Zimmermann adds a missing include in dac.h
for SH-3 which became necessary after 243ce64b2b37 ("backlight: Do not
include <linux/fb.h> in header file") which made __raw_readb() and
__raw_writeb() inaccessible in dac.h.

Thomas' second patch drops CONFIG_FIRMWARE_EDID for SH as it depends
on X86 or EFI_GENERIC_STUB which are not defined on SH for obvious
reasons.

The patch by Tim Bird fixes just a small typo in two SPDX ID lines
which he stumbled over by accident.

And, least but not last, the patch by Thomas Weißschuh removes the
CONFIG_VSYSCALL reference from UAPI. This was necessary as the
definition of AT_SYSINFO_EHDR was gated between CONFIG_VSYSCALL to
avoid a default gate VMA to be created. However that default gate VMA
was removed entirely in commit a6c19dfe3994 (arm64,ia64,ppc,s390,
sh,tile,um,x86,mm: remove default gate area)"

* tag 'sh-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
sh: Drop CONFIG_FIRMWARE_EDID from defconfig files
sh: Remove CONFIG_VSYSCALL reference from UAPI
sh: Fix typo in SPDX license ID lines
sh: Include <linux/io.h> in dac.h

Linus Torvalds ce9e9338 065c4e67

+5 -11
-1
arch/sh/configs/dreamcast_defconfig
··· 50 50 CONFIG_WATCHDOG=y 51 51 CONFIG_SH_WDT=y 52 52 CONFIG_FB=y 53 - CONFIG_FIRMWARE_EDID=y 54 53 CONFIG_FB_PVR2=y 55 54 CONFIG_FRAMEBUFFER_CONSOLE=y 56 55 CONFIG_FONTS=y
-1
arch/sh/configs/hp6xx_defconfig
··· 35 35 CONFIG_LEGACY_PTY_COUNT=64 36 36 # CONFIG_HWMON is not set 37 37 CONFIG_FB=y 38 - CONFIG_FIRMWARE_EDID=y 39 38 CONFIG_FB_HIT=y 40 39 CONFIG_FB_SH_MOBILE_LCDC=y 41 40 CONFIG_FRAMEBUFFER_CONSOLE=y
-1
arch/sh/configs/se7343_defconfig
··· 57 57 CONFIG_I2C_SH_MOBILE=y 58 58 # CONFIG_HWMON is not set 59 59 CONFIG_FB=y 60 - CONFIG_FIRMWARE_EDID=y 61 60 CONFIG_FB_SH_MOBILE_LCDC=m 62 61 CONFIG_SOUND=y 63 62 CONFIG_SND=y
-1
arch/sh/configs/se7780_defconfig
··· 60 60 # CONFIG_HW_RANDOM is not set 61 61 CONFIG_THERMAL=y 62 62 CONFIG_FB=y 63 - CONFIG_FIRMWARE_EDID=y 64 63 CONFIG_FB_SH_MOBILE_LCDC=m 65 64 CONFIG_FRAMEBUFFER_CONSOLE=y 66 65 CONFIG_LOGO=y
+1 -1
arch/sh/drivers/platform_early.c
··· 1 - // SPDX--License-Identifier: GPL-2.0 1 + // SPDX-License-Identifier: GPL-2.0 2 2 3 3 #include <asm/platform_early.h> 4 4 #include <linux/mod_devicetable.h>
+1 -1
arch/sh/include/asm/platform_early.h
··· 1 - /* SPDX--License-Identifier: GPL-2.0 */ 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 3 3 #ifndef __PLATFORM_EARLY__ 4 4 #define __PLATFORM_EARLY__
+2
arch/sh/include/cpu-sh3/cpu/dac.h
··· 2 2 #ifndef __ASM_CPU_SH3_DAC_H 3 3 #define __ASM_CPU_SH3_DAC_H 4 4 5 + #include <linux/io.h> 6 + 5 7 /* 6 8 * Copyright (C) 2003 Andriy Skulysh 7 9 */
+1 -5
arch/sh/include/uapi/asm/auxvec.h
··· 13 13 */ 14 14 #define AT_FPUCW 18 /* Used FPU control word. */ 15 15 16 - #if defined(CONFIG_VSYSCALL) || !defined(__KERNEL__) 17 16 /* 18 - * Only define this in the vsyscall case, the entry point to 19 - * the vsyscall page gets placed here. The kernel will attempt 20 - * to build a gate VMA we don't care about otherwise.. 17 + * The entry point to the vsyscall page gets placed here. 21 18 */ 22 19 #define AT_SYSINFO_EHDR 33 23 - #endif 24 20 25 21 /* 26 22 * More complete cache descriptions than AT_[DIU]CACHEBSIZE. If the