]> Git Repo - linux.git/commitdiff
Merge tag 'arc-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
authorLinus Torvalds <[email protected]>
Fri, 6 Oct 2017 22:57:08 +0000 (15:57 -0700)
committerLinus Torvalds <[email protected]>
Fri, 6 Oct 2017 22:57:08 +0000 (15:57 -0700)
Pull ARC udpates from Vineet Gupta:

 - updates for various platforms

 - boot log updates for upcoming HS48 family of cores (dual issue)

* tag 'arc-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: [plat-hsdk]: Add reset controller node to manage ethernet reset
  ARC: [plat-hsdk]: Temporary fix to set CPU frequency to 1GHz
  ARC: fix allnoconfig build warning
  ARCv2: boot log: identify HS48 cores (dual issue)
  ARC: boot log: decontaminate ARCv2 ISA_CONFIG register
  arc: remove redundant UTS_MACHINE define in arch/arc/Makefile
  ARC: [plat-eznps] Update platform maintainer as Noam left
  ARC: [plat-hsdk] use actual clk driver to manage cpu clk
  ARC: [*defconfig] Reenable soft lock-up detector
  ARC: [plat-axs10x] sdio: Temporary fix of sdio ciu frequency
  ARC: [plat-hsdk] sdio: Temporary fix of sdio ciu frequency
  ARC: [plat-axs103] Add temporary quirk to reset ethernet IP

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index d5376011c753e286ed6e767f889f2e12c472b085,42bfa57673ed065178223c841437637889285bc9..2d3d750b19c0cddf8af39786faed78709f7bbba1
@@@ -5259,7 -5259,8 +5259,8 @@@ S:      Maintaine
  F:    drivers/iommu/exynos-iommu.c
  
  EZchip NPS platform support
- M:    Noam Camus <[email protected]>
+ M:    Elad Kanfi <[email protected]>
+ M:    Vineet Gupta <[email protected]>
  S:    Supported
  F:    arch/arc/plat-eznps
  F:    arch/arc/boot/dts/eznps.dts
@@@ -6738,7 -6739,7 +6739,7 @@@ F:      Documentation/devicetree/bindings/au
  F:    drivers/auxdisplay/img-ascii-lcd.c
  
  IMGTEC IR DECODER DRIVER
 -M:    James Hogan <j[email protected]>
 +M:    James Hogan <j[email protected]>
  S:    Maintained
  F:    drivers/media/rc/img-ir/
  
@@@ -7562,7 -7563,7 +7563,7 @@@ F:      arch/arm64/include/asm/kvm
  F:    arch/arm64/kvm/
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
 -M:    James Hogan <j[email protected]>
 +M:    James Hogan <j[email protected]>
  L:    [email protected]
  S:    Supported
  F:    arch/mips/include/uapi/asm/kvm*
  S:    Orphan
  F:    drivers/net/wireless/marvell/libertas/
  
 +MARVELL MACCHIATOBIN SUPPORT
 +M:    Russell King <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
 +
  MARVELL MV643XX ETHERNET DRIVER
  M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected]
@@@ -8891,7 -8886,7 +8892,7 @@@ F:      Documentation/devicetree/bindings/me
  T:    git git://linuxtv.org/media_tree.git
  
  METAG ARCHITECTURE
 -M:    James Hogan <j[email protected]>
 +M:    James Hogan <j[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
  S:    Odd Fixes
@@@ -9360,7 -9355,7 +9361,7 @@@ NETWORK BLOCK DEVICE (NBD
  M:    Josef Bacik <[email protected]>
  S:    Maintained
  L:    [email protected]
 -L:    nbd[email protected]
 +L:    nbd@other.debian.org
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
  F:    include/uapi/linux/nbd.h
@@@ -12937,9 -12932,9 +12938,9 @@@ F:   drivers/mmc/host/dw_mmc
  SYNOPSYS HSDK RESET CONTROLLER DRIVER
  M:    Eugeniy Paltsev <[email protected]>
  S:    Supported
 -F:    drivers/reset/reset-hsdk-v1.c
 -F:    include/dt-bindings/reset/snps,hsdk-v1-reset.h
 -F:    Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt
 +F:    drivers/reset/reset-hsdk.c
 +F:    include/dt-bindings/reset/snps,hsdk-reset.h
 +F:    Documentation/devicetree/bindings/reset/snps,hsdk-reset.txt
  
  SYSTEM CONFIGURATION (SYSCON)
  M:    Lee Jones <[email protected]>
This page took 0.11709 seconds and 4 git commands to generate.