1. 10 Jan, 2011 13 commits
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 0c05384a
      Linus Torvalds authored
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        mkuboot.sh: Fail if mkimage is missing
        gen_init_cpio: checkpatch fixes
        gen_init_cpio: Avoid race between call to stat() and call to open()
        modpost: Fix address calculation in reloc_location()
        Make fixdep error handling more explicit
        checksyscalls: Fix stand-alone usage
        modpost: Put .zdebug* section on white list
        kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
        kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
        kbuild: introduce HDR_ARCH_LIST for headers_install_all
        headers_install: check exit status of unifdef
        gen_init_cpio: remove leading `/' from file names
        scripts/genksyms: fix header usage
        fixdep: use hash table instead of a single array
      0c05384a
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 1542dec1
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies.
        pata_hpt37x: actually limit HPT370 to UltraDMA/66
        pata_hpt3x2n: coding style cleanup
        pata_hpt37x: coding style cleanup
        pata_hpt366: coding style cleanup
        pata_hpt3x2n: calculate average f_CNT
        pata_hpt3x2n: clarify about HPT371N support
        pata_hpt{37x|3x2n}: SATA mode filtering
        [libata] avoid needlessly passing around ptr to SCSI completion func
        [libata] new driver acard_ahci, for ATP8620 host controller
      1542dec1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · facc7a96
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (34 commits)
        HID: roccat: Update sysfs attribute doc
        HID: roccat: don't use #pragma pack
        HID: roccat: Add support for Roccat Kone[+] v2
        HID: roccat: reduce number of functions in kone and pyra drivers
        HID: roccat: declare meaning of pack pragma usage in driver headers
        HID: roccat: use class for char device for sysfs attribute creation
        sysfs: Introducing binary attributes for struct class
        HID: hidraw: add compatibility ioctl() for 32-bit applications.
        HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report()
        HID: picolcd: fix misuse of logical operation in place of bitop
        HID: usbhid: base runtime PM on modern API
        HID: replace offsets values with their corresponding BTN_* defines
        HID: hid-mosart: support suspend/resume
        HID: hid-mosart: ignore buttons report
        HID: hid-picolcd: don't use flush_scheduled_work()
        HID: simplify an index check in hid_lookup_collection
        HID: Hoist assigns from ifs
        HID: Remove superfluous __inline__
        HID: Use vzalloc for vmalloc/memset(,0...)
        HID: Add and use hid_<level>: dev_<level> equivalents
        ...
      facc7a96
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · c8940eca
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        spi / PM: Support dev_pm_ops
        PM: Prototype the pm_generic_ operations
        PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
        PM: Use dev_name() in core device suspend and resume routines
        PM: Permit registration of parentless devices during system suspend
        PM: Replace the device power.status field with a bit field
        PM: Remove redundant checks from core device resume routines
        PM: Use a different list of devices for each stage of device suspend
        PM: Avoid compiler warning in pm_noirq_op()
        PM: Use pm_wakeup_pending() in __device_suspend()
        PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()
        PM: Prevent dpm_prepare() from returning errors unnecessarily
        PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt
        PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3)
        PM / Hibernate: When failed, in_suspend should be reset
        PM / Hibernate: hibernation_ops->leave should be checked too
        Freezer: Fix a race during freezing of TASK_STOPPED tasks
        PM: Use proper ccflag flag in kernel/power/Makefile
        PM / Runtime: Fix comments to match runtime callback code
      c8940eca
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 78c92a9f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        firewire: use split transaction timeout only for split transactions
        firewire: ohci: consolidate context status flags
        firewire: ohci: cache the context run bit
        firewire: ohci: flush AT contexts after bus reset - addendum
        firewire: ohci: flush AT contexts after bus reset for OHCI 1.2
        firewire: net: set carrier state at ifup
        firewire: net: add carrier detection
        firewire: net: ratelimit error messages
        firewire: ohci: restart iso DMA contexts on resume from low power mode
        firewire: ohci: restore GUID on resume.
        firewire: ohci: use common buffer for self IDs and AR descriptors
        firewire: ohci: optimize iso context checks in the interrupt handler
        firewire: make PHY packet header format consistent
        firewire: ohci: properly clear posted write errors
        firewire: ohci: flush MMIO writes in the interrupt handler
        firewire: ohci: fix AT context initialization error handling
        firewire: ohci: Asynchronous Reception rewrite
        firewire: core: Update WARN uses
        firewire: nosy: char device is not seekable
      78c92a9f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · b65f0d67
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
        nilfs2: unfold nilfs_dat_inode function
        nilfs2: do not pass sbi to functions which can get it from inode
        nilfs2: get rid of nilfs_mount_options structure
        nilfs2: simplify nilfs_mdt_freeze_buffer
        nilfs2: get rid of loaded flag from nilfs object
        nilfs2: fix a checkpatch error in page.c
        nilfs2: fiemap support
        nilfs2: mark buffer heads as delayed until the data is written to disk
        nilfs2: call nilfs_error inside bmap routines
        fs/nilfs2/super.c: Use printf extension %pV
        MAINTAINERS: add nilfs2 git tree entry
      b65f0d67
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · f3ea5972
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: use CreationTime like an i_generation field
        cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo
        cifs: show "acl" in DebugData Features when it's compiled in
        cifs: move "ntlmssp" and "local_leases" options out of experimental code
        cifs: replace some hardcoded values with preprocessor constants
        cifs: remove unnecessary locking around sequence_number
        [CIFS] Fix minor merge conflict in fs/cifs/dir.c
        CIFS: Simplify cifs_open code
        CIFS: Simplify non-posix open stuff (try #2)
        CIFS: Add match_port check during looking for an existing connection (try #4)
        CIFS: Simplify ipv*_connect functions into one (try #4)
        cifs: Support NTLM2 session security during NTLMSSP authentication [try #5]
        cifs: don't overwrite dentry name in d_revalidate
      f3ea5972
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · f9f265f3
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: sanitize work_start() in lowcomms.c
        dlm: reduce cond_resched during send
        dlm: use TCP_NODELAY
        dlm: Use cmwq for send and receive workqueues
        dlm: Handle application limited situations properly.
      f9f265f3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 7d44b044
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: fix ioctl ABI
        fuse: allow batching of FORGET requests
        fuse: separate queue for FORGET requests
        fuse: ioctl cleanup
      
      Fix up trivial conflict in fs/fuse/inode.c due to RCU lookup having done
      the RCU-freeing of the inode in fuse_destroy_inode().
      7d44b044
    • Randy Dunlap's avatar
      pipe_fs_i.h: fix kernel-doc warning · 0dc14885
      Randy Dunlap authored
      
      
      Fix kernel-doc notation warnings in pipe_fs_i.h:
      
        Warning(include/linux/pipe_fs_i.h:58): No description found for parameter 'buffers'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0dc14885
    • Randy Dunlap's avatar
      hrtimer.h: fix kernel-doc warning · 175881db
      Randy Dunlap authored
      
      
      Fix new kernel-doc notation warning in hrtimer.h:
      
        Warning(include/linux/hrtimer.h:150): Excess struct/union/enum/typedef member 'first' description in 'hrtimer_clock_base'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      175881db
    • Randy Dunlap's avatar
      fs: fix dcache.h kernel-doc notation · 2a8c0c68
      Randy Dunlap authored
      
      
      Fix new kernel-doc notation warning in dcache.h:
      
        Warning(include/linux/dcache.h:316): Excess function parameter 'Returns' description in '__d_rcu_to_refcount'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Cc:	Nick Piggin <npiggin@kernel.dk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2a8c0c68
    • Randy Dunlap's avatar
      fs: fix namei.c kernel-doc notation · 39191628
      Randy Dunlap authored
      
      
      Fix new kernel-doc notation warnings in fs/namei.c and spell
      ECHILD correctly.
      
        Warning(fs/namei.c:218): No description found for parameter 'flags'
        Warning(fs/namei.c:425): Excess function parameter 'Returns' description in 'nameidata_drop_rcu'
        Warning(fs/namei.c:478): Excess function parameter 'Returns' description in 'nameidata_dentry_drop_rcu'
        Warning(fs/namei.c:540): Excess function parameter 'Returns' description in 'nameidata_drop_rcu_last'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Cc:	Nick Piggin <npiggin@kernel.dk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      39191628
  2. 09 Jan, 2011 19 commits
  3. 07 Jan, 2011 8 commits