Skip to content
  • Linus Torvalds's avatar
    Merge tag 'driver-core-3.17-rc1' of... · 29b88e23
    Linus Torvalds authored
    Merge tag 'driver-core-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
    
    Pull driver core updates from Greg KH:
     "Here's the big driver-core pull request for 3.17-rc1.
    
      Largest thing in here is the dma-buf rework and fence code, that
      touched many different subsystems so it was agreed it should go
      through this tree to handle merge issues.  There's also some firmware
      loading updates, as well as tests added, and a few other tiny changes,
      the changelog has the details.
    
      All have been in linux-next for a long time"
    
    * tag 'driver-core-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (32 commits)
      ARM: imx: Remove references to platform_bus in mxc code
      firmware loader: Fix _request_firmware_load() return val for fw load abort
      platform: Remove most references to platform_bus device
      test: add firmware_class loader test
      doc: fix minor typos in firmware_class README
      staging: android: Cleanup style issues
      Documentation: devres: Sort managed interfaces
      Documentation: devres: Add devm_kmalloc() et al
      fs: debugfs: remove trailing whitespace
      kernfs: kernel-doc warning fix
      debugfs: Fix corrupted loop in debugfs_remove_recursive
      stable_kernel_rules: Add pointer to netdev-FAQ for network patches
      driver core: platform: add device binding path 'driver_override'
      driver core/platform: remove unused implicit padding in platform_object
      firmware loader: inform direct failure when udev loader is disabled
      firmware: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN
      firmware: read firmware size using i_size_read()
      firmware loader: allow disabling of udev as firmware loader
      reservation: add suppport for read-only access using rcu
      reservation: update api and add some helpers
      ...
    
    Conflicts:
    	drivers/base/platform.c
    29b88e23