• Linus Torvalds's avatar
    Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds · 490e1422
    Linus Torvalds authored
    Pull LED updates from Jacek Anaszewski:
     "In this merge cycle we had an interaction with MTD subsystem, that
      included converting drivers/mtd/nand/nand_base.c to use newly
      introduced MTD (NAND/NOR) LED trigger instead of implementing it on
      its own.
    
      Related MTD patches are intended to be merged through the LED tree,
      before MTD tree is merged, since further MTD development is based on
      those modifications.
    
      Summary:
    
      LEDs:
       - Introduce a kernel panic LED trigger
    
       - Introduce a MTD (NAND/NOR) trigger
    
       - led-tca6507: silence an uninitialized variable warning
    
       - ledtrig-ide-disk: Move ide_blink_delay to ledtrig_ide_activity()
    
       - leds-ss4200: Add depend on x86 arch
    
       - leds-ss4200: add DMI data for FSC SCALEO Home Server
    
       - leds-triggers: Allow to switch the trigger to "panic" on a kernel panic
    
       - devicetree: leds: Introduce "panic-indicator" optional property
    
       - leds-gpio: Support the "panic-indicator" firmware property
    
      MTD:
       - Uninline mtd_write_oob and move it to mtdcore.c
    
       - Remove the "nand-disk" LED trigger
    
       - Hook I/O activity to the MTD LED trigger"
    
    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
      leds: gpio: Support the "panic-indicator" firmware property
      devicetree: leds: Introduce "panic-indicator" optional property
      leds: triggers: Allow to switch the trigger to "panic" on a kernel panic
      leds: ss4200: add DMI data for FSC SCALEO Home Server
      leds: ss4200: Add depend on x86 arch
      leds: ledtrig-ide-disk: Move ide_blink_delay to ledtrig_ide_activity()
      leds: tca6507: silence an uninitialized variable warning
      mtd: Hook I/O activity to the MTD LED trigger
      mtd: nand: Remove the "nand-disk" LED trigger
      leds: trigger: Introduce a MTD (NAND/NOR) trigger
      mtd: Uninline mtd_write_oob and move it to mtdcore.c
      leds: trigger: Introduce a kernel panic LED trigger
    490e1422
nand_base.c 117 KB