Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 5e237e8c
    Linus Torvalds authored
    Pull IDE updates from David Miller:
    
     1) Fix mem region name in tx4949ide driver, from Christophe JAILLET.
    
     2) Make drive->dn read only, it should not be changeable by users. From
        Dan Carpenter.
    
     3) Several cast fixups from Krzysztof Kozlowski.
    
    There is also going to be a removal of a now unused IDE driver, but that
    will come via the MIPS tree.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
      ide: make drive->dn read only
      ide: serverworks: potential overflow in svwks_set_pio_mode()
      cmd64x: potential buffer overflow in cmd64x_program_timings()
      ide: remove unneeded header include path to drivers/ide
      ide: qd65xx: Fix cast to pointer from integer of different size
      ide: ht6560b: Fix cast to pointer from integer of different size
      ide: remove set but not used variable 'hwif'
      ide: remove unnecessary touch_softlockup_watchdog
      ide: tx4939ide: Fix the name used in a 'devm_request_mem_region()' call
      ide: Use dev_get_drvdata where possible
    5e237e8c