Commit c3e5ac0c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-fixes-5.5' of... 

Merge tag 'samsung-fixes-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes

Samsung fixes for v5.5

1. Restore debugfs support in exynos_defconfig (as now it is not
   selected as dependency of tracing).  Debugfs is required by systemd
   and several tests.
2. Maintainers updates.

* tag 'samsung-fixes-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos_defconfig: Restore debugfs support
  MAINTAINERS: Include Samsung SoC serial driver in Samsung SoC entry
  MAINTAINERS: Update Lukasz Luba's email address

Link: https://lore.kernel.org/r/20191215121316.32091-1-krzk@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents cf21d4fd a2315d3a

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de> 
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -2272,6 +2272,7 @@ F: drivers/*/*s3c64xx* 
F:	drivers/*/*s5pv210*

F:	drivers/memory/samsung/

F:	drivers/soc/samsung/

F:	drivers/tty/serial/samsung*

F:	include/linux/soc/samsung/

F:	Documentation/arm/samsung/

F:	Documentation/devicetree/bindings/arm/samsung/
@@ -4999,7 +5000,7 @@ F: include/linux/dma-mapping.h 
F:	include/linux/dma-noncoherent.h















DMC FREQUENCY DRIVER FOR SAMSUNG EXYNOS5422













M:	Lukasz Luba <l.luba@partner.samsung.com>













M:	Lukasz Luba <lukasz.luba@arm.com>















L:	linux-pm@vger.kernel.org















L:	linux-samsung-soc@vger.kernel.org















S:	Maintained

































arch/arm/configs/exynos_defconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -350,6 +350,7 @@ CONFIG_PRINTK_TIME=y













CONFIG_DYNAMIC_DEBUG=y















CONFIG_DEBUG_INFO=y















CONFIG_MAGIC_SYSRQ=y













CONFIG_DEBUG_FS=y















CONFIG_DEBUG_KERNEL=y















CONFIG_SOFTLOCKUP_DETECTOR=y















# CONFIG_DETECT_HUNG_TASK is not set



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE