22 Apr, 2008

40 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    [SPARC]: Remove SunOS and Solaris binary support.

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • This patch removes the no longer used export of kmap_atomic_to_page.

    Signed-off-by: Adrian Bunk
    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    Adrian Bunk
     
  • HARD_RESET_NOW() was unused.

    And one of the few remaining cli() users.

    Signed-off-by: Adrian Bunk
    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    Adrian Bunk
     
  • * '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

    Linus Torvalds
     
  • * 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()
    ...

    Linus Torvalds
     
  • A couple of corrections and clarifications in USB
    documentation.

    Signed-off-by: Robert P. J. Day
    Signed-off-by: Jesper Juhl

    Robert P. J. Day
     
  • * 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()

    Linus Torvalds
     
  • …l/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

    Linus Torvalds
     
  • Generate a slightly more informative error msg for bad HZ
    in include/linux/jiffies.h

    Signed-off-by: Robert P. J. Day
    Signed-off-by: Jesper Juhl

    Robert P. J. Day
     
  • * '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

    Linus Torvalds
     
  • It should be "if" but is written as "is"..

    Signed-off-by: Uwe Kleine-Koenig
    Signed-off-by: Jesper Juhl

    Uwe Kleine-König
     
  • 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: Roland McGrath
    Signed-off-by: Linus Torvalds

    Roland McGrath
     
  • 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: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • * '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
    ...

    Linus Torvalds
     
  • * 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).

    Linus Torvalds
     
  • * '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.

    Linus Torvalds
     
  • Spelling fix: prefered -> preferred

    Signed-off-by: Benoit Boissinot
    Signed-off-by: Jesper Juhl

    Benoit Boissinot
     
  • * '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
    ...

    Linus Torvalds
     
  • Signed-off-by: Robert P. J. Day
    Signed-off-by: Jesper Juhl

    Robert P. J. Day
     
  • Signed-off-by: Robert P. J. Day
    Acked-by: David Howells
    Signed-off-by: Jesper Juhl

    Robert P. J. Day
     
  • * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
    hrtimer: optimize the softirq time optimization
    hrtimer: reduce calls to hrtimer_get_softirq_time()
    clockevents: fix typo in tick-broadcast.c
    jiffies: add time_is_after_jiffies and others which compare with jiffies

    Linus Torvalds
     
  • drivers/md/*.[ch] contains only one more printk line with a trailing space.
    Remove it.

    Signed-off-by: Nick Andrew
    Signed-off-by: Jesper Juhl

    Nick Andrew
     
  • * 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
    Deprecate the asm/semaphore.h files in feature-removal-schedule.
    Convert asm/semaphore.h users to linux/semaphore.h
    security: Remove unnecessary inclusions of asm/semaphore.h
    lib: Remove unnecessary inclusions of asm/semaphore.h
    kernel: Remove unnecessary inclusions of asm/semaphore.h
    include: Remove unnecessary inclusions of asm/semaphore.h
    fs: Remove unnecessary inclusions of asm/semaphore.h
    drivers: Remove unnecessary inclusions of asm/semaphore.h
    net: Remove unnecessary inclusions of asm/semaphore.h
    arch: Remove unnecessary inclusions of asm/semaphore.h

    Linus Torvalds
     
  • * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (212 commits)
    [ARM] pxa: Phycore pcm-990-specific code for the PXA270 Quick Capture driver
    [ARM] pxa: V4L2 soc_camera driver for PXA270
    [ARM] pxa: restrict availability of pxa2xx PCMCIA drivers
    [ARM] 5005/1: BAST: Fix kset_name initialiser
    [ARM] 4967/1: Adds functions to set clkout rate for Samsung S3C2410
    [ARM] 4988/1: Add GPIO lib support to the EP93xx
    [ARM] Add initial sparsemem support
    [ARM] pxa: initialise PXA devices before platform init code
    [ARM] 5002/1: tosa: add two more leds
    [ARM] 5004/1: Tosa: make several unreferenced structures static.
    [ARM] 5003/1: Shut up sparse warnings
    [ARM] 4977/2: soc - pxa2xx-ac97 - Add missing clk_enable()
    [ARM] 4976/1: zylonite: Configure GPIO for WM9713 IRQ line
    [ARM] 4974/1: Drop unused leds-tosa.
    [ARM] 4973/1: Tosa: use leds-gpio driver.
    [ARM] 4972/1: Tosa: convert scoop GPIOs usage to generic gpio code
    [ARM] 4971/1: pxaficp_ir: provide startup and shutdown hooks
    [ARM] pxa: lubbock: move mis-placed SPI info
    [ARM] 4970/1: tosa: correct gpio used for wake up.
    [ARM] 4966/1: magician: add MFP pin configuration
    ...

    Linus Torvalds
     
  • …linux-2.6-sched-devel

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel: (62 commits)
    sched: build fix
    sched: better rt-group documentation
    sched: features fix
    sched: /debug/sched_features
    sched: add SCHED_FEAT_DEADLINE
    sched: debug: show a weight tree
    sched: fair: weight calculations
    sched: fair-group: de-couple load-balancing from the rb-trees
    sched: fair-group scheduling vs latency
    sched: rt-group: optimize dequeue_rt_stack
    sched: debug: add some debug code to handle the full hierarchy
    sched: fair-group: SMP-nice for group scheduling
    sched, cpuset: customize sched domains, core
    sched, cpuset: customize sched domains, docs
    sched: prepatory code movement
    sched: rt: multi level group constraints
    sched: task_group hierarchy
    sched: fix the task_group hierarchy for UID grouping
    sched: allow the group scheduler to have multiple levels
    sched: mix tasks and groups
    ...

    Linus Torvalds
     
  • Spelling fixes for dmaengine.[ch]

    Signed-off-by: Sebastian Siewior
    Acked-by: Maciej Sosnowski
    Signed-off-by: Jesper Juhl

    Sebastian Siewior
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (77 commits)
    x86: UV startup of slave cpus
    x86: integrate pci-dma.c
    x86: don't do dma if mask is NULL.
    x86: return conditional to mmu
    x86: remove kludge from x86_64
    x86: unify gfp masks
    x86: retry allocation if failed
    x86: don't try to allocate from DMA zone at first
    x86: use a fallback dev for i386
    x86: use numa allocation function in i386
    x86: remove virt_to_bus in pci-dma_64.c
    x86: adjust dma_free_coherent for i386
    x86: move bad_dma_address
    x86: isolate coherent mapping functions
    x86: move dma_coherent functions to pci-dma.c
    x86: merge iommu initialization parameters
    x86: merge dma_supported
    x86: move pci fixup to pci-dma.c
    x86: move x86_64-specific to common code.
    x86: move initialization functions to pci-dma.c
    ...

    Linus Torvalds
     
  • * 'ro-bind.b6' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (24 commits)
    [PATCH] r/o bind mounts: debugging for missed calls
    [PATCH] r/o bind mounts: honor mount writer counts at remount
    [PATCH] r/o bind mounts: track numbers of writers to mounts
    [PATCH] r/o bind mounts: check mnt instead of superblock directly
    [PATCH] r/o bind mounts: elevate count for xfs timestamp updates
    [PATCH] r/o bind mounts: make access() use new r/o helper
    [PATCH] r/o bind mounts: write counts for truncate()
    [PATCH] r/o bind mounts: elevate write count for chmod/chown callers
    [PATCH] r/o bind mounts: elevate write count for open()s
    [PATCH] r/o bind mounts: elevate write count for ioctls()
    [PATCH] r/o bind mounts: write count for file_update_time()
    [PATCH] r/o bind mounts: elevate write count for do_utimes()
    [PATCH] r/o bind mounts: write counts for touch_atime()
    [PATCH] r/o bind mounts: elevate write count for ncp_ioctl()
    [PATCH] r/o bind mounts: elevate write count for xattr_permission() callers
    [PATCH] r/o bind mounts: get write access for vfs_rename() callers
    [PATCH] r/o bind mounts: write counts for link/symlink
    [PATCH] r/o bind mounts: get callers of vfs_mknod/create/mkdir()
    [PATCH] r/o bind mounts: elevate write count for rmdir and unlink.
    [PATCH] r/o bind mounts: drop write during emergency remount
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (27 commits)
    sh: Fix up L2 cache probe.
    sh: Fix up SH-4A part probe.
    sh: Add support for SH7723 CPU subtype.
    sh: Fix up SH7763 build.
    sh: Add migor_ts support to MigoR
    sh: Add rs5c732b RTC support to MigoR
    sh: Add I2C support to MigoR
    sh: Add I2C platform data to sh7722
    sh: MigoR NAND flash support using gen_flash
    sh: MigoR NOR flash support using physmap-flash
    sh: Fix up mach-types formatting from merge damage.
    sh: r7780rp: Hook up the I2C and SMBus platform devices.
    sh: Use phyical addresses for MigoR smc91x resources
    sh: Use physical addresses for sh7722 USBF resources
    sh: Add MigoR header file
    Fix sh_keysc double free
    sh: Fix up __access_ok() check for nommu.
    sh: Allow optimized clear/copy page routines to be used on SH-2.
    sh: Hook up the rest of the SH7770 serial ports.
    sh: Add support for Solution Engine SH7721 board
    ...

    Linus Torvalds
     
  • MAX_NODES_SHIFT is not referenced anywhere in the tree, so dump it.

    Signed-off-by: Johannes Weiner
    Signed-off-by: Jesper Juhl

    Johannes Weiner
     
  • The list is moderated for non-subscribers

    Signed-off-by: Robert P. J. Day
    Signed-off-by: Jesper Juhl

    Robert P. J. Day
     
  • The C99 specification states in section 6.11.5:

    The placement of a storage-class specifier other than at the
    beginning of the declaration specifiers in a declaration is an
    obsolescent feature.

    Signed-off-by: Tobias Klauser
    Signed-off-by: Jesper Juhl

    Tobias Klauser
     
  • The C99 specification states in section 6.11.5:

    The placement of a storage-class specifier other than at the
    beginning of the declaration specifiers in a declaration is an
    obsolescent feature.

    Signed-off-by: Tobias Klauser
    Signed-off-by: Jesper Juhl

    Tobias Klauser
     
  • The C99 specification states in section 6.11.5:

    The placement of a storage-class specifier other than at the
    beginning of the declaration specifiers in a declaration is an
    obsolescent feature.

    Signed-off-by: Tobias Klauser
    Signed-off-by: Jesper Juhl

    Tobias Klauser
     
  • The C99 specification states in section 6.11.5:

    The placement of a storage-class specifier other than at the
    beginning of the declaration specifiers in a declaration is an
    obsolescent feature.

    Signed-off-by: Tobias Klauser
    Signed-off-by: Jesper Juhl

    Tobias Klauser
     
  • The C99 specification states in section 6.11.5:

    The placement of a storage-class specifier other than at the
    beginning of the declaration specifiers in a declaration is an
    obsolescent feature.

    Signed-off-by: Tobias Klauser
    Signed-off-by: Jesper Juhl

    Tobias Klauser
     
  • The C99 specification states in section 6.11.5:

    The placement of a storage-class specifier other than at the
    beginning of the declaration specifiers in a declaration is an
    obsolescent feature.

    Signed-off-by: Tobias Klauser
    Signed-off-by: Jesper Juhl

    Tobias Klauser
     
  • The C99 specification states in section 6.11.5:

    The placement of a storage-class specifier other than at the
    beginning of the declaration specifiers in a declaration is an
    obsolescent feature.

    Signed-off-by: Tobias Klauser
    Signed-off-by: Jesper Juhl

    Tobias Klauser