1. 26 Apr, 2008 26 commits
  2. 25 Apr, 2008 14 commits
    • Roland Dreier's avatar
      Export __locks_copy_lock() so modular lockd builds · 3dd7b71c
      Roland Dreier authored
      Commit 1a747ee0 ("locks: don't call ->copy_lock methods on return of
      conflicting locks") changed fs/lockd/svclock.c to call
      __locks_copy_lock() instead of locks_copy_lock(), but lockd can be built
      as a module and __locks_copy_lock() is not exported, which causes a
      build error
          ERROR: "__locks_copy_lock" [fs/lockd/lockd.ko] undefined!
      with CONFIG_LOCKD=m.
      Fix this by exporting __locks_copy_lock().
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · b9fa38f7
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (49 commits)
        [POWERPC] Add zImage.iseries to arch/powerpc/boot/.gitignore
        [POWERPC] bootwrapper: fix build error on virtex405-head.S
        [POWERPC] 4xx: Fix 460GT support to not enable FPU
        [POWERPC] 4xx: Add NOR FLASH entries to Canyonlands and Glacier dts
        [POWERPC] Xilinx: of_serial support for Xilinx uart 16550.
        [POWERPC] Xilinx: boot support for Xilinx uart 16550.
        [POWERPC] celleb: Add support for PCI Express
        [POWERPC] celleb: Move miscellaneous files for Beat
        [POWERPC] celleb: Move a file for SPU on Beat
        [POWERPC] celleb: Move files for Beat mmu and iommu
        [POWERPC] celleb: Move files for Beat hvcall interfaces
        [POWERPC] celleb: Move the SCC related code for celleb
        [POWERPC] celleb: Move the files for celleb base support
        [POWERPC] celleb: Consolidate io-workarounds code
        [POWERPC] cell: Generalize io-workarounds code
        [POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries
        [POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
        [POWERPC] Register udbg console early on pseries LPAR
        [POWERPC] Mark udbg console as CON_ANYTIME, ie. callable early in boot
        [POWERPC] Set udbg_console index to 0
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 6e18933f
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [PATCH] Build fix for CONFIG_NUMA=y && CONFIG_SMP=n
        [IA64] fix bootmem regression on Altix
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds · eb855fd8
      Linus Torvalds authored
      * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
        leds: Add default-on trigger
        leds: Document the context brightness_set needs
        leds: Add new driver for the LEDs on the Freecom FSG-3
        leds: Add support to leds with readable status
        leds: enable support for blink_set() platform hook in leds-gpio
        leds: Cleanup various whitespace and code style issues
        leds: disable triggers on brightness set
        leds: Add mail LED support for "Clevo D400P"
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-pat · bf16ae25
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-pat:
        generic: add ioremap_wc() interface wrapper
        /dev/mem: make promisc the default
        pat: cleanups
        x86: PAT use reserve free memtype in mmap of /dev/mem
        x86: PAT phys_mem_access_prot_allowed for dev/mem mmap
        x86: PAT avoid aliasing in /dev/mem read/write
        devmem: add range_is_allowed() check to mmap of /dev/mem
        x86: introduce /dev/mem restrictions with a config option
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of... · 0b79dada
      Linus Torvalds authored
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
        sched: fix share (re)distribution
        softlockup: fix NOHZ wakeup
        seqlock: livelock fix
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 50be4917
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_bf54x: decrease count first.
        sata_mv: re-enable hotplug, update TODO list
        sata_mv: leave SError bits untouched in mv_err_intr
        sata_mv: more interrupt handling rework
        sata_mv: tidy host controller interrupt handling
        sata_mv: simplify request/response queue handling
        sata_mv: simplify freeze/thaw bit-shift calculations
        sata_mv mask all interrupt coalescing bits
        sata_mv more cosmetics
        ata_piix: add Asus Eee 701 controller to short cable list
        libata-eh set tf flags in NCQ EH result_tf
        make sata_set_spd_needed() static
        make sata_print_link_status() static
        libata-acpi.c: remove unneeded #if's
        sata_nv: make hardreset return -EAGAIN on success
        ahci: retry enabling AHCI a few times before spitting out WARN_ON()
        libata: make WARN_ON conditions in ata_sff_hsm_move() more strict
        ATA/IDE: fix platform driver hotplug/coldplug
        sata_sis: SCR accessors return -EINVAL when requested SCR isn't available
        libata: functions with definition should not be extern
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 37b05b17
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (120 commits)
        usb: don't update devnum for wusb devices
        wusb: make ep0_reinit available for modules
        wusb: devices dont use a set address
        wusb: teach choose_address() about wireless devices
        wusb: add link wusb-usb device
        wusb: add authenticathed bit to usb_dev
        USB: remove unnecessary type casting of urb->context
        usb serial: more fixes and groundwork for tty changes
        USB: replace remaining __FUNCTION__ occurrences
        USB: usbfs: export the URB_NO_INTERRUPT flag to userspace
        USB: fix compile problems in ehci-hcd
        USB: ehci: qh_completions cleanup and bugfix
        USB: cdc-acm: signedness fix
        USB: add documentation about callbacks
        USB: don't explicitly reenable root-hub status interrupts
        USB: OHCI: turn off RD when remote wakeup is disabled
        USB: HCDs use the do_remote_wakeup flag
        USB: g_file_storage: ignore bulk-out data after invalid CBW
        USB: serial: remove endpoints setting checks from core and header
        USB: serial: remove unneeded number endpoints settings
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · ce1d5b23
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
        Input: wacom - add support for Cintiq 20WSX
        Input: ucb1400_ts - IRQ probe fix
        Input: at32psif - update MODULE_AUTHOR with new email
        Input: mac_hid - add lockdep annotation to emumousebtn
        Input: i8042 - fix incorrect usage of strncpy and strncat
        Input: bf54x-keys - add infrastructure for keypad wakeups
        Input: add MODULE_ALIAS() to hotpluggable platform modules
        Input: drivers/char/keyboard.c - use time_after
        Input: fix ordering in joystick Makefile
        Input: wm97xx-core - support use as a wakeup source
        Input: wm97xx-core - use IRQF_SAMPLE_RANDOM
        Input: wm97xx-core - only schedule interrupt handler if not already scheduled
        Input: add Zhen Hua driver
        Input: aiptek - add support for Genius G-PEN 560 tablet
        Input: wacom - implement suspend and autosuspend
        Input: xpad - set proper buffer length for outgoing requests
        Input: omap-keypad - fix build warning
        Input: gpio_keys - irq handling cleanup
        Input: add PS/2 serio driver for AVR32 devices
        Input: put ledstate in the keyboard notifier
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild · ad5e1b0f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
        kconfig: fix broken target update-po-config
        kbuild: silence documentation GEN xml messages according to $(quiet)
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm · 6f97b220
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (24 commits)
        dm crypt: add documentation
        dm: remove md argument from specific_minor
        dm table: remove unused dm_create_error_table
        dm table: drop void suspend_targets return
        dm: unplug queues in threads
        dm raid1: use timer
        dm: move include files
        dm kcopyd: rename
        dm: expose macros
        dm kcopyd: remove redundant client counting
        dm kcopyd: private mempool
        dm kcopyd: per device
        dm log: make module use tracking internal
        dm log: move register functions
        dm log: clean interface
        dm kcopyd: clean interface
        dm io: clean interface
        dm io: rename error to error_bits
        dm snapshot: store pointer to target instance
        dm log: move dirty region log code into separate module
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-xen-next · 4b7227ca
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-xen-next: (52 commits)
        xen: add balloon driver
        xen: allow compilation with non-flat memory
        xen: fold xen_sysexit into xen_iret
        xen: allow set_pte_at on init_mm to be lockless
        xen: disable preemption during tlb flush
        xen pvfb: Para-virtual framebuffer, keyboard and pointer driver
        xen: Add compatibility aliases for frontend drivers
        xen: Module autoprobing support for frontend drivers
        xen blkfront: Delay wait for block devices until after the disk is added
        xen/blkfront: use bdget_disk
        xen: Make xen-blkfront write its protocol ABI to xenstore
        xen: import arch generic part of xencomm
        xen: make grant table arch portable
        xen: replace callers of alloc_vm_area()/free_vm_area() with xen_ prefixed one
        xen: make include/xen/page.h portable moving those definitions under asm dir
        xen: add resend_irq_on_evtchn() definition into events.c
        Xen: make events.c portable for ia64/xen support
        xen: move events.c to drivers/xen for IA64/Xen support
        xen: move features.c from arch/x86/xen/features.c to drivers/xen
        xen: add missing definitions in include/xen/interface/vcpu.h which ia64/xen needs
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 5dae61b8
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit().
        [SPARC64]: Fix args to 64-bit sys_semctl() via sys_ipc().
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 2e561c7b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (48 commits)
        net: Fix wrong interpretation of some copy_to_user() results.
        xfrm: alg_key_len & alg_icv_len should be unsigned
        [netdrvr] tehuti: move ioctl perm check closer to function start
        ipv6: Fix typo in net/ipv6/Kconfig
        via-velocity: fix vlan receipt
        tg3: sparse cleanup
        forcedeth: realtek phy crossover detection
        ibm_newemac: Increase MDIO timeouts
        gianfar: Fix skb allocation strategy
        netxen: reduce stack usage of netxen_nic_flash_print
        smc911x: test after postfix decrement fails in smc911x_{reset,drop_pkt}
        net drivers: fix platform driver hotplug/coldplug
        forcedeth: new backoff implementation
        ehea: make things static
        phylib: Add support for board-level PHY fixups
        [netdrvr] atlx: code movement: move atl1 parameter parsing
        atlx: remove flash vendor parameter
        korina: misc cleanup
        korina: fix misplaced return statement
        WAN: Fix confusing insmod error code for C101 too.