1. 12 Mar, 2010 31 commits
  2. 09 Mar, 2010 1 commit
  3. 08 Mar, 2010 8 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · 51d0f6d1
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
        Btrfs: kfree correct pointer during mount option parsing
        Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL
      51d0f6d1
    • Josef Bacik's avatar
      Btrfs: kfree correct pointer during mount option parsing · da495ecc
      Josef Bacik authored
      We kstrdup the options string, but then strsep screws with the pointer,
      so when we kfree() it, we're not giving it the right pointer.
      Tested-by: default avatarAndy Lutomirski <luto@mit.edu>
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      da495ecc
    • Eric Paris's avatar
      Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL · 6bef4d31
      Eric Paris authored
      btrfs inialize rb trees in quite a number of places by settin rb_node =
      NULL;  The problem with this is that 17d9ddc72fb8bba0d4f678 in the
      linux-next tree adds a new field to that struct which needs to be NULL for
      the new rbtree library code to work properly.  This patch uses RB_ROOT as
      the intializer so all of the relevant fields will be NULL'd.  Without the
      patch I get a panic.
      Signed-off-by: default avatarEric Paris <eparis@redhat.com>
      Acked-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      6bef4d31
    • Linus Torvalds's avatar
      Linux 2.6.34-rc1 · 57d54889
      Linus Torvalds authored
      57d54889
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 · e1015418
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (62 commits)
        msi-laptop: depends on RFKILL
        msi-laptop: Detect 3G device exists by standard ec command
        msi-laptop: Add resume method for set the SCM load again
        msi-laptop: Support some MSI 3G netbook that is need load SCM
        msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command
        msi-laptop: Support standard ec 66/62 command on MSI notebook and nebook
        Driver core: create lock/unlock functions for struct device
        sysfs: fix for thinko with sysfs_bin_attr_init()
        sysfs: Kill unused sysfs_sb variable.
        sysfs: Pass super_block to sysfs_get_inode
        driver core: Use sysfs_rename_link in device_rename
        sysfs: Implement sysfs_rename_link
        sysfs: Pack sysfs_dirent more tightly.
        sysfs: Serialize updates to the vfs inode
        sysfs: windfarm: init sysfs attributes
        sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on module dynamic attributes
        sysfs: Document sysfs_attr_init and sysfs_bin_attr_init
        sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on dynamic attributes
        sysfs: Use one lockdep class per sysfs attribute.
        sysfs: Only take active references on attributes.
        ...
      e1015418
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · d4bab1b0
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] i6300esb.c: change platform_driver to pci_driver
        [WATCHDOG] i6300esb: fix unlock register with
        [WATCHDOG] drivers/watchdog/wdt.c:wdt_ioctl(): make `ident' non-static
        [WATCHDOG] change reboot_notifier to platform-shutdown method.
        [WATCHDOG] watchdog_info constify
        [WATCHDOG] gef_wdt: Author corrections following split of GE Fanuc joint venture
        [WATCHDOG] iTCO_wdt: clean up probe(), modify err msg
        [WATCHDOG] ep93xx: watchdog timer driver for TS-72xx SBCs cleanup
        [WATCHDOG] support for max63xx watchdog timer chips
        [WATCHDOG] ep93xx: added platform side support for TS-72xx WDT driver
        [WATCHDOG] ep93xx: implemented watchdog timer driver for TS-72xx SBCs
      d4bab1b0
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 56b78921
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits)
        ALSA: hdmi - show debug message on changing audio infoframe
        ALSA: hdmi - merge common code for intelhdmi and nvhdmi
        ALSA: hda - Add ASRock mobo to MSI blacklist
        ALSA: hda: uninitialized variable fix
        ALSA: hda: Use LPIB for a Biostar Microtech board
        ALSA: usb/audio.h: Fix field order
        ALSA: fix jazz16 compile (udelay)
        ALSA: hda: Use LPIB for Dell Latitude 131L
        ALSA: hda - Build hda_eld into snd-hda-codec module
        ALSA: hda - Support NVIDIA MCP89 and GT21x hdmi audio
        ALSA: hda - Support max codecs to 8 for nvidia hda controller
        ALSA: riptide: clean up while loop
        ALSA: usbaudio - remove debug "SAMPLE BYTES" printk line
        ALSA: timer - pass real event in snd_timer_notify1() to instance callback
        ALSA: oxygen: change || to &&
        ALSA: opti92x: use PnP data to select Master Control port
        ASoC: fix ak4104 register array access
        ASoC: soc_pcm_open: Add missing bailout tag
        ALSA: usbaudio: Fix wrong bitrate for Creative Creative VF0470 Live Cam
        ALSA: ua101: removing debugging code
        ...
      56b78921
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 3c443cbc
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents
        [S390] smsgiucv: declare char pointers as "const"
        [S390] dasd: automatic recognition of read-only devices
        [S390] remove unused qdio flags in zfcp and qeth
        [S390] Cleanup xtime usage
        [S390] qdio: add missing bracket
        [S390] cio: fix init_count in case of recognition after steal lock
        [S390] dasd: security and PSF update patch for EMC CKD ioctl
        [S390] hvc_iucv: allocate memory buffers for IUCV in zone DMA
        [S390] uaccess: make sure copy_from_user_overflow is builtin
      3c443cbc