16 Sep, 2009

8 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
    Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev
    debugfs: Modify default debugfs directory for debugging pktcdvd.
    debugfs: Modified default dir of debugfs for debugging UHCI.
    debugfs: Change debugfs directory of IWMC3200
    debugfs: Change debuhgfs directory of trace-events-sample.h
    debugfs: Fix mount directory of debugfs by default in events.txt
    hpilo: add poll f_op
    hpilo: add interrupt handler
    hpilo: staging for interrupt handling
    driver core: platform_device_add_data(): use kmemdup()
    Driver core: Add support for compatibility classes
    uio: add generic driver for PCI 2.3 devices
    driver-core: move dma-coherent.c from kernel to driver/base
    mem_class: fix bug
    mem_class: use minor as index instead of searching the array
    driver model: constify attribute groups
    UIO: remove 'default n' from Kconfig
    Driver core: Add accessor for device platform data
    Driver core: move dev_get/set_drvdata to drivers/base/dd.c
    Driver core: add new device to bus's list before probing

    Linus Torvalds
     
  • * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (75 commits)
    PCI hotplug: clean up acpi_run_hpp()
    PCI hotplug: acpiphp: use generic pci_configure_slot()
    PCI hotplug: shpchp: use generic pci_configure_slot()
    PCI hotplug: pciehp: use generic pci_configure_slot()
    PCI hotplug: add pci_configure_slot()
    PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface
    PCI hotplug: acpiphp: don't cache hotplug_params in acpiphp_bridge
    PCI hotplug: acpiphp: remove superfluous _HPP/_HPX evaluation
    PCI: Clear saved_state after the state has been restored
    PCI PM: Return error codes from pci_pm_resume()
    PCI: use dev_printk in quirk messages
    PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset()
    PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle
    PCI Hotplug: acpiphp: find bridges the easy way
    PCI: pcie portdrv: remove unused variable
    PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI support
    ACPI PM: Replace wakeup.prepared with reference counter
    PCI PM: Introduce device flag wakeup_prepared
    PCI / ACPI PM: Rework some debug messages
    PCI PM: Simplify PCI wake-up code
    ...

    Fixed up conflict in arch/powerpc/kernel/pci_64.c due to OF device tree
    scanning having been moved and merged for the 32- and 64-bit cases. The
    'needs_freset' initialization added in 6e19314cc ("PCI/powerpc: support
    PCIe fundamental reset") is now in arch/powerpc/kernel/pci_of_scan.c.

    Linus Torvalds
     
  • We need common default directory of denbugfs for consistency.
    (debugfs's default directory is /sys/kernel/debug/ by debugfs.)

    Signed-off-by: GeunSik Lim
    Signed-off-by: Greg Kroah-Hartman

    GeunSik Lim
     
  • This adds a generic uio driver that can bind to any PCI device. First
    user will be virtualization where a qemu userspace process needs to give
    guest OS access to the device.

    Interrupts are handled using the Interrupt Disable bit in the PCI
    command register and Interrupt Status bit in the PCI status register.
    All devices compliant to PCI 2.3 (circa 2002) and all compliant PCI
    Express devices should support these bits. Driver detects this support,
    and won't bind to devices which do not support the Interrupt Disable Bit
    in the command register.

    It's expected that more features of interest to virtualization will be
    added to this driver in the future. Possibilities are: mmap for device
    resources, MSI/MSI-X, eventfd (to interface with kvm), iommu.

    Signed-off-by: Michael S. Tsirkin
    Acked-by: Chris Wright
    Signed-off-by: Hans J. Koch
    Acked-by: Jesse Barnes
    Signed-off-by: Greg Kroah-Hartman

    Michael S. Tsirkin
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits)
    powerpc64: convert to dynamic percpu allocator
    sparc64: use embedding percpu first chunk allocator
    percpu: kill lpage first chunk allocator
    x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA
    percpu: update embedding first chunk allocator to handle sparse units
    percpu: use group information to allocate vmap areas sparsely
    vmalloc: implement pcpu_get_vm_areas()
    vmalloc: separate out insert_vmalloc_vm()
    percpu: add chunk->base_addr
    percpu: add pcpu_unit_offsets[]
    percpu: introduce pcpu_alloc_info and pcpu_group_info
    percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward
    percpu: add @align to pcpu_fc_alloc_fn_t
    percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()
    percpu: drop @static_size from first chunk allocators
    percpu: generalize first chunk allocator selection
    percpu: build first chunk allocators selectively
    percpu: rename 4k first chunk allocator to page
    percpu: improve boot messages
    percpu: fix pcpu_reclaim() locking
    ...

    Fix trivial conflict as by Tejun Heo in kernel/sched.c

    Linus Torvalds
     
  • Due to problems at cam.org, my nico@cam.org email address is no longer
    valid. FRom now on, nico@fluxnic.net should be used instead.

    Signed-off-by: Nicolas Pitre
    Signed-off-by: Linus Torvalds

    Nicolas Pitre
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (213 commits)
    V4L/DVB (12720): em28xx-cards: Add vendor/product id for Kworld DVD Maker 2
    V4L/DVB (12713): em28xx: Cleanups at ir_i2c handler
    V4L/DVB (12712): em28xx: properly load ir-kbd-i2c when needed
    V4L/DVB (12701): saa7134: ir-kbd-i2c init data needs a persistent object
    V4L/DVB (12699): cx18: ir-kbd-i2c initialization data should point to a persistent object
    V4L/DVB (12698): em28xx: ir-kbd-i2c init data needs a persistent object
    V4L/DVB (12707): gspca - sn9c20x: Add SXGA support to MT9M111
    V4L/DVB (12706): gspca - sn9c20x: disable exposure/gain controls for MT9M111 sensors.
    V4L/DVB (12705): gspca - sn9c20x: Add SXGA support to SOI968
    V4L/DVB (12703): gspca - sn9c20x: Reduces size of object
    V4L/DVB (12704): gspca - sn9c20x: Fix exposure on SOI968 sensors
    V4L/DVB (12696): gspca - sonixj / sn9c102: Two drivers for 0c45:60fc and 0c45:613e.
    V4L/DVB (12695): gspca - vc032x: Do the LED work with the sensor hv7131r.
    V4L/DVB (12694): gspca - vc032x: Change the start exchanges of the sensor hv7131r.
    V4L/DVB (12693): gspca - sunplus: The brightness is signed.
    V4L/DVB (12692): gspca - sunplus: Optimize code.
    V4L/DVB (12691): gspca - sonixj: Don't use mdelay().
    V4L/DVB (12690): gspca - pac7311: Webcam 06f8:3009 added.
    V4L/DVB (12686): dvb-core: check supported QAM modulations
    V4L/DVB (12685): dvb-core: check fe->ops.set_frontend return value
    ...

    Linus Torvalds
     
  • * 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, intel_txt: clean up the impact on generic code, unbreak non-x86
    x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE
    x86, intel_txt: Fix typos in Kconfig help
    x86, intel_txt: Factor out the code for S3 setup
    x86, intel_txt: tboot.c needs
    intel_txt: Force IOMMU on for Intel TXT launch
    x86, intel_txt: Intel TXT Sx shutdown support
    x86, intel_txt: Intel TXT reboot/halt shutdown support
    x86, intel_txt: Intel TXT boot support

    Linus Torvalds
     

15 Sep, 2009

11 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (23 commits)
    at_hdmac: Rework suspend_late()/resume_early()
    PM: Reset transition_started at dpm_resume_noirq
    PM: Update kerneldoc comments in drivers/base/power/main.c
    PM: Add convenience macro to make switching to dev_pm_ops less error-prone
    hp-wmi: Switch driver to dev_pm_ops
    floppy: Switch driver to dev_pm_ops
    PM: Trivial fixes
    PM / Hibernate / Memory hotplug: Always use for_each_populated_zone()
    PM/Hibernate: Do not try to allocate too much memory too hard (rev. 2)
    PM/Hibernate: Do not release preallocated memory unnecessarily (rev. 2)
    PM/Hibernate: Rework shrinking of memory
    PM: Fix typo in label name s/Platofrm_finish/Platform_finish/
    PM: Run-time PM platform device bus support
    PM: Introduce core framework for run-time PM of I/O devices (rev. 17)
    Driver Core: Make PM operations a const pointer
    PM: Remove platform device suspend_late()/resume_early() V2
    USB: Rework musb suspend()/resume_early()
    I2C: Rework i2c-s3c2410 suspend_late()/resume() V2
    I2C: Rework i2c-pxa suspend_late()/resume_early()
    DMA: Rework txx9dmac suspend_late()/resume_early()
    ...

    Fix trivial conflict in drivers/base/platform.c (due to same
    constification patch being merged in both sides, along with some other
    PM work in the PM branch)

    Linus Torvalds
     
  • Added Kworld DVD Maker 2
    Thanks to C Western for reporting this board.

    Signed-off-by: Douglas Schilling Landgraf
    Signed-off-by: Mauro Carvalho Chehab

    Douglas Schilling Landgraf
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (52 commits)
    Input: bcm5974 - silence uninitialized variables warnings
    Input: wistron_btns - add keymap for AOpen 1557
    Input: psmouse - use boolean type
    Input: i8042 - use platform_driver_probe
    Input: i8042 - use boolean type where it makes sense
    Input: i8042 - try disabling and re-enabling AUX port at close
    Input: pxa27x_keypad - allow modifying keymap from userspace
    Input: sunkbd - fix formatting
    Input: i8042 - bypass AUX IRQ delivery test on laptops
    Input: wacom_w8001 - simplify querying logic
    Input: atkbd - allow setting force-release bitmap via sysfs
    Input: w90p910_keypad - move a dereference below a NULL test
    Input: add twl4030_keypad driver
    Input: matrix-keypad - add function to build device keymap
    Input: tosakbd - fix cleaning up KEY_STROBEs after error
    Input: joydev - validate axis/button maps before clobbering current ones
    Input: xpad - add USB ID for the drumkit controller from Rock Band
    Input: w90p910_keypad - rename driver name to match platform
    Input: add new driver for Sentelic Finger Sensing Pad
    Input: psmouse - allow defining read-only attributes
    ...

    Linus Torvalds
     
  • * 'docs-next' of git://git.lwn.net/linux-2.6:
    Document the flex_array library.
    Doc: seq_file.txt fix wrong dd command example.

    Linus Torvalds
     
  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (257 commits)
    [ARM] Update mach-types
    ARM: 5636/1: Move vendor enum to AMBA include
    ARM: Fix pfn_valid() for sparse memory
    [ARM] orion5x: Add LaCie NAS 2Big Network support
    [ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume
    ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek board
    ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek board
    ARM: 5689/1: Update default config of HP Jornada 700-series machines
    ARM: 5691/1: fix cache aliasing issues between kmap() and kmap_atomic() with highmem
    ARM: 5688/1: ks8695_serial: disable_irq() lockup
    ARM: 5687/1: fix an oops with highmem
    ARM: 5684/1: Add nuc960 platform to w90x900
    ARM: 5683/1: Add nuc950 platform to w90x900
    ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform
    ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driver
    ARM: 5625/1: fix hard coded 4K resource size in amba bus detection
    MMC: MMCI: convert realview MMC to use gpiolib
    ARM: 5685/1: Make MMCI driver compile without gpiolib
    ARM: implement highpte
    ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ
    ...

    Fix up trivial conflict in arch/arm/kernel/signal.c.

    It was due to the TIF_NOTIFY_RESUME addition in commit d0420c83f ("KEYS:
    Extend TIF_NOTIFY_RESUME to (almost) all architectures") and follow-ups.

    Linus Torvalds
     
  • * 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (202 commits)
    MAINTAINERS: update KVM entry
    KVM: correct error-handling code
    KVM: fix compile warnings on s390
    KVM: VMX: Check cpl before emulating debug register access
    KVM: fix misreporting of coalesced interrupts by kvm tracer
    KVM: x86: drop duplicate kvm_flush_remote_tlb calls
    KVM: VMX: call vmx_load_host_state() only if msr is cached
    KVM: VMX: Conditionally reload debug register 6
    KVM: Use thread debug register storage instead of kvm specific data
    KVM guest: do not batch pte updates from interrupt context
    KVM: Fix coalesced interrupt reporting in IOAPIC
    KVM guest: fix bogus wallclock physical address calculation
    KVM: VMX: Fix cr8 exiting control clobbering by EPT
    KVM: Optimize kvm_mmu_unprotect_page_virt() for tdp
    KVM: Document KVM_CAP_IRQCHIP
    KVM: Protect update_cr8_intercept() when running without an apic
    KVM: VMX: Fix EPT with WP bit change during paging
    KVM: Use kvm_{read,write}_guest_virt() to read and write segment descriptors
    KVM: x86 emulator: Add adc and sbb missing decoder flags
    KVM: Add missing #include
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
    slub: fix slab_pad_check()
    slub: release kobject if sysfs_create_group failed in sysfs_slab_add
    SLUB: fix ARCH_KMALLOC_MINALIGN cases 64 and 256
    SLUB: Fix some coding style issues
    SLUB: Drop write permission to /proc/slabinfo
    slab: remove duplicate kmem_cache_init_late() declarations
    slub: change kmem_cache->align to record the real alignment
    slub: use size and objsize orders to disable debug flags
    slub: add option to disable higher order debugging slabs

    Linus Torvalds
     
  • * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
    GFS2: Whitespace fixes
    GFS2: Remove unused sysfs file
    GFS2: Be extra careful about deallocating inodes
    GFS2: Remove no_formal_ino generating code
    GFS2: Rename eattr.[ch] as xattr.[ch]
    GFS2: Clean up of extended attribute support
    GFS2: Add explanation of extended attr on-disk format
    GFS2: Add "-o errors=panic|withdraw" mount options
    GFS2: jumping to wrong label?
    GFS2: free disk inode which is deleted by remote node -V2
    GFS2: Add a document explaining GFS2's uevents
    GFS2: Add sysfs link to device
    GFS2: Replace assertion with proper error handling
    GFS2: Improve error handling in inode allocation
    GFS2: Add some more info to uevents
    GFS2: Add online uevent to GFS2

    Linus Torvalds
     
  • Rafael J. Wysocki
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits)
    netxen: update copyright
    netxen: fix tx timeout recovery
    netxen: fix file firmware leak
    netxen: improve pci memory access
    netxen: change firmware write size
    tg3: Fix return ring size breakage
    netxen: build fix for INET=n
    cdc-phonet: autoconfigure Phonet address
    Phonet: back-end for autoconfigured addresses
    Phonet: fix netlink address dump error handling
    ipv6: Add IFA_F_DADFAILED flag
    net: Add DEVTYPE support for Ethernet based devices
    mv643xx_eth.c: remove unused txq_set_wrr()
    ucc_geth: Fix hangs after switching from full to half duplex
    ucc_geth: Rearrange some code to avoid forward declarations
    phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
    drivers/net/phy: introduce missing kfree
    drivers/net/wan: introduce missing kfree
    net: force bridge module(s) to be GPL
    Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
    ...

    Fixed up trivial conflicts:

    - arch/x86/include/asm/socket.h

    converted to in the x86 tree. The generic
    header has the same new #define's, so that works out fine.

    - drivers/net/tun.c

    fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that
    switched over to using 'tun->socket.sk' instead of the redundantly
    available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
    to the TUN driver") which added a new 'tun->sk' use.

    Noted in 'next' by Stephen Rothwell.

    Linus Torvalds
     
  • Pekka Enberg
     

14 Sep, 2009

1 commit

  • * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (22 commits)
    x86: Fix code patching for paravirt-alternatives on 486
    x86, msr: change msr-reg.o to obj-y, and export its symbols
    x86: Use hard_smp_processor_id() to get apic id for AMD K8 cpus
    x86, sched: Workaround broken sched domain creation for AMD Magny-Cours
    x86, mcheck: Use correct cpumask for shared bank4
    x86, cacheinfo: Fixup L3 cache information for AMD multi-node processors
    x86: Fix CPU llc_shared_map information for AMD Magny-Cours
    x86, msr: Fix msr-reg.S compilation with gas 2.16.1, on 32-bit too
    x86: Move kernel_fpu_using to irq_fpu_usable in asm/i387.h
    x86, msr: fix msr-reg.S compilation with gas 2.16.1
    x86, msr: Export the register-setting MSR functions via /dev/*/msr
    x86, msr: Create _on_cpu helpers for {rw,wr}msr_safe_regs()
    x86, msr: Have the _safe MSR functions return -EIO, not -EFAULT
    x86, msr: CFI annotations, cleanups for msr-reg.S
    x86, asm: Make _ASM_EXTABLE() usable from assembly code
    x86, asm: Add 32-bit versions of the combined CFI macros
    x86, AMD: Disable wrongly set X86_FEATURE_LAHF_LM CPUID bit
    x86, msr: Rewrite AMD rd/wrmsr variants
    x86, msr: Add rd/wrmsr interfaces with preset registers
    x86: add specific support for Intel Atom architecture
    ...

    Linus Torvalds
     

12 Sep, 2009

20 commits