08 Mar, 2013

1 commit


06 Mar, 2013

1 commit

  • Pull networking fixes from David Miller:
    "A moderately sized pile of fixes, some specifically for merge window
    introduced regressions although others are for longer standing items
    and have been queued up for -stable.

    I'm kind of tired of all the RDS protocol bugs over the years, to be
    honest, it's way out of proportion to the number of people who
    actually use it.

    1) Fix missing range initialization in netfilter IPSET, from Jozsef
    Kadlecsik.

    2) ieee80211_local->tim_lock needs to use BH disabling, from Johannes
    Berg.

    3) Fix DMA syncing in SFC driver, from Ben Hutchings.

    4) Fix regression in BOND device MAC address setting, from Jiri
    Pirko.

    5) Missing usb_free_urb in ISDN Hisax driver, from Marina Makienko.

    6) Fix UDP checksumming in bnx2x driver for 57710 and 57711 chips,
    fix from Dmitry Kravkov.

    7) Missing cfgspace_lock initialization in BCMA driver.

    8) Validate parameter size for SCTP assoc stats getsockopt(), from
    Guenter Roeck.

    9) Fix SCTP association hangs, from Lee A Roberts.

    10) Fix jumbo frame handling in r8169, from Francois Romieu.

    11) Fix phy_device memory leak, from Petr Malat.

    12) Omit trailing FCS from frames received in BGMAC driver, from Hauke
    Mehrtens.

    13) Missing socket refcount release in L2TP, from Guillaume Nault.

    14) sctp_endpoint_init should respect passed in gfp_t, rather than use
    GFP_KERNEL unconditionally. From Dan Carpenter.

    15) Add AISX AX88179 USB driver, from Freddy Xin.

    16) Remove MAINTAINERS entries for drivers deleted during the merge
    window, from Cesar Eduardo Barros.

    17) RDS protocol can try to allocate huge amounts of memory, check
    that the user's request length makes sense, from Cong Wang.

    18) SCTP should use the provided KMALLOC_MAX_SIZE instead of it's own,
    bogus, definition. From Cong Wang.

    19) Fix deadlocks in FEC driver by moving TX reclaim into NAPI poll,
    from Frank Li. Also, fix a build error introduced in the merge
    window.

    20) Fix bogus purging of default routes in ipv6, from Lorenzo Colitti.

    21) Don't double count RTT measurements when we leave the TCP receive
    fast path, from Neal Cardwell."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits)
    tcp: fix double-counted receiver RTT when leaving receiver fast path
    CAIF: fix sparse warning for caif_usb
    rds: simplify a warning message
    net: fec: fix build error in no MXC platform
    net: ipv6: Don't purge default router if accept_ra=2
    net: fec: put tx to napi poll function to fix dead lock
    sctp: use KMALLOC_MAX_SIZE instead of its own MAX_KMALLOC_SIZE
    rds: limit the size allocated by rds_message_alloc()
    MAINTAINERS: remove eexpress
    MAINTAINERS: remove drivers/net/wan/cycx*
    MAINTAINERS: remove 3c505
    caif_dev: fix sparse warnings for caif_flow_cb
    ax88179_178a: ASIX AX88179_178A USB 3.0/2.0 to gigabit ethernet adapter driver
    sctp: use the passed in gfp flags instead GFP_KERNEL
    ipv[4|6]: correct dropwatch false positive in local_deliver_finish
    l2tp: Restore socket refcount when sendmsg succeeds
    net/phy: micrel: Disable asymmetric pause for KSZ9021
    bgmac: omit the fcs
    phy: Fix phy_device_free memory leak
    bnx2x: Fix KR2 work-around condition
    ...

    Linus Torvalds
     

04 Mar, 2013

1 commit

  • Pull new ImgTec Meta architecture from James Hogan:
    "This adds core architecture support for Imagination's Meta processor
    cores, followed by some later miscellaneous arch/metag cleanups and
    fixes which I kept separate to ease review:

    - Support for basic Meta 1 (ATP) and Meta 2 (HTP) core architecture
    - A few fixes all over, particularly for symbol prefixes
    - A few privilege protection fixes
    - Several cleanups (setup.c includes, split out a lot of
    metag_ksyms.c)
    - Fix some missing exports
    - Convert hugetlb to use vm_unmapped_area()
    - Copy device tree to non-init memory
    - Provide dma_get_sgtable()"

    * tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag: (61 commits)
    metag: Provide dma_get_sgtable()
    metag: prom.h: remove declaration of metag_dt_memblock_reserve()
    metag: copy devicetree to non-init memory
    metag: cleanup metag_ksyms.c includes
    metag: move mm/init.c exports out of metag_ksyms.c
    metag: move usercopy.c exports out of metag_ksyms.c
    metag: move setup.c exports out of metag_ksyms.c
    metag: move kick.c exports out of metag_ksyms.c
    metag: move traps.c exports out of metag_ksyms.c
    metag: move irq enable out of irqflags.h on SMP
    genksyms: fix metag symbol prefix on crc symbols
    metag: hugetlb: convert to vm_unmapped_area()
    metag: export clear_page and copy_page
    metag: export metag_code_cache_flush_all
    metag: protect more non-MMU memory regions
    metag: make TXPRIVEXT bits explicit
    metag: kernel/setup.c: sort includes
    perf: Enable building perf tools for Meta
    metag: add boot time LNKGET/LNKSET check
    metag: add __init to metag_cache_probe()
    ...

    Linus Torvalds
     

03 Mar, 2013

7 commits

  • This driver was removed by commit f84932d (drivers/net: delete ISA intel
    eexpress and eepro i825xx drivers).

    Cc: Paul Gortmaker
    Cc: Philip Blundell
    Cc: netdev@vger.kernel.org
    Signed-off-by: Cesar Eduardo Barros
    Signed-off-by: David S. Miller

    Cesar Eduardo Barros
     
  • This driver was removed by commit 6fcdf4f (wanrouter: delete now
    orphaned header content, files/drivers).

    Cc: Paul Gortmaker
    Cc: Arnaldo Carvalho de Melo
    Cc: netdev@vger.kernel.org
    Signed-off-by: Cesar Eduardo Barros
    Signed-off-by: David S. Miller

    Cesar Eduardo Barros
     
  • This driver was removed by commit 0e245db (drivers/net: delete the 3Com
    3c505/3c507 intel i825xx support).

    Cc: Paul Gortmaker
    Cc: Philip Blundell
    Cc: netdev@vger.kernel.org
    Signed-off-by: Cesar Eduardo Barros
    Signed-off-by: David S. Miller

    Cesar Eduardo Barros
     
  • Add basic JTAG Debug Adapter (DA) support so that drivers which
    communicate with the DA can detect whether one is actually present
    (otherwise the target will halt indefinitely).

    This allows the metag_da TTY driver and imgdafs filesystem driver to be
    built, updates defconfigs, and sets up the metag_da console early if
    it's configured in.

    Signed-off-by: James Hogan

    James Hogan
     
  • Meta core internal interrupts (from HWSTATMETA and friends) are vectored
    onto the TR1 core trigger for the current thread. This is demultiplexed
    in irq-metag.c to individual Linux IRQs for each internal interrupt.

    External SoC interrupts (from HWSTATEXT and friends) are vectored onto
    the TR2 core trigger for the current thread. This is demultiplexed in
    irq-metag-ext.c to individual Linux IRQs for each external SoC interrupt.
    The external irqchip has devicetree bindings for configuring the number
    of irq banks and the type of masking available.

    Signed-off-by: James Hogan
    Cc: Arnd Bergmann
    Cc: Grant Likely
    Cc: Rob Herring
    Cc: Rob Landley
    Cc: Dom Cobley
    Cc: Simon Arlott
    Cc: Viresh Kumar
    Cc: Maxime Ripard
    Cc: devicetree-discuss@lists.ozlabs.org
    Cc: linux-doc@vger.kernel.org

    James Hogan
     
  • Add time keeping code for metag. Meta hardware threads have 2 timers.
    The background timer (TXTIMER) is used as a free-running time base, and
    the interrupt timer (TXTIMERI) is used for the timer interrupt. Both
    counters traditionally count at approximately 1MHz.

    Signed-off-by: James Hogan
    Cc: John Stultz
    Cc: Thomas Gleixner

    James Hogan
     
  • Add MAINTAINERS entry for the metag architecture port.

    Signed-off-by: James Hogan
    Cc: Andrew Morton
    Cc: Mauro Carvalho Chehab
    Cc: Cesar Eduardo Barros
    Cc: Joe Perches
    Cc: "David S. Miller"

    James Hogan
     

02 Mar, 2013

1 commit

  • Pull new ARC architecture from Vineet Gupta:
    "Initial ARC Linux port with some fixes on top for 3.9-rc1:

    I would like to introduce the Linux port to ARC Processors (from
    Synopsys) for 3.9-rc1. The patch-set has been discussed on the public
    lists since Nov and has received a fair bit of review, specially from
    Arnd, tglx, Al and other subsystem maintainers for DeviceTree, kgdb...

    The arch bits are in arch/arc, some asm-generic changes (acked by
    Arnd), a minor change to PARISC (acked by Helge).

    The series is a touch bigger for a new port for 2 main reasons:

    1. It enables a basic kernel in first sub-series and adds
    ptrace/kgdb/.. later

    2. Some of the fallout of review (DeviceTree support, multi-platform-
    image support) were added on top of orig series, primarily to
    record the revision history.

    This updated pull request additionally contains

    - fixes due to our GNU tools catching up with the new syscall/ptrace
    ABI

    - some (minor) cross-arch Kconfig updates."

    * tag 'arc-v3.9-rc1-late' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (82 commits)
    ARC: split elf.h into uapi and export it for userspace
    ARC: Fixup the current ABI version
    ARC: gdbserver using regset interface possibly broken
    ARC: Kconfig cleanup tracking cross-arch Kconfig pruning in merge window
    ARC: make a copy of flat DT
    ARC: [plat-arcfpga] DT arc-uart bindings change: "baud" => "current-speed"
    ARC: Ensure CONFIG_VIRT_TO_BUS is not enabled
    ARC: Fix pt_orig_r8 access
    ARC: [3.9] Fallout of hlist iterator update
    ARC: 64bit RTSC timestamp hardware issue
    ARC: Don't fiddle with non-existent caches
    ARC: Add self to MAINTAINERS
    ARC: Provide a default serial.h for uart drivers needing BASE_BAUD
    ARC: [plat-arcfpga] defconfig for fully loaded ARC Linux
    ARC: [Review] Multi-platform image #8: platform registers SMP callbacks
    ARC: [Review] Multi-platform image #7: SMP common code to use callbacks
    ARC: [Review] Multi-platform image #6: cpu-to-dma-addr optional
    ARC: [Review] Multi-platform image #5: NR_IRQS defined by ARC core
    ARC: [Review] Multi-platform image #4: Isolate platform headers
    ARC: [Review] Multi-platform image #3: switch to board callback
    ...

    Linus Torvalds
     

01 Mar, 2013

3 commits

  • Pull EDAC fixes and ghes-edac from Mauro Carvalho Chehab:
    "For:

    - Some fixes at edac drivers (i7core_edac, sb_edac, i3200_edac);
    - error injection support for i5100, when EDAC debug is enabled;
    - fix edac when it is loaded builtin (early init for the subsystem);
    - a "Firmware First" EDAC driver, allowing ghes to report errors via
    EDAC (ghes-edac).

    With regards to ghes-edac, this fixes a longstanding BZ at Red Hat
    that happens with Nehalem and Sandy Bridge CPUs: when both GHES and
    i7core_edac or sb_edac are running, the error reports are
    unpredictable, as both BIOS and OS race to access the registers. With
    ghes-edac, the EDAC core will refuse to register any other concurrent
    memory error driver.

    This patchset moves the ghes struct definitions to a separate header
    file (include/acpi/ghes.h) and adds 3 hooks at apei/ghes.c to
    register/unregister and to report errors via ghes-edac. Those changes
    were acked by ghes driver maintainer (Huang)."

    * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (30 commits)
    i5100_edac: convert to use simple_open()
    ghes_edac: fix to use list_for_each_entry_safe() when delete list items
    ghes_edac: Fix RAS tracing
    ghes_edac: Make it compliant with UEFI spec 2.3.1
    ghes_edac: Improve driver's printk messages
    ghes_edac: Don't credit the same memory dimm twice
    ghes_edac: do a better job of filling EDAC DIMM info
    ghes_edac: add support for reporting errors via EDAC
    ghes_edac: Register at EDAC core the BIOS report
    ghes: add the needed hooks for EDAC error report
    ghes: move structures/enum to a header file
    edac: add support for error type "Info"
    edac: add support for raw error reports
    edac: reduce stack pressure by using a pre-allocated buffer
    edac: lock module owner to avoid error report conflicts
    edac: remove proc_name from mci structure
    edac: add a new memory layer type
    edac: initialize the core earlier
    edac: better report error conditions in debug mode
    i5100_edac: Remove two checkpatch warnings
    ...

    Linus Torvalds
     
  • Pull block driver bits from Jens Axboe:
    "After the block IO core bits are in, please grab the driver updates
    from below as well. It contains:

    - Fix ancient regression in dac960. Nobody must be using that
    anymore...

    - Some good fixes from Guo Ghao for loop, fixing both potential
    oopses and deadlocks.

    - Improve mtip32xx for NUMA systems, by being a bit more clever in
    distributing work.

    - Add IBM RamSan 70/80 driver. A second round of fixes for that is
    pending, that will come in through for-linus during the 3.9 cycle
    as per usual.

    - A few xen-blk{back,front} fixes from Konrad and Roger.

    - Other minor fixes and improvements."

    * 'for-3.9/drivers' of git://git.kernel.dk/linux-block:
    loopdev: ignore negative offset when calculate loop device size
    loopdev: remove an user triggerable oops
    loopdev: move common code into loop_figure_size()
    loopdev: update block device size in loop_set_status()
    loopdev: fix a deadlock
    xen-blkback: use balloon pages for persistent grants
    xen-blkfront: drop the use of llist_for_each_entry_safe
    xen/blkback: Don't trust the handle from the frontend.
    xen-blkback: do not leak mode property
    block: IBM RamSan 70/80 driver fixes
    rsxx: add slab.h include to dma.c
    drivers/block/mtip32xx: add missing GENERIC_HARDIRQS dependency
    block: remove new __devinit/exit annotations on ramsam driver
    block: IBM RamSan 70/80 device driver
    drivers/block/mtip32xx/mtip32xx.c:1726:5: sparse: symbol 'mtip_send_trim' was not declared. Should it be static?
    drivers/block/mtip32xx/mtip32xx.c:4029:1: sparse: symbol 'mtip_workq_sdbf0' was not declared. Should it be static?
    dac960: return success instead of -ENOTTY
    mtip32xx: add trim support
    mtip32xx: Add workqueue and NUMA support
    block: delete super ancient PC-XT driver for 1980's hardware

    Linus Torvalds
     
  • Pull first round of SCSI updates from James Bottomley:
    "The patch set is mostly driver updates (bnx2fc, ipr, lpfc, qla4) and a
    few bug fixes"

    Pull delayed because google hates James, and sneakily considers his pull
    requests spam. Why, google, why?

    * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (60 commits)
    [SCSI] aacraid: 1024 max outstanding command support for Series 7 and above
    [SCSI] bnx2fc: adjust duplicate test
    [SCSI] qla4xxx: Update driver version to 5.03.00-k4
    [SCSI] qla4xxx: Fix return code for qla4xxx_session_get_param.
    [SCSI] qla4xxx: wait for boot target login response during probe.
    [SCSI] qla4xxx: Added support for force firmware dump
    [SCSI] qla4xxx: Re-register IRQ handler while retrying initialize of adapter
    [SCSI] qla4xxx: Throttle active IOCBs to firmware limits
    [SCSI] qla4xxx: Remove unnecessary code from qla4xxx_init_local_data
    [SCSI] qla4xxx: Quiesce driver activities while loopback
    [SCSI] qla4xxx: Rename MBOX_ASTS_IDC_NOTIFY to MBOX_ASTS_IDC_REQUEST_NOTIFICATION
    [SCSI] qla4xxx: Add spurious interrupt messages under debug level 2
    [SCSI] cxgb4i: Remove the scsi host device when removing device
    [SCSI] bfa: fix strncpy() limiter in bfad_start_ops()
    [SCSI] qla4xxx: Update driver version to 5.03.00-k3
    [SCSI] qla4xxx: Correct the validation to check in get_sys_info mailbox
    [SCSI] qla4xxx: Pass correct function param to qla4_8xxx_rd_direct
    [SCSI] lpfc 8.3.37: Update lpfc version for 8.3.37 driver release
    [SCSI] lpfc 8.3.37: Fixed infinite loop in lpfc_sli4_fcf_rr_next_index_get.
    [SCSI] lpfc 8.3.37: Fixed crash due to SLI Port invalid resource count
    ...

    Linus Torvalds
     

28 Feb, 2013

3 commits

  • Documentation/blockdev/nbd.txt contained some documentation which was
    horribly outdated and probably still dates from the original patch that
    added NBD support to the kernel.

    This patch removes the useless and outdated bits. The tools on nbd.sf.net
    are fully documented in manpages, which is where documentation for the
    non-kernel bits should live.

    Additionally, add a reference to the MAINTAINERS file for the nbd-general
    mailinglist that is used for discussion of the userland tools and the
    kernel module already.

    Signed-off-by: Wouter Verhelst
    Cc: Paul Clements
    Cc: Paolo Bonzini
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wouter Verhelst
     
  • The intent is to ensure that all Tegra-related patches are sent to the
    linux-tegra@ mailing list, so people can keep up-to-date on all misc
    driver changes.

    Doing this with a keyword is far simpler and more compact than listing
    all Tegra-related drivers, even if wildcards were used.

    Words such as integrate or integrator are common. Ensure the character
    right before "tegra" isn't a-z (case-insensitive), to make sure the
    keyword doesn't match those.

    The only files that the keyword doesn't match are the NVEC driver. Add
    the linux-tegra mailing list to the NVEC entry to solve this.

    Signed-off-by: Stephen Warren
    Cc: Joe Perches
    Cc: Julian Andres Klode
    Cc: Marc Dietrich
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Warren
     
  • Allow K: entries in MAINTAINERS to match directly against filenames;
    either those extracted from patch +++ or --- lines, or those specified
    on the command-line using the -f option.

    This potentially allows fewer lines in a MAINTAINERS entry, if all the
    relevant files are scattered throughout the whole kernel tree, yet
    contain some common keyword. An example would be using an ARM SoC name
    as the keyword to catch all related drivers.

    I don't think setting exact_pattern_match_hash would be appropriate
    here; at least for intended Tegra use case, this feature is to ensure
    that all Tegra-related driver changes get Cc'd to the Tegra mailing
    list. Setting exact_pattern_match_hash would prevent git history
    parsing for e.g. S-o-b tags, which still seems like it would be useful.
    Hence, this flag isn't set.

    Signed-off-by: Stephen Warren
    Acked-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Warren
     

27 Feb, 2013

2 commits

  • Pull i2c updates from Wolfram Sang:
    "Highlights:

    - new drivers for Intel ismt & Broadcom bcm2835
    - a number of drivers got support for more variants and mostly got
    cleaned up on the way (sis630, i801, at91, tegra, designware)
    - i2c got rid of all *_set_drvdata(..., NULL) on remove/probe failure
    - removed the i2c_smbus_process_call from the core since there are no
    users
    - mxs can now switch between PIO and DMA depending on the message
    size and the bus speed can now be arbitrary

    In addition, there is the usual bunch of fixes, cleanups, devm_*
    conversions, etc"

    Fixed conflict (and buggy devm_* conversion) in i2c-s3c2410.c

    * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (39 commits)
    i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls
    i2c: pxa: remove incorrect __exit annotations
    i2c: ocores: Fix pointer to integer cast warning
    i2c: tegra: remove warning dump if timeout happen in transfer
    i2c: fix i2c-ismt.c printk format warning
    i2c: i801: Add Device IDs for Intel Wellsburg PCH
    i2c: add bcm2835 driver
    i2c: ismt: Add Seth and Myself as maintainers
    i2c: sis630: checkpatch cleanup
    i2c: sis630: display unsigned hex
    i2c: sis630: use hex to constants for SMBus commands
    i2c: sis630: fix behavior after collision
    i2c: sis630: clear sticky bits
    i2c: sis630: Add SIS964 support
    i2c: isch: Add module parameter for backbone clock rate if divider is unset
    i2c: at91: fix unsed variable warning when building with !CONFIG_OF
    i2c: Adding support for Intel iSMT SMBus 2.0 host controller
    i2c: sh_mobile: don't send a stop condition by default inside transfers
    i2c: sh_mobile: eliminate an open-coded "goto" loop
    i2c: sh_mobile: fix timeout error handling
    ...

    Linus Torvalds
     
  • Pull MMC update from Chris Ball:
    "MMC highlights for 3.9:

    Core:
    - Support for packed commands in eMMC 4.5. (This requires a host
    capability to be turned on. It increases write throughput by 20%+,
    but may also increase average write latency; more testing needed.)
    - Add DT bindings for capability flags.
    - Add mmc_of_parse() for shared DT parsing between drivers.

    Drivers:
    - android-goldfish: New MMC driver for the Android Goldfish emulator.
    - mvsdio: Add DT bindings, pinctrl, use slot-gpio for card detection.
    - omap_hsmmc: Fix boot hangs with RPMB partitions.
    - sdhci-bcm2835: New driver for controller used by Raspberry Pi.
    - sdhci-esdhc-imx: Add 8-bit data, auto CMD23 support, use slot-gpio.
    - sh_mmcif: Add support for eMMC DDR, bundled MMCIF IRQs.
    - tmio_mmc: Add DT bindings, support for vccq regulator"

    * tag 'mmc-updates-for-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (92 commits)
    mmc: tegra: assume CONFIG_OF, remove platform data
    mmc: add DT bindings for more MMC capability flags
    mmc: tmio: add support for the VccQ regulator
    mmc: tmio: remove unused and deprecated symbols
    mmc: sh_mobile_sdhi: use managed resource allocations
    mmc: sh_mobile_sdhi: remove unused .pdata field
    mmc: tmio-mmc: parse device-tree bindings
    mmc: tmio-mmc: define device-tree bindings
    mmc: sh_mmcif: use mmc_of_parse() to parse standard MMC DT bindings
    mmc: (cosmetic) remove "extern" from function declarations
    mmc: provide a standard MMC device-tree binding parser centrally
    mmc: detailed definition of CD and WP MMC line polarities in DT
    mmc: sdhi, tmio: only check flags in tmio-mmc driver proper
    mmc: sdhci: Fix parameter of sdhci_do_start_signal_voltage_switch()
    mmc: sdhci: check voltage range only on regulators aware of voltage value
    mmc: bcm2835: set SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK
    mmc: support packed write command for eMMC4.5 devices
    mmc: add packed command feature of eMMC4.5
    mmc: rtsx: remove driving adjustment
    mmc: use regulator_can_change_voltage() instead of regulator_count_voltages
    ...

    Linus Torvalds
     

26 Feb, 2013

1 commit

  • Register GHES at EDAC MC core, in order to avoid other
    drivers to also handle errors and mangle with error data.

    The edac core will warrant that just one driver will be used,
    so the first one to register (BIOS first) will be the one that
    will be reporting the hardware errors.

    For now, the EDAC driver does nothing but to register at the
    EDAC core, preventing the hardware-driven mechanism to
    interfere with GHES.

    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     

25 Feb, 2013

3 commits

  • Pull media updates from Mauro Carvalho Chehab:

    - Some cleanups at V4L2 documentation

    - new drivers: ts2020 frontend, ov9650 sensor, s5c73m3 sensor,
    sh-mobile veu mem2mem driver, radio-ma901, davinci_vpfe staging
    driver

    - Lots of missing MAINTAINERS entries added

    - several em28xx driver improvements, including its conversion to
    videobuf2

    - several fixups on drivers to make them to better comply with the API

    - DVB core: add support for DVBv5 stats, allowing the implementation of
    statistics for new standards like ISDB

    - mb86a20s: add statistics to the driver

    - lots of new board additions, cleanups, and driver improvements.

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (596 commits)
    [media] media: Add 0x3009 USB PID to ttusb2 driver (fixed diff)
    [media] rtl28xxu: Add USB IDs for Compro VideoMate U620F
    [media] em28xx: add usb id for terratec h5 rev. 3
    [media] media: rc: gpio-ir-recv: add support for device tree parsing
    [media] mceusb: move check earlier to make smatch happy
    [media] radio-si470x doc: add info about v4l2-ctl and sox+alsa
    [media] staging: media: Remove unnecessary OOM messages
    [media] sh_vou: Use vou_dev instead of vou_file wherever possible
    [media] sh_vou: Use video_drvdata()
    [media] drivers/media/platform/soc_camera/pxa_camera.c: use devm_ functions
    [media] mt9t112: mt9t111 format set up differs from mt9t112
    [media] sh-mobile-ceu-camera: fix SHARPNESS control default
    Revert "[media] fc0011: Return early, if the frequency is already tuned"
    [media] cx18/ivtv: fix regression: remove __init from a non-init function
    [media] em28xx: fix analog streaming with USB bulk transfers
    [media] stv0900: remove unnecessary null pointer check
    [media] fc0011: Return early, if the frequency is already tuned
    [media] fc0011: Add some sanity checks and cleanups
    [media] fc0011: Fix xin value clamping
    Revert "[media] [PATH,1/2] mxl5007 move reset to attach"
    ...

    Linus Torvalds
     
  • Update Maintainer email for omap_hsmmc, as Venkatraman will no longer
    be able to maintain omap_hsmmc driver.

    Signed-off-by: Balaji T K
    Acked-by: Venkatraman S
    Signed-off-by: Chris Ball

    Balaji T K
     
  • Add maintainer entry for the Synopsys DW host driver which is used in
    various SOC including EXYNOS series. As Will Newton will no longer be
    able to take care of dw_mmc*, I and Jaehoon Chung are willing to maintain
    it.

    Signed-off-by: Seungwon Jeon
    Signed-off-by: Jaehoon Chung
    Acked-by: Will Newton
    Signed-off-by: Chris Ball

    Seungwon Jeon
     

22 Feb, 2013

11 commits

  • Pull misc ia64 bits from Tony Luck.

    * tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
    MAINTAINERS: update SGI & ia64 Altix stuff
    sysctl: Enable IA64 "ignore-unaligned-usertrap" to be used cross-arch

    Linus Torvalds
     
  • Pull s390 update from Martin Schwidefsky:
    "The most prominent change in this patch set is the software dirty bit
    patch for s390. It removes __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY and
    the page_test_and_clear_dirty primitive which makes the common memory
    management code a bit less obscure.

    Heiko fixed most of the PCI related fallout, more often than not
    missing GENERIC_HARDIRQS dependencies. Notable is one of the 3270
    patches which adds an export to tty_io to be able to resize a tty.

    The rest is the usual bunch of cleanups and bug fixes."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (42 commits)
    s390/module: Add missing R_390_NONE relocation type
    drivers/gpio: add missing GENERIC_HARDIRQ dependency
    drivers/input: add couple of missing GENERIC_HARDIRQS dependencies
    s390/cleanup: rename SPP to LPP
    s390/mm: implement software dirty bits
    s390/mm: Fix crst upgrade of mmap with MAP_FIXED
    s390/linker skript: discard exit.data at runtime
    drivers/media: add missing GENERIC_HARDIRQS dependency
    s390/bpf,jit: add vlan tag support
    drivers/net,AT91RM9200: add missing GENERIC_HARDIRQS dependency
    iucv: fix kernel panic at reboot
    s390/Kconfig: sort list of arch selected config options
    phylib: remove !S390 dependeny from Kconfig
    uio: remove !S390 dependency from Kconfig
    dasd: fix sysfs cleanup in dasd_generic_remove
    s390/pci: fix hotplug module init
    s390/pci: cleanup clp page allocation
    s390/pci: cleanup clp inline assembly
    s390/perf: cpum_cf: fallback to software sampling events
    s390/mm: provide PAGE_SHARED define
    ...

    Linus Torvalds
     
  • Pull HID subsystem updates from Jiri Kosina:
    "HID subsystem and drivers update. Highlights:

    - new support of a group of Win7/Win8 multitouch devices, from
    Benjamin Tissoires

    - fix for compat interface brokenness in uhid, from Dmitry Torokhov

    - conversion of drivers to use hid_driver helper, by H Hartley
    Sweeten

    - HID over I2C transport received ACPI enumeration support, written
    by Mika Westerberg

    - there is an ongoing effort to make HID sensor hubs independent of
    USB transport. The first self-contained part of this work is
    provided here, done by Mika Westerberg

    - a few smaller fixes here and there, support for a couple new
    devices added"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (43 commits)
    HID: Correct Logitech order in hid-ids.h
    HID: LG4FF: Remove unnecessary deadzone code
    HID: LG: Prevent the Logitech Gaming Wheels deadzone
    HID: LG: Fix detection of Logitech Speed Force Wireless (WiiWheel)
    HID: LG: Add support for Logitech Momo Force (Red) Wheel
    HID: hidraw: print message when succesfully initialized
    HID: logitech: split accel, brake for Driving Force wheel
    HID: logitech: add report descriptor for Driving Force wheel
    HID: add ThingM blink(1) USB RGB LED support
    HID: uhid: make creating devices work on 64/32 systems
    HID: wiimote: fix nunchuck button parser
    HID: blacklist Velleman data acquisition boards
    HID: sensor-hub: don't limit the driver only to USB bus
    HID: sensor-hub: get rid of unused sensor_hub_grabbed_usages[] table
    HID: extend autodetect to handle I2C sensors as well
    HID: ntrig: use input_configured() callback to set the name
    HID: multitouch: do not use pointers towards hid-core
    HID: add missing GENERIC_HARDIRQ dependency
    HID: multitouch: make MT_CLS_ALWAYS_TRUE the new default class
    HID: multitouch: fix protocol for Elo panels
    ...

    Linus Torvalds
     
  • Merge misc patches from Andrew Morton:

    - Florian has vanished so I appear to have become fbdev maintainer
    again :(

    - Joel and Mark are distracted to welcome to the new OCFS2 maintainer

    - The backlight queue

    - Small core kernel changes

    - lib/ updates

    - The rtc queue

    - Various random bits

    * akpm: (164 commits)
    rtc: rtc-davinci: use devm_*() functions
    rtc: rtc-max8997: use devm_request_threaded_irq()
    rtc: rtc-max8907: use devm_request_threaded_irq()
    rtc: rtc-da9052: use devm_request_threaded_irq()
    rtc: rtc-wm831x: use devm_request_threaded_irq()
    rtc: rtc-tps80031: use devm_request_threaded_irq()
    rtc: rtc-lp8788: use devm_request_threaded_irq()
    rtc: rtc-coh901331: use devm_clk_get()
    rtc: rtc-vt8500: use devm_*() functions
    rtc: rtc-tps6586x: use devm_request_threaded_irq()
    rtc: rtc-imxdi: use devm_clk_get()
    rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
    rtc: rtc-pcf8583: use dev_warn() instead of printk()
    rtc: rtc-sun4v: use pr_warn() instead of printk()
    rtc: rtc-vr41xx: use dev_info() instead of printk()
    rtc: rtc-rs5c313: use pr_err() instead of printk()
    rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug()
    rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug()
    rtc: rtc-ds2404: use dev_err() instead of printk()
    rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk()
    ...

    Linus Torvalds
     
  • Signed-off-by: Joe Perches
    Cc: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Add gfp.h, mmzone.h, memory_hotplug.h & vmalloc.h to the "MEMORY
    MANAGMENT" section so scripts/get_maintainer.pl can do a better job of
    making recommendations.

    Signed-off-by: Cody P Schafer
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cody P Schafer
     
  • Pull ARM SoC cleanups from Arnd Bergmann:
    "A large number of cleanups, all over the platforms. This is dominated
    largely by the Samsung platforms (s3c, s5p, exynos) and a few of the
    others moving code out of arch/arm into more appropriate subsystems.

    The clocksource and irqchip drivers are now abstracted to the point
    where platforms that are already cleaned up do not need to even
    specify the driver they use, it can all get configured from the device
    tree as we do for normal device drivers. The clocksource changes
    basically touch every single platform in the process.

    We further clean up the use of platform specific header files here,
    with the goal of turning more of the platforms over to being
    "multiplatform" enabled, which implies that they cannot expose their
    headers to architecture independent code any more.

    It is expected that no functional changes are part of the cleanup.
    The overall reduction in total code lines is mostly the result of
    removing broken and obsolete code."

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (133 commits)
    ARM: mvebu: correct gated clock documentation
    ARM: kirkwood: add missing include for nsa310
    ARM: exynos: move exynos4210-combiner to drivers/irqchip
    mfd: db8500-prcmu: update resource passing
    drivers/db8500-cpufreq: delete dangling include
    ARM: at91: remove NEOCORE 926 board
    sunxi: Cleanup the reset code and add meaningful registers defines
    ARM: S3C24XX: header mach/regs-mem.h local
    ARM: S3C24XX: header mach/regs-power.h local
    ARM: S3C24XX: header mach/regs-s3c2412-mem.h local
    ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/
    ARM: S3C24XX: transform s3c2443 subirqs into new structure
    ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs
    ARM: S3C24XX: move s3c2443 irq code to irq.c
    ARM: S3C24XX: transform s3c2416 irqs into new structure
    ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs
    ARM: S3C24XX: move s3c2416 irq init to common irq code
    ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq property
    ARM: S3C24XX: Move irq syscore-ops to irq-pm
    clocksource: always define CLOCKSOURCE_OF_DECLARE
    ...

    Linus Torvalds
     
  • Pull non-critical ARM SoC bug fixes from Arnd Bergmann:
    "Bug fixes that did not make it into v3.8, mostly because they were not
    considered important enough, and in some cases because bugs only show
    up in combination with other patches destined for 3.9. This includes
    a few larger patches for GPIO on the Marvell PXA platform and a lot of
    Samsung specific bug fixes, as well as a series from Arnd to fix older
    build warnings."

    * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
    ARM: SPEAr13xx: Enable CONFIG_ARCH_HAS_CPUFREQ
    ARM: imx: MACH_MX31ADS_WM1133_EV1 needs REGULATOR_WM8350
    scripts/sortextable: silence script output
    ARM: s3c: i2c: add platform_device forward declaration
    ARM: mvebu: allow selecting mvebu without Armada XP
    ARM: pick Versatile by default for !MMU
    ARM: integrator: fix build with INTEGRATOR_AP off
    ARM: integrator/versatile: fix NOMMU warnings
    ARM: sa1100: don't warn about mach/ide.h
    ARM: shmobile: fix defconfig warning on CONFIG_USB
    ARM: w90x900: fix legacy assembly syntax
    ARM: samsung: fix assembly syntax for new gas
    ARM: disable virt_to_bus/virt_to_bus almost everywhere
    ARM: dts: Correct pin configuration of SD 4 for exynos4x12-pinctrl
    ARM: SAMSUNG: Silence empty switch warning in fimc-core.h
    ARM: SAMSUNG: Silence empty switch warning in sdhci.h
    ARM: msm: proc_comm_boot_wait should not be __init
    arm: vt8500: Update MAINTAINERS entry for arch-vt8500
    ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU
    ARM: S5PV210: Fix early uart output in fifo mode
    ...

    Linus Torvalds
     
  • Pull char/misc driver patches from Greg Kroah-Hartman:
    "Here's the big char/misc driver patches for 3.9-rc1.

    Nothing major here, just lots of different driver updates (mei,
    hyperv, ipack, extcon, vmci, etc.).

    All of these have been in the linux-next tree for a while."

    * tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (209 commits)
    w1: w1_therm: Add force-pullup option for "broken" sensors
    w1: ds2482: Added 1-Wire pull-up support to the driver
    vme: add missing put_device() after device_register() fails
    extcon: max8997: Use workqueue to check cable state after completing boot of platform
    extcon: max8997: Set default UART/USB path on probe
    extcon: max8997: Consolidate duplicate code for checking ADC/CHG cable type
    extcon: max8997: Set default of ADC debounce time during initialization
    extcon: max8997: Remove duplicate code related to set H/W line path
    extcon: max8997: Move defined constant to header file
    extcon: max77693: Make max77693_extcon_cable static
    extcon: max8997: Remove unreachable code
    extcon: max8997: Make max8997_extcon_cable static
    extcon: max77693: Remove unnecessary goto statement to improve readability
    extcon: max77693: Convert to devm_input_allocate_device()
    extcon: gpio: Rename filename of extcon-gpio.c according to kernel naming style
    CREDITS: update email and address of Harald Hoyer
    extcon: arizona: Use MICDET for final microphone identification
    extcon: arizona: Always take the first HPDET reading as the final one
    extcon: arizona: Clear _trig_sts bits after jack detection
    extcon: arizona: Don't HPDET magic when headphones are enabled
    ...

    Linus Torvalds
     
  • Pull USB patches from Greg Kroah-Hartman:
    "Here's the big USB merge for 3.9-rc1

    Nothing major, lots of gadget fixes, and of course, xhci stuff.

    All of this has been in linux-next for a while, with the exception of
    the last 3 patches, which were reverts of patches in the tree that
    caused problems, they went in yesterday."

    * tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (190 commits)
    Revert "USB: EHCI: make ehci-vt8500 a separate driver"
    Revert "USB: EHCI: make ehci-orion a separate driver"
    Revert "USB: update host controller Kconfig entries"
    USB: update host controller Kconfig entries
    USB: EHCI: make ehci-orion a separate driver
    USB: EHCI: make ehci-vt8500 a separate driver
    USB: usb-storage: unusual_devs update for Super TOP SATA bridge
    USB: ehci-omap: Fix autoloading of module
    USB: ehci-omap: Don't free gpios that we didn't request
    USB: option: add Huawei "ACM" devices using protocol = vendor
    USB: serial: fix null-pointer dereferences on disconnect
    USB: option: add Yota / Megafon M100-1 4g modem
    drivers/usb: add missing GENERIC_HARDIRQS dependencies
    USB: storage: properly handle the endian issues of idProduct
    testusb: remove all mentions of 'usbfs'
    usb: gadget: imx_udc: make it depend on BROKEN
    usb: omap_control_usb: fix compile warning
    ARM: OMAP: USB: Add phy binding information
    ARM: OMAP2: MUSB: Specify omap4 has mailbox
    ARM: OMAP: devices: create device for usb part of control module
    ...

    Linus Torvalds
     
  • Pull staging tree update from Greg Kroah-Hartman:
    "Here's the big staging tree merge for 3.9-rc1

    Lots of cleanups and updates for drivers all through the staging tree.
    We are pretty much "code neutral" here, adding just about as many
    lines as we removed.

    All of these have been in linux-next for a while."

    * tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (804 commits)
    staging: comedi: vmk80xx: wait for URBs to complete
    staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon
    staging: et131x: Update TODO list
    staging: et131x: Remove assignment of skb->dev
    staging: wlan-ng: hfa384x.h: fix for error reported by smatch
    staging/zache checkpatch ERROR: spaces prohibited around that
    staging/ozwpan: Mark read only parameters and structs as const
    staging/ozwpan: Remove empty and unused function oz_cdev_heartbeat
    staging/ozwpan: Mark local functions as static (fix sparse warnings)
    staging/ozwpan: Add missing header includes
    staging/usbip: Mark local functions as static (fix sparse warnings)
    staging/xgifb: Remove duplicated code in loops.
    staging/xgifb: Consolidate return paths
    staging/xgifb: Remove code without effect
    staging/xgifb: Remove unnecessary casts
    staging/xgifb: Consolidate if/else if with identical code branches
    staging: vt6656: replaced custom TRUE definition with true
    staging: vt6656: replaced custom FALSE definition with false
    staging: vt6656: replace custom BOOL definition with bool
    staging/rtl8187se: Mark functions as static to silence sparse
    ...

    Linus Torvalds
     

21 Feb, 2013

6 commits

  • ….9/thingm' and 'for-3.9/upstream' into for-linus

    Jiri Kosina
     
  • Pull networking update from David Miller:

    1) Checkpoint/restarted TCP sockets now can properly propagate the TCP
    timestamp offset. From Andrey Vagin.

    2) VMWARE VM VSOCK layer, from Andy King.

    3) Much improved support for virtual functions and SR-IOV in bnx2x,
    from Ariel ELior.

    4) All protocols on ipv4 and ipv6 are now network namespace aware, and
    all the compatability checks for initial-namespace-only protocols is
    removed. Thanks to Tom Parkin for helping deal with the last major
    holdout, L2TP.

    5) IPV6 support in netpoll and network namespace support in pktgen,
    from Cong Wang.

    6) Multiple Registration Protocol (MRP) and Multiple VLAN Registration
    Protocol (MVRP) support, from David Ward.

    7) Compute packet lengths more accurately in the packet scheduler, from
    Eric Dumazet.

    8) Use per-task page fragment allocator in skb_append_datato_frags(),
    also from Eric Dumazet.

    9) Add support for connection tracking labels in netfilter, from
    Florian Westphal.

    10) Fix default multicast group joining on ipv6, and add anti-spoofing
    checks to 6to4 and 6rd. From Hannes Frederic Sowa.

    11) Make ipv4/ipv6 fragmentation memory limits more reasonable in modern
    times, rearrange inet frag datastructures for better cacheline
    locality, and move more operations outside of locking. From Jesper
    Dangaard Brouer.

    12) Instead of strict master slave relationships, allow arbitrary
    scenerios with "upper device lists". From Jiri Pirko.

    13) Improve rate limiting accuracy in TBF and act_police, also from Jiri
    Pirko.

    14) Add a BPF filter netfilter match target, from Willem de Bruijn.

    15) Orphan and delete a bunch of pre-historic networking drivers from
    Paul Gortmaker.

    16) Add TSO support for GRE tunnels, from Pravin B SHelar. Although
    this still needs some minor bug fixing before it's %100 correct in
    all cases.

    17) Handle unresolved IPSEC states like ARP, with a resolution packet
    queue. From Steffen Klassert.

    18) Remove TCP Appropriate Byte Count support (ABC), from Stephen
    Hemminger. This was long overdue.

    19) Support SO_REUSEPORT, from Tom Herbert.

    20) Allow locking a socket BPF filter, so that it cannot change after a
    process drops capabilities.

    21) Add VLAN filtering to bridge, from Vlad Yasevich.

    22) Bring ipv6 on-par with ipv4 and do not cache neighbour entries in
    the ipv6 routes, from YOSHIFUJI Hideaki.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1538 commits)
    ipv6: fix race condition regarding dst->expires and dst->from.
    net: fix a wrong assignment in skb_split()
    ip_gre: remove an extra dst_release()
    ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
    atl1c: restore buffer state
    net: fix a build failure when !CONFIG_PROC_FS
    net: ipv4: fix waring -Wunused-variable
    net: proc: fix build failed when procfs is not configured
    Revert "xen: netback: remove redundant xenvif_put"
    net: move procfs code to net/core/net-procfs.c
    qmi_wwan, cdc-ether: add ADU960S
    bonding: set sysfs device_type to 'bond'
    bonding: fix bond_release_all inconsistencies
    b44: use netdev_alloc_skb_ip_align()
    xen: netback: remove redundant xenvif_put
    net: fec: Do a sanity check on the gpio number
    ip_gre: propogate target device GSO capability to the tunnel device
    ip_gre: allow CSUM capable devices to handle packets
    bonding: Fix initialize after use for 3ad machine state spinlock
    bonding: Fix race condition between bond_enslave() and bond_3ad_update_lacp_rate()
    ...

    Linus Torvalds
     
  • Pull ARM updates (part two) from Russell King:

    - breakpoint and perf updates from Will Deacon.

    - hypervisor boot mode updates from Will.

    - support for Power State Coordination Interface via the Hypervisor

    - core ARM support for KVM

    * 'for-linus-2' of git://git.linaro.org/people/rmk/linux-arm: (32 commits)
    KVM: ARM: Add maintainer entry for KVM/ARM
    KVM: ARM: Power State Coordination Interface implementation
    KVM: ARM: Handle I/O aborts
    KVM: ARM: Handle guest faults in KVM
    KVM: ARM: VFP userspace interface
    KVM: ARM: Demux CCSIDR in the userspace API
    KVM: ARM: User space API for getting/setting co-proc registers
    KVM: ARM: Emulation framework and CP15 emulation
    KVM: ARM: World-switch implementation
    KVM: ARM: Inject IRQs and FIQs from userspace
    KVM: ARM: Memory virtualization setup
    KVM: ARM: Hypervisor initialization
    KVM: ARM: Initial skeleton to compile KVM support
    ARM: Section based HYP idmap
    ARM: Add page table and page defines needed by KVM
    ARM: perf: simplify __hw_perf_event_init err handling
    ARM: perf: remove unnecessary checks for idx < 0
    ARM: perf: handle armpmu_register failing
    ARM: perf: don't pretend to support counting of L1I writes
    ARM: perf: remove redundant NULL check on cpu_pmu
    ...

    Linus Torvalds
     
  • Pull ARM updates (part one) from Russell King:

    - MMC patches from Ulf Hansson and Pawel Moll. These add support for
    DDR mode and the latest variant found on ARM Versatile Express, as
    well as a number of cleanups.

    - A fix for to improve the behaviour of ARMs sched_clock()

    - Changes to the ARM ioremap() code. I'm not convinced with the
    primary arguments for this, but it's been around for a while, and
    people seem happy with it - and the "other" justification for this is
    at

    http://lkml.org/lkml/2012/12/6/184

    - Add SCHED_HRTICK to ARMs Kconfig

    - Making the ARM SHA/AES code Thumb-2 compatible

    - A collection of other small updates.

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (26 commits)
    ARM: add SCHED_HRTICK config option
    ARM: 7650/1: mm: replace direct access to mm->context.id with new macro
    ARM: 7649/1: mm: mm->context.id fix for big-endian
    ARM: 7648/1: pci: Allow passing per-controller private data
    ARM: 7647/1: pci: Keep pci_common_init() around after init
    ARM: fix warnings introduced by previous patch
    ARM: 7646/1: mm: use static_vm for managing static mapped areas
    ARM: 7645/1: ioremap: introduce an infrastructure for static mapped area
    ARM: 7644/1: vmregion: remove vmregion code entirely
    MAINTAINERS: Re-assert MMCI driver maintainer status
    MAINTAINERS: add additional file for MMCI driver
    MAINTAINERS: add maintainer entry for AMBA serial drivers
    ARM: 7637/1: memory: use SZ_ constants for defining the virtual memory layout
    ARM: 7643/1: sched: correct update_sched_clock()
    ARM: 7635/1: versatile: fix the PCI IRQ regression
    ARM: 7639/1: cache-l2x0: add missed dummy outer_resume entry
    ARM: 7630/1: mmc: mmci: Fixup and cleanup code for DMA handling
    ARM: 7632/1: spinlock: avoid exclusive accesses on unlock() path
    ARM: 7631/1: mmc: mmci: Add new VE MMCI variant
    ARM: 7623/1: mmc: mmci: Fixup clock gating when freq is 0 for ST-variants
    ...

    Linus Torvalds
     
  • Pull SPI changes from Grant Likely:
    "Changes to both core spi code and spi device drivers. The driver
    changes are the usual set of bug fixes and platform enablement.

    Core code changes include:

    - More intelligent assignment of SPI bus numbers when using DT

    - Common mechanism for using gpios as CS lines

    - Pull checks for bits_per_word and transfer speed out of drivers and
    into core code

    - Ensure temporary DMA buffers are DMA safe"

    * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux: (50 commits)
    spi: Document cs_gpios and cs_gpio in kernel-doc
    spi/of: Fix initialization of cs_gpios array
    spi/pxa2xx: add support for Lynxpoint SPI controllers
    spi/pxa2xx: add support for Intel Low Power Subsystem SPI
    spi/pxa2xx: add support for SPI_LOOP
    spi/pxa2xx: add support for runtime PM
    spi/pxa2xx: add support for DMA engine
    spi/pxa2xx: break out the private DMA API usage into a separate file
    spi/ath79: add shutdown handler
    spi/mips-lantiq: set SPI_MASTER_HALF_DUPLEX flag
    spi/mips-lantiq: make use of spi_finalize_current_message
    spi/bcm63xx: work around inability to keep CS up
    spi/davinci: use request_threaded_irq() to fix deadlock
    spi/orion: Use module_platform_driver()
    spi/bcm63xx: reject transfers unable to transfer
    spi: Ensure memory used for spi_write_then_read() is DMA safe
    spi/spi-mpc512x-psc: init mode bits supported by the driver
    spi/mpc512x-psc: don't use obsolet cell-index property
    spi: Remove erroneous __init, __exit and __exit_p() references in drivers
    spi/s3c64xx: fix checkpatch warnings and error
    ...

    Linus Torvalds
     
  • Pull battery updates from Anton Vorontsov:
    "Four new drivers:

    - goldfish_battery:

    This is Android Emulator battery driver. Originally from Google,
    but Intel folks reshaped it for mainline

    - pm2301_charger:

    A new driver for ST-Ericsson 2301 Power Management chip, uses
    AB8500 battery management core

    - qnap-poweroff:

    The driver adds poweroff functionality for QNAP NAS boxes

    - restart-poweroff:

    A generic driver that implements 'power off by restarting'. The
    actual poweroff functionality is implemented through a bootloader,
    so Linux' task is just to restart the box. The driver is useful on
    Buffalo Linkstation LS-XHL and LS-CHLv2 boards. Andrew Lunn worked
    on submitting the driver (as well as qnap-poweroff above).

    Additionally:

    - A lot of fixes for ab8500 drivers. This is a part of efforts of
    syncing internal ST-Ericsson development tree with the mainline.
    Lee Jones @ Linaro worked on compilation and reshaping these
    series.

    - New health properties for the power supplies: "Watchdog timer
    expire" and "Safety timer expire"

    - As usual, a bunch of fixes/cleanups here and there"

    * tag 'for-v3.9' of git://git.infradead.org/battery-2.6: (81 commits)
    bq2415x_charger: Add support for offline and 100mA mode
    generic-adc-battery: Fix forever loop in gab_remove()
    goldfish_battery: Add missing GENERIC_HARDIRQS dependency
    da9030_battery: Include notifier.h
    bq27x00_battery: Fix reporting battery temperature
    power/reset: Remove newly introduced __dev* annotations
    lp8727_charger: Small cleanup in naming
    ab8500_btemp: Demote initcall sequence
    ds2782_battery: Add power_supply_changed() calls for proper uevent support
    power: Add battery driver for goldfish emulator
    u8500-charger: Delay for USB enumeration
    ab8500-bm: Remove individual [charger|btemp|fg|chargalg] pdata structures
    ab8500-charger: Do not touch VBUSOVV bits
    ab8500-fg: Use correct battery charge full design
    pm2301: LPN mode control support
    pm2301: Enable vbat low monitoring
    ab8500-bm: Flush all work queues before suspending
    ab8500-fg: Go to INIT_RECOVERY when charger removed
    ab8500-charger: Add support for autopower on AB8505 and AB9540
    abx500-chargalg: Add new sysfs interface to get current charge status
    ...

    Fix up fairly straightforward conflicts in the ab8500 driver. But since
    it seems to be ARM-specific, I can't even compile-test the result..

    Linus Torvalds