22 Sep, 2009

1 commit


21 Sep, 2009

1 commit

  • - provide compatibility Kconfig entry for existing PERF_COUNTERS .config's

    - provide courtesy copy of old perf_counter.h, for user-space projects

    - small indentation fixups

    - fix up MAINTAINERS

    - fix small x86 printout fallout

    - fix up small PowerPC comment fallout (use 'counter' as in register)

    Reviewed-by: Arjan van de Ven
    Acked-by: Peter Zijlstra
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Benjamin Herrenschmidt
    Cc: Frederic Weisbecker
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Ingo Molnar
     

19 Sep, 2009

4 commits

  • * 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score: (22 commits)
    score: add TIF_NOTIFY_RESUME define in asm/thread_info.h
    score: make init_thread_union align to THREAD_SIZE
    score: update files according to review comments.
    score: add old syscall support
    score: add MEMORY_START and MEMORY_SIZE define, to make the code clear
    score: update inconsistent declare after .c was changed
    score: remove unused code, add include files in .c
    score: clean up mm/init.c
    score: make irq.h definitions local
    score: cleanups: dead code, 0 as pointer, shadowed variables
    score: fix function prototypes
    score: add address space annotations
    score: add missing #includes
    score: move save arg5 and arg6 instruction in front of enable_irq
    score: add prototypes for wrapped syscalls
    score: remove init_mm
    score: add generic sys_call_table
    score: remove __{put,get}_user_unknown
    score: unset __ARCH_WANT_IPC_PARSE_VERSION
    score: update files according to review comments
    ...

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (55 commits)
    regulator: Voltage count for AB3100
    mfd: Convert WM8350 to use request_threaded_irq()
    mfd: Update MAINTAINERS patterns for WM831x
    mfd: Fix twl4030-power warnings
    regulator: AB3100 support
    rtc: AB3100 RTC support
    mfd: Fix ab3100-otp build failure
    mfd: OMAP: Board-specifc twl4030 DPS scripts for RX51 board
    mfd: Print warning for twl4030 out-of-order script loading
    mfd: Add support for TWL4030/5030 dynamic power switching
    mfd: AB3100 OTP readout
    regulator: Add Freescale MC13783 driver
    mfd: Add Freescale MC13783 driver
    mfd: AB3100 disable irq nosync
    mfd: AB3100 alter default setting
    mfd: AB3100 propagate error
    mfd: AB3100 accessor function cleanups
    rtc: Add support for RTCs on Wolfson WM831x devices
    regulator: get pcap data from the parent device
    input: PCAP2 misc input driver
    ...

    Linus Torvalds
     
  • …t/khilman/linux-davinci

    * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (62 commits)
    DaVinci: DM646x - platform changes for vpif capture and display drivers
    davinci: DM355 - platform changes for vpfe capture
    davinci: DM644x platform changes for vpfe capture
    davinci: audio: move tlv320aic33 i2c setup into board files
    DaVinci: EDMA: Adding 2 new APIs for allocating/freeing PARAMs
    DaVinci: DM365: Adding entries for DM365 IRQ's
    DaVinci: DM355: Adding PINMUX entries for DM355 Display
    davinci: Handle pinmux conflict between mmc/sd and nor flash
    davinci: Add NOR flash support for da850/omap-l138
    davinci: Add NAND flash support for DA850/OMAP-L138
    davinci: Add MMC/SD support for da850/omap-l138
    davinci: Add platform support for da850/omap-l138 GLCD
    davinci: Macro to convert GPIO signal to GPIO pin number
    davinci: Audio support for DA850/OMAP-L138 EVM
    davinci: Audio support for DA830 EVM
    davinci: Correct the number of GPIO pins for da850/omap-l138
    davinci: Configure MDIO pins for EMAC
    DaVinci: DM365: Add Support for new Revision of silicon
    DaVinci: DM365: Fix Compilation issue due to PINMUX entry
    DaVinci: EDMA: Updating default queue handling
    ...

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
    ext3: Flush disk caches on fsync when needed
    ext3: Add locking to ext3_do_update_inode
    ext3: Fix possible deadlock between ext3_truncate() and ext3_get_blocks()
    jbd: Annotate transaction start also for journal_restart()
    jbd: Journal block numbers can ever be only 32-bit use unsigned int for them
    ext3: Update MAINTAINERS for ext3 and JBD
    JBD: round commit timer up to avoid uncommitted transaction

    Linus Torvalds
     

18 Sep, 2009

4 commits

  • …el/git/tip/linux-2.6-tip

    * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (44 commits)
    vsnprintf: remove duplicate comment of vsnprintf
    softirq: add BLOCK_IOPOLL to softirq_to_name
    oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP
    tracing: switch function prints from %pf to %ps
    vsprintf: add %ps that is the same as %pS but is like %pf
    tracing: Fix minor bugs for __unregister_ftrace_function_probe
    tracing: remove notrace from __kprobes annotation
    tracing: optimize global_trace_clock cachelines
    MAINTAINERS: Update tracing tree details
    ftrace: document function and function graph implementation
    tracing: make testing syscall events a separate configuration
    tracing: remove some unused macros
    ftrace: add compile-time check on F_printk()
    tracing: fix F_printk() typos
    tracing: have TRACE_EVENT macro use __flags to not shadow parameter
    tracing: add static to generated TRACE_EVENT functions
    ring-buffer: typecast cmpxchg to fix PowerPC warning
    tracing: add filter event logic to special, mmiotrace and boot tracers
    tracing: remove trace_event_types.h
    tracing: use the new trace_entries.h to create format files
    ...

    Linus Torvalds
     
  • Merge reason: Pick up kernel/softirq.c update for dependent fix.

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • * 'for-linus' of git://oss.sgi.com/xfs/xfs: (39 commits)
    xfs: includecheck fix for fs/xfs/xfs_iops.c
    xfs: switch to seq_file
    xfs: Record new maintainer information
    xfs: use correct log reservation when handling ENOSPC in xfs_create
    xfs: xfs_showargs() reports group *and* project quotas enabled
    xfs: un-static xfs_inobt_lookup
    xfs: actually enable the swapext compat handler
    xfs: simplify xfs_trans_iget
    xfs: merge fsync and O_SYNC handling
    xfs: speed up free inode search
    xfs: rationalize xfs_inobt_lookup*
    xfs: untangle xfs_dialloc
    xfs: factor out debug checks from xfs_dialloc and xfs_difree
    xfs: improve xfs_inobt_update prototype
    xfs: improve xfs_inobt_get_rec prototype
    xfs: factor out inode initialisation
    fs/xfs: Correct redundant test
    xfs: remove XFS_INO64_OFFSET
    un-static xfs_read_agf
    xfs: add more statics & drop some unused functions
    ...

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: (lm85) Don't bind to Winbond/Nuvoton WPCD377I
    hwmon: (pcf8591) Documentation clean-ups
    hwmon: Clearly mark ACPI drivers as such
    hwmon: Use resource_size
    hwmon: Include instead of
    hwmon: (tmp421) Add documentation
    hwmon: Add driver for Texas Instruments TMP421/422/423 sensor chips
    hwmon-vid: Ignore 6th VID pin of AMD family 0Fh processors
    hwmon: (asus_atk0110) Add maintainer information
    hwmon: (abituguru3) Support multiple DMI strings per chip ID

    Linus Torvalds
     

17 Sep, 2009

2 commits


16 Sep, 2009

5 commits

  • Stephen agreed that he's unlikely to find time for working on ext3/JBD in the
    near future and is not working on it for some time already. So remove him.
    Added myself to JBD since after Andrew I'm probably the second most sensible
    contact ;).

    CC: Stephen Tweedie
    Signed-off-by: Jan Kara

    Jan Kara
     
  • * 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
     
  • Conflicts:
    fs/xfs/linux-2.6/xfs_lrw.c

    Alex Elder
     
  • 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
     
  • 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
     

15 Sep, 2009

6 commits

  • Add myself as asus_atk0110 maintainer.

    Signed-off-by: Luca Tettamanti
    Signed-off-by: Jean Delvare

    Luca Tettamanti
     
  • Acked-by: Steven Rostedt
    Acked-by: Frederic Weisbecker
    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (209 commits)
    [SCSI] fix oops during scsi scanning
    [SCSI] libsrp: fix memory leak in srp_ring_free()
    [SCSI] libiscsi, bnx2i: make bound ep check common
    [SCSI] libiscsi: add completion function for drivers that do not need pdu processing
    [SCSI] scsi_dh_rdac: changes for rdac debug logging
    [SCSI] scsi_dh_rdac: changes to collect the rdac debug information during the initialization
    [SCSI] scsi_dh_rdac: move the init code from rdac_activate to rdac_bus_attach
    [SCSI] sg: fix oops in the error path in sg_build_indirect()
    [SCSI] mptsas : Bump version to 3.04.12
    [SCSI] mptsas : FW event thread and scsi mid layer deadlock in SYNCHRONIZE CACHE command
    [SCSI] mptsas : Send DID_NO_CONNECT for pending IOs of removed device
    [SCSI] mptsas : PAE Kernel more than 4 GB kernel panic
    [SCSI] mptsas : NULL pointer on big endian systems causing Expander not to tear off
    [SCSI] mptsas : Sanity check for phyinfo is added
    [SCSI] scsi_dh_rdac: Add support for Sun StorageTek ST2500, ST2510 and ST2530
    [SCSI] pmcraid: PMC-Sierra MaxRAID driver to support 6Gb/s SAS RAID controller
    [SCSI] qla2xxx: Update version number to 8.03.01-k6.
    [SCSI] qla2xxx: Properly delete rports attached to a vport.
    [SCSI] qla2xxx: Correct various NPIV issues.
    [SCSI] qla2xxx: Correct qla2x00_eh_wait_on_command() to wait correctly.
    ...

    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
     
  • * 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
     

12 Sep, 2009

5 commits


11 Sep, 2009

1 commit


09 Sep, 2009

1 commit

  • On Sun, 2009-09-06 at 12:26 -0700, Luis R. Rodriguez wrote:
    > On Sun, Sep 6, 2009 at 10:59 AM, Joe Perches wrote:
    > > On Thu, 2009-09-03 at 15:54 -0700, Luis R. Rodriguez wrote:
    > >> I'm pleased to announce the new home page to Atheros Linux wireless drivers:
    > >> http://wireless.kernel.org/en/users/Drivers/Atheros
    > > Perhaps add this to MAINTAINERS?
    > Fine by me, except ath5k and ath9k also have their own respective page
    > so those can also be added.

    (cc's trimmed and maintainers added)

    Perhaps this instead:

    Signed-off-by: Joe Perches
    Acked-by: Luis R. Rodriguez
    Signed-off-by: John W. Linville

    Joe Perches
     

08 Sep, 2009

1 commit


31 Aug, 2009

1 commit


30 Aug, 2009

1 commit

  • …eneric into for-linus

    * 'score' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
    score: clean up mm/init.c
    score: make irq.h definitions local
    score: cleanups: dead code, 0 as pointer, shadowed variables
    score: fix function prototypes
    score: add address space annotations
    score: add missing #includes
    score: move save arg5 and arg6 instruction in front of enable_irq
    score: add prototypes for wrapped syscalls
    score: remove init_mm
    score: add generic sys_call_table
    score: remove __{put,get}_user_unknown
    score: unset __ARCH_WANT_IPC_PARSE_VERSION
    score: update files according to review comments
    score: add maintainers for score architecture
    score: Add support for Sunplus S+core architecture

    Chen Liqin
     

29 Aug, 2009

2 commits


27 Aug, 2009

1 commit


26 Aug, 2009

1 commit


23 Aug, 2009

1 commit


20 Aug, 2009

1 commit


19 Aug, 2009

1 commit

  • There are a number of individual MMC drivers listed in MAINTAINERS. I
    didn't modify those records. Perhaps I should have.

    Cc:
    Cc: Manuel Lauss
    Cc: Nicolas Pitre
    Cc: Pierre Ossman
    Cc: Pavel Pisa
    Cc: Jarkko Lavinen
    Cc: Ben Dooks
    Cc: Sascha Sommer
    Cc: Ian Molton
    Cc: Joseph Chan
    Cc: Harald Welte
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton