1. 30 10月, 2011 31 次提交
  2. 29 10月, 2011 9 次提交
    • L
      Merge git://github.com/rustyrussell/linux · ce949717
      Linus Torvalds 提交于
      * git://github.com/rustyrussell/linux:
        lguest: move process freezing before pending signals check
        lguest: don't allow KVM-detection cpuid.
        lguest: Allow running under paravirt-enabled KVM.
      ce949717
    • L
      Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 · 24984247
      Linus Torvalds 提交于
      * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
        ARM: mark empty gpio.h files empty
        gpio: Fix ARM versatile-express build failure
        of: include errno.h
      24984247
    • L
      Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 · 18c06353
      Linus Torvalds 提交于
      * 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
        drivercore: Add helper macro for platform_driver boilerplate
        spi: irq: Remove IRQF_DISABLED
        OMAP: SPI: Fix the trying to free nonexistent resource error
        spi/spi-ep93xx: add module.h include
        spi/tegra: fix compilation error in spi-tegra.c
        spi: spi-dw: fix all sparse warnings
        spi/spi-pl022: Call pl022_dma_remove(pl022) only if enable_dma is true
        spi/spi-pl022: calculate_effective_freq() must set rate <= requested rate
        spi/spi-pl022: Don't allocate more sg than required.
        spi/spi-pl022: Use GFP_ATOMIC for allocation from tasklet
        spi/spi-pl022: Resolve formatting issues
      18c06353
    • L
      Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 · 41684f67
      Linus Torvalds 提交于
      * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
        h8300: Move gpio.h to gpio-internal.h
        gpio: pl061: add DT binding support
        gpio: fix build error in include/asm-generic/gpio.h
        gpiolib: Ensure struct gpio is always defined
        irq: Add EXPORT_SYMBOL_GPL to function of irq generic-chip
        gpio-ml-ioh: Use NUMA_NO_NODE not GFP_KERNEL
        gpio-pch: Use NUMA_NO_NODE not GFP_KERNEL
        gpio: langwell: ensure alternate function is cleared
        gpio-pch: Support interrupt function
        gpio-pch: Save register value in suspend()
        gpio-pch: modify gpio_nums and mask
        gpio-pch: support ML7223 IOH n-Bus
        gpio-pch: add spinlock in suspend/resume processing
        gpio-pch: Delete invalid "restore" code in suspend()
        gpio-ml-ioh: Fix suspend/resume issue
        gpio-ml-ioh: Support interrupt function
        gpio-ml-ioh: Delete unnecessary code
        gpio/mxc: add chained_irq_enter/exit() to mx3_gpio_irq_handler()
        gpio/nomadik: use genirq core to track enablement
        gpio/nomadik: disable clocks when unused
      41684f67
    • L
      ARM: mark empty gpio.h files empty · 81397a62
      Linus Walleij 提交于
      It is generally a better idea to make intentionally empty files
      contain the human-readable /* empty */ comment, also it makes
      the files play nice with "make distclean".
      Reported-by: NJeff Garzik <jeff@garzik.org>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Acked-by: NJeff Garzik <jeff@garzik.org>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      81397a62
    • G
      gpio: Fix ARM versatile-express build failure · 041af835
      Grant Likely 提交于
      A missing mach/gpio.h prevents building gpiolib on versatile express.
      
        CC      drivers/gpio/gpiolib.o
      In file included from /.../linux/include/linux/gpio.h:18:0,
                       from /.../linux/drivers/gpio/gpiolib.c:10:
      /.../linux/arch/arm/include/asm/gpio.h:5:23: fatal error: mach/gpio.h: No such file or directory
      compilation terminated.
      make[3]: *** [drivers/gpio/gpiolib.o] Error 1
      make[2]: *** [drivers/gpio] Error 2
      make[1]: *** [drivers] Error 2
      make: *** [sub-make] Error 2
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      041af835
    • K
      of: include errno.h · e51130c0
      Kalle Valo 提交于
      When compiling ath6kl for beagleboard (omap2plus_defconfig plus
      CONFIG_ATH6KL, CONFIG_OF disable) with current linux-next compilation
      fails:
      
      include/linux/of.h:269: error: 'ENOSYS' undeclared (first use in this function)
      include/linux/of.h:276: error: 'ENOSYS' undeclared (first use in this function)
      include/linux/of.h:289: error: 'ENOSYS' undeclared (first use in this function)
      
      Fix this by including errno.h from of.h.
      Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>
      Acked-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      e51130c0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · ec7ae517
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (204 commits)
        [SCSI] qla4xxx: export address/port of connection (fix udev disk names)
        [SCSI] ipr: Fix BUG on adapter dump timeout
        [SCSI] megaraid_sas: Fix instance access in megasas_reset_timer
        [SCSI] hpsa: change confusing message to be more clear
        [SCSI] iscsi class: fix vlan configuration
        [SCSI] qla4xxx: fix data alignment and use nl helpers
        [SCSI] iscsi class: fix link local mispelling
        [SCSI] iscsi class: Replace iscsi_get_next_target_id with IDA
        [SCSI] aacraid: use lower snprintf() limit
        [SCSI] lpfc 8.3.27: Change driver version to 8.3.27
        [SCSI] lpfc 8.3.27: T10 additions for SLI4
        [SCSI] lpfc 8.3.27: Fix queue allocation failure recovery
        [SCSI] lpfc 8.3.27: Change algorithm for getting physical port name
        [SCSI] lpfc 8.3.27: Changed worst case mailbox timeout
        [SCSI] lpfc 8.3.27: Miscellanous logic and interface fixes
        [SCSI] megaraid_sas: Changelog and version update
        [SCSI] megaraid_sas: Add driver workaround for PERC5/1068 kdump kernel panic
        [SCSI] megaraid_sas: Add multiple MSI-X vector/multiple reply queue support
        [SCSI] megaraid_sas: Add support for MegaRAID 9360/9380 12GB/s controllers
        [SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts
        ...
      ec7ae517
    • L
      Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client · 97d2eb13
      Linus Torvalds 提交于
      * 'for-linus' of git://ceph.newdream.net/git/ceph-client:
        libceph: fix double-free of page vector
        ceph: fix 32-bit ino numbers
        libceph: force resend of osd requests if we skip an osdmap
        ceph: use kernel DNS resolver
        ceph: fix ceph_monc_init memory leak
        ceph: let the set_layout ioctl set single traits
        Revert "ceph: don't truncate dirty pages in invalidate work thread"
        ceph: replace leading spaces with tabs
        libceph: warn on msg allocation failures
        libceph: don't complain on msgpool alloc failures
        libceph: always preallocate mon connection
        libceph: create messenger with client
        ceph: document ioctls
        ceph: implement (optional) max read size
        ceph: rename rsize -> rasize
        ceph: make readpages fully async
      97d2eb13