1. 07 Feb, 2007 30 commits
  2. 06 Feb, 2007 10 commits
    • Linus Torvalds's avatar
      dda2ac15
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid · 2ac04a15
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
        USB HID: handle multi-interface devices for Apple macbook pro properly
        HID: move away from DEBUG defines in favor of CONFIG_HID_DEBUG
        USB HID: fix bogus comment in hid_get_class_descriptor()
        USB HID: remove hid_find_field_by_usage()
        HID: API - fix leftovers of hidinput API in USB HID
        HID: hid debug from hid-debug.h to hid layer
        hid: force feedback driver for PantherLord USB/PS2 2in1 Adapter
        hid: quirk for multi-input devices with unneeded output reports
        hid: allow force feedback for multi-input devices
      2ac04a15
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 0c7d3757
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IB/ehca: Remove obsolete prototypes
        IB/ehca: Remove use of do_mmap()
        RDMA/addr: Handle ethernet neighbour updates during route resolution
        IB: Make sure struct ib_user_mad.data is aligned
        IB/srp: Don't wait for response when QP is in error state.
        IB: Return qp pointer as part of ib_wc
        IB: Include <linux/kref.h> explicitly in <rdma/ib_verbs.h>
      0c7d3757
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc · 2442d310
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (32 commits)
        mmc: tifm: replace kmap with page_address
        mmc: sdhci: fix voltage ocr
        mmc: sdhci: replace kmap with page_address
        mmc: wbsd: replace kmap with page_address
        mmc: handle pci_enable_device() return value in sdhci
        mmc: Proper unclaim in mmc_block
        mmc: change wbsd mailing list
        mmc: Graceful fallback for fancy features
        mmc: Handle wbsd's stupid command list
        mmc: Allow host drivers to specify max block count
        mmc: Allow host drivers to specify a max block size
        tifm_sd: add suspend and resume functionality
        tifm_core: add suspend/resume infrastructure for tifm devices
        tifm_7xx1: prettify
        tifm_7xx1: recognize device 0xac8f as supported
        tifm_7xx1: switch from workqueue to kthread
        tifm_7xx1: Merge media insert and media remove functions
        tifm_7xx1: simplify eject function
        Add dummy_signal_irq function to save check in ISR
        Remove unused return value from signal_irq callback
        ...
      2442d310
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 02aedd69
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (37 commits)
        [S390] Avoid excessive inlining.
        [S390] Mark kernel text section read-only.
        [S390] Convert memory detection into C code.
        [S390] Calibrate delay and bogomips.
        [S390] Hypervisor filesystem (s390_hypfs) for z/VM
        [S390] Add crypto support for 3592 tape devices
        [S390] boot from NSS support
        [S390] Support for s390 Pseudo Random Number Generator
        [S390] ETR support.
        [S390] noexec protection
        [S390] move crypto options and some cleanup.
        [S390] cio: Don't spam debug feature.
        [S390] Cleanup of CHSC event handling.
        [S390] cio: declare hardware structures packed.
        [S390] Add set_fs(USER_DS) to start_thread().
        [S390] cio: Catch operand exceptions on stsch.
        [S390] Fix register usage description.
        [S390] kretprobe_trampoline_holder() in wrong section.
        [S390] Fix kprobes breakpoint handling.
        [S390] Update maintainers file.
        ...
      02aedd69
    • David Howells's avatar
      [PATCH] Keys: Fix key serial number collision handling · 9ad0830f
      David Howells authored
      Fix the key serial number collision avoidance code in key_alloc_serial().
      
      This didn't use to be so much of a problem as the key serial numbers were
      allocated from a simple incremental counter, and it would have to go through
      two billion keys before it could possibly encounter a collision.  However, now
      that random numbers are used instead, collisions are much more likely.
      
      This is fixed by finding a hole in the rbtree where the next unused serial
      number ought to be and using that by going almost back to the top of the
      insertion routine and redoing the insertion with the new serial number rather
      than trying to be clever and attempting to work out the insertion point
      pointer directly.
      
      This fixes kernel BZ #7727.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9ad0830f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 768c242b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Minor cleanup
        [CIFS] Missing free in error path
        [CIFS] Reduce cifs stack space usage
        [CIFS] lseek polling returned stale EOF
      768c242b
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · e503606c
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (40 commits)
        [MIPS] Yosemite: Fix missing parens in SERIAL_READ_1 macro
        [MIPS] Fix warnings in run_uncached on 32bit kernel
        [MIPS] Comment fix
        [MIPS] MT: Nuke duplicate mips_mt_regdump() prototype.
        [MIPS] Alchemy:  Fix PCI-memory access
        [MIPS] Move .set reorder out of conditional code
        [MIPS] Check FCSR for pending interrupts before restoring from a context.
        [MIPS] Jaguar ATX: Fix large number of warnings.
        [MIPS] Jaguar: Fix MAC address detection after platform_device conversion.
        [MIPS] SMTC: Make a bunch of functions and variables static.
        [MIPS] Use compat_sys_pselect6
        [MIPS] SMTC: Cleanup idle hook invocation.
        [MIPS] SELinux: Add security hooks to mips-mt {get,set}affinity
        [MIPS] IRIX: Linux coding style cleanups.
        [MIPS] PB1100: Fix pile of warnings
        [MIPS] Alchemy: Fix bunch of warnings
        [MIPS] Whitespace cleanups.
        [MIPS] Alchemy: Fix bunch more warnings.
        [MIPS] Use ARRAY_SIZE macro when appropriate
        [MIPS] Fix some whitespace damage
        ...
      e503606c
    • Oleg Verych's avatar
      [PATCH] kbuild: correctly skip tilded backups in localversion files · 76c32956
      Oleg Verych authored
       Tildes as in path as in filenames are handled correctly now:
       only files, containing tilde '~', are backups, thus are not valid.
      
       [KJ]:
       Definition of `space' was removed, scripts/Kbuild.include has one.
       That definition was taken right from the GNU make manual, while Kbuild's
       version is original.
      
      Cc: Roman Zippel <zippel@linux-m68k.org>
      Cc: Bastian Blank <bastian@waldi.eu.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarOleg Verych <olecom@flower.upol.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      76c32956
    • Oleg Verych's avatar
      [PATCH] kbuild: improve option checking, Kbuild.include cleanup · 5de043f4
      Oleg Verych authored
       GNU binutils, root users, tmpfiles, external modules ro builds must
       be fixed to do the right thing now.
      
      Cc: Roman Zippel <zippel@linux-m68k.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Cc: Horst Schirmeier <horst@schirmeier.com>
      Cc: Jan Beulich <jbeulich@novell.com>
      Cc: Daniel Drake <dsd@gentoo.org>
      Cc: Andi Kleen <ak@suse.de>
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarOleg Verych <olecom@flower.upol.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5de043f4