This project is mirrored from https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git. Pull mirroring updated .
  1. 07 Nov, 2011 11 commits
  2. 06 Nov, 2011 23 commits
  3. 05 Nov, 2011 6 commits
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 06d8eb1b
      Linus Torvalds authored
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: Convert wm831x driver to watchdog core
        watchdog: s3c2410: convert to use the watchdog framework
        Documentation: watchdog: add guide how to convert drivers to new framework
        watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing
        watchdog: Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver
        watchdog: irq: Remove IRQF_DISABLED
        watchdog: Octeon: Mark octeon_wdt interrupt as IRQF_NO_THREAD
        watchdog: sc520_wdt: Remove unnecessary cast.
      06d8eb1b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · cd3f07d1
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (45 commits)
        [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev
        [SCSI] scsi_dh_alua: Fix the time inteval for alua rtpg commands
        [SCSI] scsi_transport_iscsi: Fix documentation os parameter
        [SCSI] mv_sas: OCZ RevoDrive3 & zDrive R4 support
        [SCSI] libfc: improve flogi retries to avoid lport stuck
        [SCSI] libfc: avoid exchanges collision during lport reset
        [SCSI] libfc: fix checking FC_TYPE_BLS
        [SCSI] edd: Treat "XPRS" host bus type the same as "PCI"
        [SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user)
        [SCSI] isci: revert bcn filtering
        [SCSI] isci: Fix hard reset timeout conditions.
        [SCSI] isci: No need to manage the pending reset bit on pending requests.
        [SCSI] isci: Remove redundant isci_request.ttype field.
        [SCSI] isci: Fix task management for SMP, SATA and on dev remove.
        [SCSI] isci: No task_done callbacks in error handler paths.
        [SCSI] isci: Handle task request timeouts correctly.
        [SCSI] isci: Fix tag leak in tasks and terminated requests.
        [SCSI] isci: Immediately fail I/O to removed devices.
        [SCSI] isci: Lookup device references through requests in completions.
        [SCSI] ipr: add definitions for additional adapter
        ...
      cd3f07d1
    • Russell King's avatar
      ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver · 7a3f8de5
      Russell King authored
      
      
      The includes in the pxa2xx_cm_x2xx PCMCIA driver are rather random;
      the driver doesn't require anything from these headers except the
      cpu_is_xxx() macros which come from another include.
      
      The concern is that it's getting these definitions via mach/system.h,
      which is supposed to only be included by arch/arm/kernel/process.c.
      As this header is scheduled for cleanup (and elimination) keeping
      the status quo will cause build errors.  So lets fix properly and
      independent of the future work.
      
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      7a3f8de5
    • Russell King's avatar
      ARM: PXA: fix gpio-pxa.h build errors · 7124cb96
      Russell King authored
      A mismerge in 43872fa7
      
       (Merge branch 'depends/rmk/gpio' into next/fixes)
      causes these build errors:
      
      In file included from arch/arm/mach-pxa/include/mach/gpio.h:30,
                       from arch/arm/include/asm/gpio.h:6,
                       from include/linux/gpio.h:31,
                       from arch/arm/mach-pxa/generic.c:20:
      arch/arm/mach-pxa/include/mach/gpio-pxa.h: In function ■__gpio_is_occupied■:
      arch/arm/mach-pxa/include/mach/gpio-pxa.h:121: error: invalid operands to binary >> (have ■void *■ and ■unsigned int■)
      arch/arm/mach-pxa/include/mach/gpio-pxa.h:122: error: invalid operands to binary & (have ■void *■ and ■int■)
      arch/arm/mach-pxa/include/mach/gpio-pxa.h:129: error: invalid operands to binary & (have ■void *■ and ■int■)
      
      So fix them.
      
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      7124cb96
    • Mark Brown's avatar
      watchdog: Convert wm831x driver to watchdog core · 00411ee9
      Mark Brown authored
      
      
      Fairly large code churn but not much doing with that and the overall
      result is a definite win.
      
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      00411ee9
    • Wolfram Sang's avatar
      watchdog: s3c2410: convert to use the watchdog framework · 25dc46e3
      Wolfram Sang authored
      
      
      Make this driver a user of the watchdog framework and remove now
      centrally handled parts. Tested on a mini2440.
      
      Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
      Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      25dc46e3