1. 17 12月, 2011 2 次提交
    • L
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 3f5fcf60
      Linus Torvalds 提交于
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: OMAP: rx51: fix USB
        ARM: OMAP: mcbsp: Fix possible memory corruption
        arm/imx: fix power button on imx51 babbage board
        ARM: imx: fix cpufreq build errors
        ARM: mx5: add __initconst for fec pdata
        MXC PWM: should active during DOZE/WAIT/DBG mode
        ARM: EXYNOS: Fix build error without CONFIG_LOCAL_TIMERS
        ARM: EXYNOS: Fix for stall in case of cpu hotplug or sleep
        ARM: S5PV210: Set 1000ns as PWM backlight period on SMDKV210
        ARM: SAMSUNG: remove duplicated header include
      3f5fcf60
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · b0d78ee8
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: don't kick empty queue in blk_drain_queue()
        block/swim3: Locking fixes
        loop: Fix discard_alignment default setting
        cfq-iosched: fix cfq_cic_link() race confition
        cfq-iosched: free cic_index if blkio_alloc_blkg_stats fails
        cciss: fix flush cache transfer length
        cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
        loop: fix loop block driver discard and encryption comment
        block: initialize request_queue's numa node during
      b0d78ee8
  2. 16 12月, 2011 10 次提交
  3. 15 12月, 2011 4 次提交
  4. 14 12月, 2011 22 次提交
  5. 13 12月, 2011 2 次提交
    • Y
      ibft: Fix finding IBFT ACPI table on UEFI · 935a9fee
      Yinghai Lu 提交于
      Found one system with UEFI/iBFT, kernel does not detect the iBFT during
      iscsi_ibft module loading.
      
      Root cause: on x86 (UEFI), we are calling of find_ibft_region() much earlier
      - specifically in setup_arch() before ACPI is enabled.
      
      Try to split acpi checking code out and call that later
      
      At that time ACPI iBFT already get permanent mapped with ioremap.
      So isa_virt_to_bus() will get wrong phys from right virt address.
      We could just skip that phys address printing.
      
      For legacy one, print the found address early.
      
      -v2: update comments and description according to Konrad.
      -v3: fix problem about module use case that is found by Konrad.
      -v4: use acpi_get_table() instead of acpi_table_parse() to handle module use case that is found by Konrad again..
      Signed-off-by: NYinghai Lu <yinghai@kernel.org>
      Signed-off-by: NKonrad Rzeszutek Wilk <konrad@kernel.org>
      935a9fee
    • M
      fuse: llseek fix race · 73104b6e
      Miklos Szeredi 提交于
      Fix race between lseek(fd, 0, SEEK_CUR) and read/write.  This was fixed in
      generic code by commit 5b6f1eb9 (vfs: lseek(fd, 0, SEEK_CUR) race condition).
      Signed-off-by: NMiklos Szeredi <mszeredi@suse.cz>
      73104b6e