1. 18 10月, 2008 7 次提交
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 58617d5e
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: Remove automatic enabling of the HUGE_FILE feature flag
        ext4: Replace hackish ext4_mb_poll_new_transaction with commit callback
        ext4: Update Documentation/filesystems/ext4.txt
        ext4: Remove unused mount options: nomballoc, mballoc, nocheck
        ext4: Remove compile warnings when building w/o CONFIG_PROC_FS
        ext4: Add missing newlines to printk messages
        ext4: Fix file fragmentation during large file write.
        vfs: Add no_nrwrite_index_update writeback control flag
        vfs: Remove the range_cont writeback mode.
        ext4: Use tag dirty lookup during mpage_da_submit_io
        ext4: let the block device know when unused blocks can be discarded
        ext4: Don't reuse released data blocks until transaction commits
        ext4: Use an rbtree for tracking blocks freed during transaction.
        ext4: Do mballoc init before doing filesystem recovery
        ext4: Free ext4_prealloc_space using kmem_cache_free
        ext4: Fix Kconfig typo for ext4dev
        ext4: Remove an old reference to ext4dev in Makefile comment
      58617d5e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 26e9a397
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (25 commits)
        staging: at76_usb wireless driver
        Staging: workaround build system bug
        Staging: Lindent sxg.c
        Staging: SLICOSS: Call pci_release_regions at driver exit
        Staging: SLICOSS: Fix remaining type names
        Staging: SLICOSS: Fix warnings due to static usage
        Staging: SLICOSS: lots of checkpatch fixes
        Staging: go7007 v4l fixes
        Staging: Fix gcc warnings in sxg
        Staging: add echo cancelation module
        Staging: add wlan-ng prism2 usb driver
        Staging: add w35und wifi driver
        Staging: USB/IP: add host driver
        Staging: USB/IP: add client driver
        Staging: USB/IP: add common functions needed
        Staging: add the go7007 video driver
        Staging: add me4000 pci data collection driver
        Staging: add me4000 firmware files
        Staging: add sxg network driver
        Staging: add Alacritech slicoss network driver
        ...
      
      Fixed up conflicts due to taint flags changes and MAINTAINERS cleanup in
      MAINTAINERS, include/linux/kernel.h and kernel/panic.c.
      26e9a397
    • L
      Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · bdbf0ac7
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (47 commits)
        hwmon: (adm1026) Prevent log spamming
        hwmon: (adm1026) Fix debug messages
        hwmon: (adm1029) Use mask for fan_div value
        hwmon: (adt7470) Add documentation
        hwmon: (ibmaem) Automatically load on IBM systems via DMI
        hwmon: (ibmpex) Automatically load on IBM systems via DMI
        hwmon: (w83781d) Use new style driver binding
        hwmon: (w83781d) Stop abusing struct i2c_client for ISA devices
        hwmon: (w83781d) Make ISA interface depend on CONFIG_ISA
        hwmon: (w83781d) Additional information about AS99127F PWM
        hwmon: (w83781d) Detect alias chips
        hwmon: (w83781d) Refactor beep enable handling
        hwmon: Drop dead links to old National Semiconductor chip datasheets
        hwmon: (w83791d) add support for thermal cruise mode
        hwmon: (w83791d) add pwm_enable support
        hwmon: (w83791d) add manual PWM support
        hwmon: (w83791d) fan 4/5 pins can also be used for gpio
        hwmon: (max1619) Use inline functions instead of macros
        hwmon: (it87) Fix thermal sensor type values
        hwmon: (lm78) Convert to a new-style i2c driver
        ...
      bdbf0ac7
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 8eb88c80
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: Fix debugfs_create_dir's error checking method for sound/soc/
        ALSA: ASoC: Convert playpaq_wm8510 to bulk route registration API
        ALSA: kernel docs: fix sound/core/ kernel-doc
        ALSA: Handle NULL jacks in snd_jack_report()
        ALSA: hda - Fix PCM type of Nvidia HDMI devices
      8eb88c80
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · c53dbf54
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        block: remove __generic_unplug_device() from exports
        block: move q->unplug_work initialization
        blktrace: pass zfcp driver data
        blktrace: add support for driver data
        block: fix current kernel-doc warnings
        block: only call ->request_fn when the queue is not stopped
        block: simplify string handling in elv_iosched_store()
        block: fix kernel-doc for blk_alloc_devt()
        block: fix nr_phys_segments miscalculation bug
        block: add partition attribute for partition number
        block: add BIG FAT WARNING to CONFIG_DEBUG_BLOCK_EXT_DEVT
        softirq: Add support for triggering softirq work on softirqs.
      c53dbf54
    • L
      Merge branch 'for-linus' of git://www.jni.nu/cris · b73b636e
      Linus Torvalds 提交于
      * 'for-linus' of git://www.jni.nu/cris:
        CRIS: proper defconfig setup
        [CRIS] Rename boot-linkscripts and fix the path to them.
      b73b636e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · ed09441d
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (39 commits)
        [SCSI] sd: fix compile failure with CONFIG_BLK_DEV_INTEGRITY=n
        libiscsi: fix locking in iscsi_eh_device_reset
        libiscsi: check reason why we are stopping iscsi session to determine error value
        [SCSI] iscsi_tcp: return a descriptive error value during connection errors
        [SCSI] libiscsi: rename host reset to target reset
        [SCSI] iscsi class: fix endpoint id handling
        [SCSI] libiscsi: Support drivers initiating session removal
        [SCSI] libiscsi: fix data corruption when target has to resend data-in packets
        [SCSI] sd: Switch kernel printing level for DIF messages
        [SCSI] sd: Correctly handle all combinations of DIF and DIX
        [SCSI] sd: Always print actual protection_type
        [SCSI] sd: Issue correct protection operation
        [SCSI] scsi_error: fix target reset handling
        [SCSI] lpfc 8.2.8 v2 : Add statistical reporting control and additional fc vendor events
        [SCSI] lpfc 8.2.8 v2 : Add sysfs control of target queue depth handling
        [SCSI] lpfc 8.2.8 v2 : Revert target busy in favor of transport disrupted
        [SCSI] scsi_dh_alua: remove REQ_NOMERGE
        [SCSI] lpfc 8.2.8 : update driver version to 8.2.8
        [SCSI] lpfc 8.2.8 : Add MSI-X support
        [SCSI] lpfc 8.2.8 : Update driver to use new Host byte error code DID_TRANSPORT_DISRUPTED
        ...
      ed09441d
  2. 17 10月, 2008 33 次提交