[linux-next] LinuxNextTracking branch, master, updated. next-20180827

batman at open-mesh.org batman at open-mesh.org
Tue Aug 28 00:17:18 CEST 2018


The following commit has been merged in the master branch:
commit 2ab054fd1f88d7d22e6df7c34c41a2f9782c3f08
Merge: 2f34a64aeac4d87e8ed8275d9f1230e18a50079c 5600779ea5f3d29fadc62208e21feb0bb9b813aa
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu Aug 23 14:09:37 2018 -0700

    Merge tag 'for-linus' of git://github.com/openrisc/linux
    
    Pull OpenRISC update from Stafford Horne:
     "Just one change for 4.19: refactoring from Christoph Hellwig to use
      generic DMA facilities"
    
    * tag 'for-linus' of git://github.com/openrisc/linux:
      openrisc: use generic dma_noncoherent_ops
      openrisc: fix cache maintainance the the sync_single_for_device DMA operation
      openrisc: remove the no-op unmap_page and unmap_sg DMA operations
      openrisc: remove the sync_single_for_cpu DMA operation

diff --combined arch/openrisc/Kconfig
index ed5f32d8fbd8,65e3c574c9d3..e0081e734827
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@@ -6,6 -6,8 +6,8 @@@
  
  config OPENRISC
  	def_bool y
+ 	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
+ 	select DMA_NONCOHERENT_OPS
  	select OF
  	select OF_EARLY_FLATTREE
  	select IRQ_DOMAIN
@@@ -27,6 -29,7 +29,6 @@@
  	select GENERIC_STRNLEN_USER
  	select GENERIC_SMP_IDLE_THREAD
  	select MODULES_USE_ELF_RELA
 -	select MULTI_IRQ_HANDLER
  	select HAVE_DEBUG_STACKOVERFLOW
  	select OR1K_PIC
  	select CPU_NO_EFFICIENT_FFS if !OPENRISC_HAVE_INST_FF1
@@@ -35,7 -38,6 +37,7 @@@
  	select ARCH_USE_QUEUED_RWLOCKS
  	select OMPIC if SMP
  	select ARCH_WANT_FRAME_POINTERS
 +	select GENERIC_IRQ_MULTI_HANDLER
  
  config CPU_BIG_ENDIAN
  	def_bool y
@@@ -69,6 -71,13 +71,6 @@@ config STACKTRACE_SUPPOR
  config LOCKDEP_SUPPORT
  	def_bool  y
  
 -config MULTI_IRQ_HANDLER
 -	def_bool y
 -
 -source "init/Kconfig"
 -
 -source "kernel/Kconfig.freezer"
 -
  menu "Processor type and features"
  
  choice
@@@ -140,6 -149,8 +142,6 @@@ config SM
  	  If you don't know what to do here, say N.
  
  source kernel/Kconfig.hz
 -source kernel/Kconfig.preempt
 -source "mm/Kconfig"
  
  config OPENRISC_NO_SPR_SR_DSX
  	bool "use SPR_SR_DSX software emulation" if OR1K_1200
@@@ -197,3 -208,27 +199,3 @@@ config OPENRISC_ESR_EXCEPTION_BUG_CHEC
  endmenu
  
  endmenu
 -
 -menu "Executable file formats"
 -
 -source "fs/Kconfig.binfmt"
 -
 -endmenu
 -
 -source "net/Kconfig"
 -
 -source "drivers/Kconfig"
 -
 -source "fs/Kconfig"
 -
 -source "security/Kconfig"
 -
 -source "crypto/Kconfig"
 -
 -source "lib/Kconfig"
 -
 -menu "Kernel hacking"
 -
 -source "lib/Kconfig.debug"
 -
 -endmenu

-- 
LinuxNextTracking


More information about the linux-merge mailing list