1. 13 1月, 2012 5 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 6733e54b
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        FUSE: Notifying the kernel of deletion.
        fuse: support ioctl on directories
        fuse: Use kcalloc instead of kzalloc to allocate array
        fuse: llseek optimize SEEK_CUR and SEEK_SET
      6733e54b
    • L
      Merge tag 'to-linus' of git://github.com/rustyrussell/linux · bcf8a3df
      Linus Torvalds 提交于
      * tag 'to-linus' of git://github.com/rustyrussell/linux: (24 commits)
        lguest: Make sure interrupt is allocated ok by lguest_setup_irq
        lguest: move the lguest tool to the tools directory
        lguest: switch segment-voodoo-numbers to readable symbols
        virtio: balloon: Add freeze, restore handlers to support S4
        virtio: balloon: Move vq initialization into separate function
        virtio: net: Add freeze, restore handlers to support S4
        virtio: net: Move vq and vq buf removal into separate function
        virtio: net: Move vq initialization into separate function
        virtio: blk: Add freeze, restore handlers to support S4
        virtio: blk: Move vq initialization to separate function
        virtio: console: Disable callbacks for virtqueues at start of S4 freeze
        virtio: console: Add freeze and restore handlers to support S4
        virtio: console: Move vq and vq buf removal into separate functions
        virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff
        virtio: pci: switch to new PM API
        virtio_blk: fix config handler race
        virtio: add debugging if driver doesn't kick.
        virtio: expose added descriptors immediately.
        virtio: avoid modulus operation.
        virtio: support unlocked queue kick
        ...
      bcf8a3df
    • L
      brcmsmac: fix reading of PCI sprom contents · 61bd5e56
      Linus Torvalds 提交于
      It appears that you can only read the sprom contents with aligned 16-bit
      reads: anything else causes at least some versions of the broadcom
      chipset to abort the PCI transaction, returning 0xff.
      
      This apparently doesn't trigger very often, because most setups don't
      use an external srom chip, and the OTP sprom loading doesn't have this
      issue.  But at least the current 11" Macbook Air does trigger it, and
      wireless communications were broken as a result.
      Acked-by: NArend van Spriel <arend@broadcom.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      61bd5e56
    • A
      x86: Get rid of 'dubious one-bit signed bitfield' sprase warning · bccd1729
      Anton Vorontsov 提交于
      This very noisy sparse warning appears on almost every file in the
      kernel:
      
        CHECK   init/main.c
        arch/x86/include/asm/thread_info.h:43:55: error: dubious one-bit signed bitfield
        arch/x86/include/asm/thread_info.h:44:46: error: dubious one-bit signed bitfield
      
      This patch changes sig_on_uaccess_error and uaccess_err flags to unsigned
      type and thus fixes the warning.
      Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>
      Acked-by: NAndy Lutomirski <luto@mit.edu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bccd1729
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · a429638c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
        ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
        ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
        ALSA: usb-audio: add Yamaha MOX6/MOX8 support
        ALSA: virtuoso: add S/PDIF input support for all Xonars
        ALSA: ice1724 - Support for ooAoo SQ210a
        ALSA: ice1724 - Allow card info based on model only
        ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
        ALSA: hdspm - Provide unique driver id based on card serial
        ASoC: Dynamically allocate the rtd device for a non-empty release()
        ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
        ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
        ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
        ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
        ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
        ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
        ALSA: hda/cirrus - support for iMac12,2 model
        ASoC: cx20442: add bias control over a platform provided regulator
        ALSA: usb-audio - Avoid flood of frame-active debug messages
        ALSA: snd-usb-us122l: Delete calls to preempt_disable
        mfd: Put WM8994 into cache only mode when suspending
        ...
      
      Fix up trivial conflicts in:
       - arch/arm/mach-s3c64xx/mach-crag6410.c:
      	renamed speyside_wm8962 to tobermory, added littlemill right
      	next to it
       - drivers/base/regmap/{regcache.c,regmap.c}:
      	duplicate diff that had already come in with other changes in
      	the regmap tree
      a429638c
  2. 12 1月, 2012 35 次提交