05 Jan, 2013

1 commit

  • This adds support for the 60 GHz 802.11ad Wilocity card
    through a new driver, wil6210. Wilocity implemented the
    firmware, QCA maintains the device driver.

    Currently supported:

    - STA: with security
    - AP: limited to 1 connected STA, security disabled
    - Monitor: due to a hardware/firmware limitation
    either control or non-control frames are monitored

    Using a STA and AP with this drive, one can assemble
    a fully functional BSS. Throughput of 1.2Gbps is achieved
    with iperf.

    The wil6210 cards have on-board flash memory for the
    firmware, the cards comes pre-flashed and no firmware
    download is required.

    For more details see:

    http://wireless.kernel.org/en/users/Drivers/wil6210

    Signed-off-by: Vladimir Kondratiev
    Signed-off-by: Luis R. Rodriguez
    Signed-off-by: John W. Linville

    Vladimir Kondratiev
     

18 Dec, 2012

6 commits

  • Signed-off-by: Milo(Woogyom) Kim
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • Signed-off-by: Stefan Richter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stefan Richter
     
  • Signed-off-by: Corentin Chary
    Cc: Matthew Garrett
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Corentin Chary
     
  • Moved to fs/ext3/ext3.h by commit 4613ad180d19 ("ext3: move headers to
    fs/ext3/").

    Signed-off-by: Cesar Eduardo Barros
    Cc: Jan Kara
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cesar Eduardo Barros
     
  • Mark it so.

    Signed-off-by: Joe Perches
    Cc: Harry Wei
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Pull DRM updates from Dave Airlie:
    "This is the one and only next pull for 3.8, we had a regression we
    found last week, so I was waiting for that to resolve itself, and I
    ended up with some Intel fixes on top as well.

    Highlights:
    - new driver: nvidia tegra 20/30/hdmi support
    - radeon: add support for previously unused DMA engines, more HDMI
    regs, eviction speeds ups and fixes
    - i915: HSW support enable, agp removal on GEN6, seqno wrapping
    - exynos: IPP subsystem support (image post proc), HDMI
    - nouveau: display class reworking, nv20->40 z compression
    - ttm: start of locking fixes, rcu usage for lookups,
    - core: documentation updates, docbook integration, monotonic clock
    usage, move from connector to object properties"

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (590 commits)
    drm/exynos: add gsc ipp driver
    drm/exynos: add rotator ipp driver
    drm/exynos: add fimc ipp driver
    drm/exynos: add iommu support for ipp
    drm/exynos: add ipp subsystem
    drm/exynos: support device tree for fimd
    radeon: fix regression with eviction since evict caching changes
    drm/radeon: add more pedantic checks in the CP DMA checker
    drm/radeon: bump version for CS ioctl support for async DMA
    drm/radeon: enable the async DMA rings in the CS ioctl
    drm/radeon: add VM CS parser support for async DMA on cayman/TN/SI
    drm/radeon/kms: add evergreen/cayman CS parser for async DMA (v2)
    drm/radeon/kms: add 6xx/7xx CS parser for async DMA (v2)
    drm/radeon: fix htile buffer size computation for command stream checker
    drm/radeon: fix fence locking in the pageflip callback
    drm/radeon: make indirect register access concurrency-safe
    drm/radeon: add W|RREG32_IDX for MM_INDEX|DATA based mmio accesss
    drm/exynos: support extended screen coordinate of fimd
    drm/exynos: fix x, y coordinates for right bottom pixel
    drm/exynos: fix fb offset calculation for plane
    ...

    Linus Torvalds
     

17 Dec, 2012

1 commit


16 Dec, 2012

1 commit

  • Pull fbdev changes from Tomi Valkeinen:
    "OMAPDSS changes, including:
    - use dynanic debug prints
    - OMAP platform dependency removals
    - Creation of compat-layer, helping us to improve omapdrm
    - Misc cleanups, aiming to make omadss more in line with the upcoming
    common display framework

    Exynos DP changes for the 3.8 merge window:
    - Device Tree support for Samsung Exynos DP
    - SW Link training is cleaned up.
    - HPD interrupt is supported.

    Samsung Framebuffer changes for the 3.8 merge window:
    - The bit definitions of header file are updated.
    - Some minor typos are fixed.
    - Some minor bugs of s3c_fb_check_var() are fixed.

    FB related changes for SH Mobile, Freescale DIU

    Add support for the Solomon SSD1307 OLED Controller"

    * tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
    OMAPDSS: fix TV-out issue with DSI PLL
    Revert "OMAPFB: simplify locking"
    OMAPFB: remove silly loop in fb2display()
    OMAPFB: fix error handling in omapfb_find_best_mode()
    OMAPFB: use devm_kzalloc to allocate omapfb2_device
    OMAPDSS: DISPC: remove dispc fck uses
    OMAPDSS: DISPC: get dss clock rate from dss driver
    drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
    drivers/video: add support for the Solomon SSD1307 OLED Controller
    OMAPDSS: use omapdss_compat_init() in other drivers
    OMAPDSS: export dispc functions
    OMAPDSS: export dss_feat functions
    OMAPDSS: export dss_mgr_ops functions
    OMAPDSS: separate compat files in the Makefile
    OMAPDSS: move display sysfs init to compat layer
    OMAPDSS: DPI: use dispc's check_timings
    OMAPDSS: DISPC: add dispc_ovl_check()
    OMAPDSS: move irq handling to dispc-compat
    OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
    OMAPDSS: move blocking mgr enable/disable to compat layer
    ...

    Conflicts:
    arch/arm/mach-davinci/devices-da8xx.c
    arch/arm/plat-omap/common.c
    drivers/media/platform/omap/omap_vout.c

    Linus Torvalds
     

15 Dec, 2012

2 commits

  • Pull ARM SoC updates for Marvell mvebu/kirkwood from Olof Johansson:
    "This is a branch with updates for Marvell's mvebu/kirkwood platforms.
    They came in late-ish, and were heavily interdependent such that it
    didn't make sense to split them up across the cross-platform topic
    branches. So here they are (for the second release in a row) in a
    branch on their own."

    * tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (88 commits)
    arm: l2x0: add aurora related properties to OF binding
    arm: mvebu: add Aurora L2 Cache Controller to the DT
    arm: mvebu: add L2 cache support
    dma: mv_xor: fix error handling path
    dma: mv_xor: fix error checking of irq_of_parse_and_map()
    dma: mv_xor: use request_irq() instead of devm_request_irq()
    dma: mv_xor: clear the window override control registers
    arm: mvebu: fix address decoding armada_cfg_base() function
    ARM: mvebu: update defconfig with I2C and RTC support
    ARM: mvebu: Add SATA support for OpenBlocks AX3-4
    ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4
    ARM: mvebu: Add support for I2C on OpenBlocks AX3-4
    ARM: mvebu: Add support for I2C controllers in Armada 370/XP
    arm: mvebu: Add hardware I/O Coherency support
    arm: plat-orion: Add coherency attribute when setup mbus target
    arm: dma mapping: Export a dma ops function arm_dma_set_mask
    arm: mvebu: Add SMP support for Armada XP
    arm: mm: Add support for PJ4B cpu and init routines
    arm: mvebu: Add IPI support via doorbells
    arm: mvebu: Add initial support for power managmement service unit
    ...

    Linus Torvalds
     
  • Pull MIPS updates from Ralf Baechle:
    "The MIPS bits for 3.8. This also includes a bunch fixes that were
    sitting in the linux-mips.org git tree for a long time. This pull
    request contains updates to several OCTEON drivers and the board
    support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
    updates to the SSB bus support, MIPS kexec code and adds support for
    kdump.

    When pulling this, there are two expected merge conflicts in
    include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
    resolve, just remove the conflict markers and keep both alternatives."

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
    MIPS: PMC-Sierra Yosemite: Remove support.
    VIDEO: Newport Fix console crashes
    MIPS: wrppmc: Fix build of PCI code.
    MIPS: IP22/IP28: Fix build of EISA code.
    MIPS: RB532: Fix build of prom code.
    MIPS: PowerTV: Fix build.
    MIPS: IP27: Correct fucked grammar in ops-bridge.c
    MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
    MIPS: Fix potencial corruption
    MIPS: Fix for warning from FPU emulation code
    MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
    MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
    MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
    MIPS: Remove unused smvp.h
    MIPS/EDAC: Improve OCTEON EDAC support.
    MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
    MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
    ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
    MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
    MIPS: Remove usage of CEVT_R4K_LIB config option.
    ...

    Linus Torvalds
     

14 Dec, 2012

4 commits

  • Pull media updates from Mauro Carvalho Chehab:

    - Missing MAINTAINERS entries were added for several drivers

    - Adds V4L2 support for DMABUF handling, allowing zero-copy buffer
    sharing between V4L2 devices and GPU

    - Got rid of all warnings when compiling with W=1 on x86

    - Add a new driver for Exynos hardware (s3c-camif)

    - Several bug fixes, cleanups and driver improvements

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (243 commits)
    [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
    [media] omap3isp: Prepare/unprepare clocks before/after enable/disable
    [media] omap3isp: preview: Add support for 8-bit formats at the sink pad
    [media] omap3isp: Replace printk with dev_*
    [media] omap3isp: Find source pad from external entity
    [media] omap3isp: Configure CSI-2 phy based on platform data
    [media] omap3isp: Add PHY routing configuration
    [media] omap3isp: Add CSI configuration registers from control block to ISP resources
    [media] omap3isp: Remove unneeded module memory address definitions
    [media] omap3isp: Use monotonic timestamps for statistics buffers
    [media] uvcvideo: Fix control value clamping for unsigned integer controls
    [media] uvcvideo: Mark first output terminal as default video node
    [media] uvcvideo: Add VIDIOC_[GS]_PRIORITY support
    [media] uvcvideo: Return -ENOTTY for unsupported ioctls
    [media] uvcvideo: Set device_caps in VIDIOC_QUERYCAP
    [media] uvcvideo: Don't fail when an unsupported format is requested
    [media] uvcvideo: Return -EACCES when trying to access a read/write-only control
    [media] uvcvideo: Set error_idx properly for extended controls API failures
    [media] rtl28xxu: add NOXON DAB/DAB+ USB dongle rev 2
    [media] fc2580: write some registers conditionally
    ...

    Linus Torvalds
     
  • Pull first round of SCSI updates from James Bottomley:
    "This patch set includes two large new drivers: mpt3sas (for the next
    gen fusion SAS hardware) and csiostor a FCoE offload driver for the
    Chelsio converged network cards (this includes some net changes which
    I've OK'd with DaveM).

    The rest of the patch is driver updates (qla2xxx, lpfc, hptiop,
    be2iscsi) plus a few assorted updates and bug fixes.

    We also have a Power Management rework in the Upper Layer Drivers
    preparatory to doing ACPI zero power optical devices, but the actual
    enabler is still being worked on.

    Signed-off-by: James Bottomley "

    * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (72 commits)
    [SCSI] mpt3sas: add new driver supporting 12GB SAS
    [SCSI] scsi_transport_sas: add 12GB definitions for mpt3sas
    [SCSI] miscdevice: Adding support for MPT3SAS_MINOR(222)
    [SCSI] csiostor: remove unneeded memset()
    [SCSI] csiostor: Fix sparse warnings.
    [SCSI] qla2xxx: Display that driver is operating in legacy interrupt mode.
    [SCSI] qla2xxx: Dont clear drv active on iospace config failure.
    [SCSI] qla2xxx: Fix typo in qla2xxx driver.
    [SCSI] qla2xxx: Update ql2xextended_error_logging parameter description with new option.
    [SCSI] qla2xxx: Parameterize the link speed of hba rather than fcport.
    [SCSI] qla2xxx: Add 16Gb/s case to get port speed capability.
    [SCSI] qla2xxx: Move marking fcport online ahead of setting iiDMA speed.
    [SCSI] qla2xxx: Add acquiring of risc semaphore before doing ISP reset.
    [SCSI] qla2xxx: Ignore driver ack bit if corresponding presence bit is not set.
    [SCSI] qla2xxx: Fix typo in qla83xx_fw_dump function.
    [SCSI] qla2xxx: Add Gen3 PCIe speed 8GT/s to the log message.
    [SCSI] qla2xxx: Use correct Request-Q-Out register during bidirectional request processing
    [SCSI] qla2xxx: Move noisy Start scsi failed messages to verbose logging level.
    [SCSI] qla2xxx: Fix coccinelle warnings in qla2x00_relogin.
    [SCSI] qla2xxx: No fcport FC-4 type assignment in GA_NXT response.
    ...

    Linus Torvalds
     
  • Pull KVM updates from Marcelo Tosatti:
    "Considerable KVM/PPC work, x86 kvmclock vsyscall support,
    IA32_TSC_ADJUST MSR emulation, amongst others."

    Fix up trivial conflict in kernel/sched/core.c due to cross-cpu
    migration notifier added next to rq migration call-back.

    * tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (156 commits)
    KVM: emulator: fix real mode segment checks in address linearization
    VMX: remove unneeded enable_unrestricted_guest check
    KVM: VMX: fix DPL during entry to protected mode
    x86/kexec: crash_vmclear_local_vmcss needs __rcu
    kvm: Fix irqfd resampler list walk
    KVM: VMX: provide the vmclear function and a bitmap to support VMCLEAR in kdump
    x86/kexec: VMCLEAR VMCSs loaded on all cpus if necessary
    KVM: MMU: optimize for set_spte
    KVM: PPC: booke: Get/set guest EPCR register using ONE_REG interface
    KVM: PPC: bookehv: Add EPCR support in mtspr/mfspr emulation
    KVM: PPC: bookehv: Add guest computation mode for irq delivery
    KVM: PPC: Make EPCR a valid field for booke64 and bookehv
    KVM: PPC: booke: Extend MAS2 EPN mask for 64-bit
    KVM: PPC: e500: Mask MAS2 EPN high 32-bits in 32/64 tlbwe emulation
    KVM: PPC: Mask ea's high 32-bits in 32/64 instr emulation
    KVM: PPC: e500: Add emulation helper for getting instruction ea
    KVM: PPC: bookehv64: Add support for interrupt handling
    KVM: PPC: bookehv: Remove GET_VCPU macro from exception handler
    KVM: PPC: booke: Fix get_tb() compile error on 64-bit
    KVM: PPC: e500: Silence bogus GCC warning in tlb code
    ...

    Linus Torvalds
     
  • Pull trivial branch from Jiri Kosina:
    "Usual stuff -- comment/printk typo fixes, documentation updates, dead
    code elimination."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    HOWTO: fix double words typo
    x86 mtrr: fix comment typo in mtrr_bp_init
    propagate name change to comments in kernel source
    doc: Update the name of profiling based on sysfs
    treewide: Fix typos in various drivers
    treewide: Fix typos in various Kconfig
    wireless: mwifiex: Fix typo in wireless/mwifiex driver
    messages: i2o: Fix typo in messages/i2o
    scripts/kernel-doc: check that non-void fcts describe their return value
    Kernel-doc: Convention: Use a "Return" section to describe return values
    radeon: Fix typo and copy/paste error in comments
    doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
    various: Fix spelling of "asynchronous" in comments.
    Fix misspellings of "whether" in comments.
    eisa: Fix spelling of "asynchronous".
    various: Fix spelling of "registered" in comments.
    doc: fix quite a few typos within Documentation
    target: iscsi: fix comment typos in target/iscsi drivers
    treewide: fix typo of "suport" in various comments and Kconfig
    treewide: fix typo of "suppport" in various comments
    ...

    Linus Torvalds
     

13 Dec, 2012

4 commits

  • Pull networking changes from David Miller:

    1) Allow to dump, monitor, and change the bridge multicast database
    using netlink. From Cong Wang.

    2) RFC 5961 TCP blind data injection attack mitigation, from Eric
    Dumazet.

    3) Networking user namespace support from Eric W. Biederman.

    4) tuntap/virtio-net multiqueue support by Jason Wang.

    5) Support for checksum offload of encapsulated packets (basically,
    tunneled traffic can still be checksummed by HW). From Joseph
    Gasparakis.

    6) Allow BPF filter access to VLAN tags, from Eric Dumazet and
    Daniel Borkmann.

    7) Bridge port parameters over netlink and BPDU blocking support
    from Stephen Hemminger.

    8) Improve data access patterns during inet socket demux by rearranging
    socket layout, from Eric Dumazet.

    9) TIPC protocol updates and cleanups from Ying Xue, Paul Gortmaker, and
    Jon Maloy.

    10) Update TCP socket hash sizing to be more in line with current day
    realities. The existing heurstics were choosen a decade ago.
    From Eric Dumazet.

    11) Fix races, queue bloat, and excessive wakeups in ATM and
    associated drivers, from Krzysztof Mazur and David Woodhouse.

    12) Support DOVE (Distributed Overlay Virtual Ethernet) extensions
    in VXLAN driver, from David Stevens.

    13) Add "oops_only" mode to netconsole, from Amerigo Wang.

    14) Support set and query of VEB/VEPA bridge mode via PF_BRIDGE, also
    allow DCB netlink to work on namespaces other than the initial
    namespace. From John Fastabend.

    15) Support PTP in the Tigon3 driver, from Matt Carlson.

    16) tun/vhost zero copy fixes and improvements, plus turn it on
    by default, from Michael S. Tsirkin.

    17) Support per-association statistics in SCTP, from Michele
    Baldessari.

    And many, many, driver updates, cleanups, and improvements. Too
    numerous to mention individually.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
    net/mlx4_en: Add support for destination MAC in steering rules
    net/mlx4_en: Use generic etherdevice.h functions.
    net: ethtool: Add destination MAC address to flow steering API
    bridge: add support of adding and deleting mdb entries
    bridge: notify mdb changes via netlink
    ndisc: Unexport ndisc_{build,send}_skb().
    uapi: add missing netconf.h to export list
    pkt_sched: avoid requeues if possible
    solos-pci: fix double-free of TX skb in DMA mode
    bnx2: Fix accidental reversions.
    bna: Driver Version Updated to 3.1.2.1
    bna: Firmware update
    bna: Add RX State
    bna: Rx Page Based Allocation
    bna: TX Intr Coalescing Fix
    bna: Tx and Rx Optimizations
    bna: Code Cleanup and Enhancements
    ath9k: check pdata variable before dereferencing it
    ath5k: RX timestamp is reported at end of frame
    ath9k_htc: RX timestamp is reported at end of frame
    ...

    Linus Torvalds
     
  • Pull ARM SoC updates from Olof Johansson:
    "This contains the bulk of new SoC development for this merge window.

    Two new platforms have been added, the sunxi platforms (Allwinner A1x
    SoCs) by Maxime Ripard, and a generic Broadcom platform for a new
    series of ARMv7 platforms from them, where the hope is that we can
    keep the platform code generic enough to have them all share one mach
    directory. The new Broadcom platform is contributed by Christian
    Daudt.

    Highbank has grown support for Calxeda's next generation of hardware,
    ECX-2000.

    clps711x has seen a lot of cleanup from Alexander Shiyan, and he's
    also taken on maintainership of the platform.

    Beyond this there has been a bunch of work from a number of people on
    converting more platforms to IRQ domains, pinctrl conversion, cleanup
    and general feature enablement across most of the active platforms."

    Fix up trivial conflicts as per Olof.

    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (174 commits)
    mfd: vexpress-sysreg: Remove LEDs code
    irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids
    clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids
    irq: versatile: delete dangling variable
    ARM: sunxi: add missing include for mdelay()
    ARM: EXYNOS: Avoid early use of of_machine_is_compatible()
    ARM: dts: add node for PL330 MDMA1 controller for exynos4
    ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
    ARM: EXYNOS: add UART3 to DEBUG_LL ports
    ARM: S3C24XX: Add clkdev entry for camif-upll clock
    ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
    ARM: sunxi: Add missing sun4i.dtsi file
    pinctrl: samsung: Do not initialise statics to 0
    ARM i.MX6: remove gate_mask from pllv3
    ARM i.MX6: Fix ethernet PLL clocks
    ARM i.MX6: rename PLLs according to datasheet
    ARM i.MX6: Add pwm support
    ARM i.MX51: Add pwm support
    ARM i.MX53: Add pwm support
    ARM: mx5: Replace clk_register_clkdev with clock DT lookup
    ...

    Linus Torvalds
     
  • Pull ARM SoC cleanups on various subarchitectures from Olof Johansson:
    "Cleanup patches for various ARM platforms and some of their associated
    drivers. There's also a branch in here that enables Freescale i.MX to
    be part of the multiplatform support -- the first "big" SoC that is
    moved over (more multiplatform work comes in a separate branch later
    during the merge window)."

    Conflicts fixed as per Olof, including a silent semantic one in
    arch/arm/mach-omap2/board-generic.c (omap_prcm_restart() was renamed to
    omap3xxx_restart(), and a new user of the old name was added).

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (189 commits)
    ARM: omap: fix typo on timer cleanup
    ARM: EXYNOS: Remove unused regs-mem.h file
    ARM: EXYNOS: Remove unused non-dt support for dwmci controller
    ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
    ARM: OMAP3: cm-t3517: use GPTIMER for system clock
    ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
    ARM: SAMSUNG: use devm_ functions for ADC driver
    ARM: EXYNOS: no duplicate mask/unmask in eint0_15
    ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443
    ARM: EXYNOS: Remove i2c0 resource information and setting of device names
    ARM: Kirkwood: checkpatch cleanups
    ARM: Kirkwood: Fix sparse warnings.
    ARM: Kirkwood: Remove unused includes
    ARM: kirkwood: cleanup lsxl board includes
    ARM: integrator: use BUG_ON where possible
    ARM: integrator: push down SC dependencies
    ARM: integrator: delete static UART1 mapping
    ARM: integrator: delete SC mapping on the CP
    ARM: integrator: remove static CP syscon mapping
    ARM: integrator: remove static AP syscon mapping
    ...

    Linus Torvalds
     
  • Pull ARM SoC Non-critical bug fixes from Olof Johansson:
    "Simple bug fixes that were not considered important enough for
    inclusion into 3.7, especially those that arrived late during the
    merge window.

    There's also a MAINTAINERS update for the Renesas platforms in here,
    marking Simon Horman as a maintainer and changing the git url to his
    tree."

    * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    Update ARM/SHMOBILE section of MAINTAINERS
    ARM: Fix Kconfig symbols typo for LEDS
    ARM: pxa: add dummy SA1100 rtc clock in pxa25x
    ARM: pxa: fix pxa25x gpio wakeup setting
    ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n
    ARM: cns3xxx: drop unnecessary symbol selection
    ARM: vexpress: fix ll debug code when building multiplatform
    ARM: OMAP4: retrigger localtimers after re-enabling gic
    ARM: OMAP4460: Workaround for ROM bug because of CA9 r2pX GIC control register change.
    ARM: OMAP4: PM: add errata support
    ARM: davinci: fix return value check by using IS_ERR in tnetv107x_devices_init()
    ARM: davinci: uncompress.h: bail out if uart not initialized
    ARM: davinci: serial.h: fix uart number in the comment
    ARM: davinci: dm644x evm: move pointer dereference below NULL check
    ARM: vexpress: Make the debug UART detection more specific

    Linus Torvalds
     

12 Dec, 2012

9 commits

  • Pull ARM64 updates from Catalin Marinas:

    - Generic execve, kernel_thread, fork/vfork/clone.

    - Preparatory patches for KVM support (initialising EL2 mode for later
    installing KVM support, hypervisor stub).

    - Signal handling corner case fix (alternative signal stack set up for
    a SEGV handler, which is raised in response to RLIMIT_STACK being
    reached).

    - Sub-nanosecond timer error fix.

    * tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (30 commits)
    arm64: Update the MAINTAINERS entry
    arm64: compat for clock_adjtime(2) is miswired
    arm64: move FP-SIMD save/restore code to a macro
    arm64: hyp: initialize vttbr_el2 to zero
    arm64: add hypervisor stub
    arm64: record boot mode when entering the kernel
    arm64: move vector entry macro to assembler.h
    arm64: add AArch32 execution modes to ptrace.h
    arm64: expand register mapping between AArch32 and AArch64
    arm64: generic timer: use virtual counter instead of physical at EL0
    arm64: vdso: defer shifting of nanosecond component of timespec
    arm64: vdso: rework __do_get_tspec register allocation and return shift
    arm64: vdso: check sequence counter even for coarse realtime operations
    arm64: vdso: fix clocksource mask when extracting bottom 56 bits
    ARM64: Remove incorrect Kconfig symbol HAVE_SPARSE_IRQ
    Documentation: Fixes a word in Documentation/arm64/memory.txt
    arm64: Make !dirty ptes read-only
    arm64: Convert empty flush_cache_{mm,page} functions to static inline
    arm64: signal: let the compiler inline compat_get_sigframe
    arm64: signal: return struct rt_sigframe from get_sigframe
    ...

    Conflicts:
    arch/arm64/include/asm/unistd32.h

    Linus Torvalds
     
  • Drivers for EDAC on Cavium. Supported subsystems are:

    o CPU primary caches. These are parity protected only, so only error
    reporting.
    o Second level cache - ECC protected, provides SECDED.
    o Memory: ECC / SECDEC if used with suitable DRAM modules. The driver will
    will only initialize if ECC is enabled on a system so is safe to run on
    non-ECC memory.
    o PCI: Parity error reporting

    Since it is very hard to test this sort of code the implementation is very
    conservative and uses polling where possible for now.

    Signed-off-by: Ralf Baechle
    Reviewed-by: Borislav Petkov

    Ralf Baechle
     
  • Pull USB patches from Greg Kroah-Hartman:
    "Here's the big set of USB patches for 3.8-rc1.

    Lots of USB host driver cleanups in here, and a bit of a reorg of the
    EHCI driver to make it easier for the different EHCI platform drivers
    to all work together nicer, which was a reduction in overall code. We
    also deleted some unused firmware files, and got rid of the very old
    file_storage usb gadget driver that had been broken for a long time.
    This means we ended up removing way more code than added, always a
    nice thing to see:
    310 files changed, 3028 insertions(+), 10754 deletions(-)

    Other than that, the usual set of new device ids, driver fixes, gadget
    driver and controller updates and the like.

    All of these have been in the linux-next tree for a number of weeks.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'usb-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (228 commits)
    USB: mark uas driver as BROKEN
    xhci: Add Lynx Point LP to list of Intel switchable hosts
    uwb: fix uwb_dev_unlock() missed at an error path in uwb_rc_cmd_async()
    USB: ftdi_sio: Add support for Newport AGILIS motor drivers
    MAINTAINERS: remove drivers/block/ub.c
    USB: chipidea: fix use after free bug
    ezusb: add dependency to USB
    usb: ftdi_sio: fixup BeagleBone A5+ quirk
    USB: cp210x: add Virtenio Preon32 device id
    usb: storage: remove redundant memset() in usb_probe_stor1()
    USB: option: blacklist network interface on Huawei E173
    USB: OHCI: workaround for hardware bug: retired TDs not added to the Done Queue
    USB: add new zte 3g-dongle's pid to option.c
    USB: opticon: switch to generic read implementation
    USB: opticon: refactor reab-urb processing
    USB: opticon: use usb-serial bulk-in urb
    USB: opticon: increase bulk-in size
    USB: opticon: use port as urb context
    USB: opticon: pass port to get_serial_info
    USB: opticon: make private data port specific
    ...

    Linus Torvalds
     
  • Pull TTY/Serial merge from Greg Kroah-Hartman:
    "Here's the big tty/serial tree set of changes for 3.8-rc1.

    Contained in here is a bunch more reworks of the tty port layer from
    Jiri and bugfixes from Alan, along with a number of other tty and
    serial driver updates by the various driver authors.

    Also, Jiri has been coerced^Wconvinced to be the co-maintainer of the
    TTY layer, which is much appreciated by me.

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

    Signed-off-by: Greg Kroah-Hartman "

    Fixed up some trivial conflicts in the staging tree, due to the fwserial
    driver having come in both ways (but fixed up a bit in the serial tree),
    and the ioctl handling in the dgrp driver having been done slightly
    differently (staging tree got that one right, and removed both
    TIOCGSOFTCAR and TIOCSSOFTCAR).

    * tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (146 commits)
    staging: sb105x: fix potential NULL pointer dereference in mp_chars_in_buffer()
    staging/fwserial: Remove superfluous free
    staging/fwserial: Use WARN_ONCE when port table is corrupted
    staging/fwserial: Destruct embedded tty_port on teardown
    staging/fwserial: Fix build breakage when !CONFIG_BUG
    staging: fwserial: Add TTY-over-Firewire serial driver
    drivers/tty/serial/serial_core.c: clean up HIGH_BITS_OFFSET usage
    staging: dgrp: dgrp_tty.c: Audit the return values of get/put_user()
    staging: dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp driver
    serial: ifx6x60: Add modem power off function in the platform reboot process
    serial: mxs-auart: unmap the scatter list before we copy the data
    serial: mxs-auart: disable the Receive Timeout Interrupt when DMA is enabled
    serial: max310x: Setup missing "can_sleep" field for GPIO
    tty/serial: fix ifx6x60.c declaration warning
    serial: samsung: add devicetree properties for non-Exynos SoCs
    serial: samsung: fix potential soft lockup during uart write
    tty: vt: Remove redundant null check before kfree.
    tty/8250 Add check for pci_ioremap_bar failure
    tty/8250 Add support for Commtech's Fastcom Async-335 and Fastcom Async-PCIe cards
    tty/8250 Add XR17D15x devices to the exar_handle_irq override
    ...

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

    There's a lot of patches in here, the majority being the comedi
    rework/cleanup that has been ongoing and is causing a huge reduction
    in overall code size, which is amazing to watch. We also removed some
    older drivers (telephony and rts_pstor), and added a new one (fwserial
    which also came in through the tty tree due to tty api changes, take
    that one if you get merge conflicts.)

    The iio and ipack drivers are moving out of the staging area into
    their own part of the kernel as they have been cleaned up sufficiently
    and are working well.

    Overall, again a reduction of code:
    768 files changed, 31887 insertions(+), 82166 deletions(-)

    All of this has been in the linux-next tree for a while.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'staging-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1298 commits)
    iio: imu: adis16480: remove duplicated include from adis16480.c
    iio: gyro: adis16136: remove duplicated include from adis16136.c
    iio:imu: adis16480: show_firmware() buffer too small
    iio:gyro: adis16136: divide by zero in write_frequency()
    iio: adc: Add Texas Instruments ADC081C021/027 support
    iio:ad7793: Add support for the ad7796 and ad7797
    iio:ad7793: Add support for the ad7798 and ad7799
    staging:iio: Move ad7793 driver out of staging
    staging:iio:ad7793: Implement stricter id checking
    staging:iio:ad7793: Move register definitions from header to source
    staging:iio:ad7793: Rework regulator handling
    staging:iio:ad7793: Rework platform data
    staging:iio:ad7793: Use kstrtol instead of strict_strtol
    staging:iio:ad7793: Use usleep_range instead of msleep
    staging:iio:ad7793: Fix temperature scale
    staging:iio:ad7793: Fix VDD monitor scale
    staging: gdm72xx: unlock on error in init_usb()
    staging: panel: pass correct lengths to keypad_send_key()
    staging: comedi: addi_apci_2032: fix interrupt support
    staging: comedi: addi_apci_2032: move i_APCI2032_ConfigDigitalOutput()
    ...

    Linus Torvalds
     
  • Pull Char/Misc driver merge from Greg Kroah-Hartman:
    "Here is the "big" char/misc driver patches for 3.8-rc1. I'm starting
    to put random driver subsystems that I had previously sent you through
    the driver-core tree in this tree, as it makes more sense to do so.

    Nothing major here, the various __dev* removals, some mei driver
    updates, and other random driver-specific things from the different
    maintainers and developers.

    Note, some MFD drivers got added through this tree, and they are also
    coming in through the "real" MFD tree as well, due to some major
    mis-communication between me and the different developers. If you
    have any merge conflicts, take the ones from the MFD tree, not these
    ones, sorry about that.

    All of this has been in linux-next for a while.

    Signed-off-by: Greg Kroah-Hartman "

    Fix up trivial conflict in drivers/mmc/host/Kconfig due to new drivers
    having been added (both at the end, as usual..)

    * tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (84 commits)
    MAINTAINERS: remove drivers/staging/hv/
    misc/st_kim: Free resources in the error path of probe()
    drivers/char: for hpet, add count checking, and ~0UL instead of -1
    w1-gpio: Simplify & get rid of defines
    w1-gpio: Pinctrl-fy
    extcon: remove use of __devexit_p
    extcon: remove use of __devinit
    extcon: remove use of __devexit
    drivers: uio: Only allocate new private data when probing device tree node
    drivers: uio_dmem_genirq: Allow partial success when opening device
    drivers: uio_dmem_genirq: Don't use DMA_ERROR_CODE to indicate unmapped regions
    drivers: uio_dmem_genirq: Don't mix address spaces for dynamic region vaddr
    uio: remove use of __devexit
    uio: remove use of __devinitdata
    uio: remove use of __devinit
    uio: remove use of __devexit_p
    char: remove use of __devexit
    char: remove use of __devinitconst
    char: remove use of __devinitdata
    char: remove use of __devinit
    ...

    Linus Torvalds
     
  • Pull clock framework changes from Mike Turquette:
    "The common clock framework changes for 3.8 are comprised of lots of
    fixes for existing platforms as well as new ports for some ARM
    platforms. In addition there are new clk drivers for audio devices
    and MFDs."

    Fix up trivial conflict in (removal of 'inline'
    clashing with return type fixes)

    * tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux: (51 commits)
    MAINTAINERS: bad email address for Mike Turquette
    clk: introduce optional disable_unused callback
    clk: ux500: fix bit error
    clk: clock multiplexers may register out of order
    clk: ux500: Initial support for abx500 clock driver
    CLK: SPEAr: Remove unused dummy apb_pclk
    CLK: SPEAr: Correct index scanning done for clock synths
    CLK: SPEAr: Update clock rate table
    CLK: SPEAr: Add missing clocks
    CLK: SPEAr: Set CLK_SET_RATE_PARENT for few clocks
    CLK: SPEAr13xx: fix parent names of multiple clocks
    CLK: SPEAr13xx: Fix mux clock names
    CLK: SPEAr: Fix dev_id & con_id for multiple clocks
    clk: move IM-PD1 clocks to drivers/clk
    clk: make ICST driver handle the VCO registers
    clk: add GPLv2 headers to the Versatile clock files
    clk: mxs: Use a better name for the USB PHY clock
    clk: spear: Add stub functions for spear3[0|1|2]0_clk_init()
    CLK: clk-twl6040: fix return value check in twl6040_clk_probe()
    clk: ux500: Register nomadik keypad clock lookups for u8500
    ...

    Linus Torvalds
     
  • Pull pinctrl changes from Linus Walleij:
    "These are the first and major pinctrl changes for the v3.8 merge
    cycle. Some of this is used as merge base for other trees so I better
    be early on the trigger.

    As can be seen from the diffstat the major changes are:

    - A big conversion of the AT91 pinctrl driver and the associated ACKed
    platform changes under arch/arm/max-at91 and its device trees. This
    has been coordinated with the AT91 maintainers to go in through the
    pinctrl tree.

    - A larger chunk of changes to the SPEAr drivers and the addition of
    the "plgpio" driver for the SPEAr as well.

    - The removal of the remnants of the Nomadik driver from the arch/arm
    tree and fusion of that into the Nomadik driver and platform data
    header files.

    - Some local movement in the Marvell MVEBU drivers, these now have
    their own subdirectory.

    - The addition of a chunk of code to gpiolib under drivers/gpio to
    register gpio-to-pin range mappings from the GPIO side of things.
    This has been requested by Grant Likely and is now implemented, it
    is particularly useful for device tree work.

    Then we have incremental updates all over the place, many of these are
    cleanups and fixes from Axel Lin who has done a great job of removing
    minor mistakes and compilation annoyances."

    * tag 'pinctrl-for-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (114 commits)
    ARM: mmp: select PINCTRL for ARCH_MMP
    pinctrl: Drop selecting PINCONF for MMP2, PXA168 and PXA910
    pinctrl: pinctrl-single: Fix error check condition
    pinctrl: SPEAr: Update error check for unsigned variables
    gpiolib: Fix use after free in gpiochip_add_pin_range
    gpiolib: rename pin range arguments
    pinctrl: single: support gpio request and free
    pinctrl: generic: add input schmitt disable parameter
    pinctrl/u300/coh901: stop spawning pinctrl from GPIO
    pinctrl/u300/coh901: let the gpio_chip register the range
    pinctrl: add function to retrieve range from pin
    gpiolib: return any error code from range creation
    pinctrl: make range registration defer properly
    gpiolib: rename find_pinctrl_*
    gpiolib: let gpiochip_add_pin_range() specify offset
    ARM: at91: pm9g45: add mmc support
    ARM: at91: Animeo IP: add mmc support
    ARM: at91: dt: add mmc pinctrl for Atmel reference boards
    ARM: at91: dt: at91sam9: add mmc pinctrl support
    ARM: at91/dts: add nodes for atmel hsmci controllers for atmel boards
    ...

    Linus Torvalds
     
  • Pull MMC updates from Chris Ball:
    "MMC highlights for 3.8:

    Core:
    - Expose access to the eMMC RPMB ("Replay Protected Memory Block")
    area by extending the existing mmc_block ioctl.
    - Add SDIO powered-suspend DT properties to the core MMC DT binding.
    - Add no-1-8-v DT flag for boards where the SD controller reports
    that it supports 1.8V but the board itself has no way to switch to
    1.8V.
    - More work on switching to 1.8V UHS support using a vqmmc regulator.
    - Fix up a case where the slot-gpio helper may fail to reset the host
    controller properly if a card was removed during a transfer.
    - Fix several cases where a broken device could cause an infinite
    loop while we wait for a register to update.

    Drivers:
    - at91-mci: Remove obsolete driver, atmel-mci handles these devices
    now.
    - sdhci-dove: Allow using GPIOs for card-detect notifications.
    - sdhci-esdhc: Fix for recovering from ADMA errors on broken silicon.
    - sdhci-s3c: Add pinctrl support.
    - wmt-sdmmc: New driver for WonderMedia SD/MMC controllers."

    * tag 'mmc-updates-for-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (65 commits)
    mmc: sdhci: implement the .card_event() method
    mmc: extend the slot-gpio card-detection to use host's .card_event() method
    mmc: add a card-event host operation
    mmc: sdhci-s3c: Fix compilation warning
    mmc: sdhci-pci: Enable SDHCI_CAN_DO_HISPD for Ricoh SDHCI controller
    mmc: sdhci-dove: allow GPIOs to be used for card detection on Dove
    mmc: sdhci-dove: use two-stage initialization for sdhci-pltfm
    mmc: sdhci-dove: use devm_clk_get()
    mmc: eSDHC: Recover from ADMA errors
    mmc: dw_mmc: remove duplicated buswidth code
    mmc: dw_mmc: relocate where dw_mci_setup_bus() is called from
    mmc: Limit MMC speed to 52MHz if not HS200
    mmc: dw_mmc: use devres functions in dw_mmc
    mmc: sh_mmcif: remove unneeded clock connection ID
    mmc: sh_mobile_sdhi: remove unneeded clock connection ID
    mmc: sh_mobile_sdhi: fix clock frequency printing
    mmc: Remove redundant null check before kfree in bus.c
    mmc: Remove redundant null check before kfree in sdio_bus.c
    mmc: sdhci-imx-esdhc: use more devm_* functions
    mmc: dt: add no-1-8-v device tree flag
    ...

    Linus Torvalds
     

11 Dec, 2012

2 commits


10 Dec, 2012

1 commit

  • Alex writes:
    Pretty minor -next pull request. We some additional new bits waiting
    internally for release. Hopefully Monday we can get at least some of
    them out. The others will probably take a few more weeks.

    Highlights of the current request:
    - ELD registers for passing audio information to the sound hardware
    - Handle GPUVM page faults more gracefully
    - Misc fixes

    Merge radeon test
    * 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux: (483 commits)
    drm/radeon: bump driver version for new info ioctl requests
    drm/radeon: fix eDP clk and lane setup for scaled modes
    drm/radeon: add new INFO ioctl requests
    drm/radeon/dce32+: use fractional fb dividers for high clocks
    drm/radeon: use cached memory when evicting for vram on non agp
    drm/radeon: add a CS flag END_OF_FRAME
    drm/radeon: stop page faults from hanging the system (v2)
    drm/radeon/dce4/5: add registers for ELD handling
    drm/radeon/dce3.2: add registers for ELD handling
    radeon: fix pll/ctrc mapping on dce2 and dce3 hardware
    Linux 3.7-rc7
    powerpc/eeh: Do not invalidate PE properly
    Revert "drm/i915: enable rc6 on ilk again"
    ALSA: hda - Fix build without CONFIG_PM
    of/address: sparc: Declare of_iomap as an extern function for sparc again
    PM / QoS: fix wrong error-checking condition
    bnx2x: remove redundant warning log
    vxlan: fix command usage in its doc
    8139cp: revert "set ring address before enabling receiver"
    MPI: Fix compilation on MIPS with GCC 4.4 and newer
    ...

    Conflicts:
    drivers/gpu/drm/exynos/exynos_drm_encoder.c
    drivers/gpu/drm/exynos/exynos_drm_fbdev.c
    drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

    Dave Airlie
     

08 Dec, 2012

1 commit


07 Dec, 2012

2 commits


06 Dec, 2012

2 commits


03 Dec, 2012

1 commit


01 Dec, 2012

3 commits

  • Organizational changes need to be reflected in the MAINTAINERS file.
    The contact info on wireless.kernel.org has also been updated.

    Reviewed-by: Hante Meuleman
    Reviewed-by: Pieter-Paul Giesberts
    Signed-off-by: Arend van Spriel
    Signed-off-by: John W. Linville

    Arend van Spriel
     
  • …/kgene/linux-samsung into next/soc

    From Kukjin Kim:
    Just adding camif gpio setup and clkdev.

    * 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
    ARM: S3C24XX: Add clkdev entry for camif-upll clock
    ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
    + Linux 3.7-rc6

    Conflicts due to the 3.7-rc6 sync: arch/arm/mach-highbank/system.c
    include/linux/clk-provider.h, resolved as in other branches.

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • Delivery to the following recipient failed permanently:

    vtun@office.satix.net

    Technical details of permanent failure:
    DNS Error: Domain name not found

    Of course:
    $ host office.satix.net
    Host office.satix.net not found: 3(NXDOMAIN)

    ===========

    And "Change of Email Address Notification":
    Old Address New Address Email Subject
    ------------------------------------------------------
    maxk@qualcomm.com maxk@qti.qualcomm.com "tuntap: multiqueue...

    Signed-off-by: Jiri Slaby
    Cc: Maxim Krasnyansky
    Signed-off-by: David S. Miller

    Jiri Slaby