1. 04 11月, 2010 1 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 81a6cff6
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ASoC: tpa6130a2: Get rid of compile warning from tpa6130a2_power
        ALSA: hda - MacBookAir3,1(3,2) alsa support
        ASoC: fix the building issue of missing codec field in 'struct snd_soc_card'
        ALSA: usb-audio - Support for Power/Status LED on Creative USB X-Fi S51
        ALSA: asihpi - Unsafe memory management when allocating control cache
        ASoC: Update WARN uses in wm_hubs
        ASoC: Include cx20442 to SND_SOC_ALL_CODECS
        ASoC: Fix SND_SOC_ALL_CODECS typo for jz4740
        ASoC: Remove volatility from WM8900 POWER1 register
        ALSA: lx6464es - make 1 bit signed bitfield unsigned
        ALSA: cs46xx memory management fixes for cs46xx_dsp_spos_create()
        ALSA: usb - driver neglects kmalloc return value check and may deref NULL
        ASoC: tpa6130a2: Fix unbalanced regulator disables
        ASoC: tlv320dac33: Mode1 FIFO auto configuration fix
        ASoC: tlv320dac33: Limit the US_TO_SAMPLES macro
        ASoC: tlv320dac33: Error handling for broken chip
        ASoC: Check return value of struct_strtoul() in pmdown_time_set()
      81a6cff6
  2. 03 11月, 2010 5 次提交
  3. 02 11月, 2010 9 次提交
  4. 01 11月, 2010 20 次提交
  5. 31 10月, 2010 5 次提交
    • J
      d745b532
    • C
      locks: remove fl_copy_lock lock_manager operation · bb8430a2
      Christoph Hellwig 提交于
      This one was only used for a nasty hack in nfsd, which has recently
      been removed.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bb8430a2
    • C
      locks: let the caller free file_lock on ->setlease failure · 51ee4b84
      Christoph Hellwig 提交于
      The caller allocated it, the caller should free it.
      
      The only issue so far is that we could change the flp pointer even on an
      error return if the fl_change callback failed.  But we can simply move
      the flp assignment after the fl_change invocation, as the callers don't
      care about the flp return value if the setlease call failed.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      51ee4b84
    • G
      initramfs: Fix initramfs size for 32-bit arches · 96f93593
      Geert Uytterhoeven 提交于
      Commit ffe8018c ("initramfs: fix initramfs size calculation") broke
      32-bit big-endian arches like (on ARAnyM):
      
          VFS: Cannot open root device "hda1" or unknown-block(3,1)
          Please append a correct "root=" boot option; here are the available partitions:
          fe80         1059408 nfhd8  (driver?)
            fe81          921600 nfhd8p1 00000000-0000-0000-0000-000000000nfhd8p1
            fe82          137807 nfhd8p2 00000000-0000-0000-0000-000000000nfhd8p2
          0200            3280 fd0  (driver?)
          0201            3280 fd1  (driver?)
          0300         1059408 hda  driver: ide-gd
            0301          921600 hda1 00000000-0000-0000-0000-000000000hda1
            0302          137807 hda2 00000000-0000-0000-0000-000000000hda2
          Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(3,1)
      
      As pointed out by Kerstin Jonsson <kerstin.jonsson@ericsson.com>, this
      is due to CONFIG_32BIT not being defined, so the initramfs size field is
      done as a 64-bit quad.  On little-endian (like x86) this doesn matter,
      but on a big-endian machine the 32-bit reads will see the (zero) high
      bits.
      
      Only mips, s390, and score set CONFIG_32BIT for 32-bit builds, so fix it for
      all other 32-bit arches by inverting the logic and testing for CONFIG_64BIT,
      which should be defined on all 64-bit arches.
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      [ I think we should just make it "u64" on all architectures and get
        rid of the whole #ifdef CONFIG_xxBIT   - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      96f93593
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 3985c7ce
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        isdn: mISDN: socket: fix information leak to userland
        netdev: can: Change mail address of Hans J. Koch
        pcnet_cs: add new_id
        net: Truncate recvfrom and sendto length to INT_MAX.
        RDS: Let rds_message_alloc_sgs() return NULL
        RDS: Copy rds_iovecs into kernel memory instead of rereading from userspace
        RDS: Clean up error handling in rds_cmsg_rdma_args
        RDS: Return -EINVAL if rds_rdma_pages returns an error
        net: fix rds_iovec page count overflow
        can: pch_can: fix section mismatch warning by using a whitelisted name
        can: pch_can: fix sparse warning
        netxen_nic: Fix the tx queue manipulation bug in netxen_nic_probe
        ip_gre: fix fallback tunnel setup
        vmxnet: trivial annotation of protocol constant
        vmxnet3: remove unnecessary byteswapping in BAR writing macros
        ipv6/udp: report SndbufErrors and RcvbufErrors
        phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr
      3985c7ce