1. 23 Apr, 2008 10 commits
  2. 22 Apr, 2008 11 commits
  3. 21 Apr, 2008 19 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial · e9b62693
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
        DOC:  A couple corrections and clarifications in USB doc.
        Generate a slightly more informative error msg for bad HZ
        fix typo "is" -> "if" in Makefile
        ext*: spelling fix prefered -> preferred
        DOCUMENTATION:  Use newer DEFINE_SPINLOCK macro in docs.
        KEYS:  Fix the comment to match the file name in rxrpc-type.h.
        RAID: remove trailing space from printk line
        DMA engine: typo fixes
        Remove unused MAX_NODES_SHIFT
        MAINTAINERS: Clarify access to OCFS2 development mailing list.
        V4L: Storage class should be before const qualifier (sn9c102)
        V4L: Storage class should be before const qualifier
        sonypi: Storage class should be before const qualifier
        intel_menlow: Storage class should be before const qualifier
        DVB: Storage class should be before const qualifier
        arm: Storage class should be before const qualifier
        ALSA: Storage class should be before const qualifier
        acpi: Storage class should be before const qualifier
        firmware_sample_driver.c: fix coding style
        MAINTAINERS: Add ati_remote2 driver
        ...
      
      Fixed up trivial conflicts in firmware_sample_driver.c
      e9b62693
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block · 548453fd
      Linus Torvalds authored
      * 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block:
        block: fix blk_register_queue() return value
        block: fix memory hotplug and bouncing in block layer
        block: replace remaining __FUNCTION__ occurrences
        Kconfig: clean up block/Kconfig help descriptions
        cciss: fix warning oops on rmmod of driver
        cciss: Fix race between disk-adding code and interrupt handler
        block: move the padding adjustment to blk_rq_map_sg
        block: add bio_copy_user_iov support to blk_rq_map_user_iov
        block: convert bio_copy_user to bio_copy_user_iov
        loop: manage partitions in disk image
        cdrom: use kmalloced buffers instead of buffers on stack
        cdrom: make unregister_cdrom() return void
        cdrom: use list_head for cdrom_device_info list
        cdrom: protect cdrom_device_info list by mutex
        cdrom: cleanup hardcoded error-code
        cdrom: remove ifdef CONFIG_SYSCTL
      548453fd
    • Adrian Bunk's avatar
      frv: unexport kmap_atomic_to_page · 9fd91217
      Adrian Bunk authored
      This patch removes the no longer used export of kmap_atomic_to_page.
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9fd91217
    • Adrian Bunk's avatar
      frv: remove HARD_RESET_NOW() · eb0cc5fe
      Adrian Bunk authored
      HARD_RESET_NOW() was unused.
      
      And one of the few remaining cli() users.
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      eb0cc5fe
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 · 19b5b517
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
        SELinux: one little, two little, three little whitespaces, the avc.c saga.
        SELinux: cleanup on isle selinuxfs.c
        changing whitespace for fun and profit: policydb.c
        SELinux: whitespace and formating fixes for hooks.c
        SELinux: clean up printks
        SELinux: sidtab.c whitespace, syntax, and static declaraction cleanups
        SELinux: services.c whitespace, syntax, and static declaraction cleanups
        SELinux: mls.c whitespace, syntax, and static declaraction cleanups
        SELinux: hashtab.c whitespace, syntax, and static declaraction cleanups
        SELinux: ebitmap.c whitespace, syntax, and static declaraction cleanups
        SELinux: conditional.c whitespace, syntax, and static declaraction cleanups
        SELinux: avtab.c whitespace, syntax, and static declaraction cleanups
        SELinux: xfrm.c whitespace, syntax, and static declaraction cleanups
        SELinux: nlmsgtab.c whitespace, syntax, and static declaraction cleanups
        SELinux: netnode.c whitespace, syntax, and static declaraction cleanups
        SELinux: netlink.c whitespace, syntax, and static declaraction cleanups
        SELinux: netlabel.c whitespace, syntax, and static declaraction cleanups
        SELinux: netif.c whitespace, syntax, and static declaraction cleanups
      19b5b517
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 · bda0c0af
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: (42 commits)
        PCI: Change PCI subsystem MAINTAINER
        PCI: pci-iommu-iotlb-flushing-speedup
        PCI: pci_setup_bridge() mustn't be __devinit
        PCI: pci_bus_size_cardbus() mustn't be __devinit
        PCI: pci_scan_device() mustn't be __devinit
        PCI: pci_alloc_child_bus() mustn't be __devinit
        PCI: replace remaining __FUNCTION__ occurrences
        PCI: Hotplug: fakephp: Return success, not ENODEV, when bus rescan is triggered
        PCI: Hotplug: Fix leaks in IBM Hot Plug Controller Driver - ibmphp_init_devno()
        PCI: clean up resource alignment management
        PCI: aerdrv_acpi.c: remove unneeded NULL check
        PCI: Update VIA CX700 quirk
        PCI: Expose PCI VPD through sysfs
        PCI: iommu: iotlb flushing
        PCI: simplify quirk debug output
        PCI: iova RB tree setup tweak
        PCI: parisc: use generic pci_enable_resources()
        PCI: ppc: use generic pci_enable_resources()
        PCI: powerpc: use generic pci_enable_resources()
        PCI: ia64: use generic pci_enable_resources()
        ...
      bda0c0af
    • Robert P. J. Day's avatar
      DOC: A couple corrections and clarifications in USB doc. · 838cb6ab
      Robert P. J. Day authored
      A couple of corrections and clarifications in USB
      documentation.
      Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
      Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
      838cb6ab
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 904e0ab5
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        [HWRNG] omap: Minor updates
        [CRYPTO] kconfig: Ordering cleanup
        [CRYPTO] all: Clean up init()/fini()
        [CRYPTO] padlock-aes: Use generic setkey function
        [CRYPTO] aes: Export generic setkey
        [CRYPTO] api: Make the crypto subsystem fully modular
        [CRYPTO] cts: Add CTS mode required for Kerberos AES support
        [CRYPTO] lrw: Replace all adds to big endians variables with be*_add_cpu
        [CRYPTO] tcrypt: Change the XTEA test vectors
        [CRYPTO] tcrypt: Shrink the tcrypt module
        [CRYPTO] tcrypt: Change the usage of the test vectors
        [CRYPTO] api: Constify function pointer tables
        [CRYPTO] aes-x86-32: Remove unused return code
        [CRYPTO] tcrypt: Shrink speed templates
        [CRYPTO] tcrypt: Group common speed templates
        [CRYPTO] sha512: Rename sha512 to sha512_generic
        [CRYPTO] sha384: Hardware acceleration for s390
        [CRYPTO] sha512: Hardware acceleration for s390
        [CRYPTO] s390: Generic sha_update and sha_final
        [CRYPTO] api: Switch to proc_create()
      904e0ab5
    • Linus Torvalds's avatar
      Merge branch 'irq-cleanups-upstream' of... · 98a1e95f
      Linus Torvalds authored
      Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
      
      * 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
        [ISDN] minor irq handler cleanups
        drivers/char: minor irq handler cleanups
        [PPC] minor irq handler cleanups
        [BLACKFIN] minor irq handler cleanups
        [SPARC] minor irq handler cleanups
        ARM minor irq handler cleanup: avoid passing unused info to irq
      98a1e95f
    • Robert P. J. Day's avatar
      Generate a slightly more informative error msg for bad HZ · 37679011
      Robert P. J. Day authored
      Generate a slightly more informative error msg for bad HZ
       in include/linux/jiffies.h
      Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
      Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
      37679011
    • Linus Torvalds's avatar
      Merge branch 'isdn-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 · abe834c8
      Linus Torvalds authored
      * 'isdn-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
        [ISDN] Hisax: eliminate many unnecessary references to CardType[]
        [ISDN] HiSax: modularization prep
      abe834c8
    • Uwe Kleine-König's avatar
      fix typo "is" -> "if" in Makefile · bc3c26fe
      Uwe Kleine-König authored
      It should be "if" but is written as "is"..
      Signed-off-by: default avatarUwe Kleine-Koenig <Uwe.Kleine-Koenig@digi.com>
      Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
      bc3c26fe
    • Roland McGrath's avatar
      ptrace: compat_ptrace_request siginfo · e16b2781
      Roland McGrath authored
      This adds support for PTRACE_GETSIGINFO and PTRACE_SETSIGINFO in
      compat_ptrace_request.  It relies on existing arch definitions for
      copy_siginfo_to_user32 and copy_siginfo_from_user32.
      
      On powerpc, this fixes a longstanding regression of 32-bit ptrace
      calls on 64-bit kernels vs native calls (64-bit calls or 32-bit
      kernels).  This can be seen in a 32-bit call using PTRACE_GETSIGINFO
      to examine e.g. siginfo_t.si_addr from a signal that sets it.
      (This was broken as of 2.6.24 and, I presume, many or all prior versions.)
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e16b2781
    • Randy Dunlap's avatar
      skbuff: fix missing kernel-doc notation · 553a5672
      Randy Dunlap authored
      Add kernel-doc notation for ndisc_nodetype:
      
      Warning(linux-2.6.25-git2//include/linux/skbuff.h:340): No description found for parameter 'ndisc_nodetype'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      553a5672
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 9a64388d
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
        [POWERPC] Fix compile breakage for 64-bit UP configs
        [POWERPC] Define copy_siginfo_from_user32
        [POWERPC] Add compat handler for PTRACE_GETSIGINFO
        [POWERPC] i2c: Fix build breakage introduced by OF helpers
        [POWERPC] Optimize fls64() on 64-bit processors
        [POWERPC] irqtrace support for 64-bit powerpc
        [POWERPC] Stacktrace support for lockdep
        [POWERPC] Move stackframe definitions to common header
        [POWERPC] Fix device-tree locking vs. interrupts
        [POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
        [POWERPC] Remove unused __max_memory variable
        [POWERPC] Simplify xics direct/lpar irq_host setup
        [POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
        [POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
        [POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
        [POWERPC] Use asm-generic/bitops/find.h in bitops.h
        [POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
        [POWERPC] 85xx: Fix the size of qe muram for MPC8568E
        [POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
        [POWERPC] 86xx: mark functions static, other minor cleanups
        ...
      9a64388d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 · e80ab411
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (36 commits)
        SCSI: convert struct class_device to struct device
        DRM: remove unused dev_class
        IB: rename "dev" to "srp_dev" in srp_host structure
        IB: convert struct class_device to struct device
        memstick: convert struct class_device to struct device
        driver core: replace remaining __FUNCTION__ occurrences
        sysfs: refill attribute buffer when reading from offset 0
        PM: Remove destroy_suspended_device()
        Firmware: add iSCSI iBFT Support
        PM: Remove legacy PM (fix)
        Kobject: Replace list_for_each() with list_for_each_entry().
        SYSFS: Explicitly include required header file slab.h.
        Driver core: make device_is_registered() work for class devices
        PM: Convert wakeup flag accessors to inline functions
        PM: Make wakeup flags available whenever CONFIG_PM is set
        PM: Fix misuse of wakeup flag accessors in serial core
        Driver core: Call device_pm_add() after bus_add_device() in device_add()
        PM: Handle device registrations during suspend/resume
        block: send disk "change" event for rescan_partitions()
        sysdev: detect multiple driver registrations
        ...
      
      Fixed trivial conflict in include/linux/memory.h due to semaphore header
      file change (made irrelevant by the change to mutex).
      e80ab411
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 529a41e3
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        rose: Socket lock was not released before returning to user space
        hci_usb: remove code obfuscation
        drivers/net/appletalk: use time_before, time_before_eq, etc
        drivers/atm: use time_before, time_before_eq, etc
        hci_usb: do not initialize static variables to 0
        tg3: 5701 DMA corruption fix
        atm nicstar: Removal of debug code containing deprecated calls to cli()/sti()
        iwlwifi: Fix unconditional access to station->tidp[].agg.
        netfilter: Fix SIP conntrack build with NAT disabled.
        netfilter: Fix SCTP nat build.
      529a41e3
    • Benoit Boissinot's avatar
      ext*: spelling fix prefered -> preferred · 1cc8dcf5
      Benoit Boissinot authored
      Spelling fix: prefered -> preferred
      Signed-off-by: default avatarBenoit Boissinot <benoit.boissinot@ens-lyon.org>
      Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
      1cc8dcf5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · c3823c47
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: (25 commits)
        avr32: Add hardware power-down function call
        avr32: add include/asm-avr32/serial.h
        avr32: don't offer PARPORT_PC
        avr32: don't offer CONFIG_GEN_RTC
        avr32: don't offer CONFIG_RTC
        add include/asm-avr32/xor.h
        avr32: Remove two unused #defines from mm/init.c
        avr32: Implement set_rate(), set_parent() and mode() for pll1
        avr32: Generic clockevents support
        avr32: Move sleep code into mach-at32ap
        avr32: Use constants from sysreg.h in asm.h
        avr32: Delete mostly unused header asm/intc.h
        avr32: start clocksource cleanup
        avr32: pass i2c board info through at32_add_device_twi
        avr32: cleanup - use _AC macro to define PAGE_SIZE
        Generate raw keyboard codes for AVR32 architecture
        atmel_usba_udc: Add support for AT91CAP9 UDPHS
        atmel_usba_udc: Add missing kfree() in usba_udc_remove()
        atmel_usba_udc: move endpoint declarations into platform data.
        atmel_usba_udc: Kill GPIO_PIN_NONE
        ...
      c3823c47