17 Oct, 2007

7 commits

  • Current ia64 kernel flushes icache by lazy_mmu_prot_update() *after*
    set_pte(). This is too late. This patch removes lazy_mmu_prot_update and
    add modfied set_pte() for flushing if necessary.

    This patch flush icache of a page when
    new pte has exec bit.
    && new pte has present bit
    && new pte is user's page.
    && (old *ptep is not present
    || new pte's pfn is not same to old *ptep's ptn)
    && new pte's page has no Pg_arch_1 bit.
    Pg_arch_1 is set when a page is cache consistent.

    I think this condition checks are much easier to understand than considering
    "Where sync_icache_dcache() should be inserted ?".

    pte_user() for ia64 was removed by http://lkml.org/lkml/2007/6/12/67 as
    clean-up. So, I added it again.

    Signed-off-by: KAMEZAWA Hiroyuki
    Cc: "Luck, Tony"
    Cc: Christoph Lameter
    Cc: Hugh Dickins
    Cc: Nick Piggin
    Acked-by: David S. Miller
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KAMEZAWA Hiroyuki
     
  • cpusets try to ensure that any node added to a cpuset's mems_allowed is
    on-line and contains memory. The assumption was that online nodes contained
    memory. Thus, it is possible to add memoryless nodes to a cpuset and then add
    tasks to this cpuset. This results in continuous series of oom-kill and
    apparent system hang.

    Change cpusets to use node_states[N_HIGH_MEMORY] [a.k.a. node_memory_map] in
    place of node_online_map when vetting memories. Return error if admin
    attempts to write a non-empty mems_allowed node mask containing only
    memoryless-nodes.

    Signed-off-by: Lee Schermerhorn
    Signed-off-by: Bob Picco
    Signed-off-by: Nishanth Aravamudan
    Cc: KAMEZAWA Hiroyuki
    Cc: Mel Gorman
    Signed-off-by: Christoph Lameter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Lameter
     
  • prepare/commit_write no longer returns AOP_TRUNCATED_PAGE since OCFS2 and
    GFS2 were converted to the new aops, so we can make some simplifications
    for that.

    [michal.k.k.piotrowski@gmail.com: fix warning]
    Signed-off-by: Nick Piggin
    Cc: Michael Halcrow
    Cc: Mark Fasheh
    Cc: Steven Whitehouse
    Signed-off-by: Michal Piotrowski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Nick Piggin
     
  • These are intended to replace prepare_write and commit_write with more
    flexible alternatives that are also able to avoid the buffered write
    deadlock problems efficiently (which prepare_write is unable to do).

    [mark.fasheh@oracle.com: API design contributions, code review and fixes]
    [akpm@linux-foundation.org: various fixes]
    [dmonakhov@sw.ru: new aop block_write_begin fix]
    Signed-off-by: Nick Piggin
    Signed-off-by: Mark Fasheh
    Signed-off-by: Dmitriy Monakhov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Nick Piggin
     
  • Allow an application to query the memories allowed by its context.

    Updated numa_memory_policy.txt to mention that applications can use this to
    obtain allowed memories for constructing valid policies.

    TODO: update out-of-tree libnuma wrapper[s], or maybe add a new
    wrapper--e.g., numa_get_mems_allowed() ?

    Also, update numa syscall man pages.

    Tested with memtoy V>=0.13.

    Signed-off-by: Lee Schermerhorn
    Acked-by: Christoph Lameter
    Cc: Andi Kleen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Lee Schermerhorn
     
  • x86_64 uses 2M page table entries to map its 1-1 kernel space. We also
    implement the virtual memmap using 2M page table entries. So there is no
    additional runtime overhead over FLATMEM, initialisation is slightly more
    complex. As FLATMEM still references memory to obtain the mem_map pointer and
    SPARSEMEM_VMEMMAP uses a compile time constant, SPARSEMEM_VMEMMAP should be
    superior.

    With this SPARSEMEM becomes the most efficient way of handling virt_to_page,
    pfn_to_page and friends for UP, SMP and NUMA on x86_64.

    [apw@shadowen.org: code resplit, style fixups]
    [apw@shadowen.org: vmemmap x86_64: ensure end of section memmap is initialised]
    Signed-off-by: Christoph Lameter
    Signed-off-by: Andy Whitcroft
    Acked-by: Mel Gorman
    Cc: Andi Kleen
    Cc: KAMEZAWA Hiroyuki
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Lameter
     
  • Optionally add a boot delay after each kernel printk() call, crudely
    measured in milliseconds, with a maximum delay of 10 seconds per printk.

    Enable CONFIG_BOOT_PRINTK_DELAY=y and then add (e.g.):
    "lpj=loops_per_jiffy boot_delay=100"
    to the kernel command line.

    It has been useful in cases like "during boot, my machine just reboots or the
    screen goes black" by slowing down printk, (and adding initcall_debug), we can
    usually see the last thing that happened before the lights went out which is
    usually a valuable clue.

    [akpm@linux-foundation.org: not all architectures implement CONFIG_HZ]
    [akpm@linux-foundation.org: fix lots of stuff]
    [bunk@stusta.de: kernel/printk.c: make 2 variables static]
    [heiko.carstens@de.ibm.com: fix slow down printk on boot compile error]
    Signed-off-by: Randy Dunlap
    Signed-off-by: Dave Jones
    Signed-off-by: Adrian Bunk
    Signed-off-by: Heiko Carstens
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     

16 Oct, 2007

7 commits

  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
    [ARM] 4578/1: CM-x270: PCMCIA support
    [ARM] 4577/1: ITE 8152 PCI bridge support
    [ARM] 4576/1: CM-X270 machine support
    [ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
    [ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
    [ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
    [ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
    [ARM] pxa: PXA3xx base support
    [NET] smc91x: fix PXA DMA support code
    [SERIAL] Fix console initialisation ordering
    [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
    [ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
    [ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
    [ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
    [ARM] Rename consistent_sync() as dma_cache_maint()
    [ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
    [ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
    [ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
    [ARM] 4594/1: ns9xxx: use the new gpio functions
    [ARM] 4593/1: ns9xxx: implement generic clockevents
    ...

    Linus Torvalds
     
  • * 'locks' of git://linux-nfs.org/~bfields/linux:
    nfsd: remove IS_ISMNDLCK macro
    Rework /proc/locks via seq_files and seq_list helpers
    fs/locks.c: use list_for_each_entry() instead of list_for_each()
    NFS: clean up explicit check for mandatory locks
    AFS: clean up explicit check for mandatory locks
    9PFS: clean up explicit check for mandatory locks
    GFS2: clean up explicit check for mandatory locks
    Cleanup macros for distinguishing mandatory locks
    Documentation: move locks.txt in filesystems/
    locks: add warning about mandatory locking races
    Documentation: move mandatory locking documentation to filesystems/
    locks: Fix potential OOPS in generic_setlease()
    Use list_first_entry in locks_wake_up_blocks
    locks: fix flock_lock_file() comment
    Memory shortage can result in inconsistent flocks state
    locks: kill redundant local variable
    locks: reverse order of posix_locks_conflict() arguments

    Linus Torvalds
     
  • * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
    [IPV6]: Consolidate the ip6_pol_route_(input|output) pair
    [TCP]: Make snd_cwnd_cnt 32-bit
    [TCP]: Update the /proc/net/tcp documentation
    [NETNS]: Don't panic on creating the namespace's loopback
    [NEIGH]: Ensure that pneigh_lookup is protected with RTNL
    [INET]: kmalloc+memset -> kzalloc in frag_alloc_queue
    [ISDN]: Fix compile with CONFIG_ISDN_X25 disabled.
    [IPV6]: Replace sk_buff ** with sk_buff * in input handlers
    [SELINUX]: Update for netfilter ->hook() arg changes.
    [INET]: Consolidate the xxx_put
    [INET]: Small cleanup for xxx_put after evictor consolidation
    [INET]: Consolidate the xxx_evictor
    [INET]: Consolidate the xxx_frag_destroy
    [INET]: Consolidate xxx_the secret_rebuild
    [INET]: Consolidate the xxx_frag_kill
    [INET]: Collect common frag sysctl variables together
    [INET]: Collect frag queues management objects together
    [INET]: Move common fields from frag_queues in one place.
    [TG3]: Fix performance regression on 5705.
    [ISDN]: Remove local copy of device name to make sure renames work.
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
    Input: use full RCU API
    Input: remove tsdev interface
    Input: add support for Blackfin BF54x Keypad controller
    Input: appletouch - another fix for idle reset logic
    HWMON: hdaps - switch to using input-polldev
    Input: add support for SEGA Dreamcast keyboard
    Input: omap-keyboard - don't pretend we support changing keymap
    Input: lifebook - fix X and Y axis range
    Input: usbtouchscreen - add support for GeneralTouch devices
    Input: fix open count handling in input interfaces
    Input: keyboard - add CapsShift lock
    Input: adbhid - produce all CapsLock key events
    Input: ALPS - add signature for ThinkPad R61
    Input: jornada720_kbd - send MSC_SCAN events
    Input: add support for the HP Jornada 7xx (710/720/728) touchscreen
    Input: add support for HP Jornada 7xx onboard keyboard
    Input: add support for HP Jornada onboard keyboard (HP6XX)
    Input: ucb1400_ts - use schedule_timeout_uninterruptible
    Input: xpad - fix dependancy on LEDS class
    Input: auto-select INPUT for MAC_EMUMOUSEBTN option
    ...

    Resolved conflicts manually in drivers/hwmon/applesmc.c: converting from
    a class device to a device and converting to use input-polldev created a
    few apparently trivial clashes..

    Linus Torvalds
     
  • * Say that this interface is deprecated.
    * Update function name references to match the current code.

    Signed-off-by: Jean Delvare
    Signed-off-by: David S. Miller

    Jean Delvare
     
  • Update the "don't change MAC of slaves" functionality added in
    previous changes to be a generic option, rather than something tied to
    IB devices, as it's occasionally useful for regular ethernet devices as
    well.

    Adds "fail_over_mac" option (which is automatically enabled for IB
    slaves), applicable only to active-backup mode.

    Includes documentation update.

    Updates bonding driver version to 3.2.0.

    Signed-off-by: Jay Vosburgh
    Signed-off-by: Jeff Garzik

    Jay Vosburgh
     
  • * git://git.linux-nfs.org/pub/linux/nfs-2.6: (131 commits)
    NFSv4: Fix a typo in nfs_inode_reclaim_delegation
    NFS: Add a boot parameter to disable 64 bit inode numbers
    NFS: nfs_refresh_inode should clear cache_validity flags on success
    NFS: Fix a connectathon regression in NFSv3 and NFSv4
    NFS: Use nfs_refresh_inode() in ops that aren't expected to change the inode
    SUNRPC: Don't call xprt_release in call refresh
    SUNRPC: Don't call xprt_release() if call_allocate fails
    SUNRPC: Fix buggy UDP transmission
    [23/37] Clean up duplicate includes in
    [2.6 patch] net/sunrpc/rpcb_clnt.c: make struct rpcb_program static
    SUNRPC: Use correct type in buffer length calculations
    SUNRPC: Fix default hostname created in rpc_create()
    nfs: add server port to rpc_pipe info file
    NFS: Get rid of some obsolete macros
    NFS: Simplify filehandle revalidation
    NFS: Ensure that nfs_link() returns a hashed dentry
    NFS: Be strict about dentry revalidation when doing exclusive create
    NFS: Don't zap the readdir caches upon error
    NFS: Remove the redundant nfs_reval_fsid()
    NFSv3: Always use directory post-op attributes in nfs3_proc_lookup
    ...

    Fix up trivial conflict due to sock_owned_by_user() cleanup manually in
    net/sunrpc/xprtsock.c

    Linus Torvalds
     

15 Oct, 2007

4 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: (140 commits)
    sched: sync wakeups preempt too
    sched: affine sync wakeups
    sched: guest CPU accounting: maintain guest state in KVM
    sched: guest CPU accounting: maintain stats in account_system_time()
    sched: guest CPU accounting: add guest-CPU /proc//stat fields
    sched: guest CPU accounting: add guest-CPU /proc/stat field
    sched: domain sysctl fixes: add terminator comment
    sched: domain sysctl fixes: do not crash on allocation failure
    sched: domain sysctl fixes: unregister the sysctl table before domains
    sched: domain sysctl fixes: use for_each_online_cpu()
    sched: domain sysctl fixes: use kcalloc()
    Make scheduler debug file operations const
    sched: enable wake-idle on CONFIG_SCHED_MC=y
    sched: reintroduce topology.h tunings
    sched: allow the immediate migration of cache-cold tasks
    sched: debug, improve migration statistics
    sched: debug: increase width of debug line
    sched: activate task_hot() only on fair-scheduled tasks
    sched: reintroduce cache-hot affinity
    sched: speed up context-switches a bit
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (207 commits)
    [SCSI] gdth: fix CONFIG_ISA build failure
    [SCSI] esp_scsi: remove __dev{init,exit}
    [SCSI] gdth: !use_sg cleanup and use of scsi accessors
    [SCSI] gdth: Move members from SCp to gdth_cmndinfo, stage 2
    [SCSI] gdth: Setup proper per-command private data
    [SCSI] gdth: Remove gdth_ctr_tab[]
    [SCSI] gdth: switch to modern scsi host registration
    [SCSI] gdth: gdth_interrupt() gdth_get_status() & gdth_wait() fixes
    [SCSI] gdth: clean up host private data
    [SCSI] gdth: Remove virt hosts
    [SCSI] gdth: Reorder scsi_host_template intitializers
    [SCSI] gdth: kill gdth_{read,write}[bwl] wrappers
    [SCSI] gdth: Remove 2.4.x support, in-kernel changelog
    [SCSI] gdth: split out pci probing
    [SCSI] gdth: split out eisa probing
    [SCSI] gdth: split out isa probing
    gdth: Make one abuse of scsi_cmnd less obvious
    [SCSI] NCR5380: Use scsi_eh API for REQUEST_SENSE invocation
    [SCSI] usb storage: use scsi_eh API in REQUEST_SENSE execution
    [SCSI] scsi_error: Refactoring scsi_error to facilitate in synchronous REQUEST_SENSE
    ...

    Linus Torvalds
     
  • Add tunables in sysfs to modify a user's cpu share.

    A directory is created in sysfs for each new user in the system.

    /sys/kernel/uids//cpu_share

    Reading this file returns the cpu shares granted for the user.
    Writing into this file modifies the cpu share for the user. Only an
    administrator is allowed to modify a user's cpu share.

    Ex:
    # cd /sys/kernel/uids/
    # cat 512/cpu_share
    1024
    # echo 2048 > 512/cpu_share
    # cat 512/cpu_share
    2048
    #

    Signed-off-by: Srivatsa Vaddagiri
    Signed-off-by: Dhaval Giani
    Signed-off-by: Ingo Molnar

    Dhaval Giani
     
  • * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (53 commits)
    hwmon: (vt8231) fix sparse warning
    hwmon: (sis5595) fix sparse warning
    hwmon: (w83627hf) don't assume bank 0
    hwmon: (w83627hf) Fix setting fan min right after driver load
    hwmon: (w83627hf) De-macro sysfs callback functions
    hwmon: Add new combined driver for FSC chips
    hwmon: (ibmpex) Release IPMI user if hwmon registration fails
    hwmon: (dme1737) Add sch311x support
    hwmon: (dme1737) group functions logically
    hwmon: (dme1737) cleanups
    hwmon: IBM power meter driver
    hwmon: (coretemp) Add support for Celeron 4xx
    hwmon: (lm87) Disable VID when it should be
    hwmon: (w83781d) Add individual alarm and beep files
    hwmon: VRM is not read from registers
    MAINTAINERS: update hwmon subsystem git trees
    hwmon: Fix the code examples in documentation
    hwmon: update sysfs interface document - error handling
    hwmon: (thmc50) Fix a debug message
    hwmon: (thmc50) Don't create temp3 if not enabled
    ...

    Linus Torvalds
     

14 Oct, 2007

10 commits

  • The name field of of_platform_driver is just copied into the
    included device_driver. By not overriding an already initialised
    device_driver name, we can convert the drivers over time to stop using
    the of_platform_driver name.

    Also we were not copying the owner field from of_platform_driver, so do
    the same with it.

    Signed-off-by: Stephen Rothwell
    Signed-off-by: David S. Miller

    Stephen Rothwell
     
  • Rename I2C_FUNC_SMBUS_HWPEC_CALC as I2C_FUNC_SMBUS_PEC, and list that
    functionality as always available through the software implementation.
    Update documentation accordingly (and list similar requirements).

    The way it's currently packaged doesn't present the capability in a
    useful way.

    Signed-off-by: David Brownell
    Signed-off-by: Jean Delvare

    David Brownell
     
  • Add support for multiple chips to i2c-stub. I've changed the memory
    allocation scheme from static to dynamic, so that we don't waste too
    much memory.

    Signed-off-by: Jean Delvare
    Acked-by: Mark M. Hoffman

    Jean Delvare
     
  • Add the Intel Tolapai SMBus Controller DID.

    Signed-off-by: Jason Gaston
    Signed-off-by: Jean Delvare

    Jason Gaston
     
  • Do not initialize the PCF8574 with an arbitrary value. Users will have
    to write the initial value to sysfs themselves.

    Signed-off-by: Jean Delvare
    Acked-by: Aurelien Jarno

    Jean Delvare
     
  • * git://git.infradead.org/mtd-2.6: (91 commits)
    [MTD] [NAND] Blackfin on-chip NAND Flash Controller driver
    [MTD] [NOR] fix ctrl-alt-del can't reboot for intel flash bug
    [MTD] [NAND] Fix compiler warning in Alauda driver
    [JFFS2] Remove stray debugging printk
    [JFFS2] Handle dirents on the flash with embedded zero bytes in names.
    [JFFS2] Check for creation of dirents with embedded zero bytes in name.
    [JFFS2] Don't count all 'very dirty' blocks except in debug mode
    [JFFS2] Check whether garbage-collection actually obsoleted its victim.
    [JFFS2] Relax threshold for triggering GC due to dirty blocks.
    [MTD] [OneNAND] Fix typo related with recent commit
    [JFFS2] Trigger garbage collection when very_dirty_list size becomes excessive
    [MTD] [NAND] Avoid deadlock in erase callback; release chip lock first.
    [MTD] [NAND] Resume method for CAFÉ NAND controller
    [MTD] [NAND] Fix PCI ident table for CAFÉ NAND controller.
    [MTD] [NAND] s3c2410: fix arch moves
    [MTD] [OneNAND] fix numerous races
    [MTD] map driver for NOR flash on the Intel Vermilion Range chipset
    [JFFS2] Fix unpoint length
    [MTD] fix CFI point method for discontiguous maps
    [MTD] MAPS: Merge Lubbock and Mainstone drivers into common PXA2xx driver
    ...

    Linus Torvalds
     
  • Fix docbook templates for new x86 path/filenames:
    docproc: linux-2.6.23-git2/include/asm-i386/mca_dma.h: No such file or directory

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Fix docbook templates for new x86 path/filenames.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Fix docbook templates for modified x86 path/filenames.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Fix docbook templates for new x86 path/filenames:

    docproc: linux-2.6.23-git2/include/asm-i386/io.h: No such file or directory

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     

13 Oct, 2007

12 commits

  • David Woodhouse
     
  • David Woodhouse
     
  • Remove the obsolete tsdev.c driver as scheduled.

    Signed-off-by: Richard Purdie
    Signed-off-by: Dmitry Torokhov

    Richard Purdie
     
  • * 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (119 commits)
    [libata] struct pci_dev related cleanups
    libata: use ata_exec_internal() for PMP register access
    libata: implement ATA_PFLAG_RESETTING
    libata: add @timeout to ata_exec_internal[_sg]()
    ahci: fix notification handling
    ahci: clean up PORT_IRQ_BAD_PMP enabling
    ahci: kill leftover from enabling NCQ over PMP
    libata: wrap schedule_timeout_uninterruptible() in loop
    libata: skip suppress reporting if ATA_EHI_QUIET
    libata: clear ehi description after initial host report
    pata_jmicron: match vendor and class code only
    libata: add ST9160821AS / 3.ALD to NCQ blacklist
    pata_acpi: ACPI driver support
    libata-core: Expose gtm methods for driver use
    libata: add HDT722516DLA380 to NCQ blacklist
    libata: blacklist NCQ on Seagate Barracuda ST380817AS
    [libata] Turn on ACPI by default
    libata_scsi: Fix ATAPI transfer lengths
    libata: correct handling of SRST reset sequences
    libata: Integrate ACPI-based PATA/SATA hotplug - version 5
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (37 commits)
    PCI: merge almost all of pci_32.h and pci_64.h together
    PCI: X86: Introduce and enable PCI domain support
    PCI: Add 'nodomains' boot option, and pci_domains_supported global
    PCI: modify PCI bridge control ISA flag for clarity
    PCI: use _CRS for PCI resource allocation
    PCI: avoid P2P prefetch window for expansion ROMs
    PCI: skip ISA ioresource alignment on some systems
    PCI: remove transparent bridge sizing
    pci: write file size to inode on proc bus file write
    pci: use size stored in proc_dir_entry for proc bus files
    pci: implement "pci=noaer"
    PCI: fix IDE legacy mode resources
    MSI: Use correct data offset for 32-bit MSI in read_msi_msg()
    PCI: Fix incorrect argument order to list_add_tail() in PCI dynamic ID code
    PCI: i386: Compaq EVO N800c needs PCI bus renumbering
    PCI: Remove no longer correct documentation regarding MSI vector assignment
    PCI: re-enable onboard sound on "MSI K8T Neo2-FIR"
    PCI: quirk_vt82c586_acpi: Omit reading PCI revision ID
    PCI: quirk amd_8131_mmrbc: Omit reading pci revision ID
    cpqphp: Use PCI_CLASS_REVISION instead of PCI_REVISION_ID for read
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (75 commits)
    PM: merge device power-management source files
    sysfs: add copyrights
    kobject: update the copyrights
    kset: add some kerneldoc to help describe what these strange things are
    Driver core: rename ktype_edd and ktype_efivar
    Driver core: rename ktype_driver
    Driver core: rename ktype_device
    Driver core: rename ktype_class
    driver core: remove subsystem_init()
    sysfs: move sysfs file poll implementation to sysfs_open_dirent
    sysfs: implement sysfs_open_dirent
    sysfs: move sysfs_dirent->s_children into sysfs_dirent->s_dir
    sysfs: make sysfs_root a regular directory dirent
    sysfs: open code sysfs_attach_dentry()
    sysfs: make s_elem an anonymous union
    sysfs: make bin attr open get active reference of parent too
    sysfs: kill unnecessary NULL pointer check in sysfs_release()
    sysfs: kill unnecessary sysfs_get() in open paths
    sysfs: reposition sysfs_dirent->s_mode.
    sysfs: kill sysfs_update_file()
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (142 commits)
    USB: fix race in autosuspend reschedule
    atmel_usba_udc: Keep track of the device status
    USB: Nikon D40X unusual_devs entry
    USB: serial core should respect driver requirements
    USB: documentation for USB power management
    USB: skip autosuspended devices during system resume
    USB: mutual exclusion for EHCI init and port resets
    USB: allow usbstorage to have LUNS greater than 2Tb
    USB: Adding support for SHARP WS011SH to ipaq.c
    USB: add atmel_usba_udc driver
    USB: ohci SSB bus glue
    USB: ehci build fixes on au1xxx, ppc-soc
    USB: add runtime frame_no quirk for big-endian OHCI
    USB: funsoft: Fix termios
    USB: visor: termios bits
    USB: unusual_devs entry for Nikon DSC D2Xs
    USB: re-remove
    USB: move to
    USB: Export URB statistics for powertop
    USB: serial gadget: Disable endpoints on unload
    ...

    Linus Torvalds
     
  • Add several missing entries to Documentation/arm/00-INDEX

    Signed-off-by: Rob Landley
    Signed-off-by: Russell King

    Rob Landley
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (40 commits)
    x86: HPET add another ICH7 PCI id
    x86: HPET force enable ICH5 suspend/resume fix
    x86: HPET force enable for ICH5
    x86: HPET try to activate force detected hpet
    x86: HPET force enable o ICH7 and later
    x86: HPET restructure hpet code for hpet force enable
    clock events: allow replacement of broadcast timer
    i386/x8664: cleanup the shared hpet code
    i386: Remove the useless #ifdef in i8253.h
    ACPI: remove the now unused ifdef code
    jiffies: remove unused macros
    x86_64: cleanup apic.c after clock events switch
    x86_64: remove now unused code
    x86: unify timex.h variants
    x86: kill 8253pit.h
    x86: disable apic timer for AMD C1E enabled CPUs
    x86: Fix irq0 / local apic timer accounting
    x86_64: convert to clock events
    x86_64: Add (not yet used) clock event functions
    x86_64: prepare idle loop for dynamic ticks
    ...

    Linus Torvalds
     
  • * Introduce pci_domains_supported global, hardcoded to zero if
    !CONFIG_PCI_DOMAINS.

    * Introduce 'nodomains' boot option, which clears pci_domains_supported
    on platforms that enable it by default (x86, x86-64, and others when
    they are converted to use this).

    Signed-off-by: Jeff Garzik
    Cc: Andi Kleen
    Signed-off-by: Greg Kroah-Hartman

    Jeff Garzik
     
  • Use _CRS for PCI resource allocation

    This patch resolves an issue where incorrect PCI memory and i/o ranges
    are being assigned to hotplugged PCI devices on some IBM systems. The
    resource mis-allocation not only makes the PCI device unuseable but
    often makes the entire system unuseable due to resulting machine checks.

    The hotplug capable PCI slots on the affected systems are not located
    under a standard P2P bridge but are instead located under PCI root
    bridges or subtractive decode P2P bridges. For example, the IBM x3850
    contains 2 hotplug capable PCI-X slots and 4 hotplug capable PCIe slots
    with the PCI-X slots each located under a PCI root bridge and the PCIe
    slots each located under a subtractive decode P2P bridge.

    The current i386/x86_64 PCI resource allocation code does not use _CRS
    returned resource information. No other resource information source is
    available for slots that are not below a standard P2P bridge so
    incorrect ranges are being allocated from e820 hole causing the bad
    result.

    This patch causes the kernel to use _CRS returned resource info. It is
    roughly based on a change provided by Matthew Wilcox for the ia64 kernel
    in 2005. Due to possible buggy BIOS factor and possible yet to be
    discovered kernel issues the function is disabled by default and can be
    enabled with pci=use_crs.

    Signed-off-by: Gary Hade
    Signed-off-by: Greg Kroah-Hartman

    Gary Hade
     
  • For cases in which CONFIG_PCIEAER=y (such as distro kernels), allow users
    to disable PCIE Advanced Error Reporting by using "pci=noaer" on the
    kernel command line.

    This can be used to work around hardware or (kernel) software problems.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Greg Kroah-Hartman

    Randy Dunlap