02 Aug, 2012

2 commits

  • Pull UML fixes from Richard Weinberger:
    "This patch set contains mostly fixes and cleanups. The UML tty driver
    uses now tty_port and is no longer broken like hell :-)"

    * 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
    um: Add arch/x86/um to MAINTAINERS
    um: pass siginfo to guest process
    um: fix ubd_file_size for read-only files
    um: pull interrupt_end() into userspace()
    um: split syscall_trace(), pass pt_regs to it
    um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs
    um: set BLK_CGROUP=y in defconfig
    um: remove count_lock
    um: fully use tty_port
    um: Remove dead code
    um: remove line_ioctl()
    TTY: um/line, use tty from tty_port
    TTY: um/line, add tty_port

    Linus Torvalds
     
  • Signed-off-by: Richard Weinberger

    Richard Weinberger
     

01 Aug, 2012

3 commits

  • Pull VFIO core from Alex Williamson:
    "This series includes the VFIO userspace driver interface for the 3.6
    kernel merge window. This driver is intended to provide a secure
    interface for device access using IOMMU protection for applications
    like assignment of physical devices to virtual machines.

    Qemu will be the first user of this interface, enabling assignment of
    PCI devices to Qemu guests. This interface is intended to eventually
    replace the x86-specific assignment mechanism currently available in
    KVM.

    This interface has the advantage of being more secure, by working with
    IOMMU groups to ensure device isolation and providing it's own
    filtered resource access mechanism, and also more flexible, in not
    being x86 or KVM specific (extensions to enable POWER are already
    working).

    This driver is originally the work of Tom Lyon, but has since been
    handed over to me and gone through a complete overhaul thanks to the
    input from David Gibson, Ben Herrenschmidt, Chris Wright, Joerg
    Roedel, and others. This driver has been available in linux-next for
    the last month."

    Paul Mackerras says:
    "I would be glad to see it go in since we want to use it with KVM on
    PowerPC. If possible we'd like the PowerPC bits for it to go in as
    well."

    * tag 'vfio-for-v3.6' of git://github.com/awilliam/linux-vfio:
    vfio: Add PCI device driver
    vfio: Type1 IOMMU implementation
    vfio: Add documentation
    vfio: VFIO core

    Linus Torvalds
     
  • Pull random subsystem patches from Ted Ts'o:
    "This patch series contains a major revamp of how we collect entropy
    from interrupts for /dev/random and /dev/urandom.

    The goal is to addresses weaknesses discussed in the paper "Mining
    your Ps and Qs: Detection of Widespread Weak Keys in Network Devices",
    by Nadia Heninger, Zakir Durumeric, Eric Wustrow, J. Alex Halderman,
    which will be published in the Proceedings of the 21st Usenix Security
    Symposium, August 2012. (See https://factorable.net for more
    information and an extended version of the paper.)"

    Fix up trivial conflicts due to nearby changes in
    drivers/{mfd/ab3100-core.c, usb/gadget/omap_udc.c}

    * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random: (33 commits)
    random: mix in architectural randomness in extract_buf()
    dmi: Feed DMI table to /dev/random driver
    random: Add comment to random_initialize()
    random: final removal of IRQF_SAMPLE_RANDOM
    um: remove IRQF_SAMPLE_RANDOM which is now a no-op
    sparc/ldc: remove IRQF_SAMPLE_RANDOM which is now a no-op
    [ARM] pxa: remove IRQF_SAMPLE_RANDOM which is now a no-op
    board-palmz71: remove IRQF_SAMPLE_RANDOM which is now a no-op
    isp1301_omap: remove IRQF_SAMPLE_RANDOM which is now a no-op
    pxa25x_udc: remove IRQF_SAMPLE_RANDOM which is now a no-op
    omap_udc: remove IRQF_SAMPLE_RANDOM which is now a no-op
    goku_udc: remove IRQF_SAMPLE_RANDOM which was commented out
    uartlite: remove IRQF_SAMPLE_RANDOM which is now a no-op
    drivers: hv: remove IRQF_SAMPLE_RANDOM which is now a no-op
    xen-blkfront: remove IRQF_SAMPLE_RANDOM which is now a no-op
    n2_crypto: remove IRQF_SAMPLE_RANDOM which is now a no-op
    pda_power: remove IRQF_SAMPLE_RANDOM which is now a no-op
    i2c-pmcmsp: remove IRQF_SAMPLE_RANDOM which is now a no-op
    input/serio/hp_sdc.c: remove IRQF_SAMPLE_RANDOM which is now a no-op
    mfd: remove IRQF_SAMPLE_RANDOM which is now a no-op
    ...

    Linus Torvalds
     
  • Pull Ceph changes from Sage Weil:
    "Lots of stuff this time around:

    - lots of cleanup and refactoring in the libceph messenger code, and
    many hard to hit races and bugs closed as a result.
    - lots of cleanup and refactoring in the rbd code from Alex Elder,
    mostly in preparation for the layering functionality that will be
    coming in 3.7.
    - some misc rbd cleanups from Josh Durgin that are finally going
    upstream
    - support for CRUSH tunables (used by newer clusters to improve the
    data placement)
    - some cleanup in our use of d_parent that Al brought up a while back
    - a random collection of fixes across the tree

    There is another patch coming that fixes up our ->atomic_open()
    behavior, but I'm going to hammer on it a bit more before sending it."

    Fix up conflicts due to commits that were already committed earlier in
    drivers/block/rbd.c, net/ceph/{messenger.c, osd_client.c}

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (132 commits)
    rbd: create rbd_refresh_helper()
    rbd: return obj version in __rbd_refresh_header()
    rbd: fixes in rbd_header_from_disk()
    rbd: always pass ops array to rbd_req_sync_op()
    rbd: pass null version pointer in add_snap()
    rbd: make rbd_create_rw_ops() return a pointer
    rbd: have __rbd_add_snap_dev() return a pointer
    libceph: recheck con state after allocating incoming message
    libceph: change ceph_con_in_msg_alloc convention to be less weird
    libceph: avoid dropping con mutex before fault
    libceph: verify state after retaking con lock after dispatch
    libceph: revoke mon_client messages on session restart
    libceph: fix handling of immediate socket connect failure
    ceph: update MAINTAINERS file
    libceph: be less chatty about stray replies
    libceph: clear all flags on con_close
    libceph: clean up con flags
    libceph: replace connection state bits with states
    libceph: drop unnecessary CLOSED check in socket state change callback
    libceph: close socket directly from ceph_con_close()
    ...

    Linus Torvalds
     

31 Jul, 2012

7 commits

  • VFIO is a secure user level driver for use with both virtual machines
    and user level drivers. VFIO makes use of IOMMU groups to ensure the
    isolation of devices in use, allowing unprivileged user access. It's
    intended that VFIO will replace KVM device assignment and UIO drivers
    (in cases where the target platform includes a sufficiently capable
    IOMMU).

    New in this version of VFIO is support for IOMMU groups managed
    through the IOMMU core as well as a rework of the API, removing the
    group merge interface. We now go back to a model more similar to
    original VFIO with UIOMMU support where the file descriptor obtained
    from /dev/vfio/vfio allows access to the IOMMU, but only after a
    group is added, avoiding the previous privilege issues with this type
    of model. IOMMU support is also now fully modular as IOMMUs have
    vastly different interface requirements on different platforms. VFIO
    users are able to query and initialize the IOMMU model of their
    choice.

    Please see the follow-on Documentation commit for further description
    and usage example.

    Signed-off-by: Alex Williamson

    Alex Williamson
     
  • Pull media updates from Mauro Carvalho Chehab:
    "This is the first part of the media patches for v3.6.

    This patch series contain:
    - new DVB frontend: rtl2832
    - new video drivers: adv7393
    - some unused files got removed
    - a selection API cleanup between V4L2 and V4L2 subdev API's
    - a major redesign at v4l-ioctl2, in order to clean it up
    - several driver fixes and improvements."

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (174 commits)
    v4l: Export v4l2-common.h in include/linux/Kbuild
    media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
    [media] media: Use pr_info not homegrown pr_reg macro
    [media] Terratec Cinergy S2 USB HD Rev.2
    [media] v4l: Correct conflicting V4L2 subdev selection API documentation
    [media] Feature removal: V4L2 selections API target and flag definitions
    [media] v4l: Unify selection flags documentation
    [media] v4l: Unify selection flags
    [media] v4l: Common documentation for selection targets
    [media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
    [media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
    [media] V4L: Remove "_ACTIVE" from the selection target name definitions
    [media] media: dvb-usb: print mac address via native %pM
    [media] s5p-tv: Use module_i2c_driver in sii9234_drv.c file
    [media] media: gpio-ir-recv: add allowed_protos for platform data
    [media] s5p-jpeg: Use module_platform_driver in jpeg-core.c file
    [media] saa7134: fix spelling of detach in label
    [media] cx88-blackbird: replace ioctl by unlocked_ioctl
    [media] cx88: don't use current_norm
    [media] cx88: fix a number of v4l2-compliance violations
    ...

    Linus Torvalds
     
  • * shiny new inktank.com email addresses
    * add include/linux/crush directory (previous oversight)

    Signed-off-by: Sage Weil
    Reviewed-by: Alex Elder

    Sage Weil
     
  • Merge Andrew's first set of patches:
    "Non-MM patches:

    - lots of misc bits

    - tree-wide have_clk() cleanups

    - quite a lot of printk tweaks. I draw your attention to "printk:
    convert the format for KERN_ to a 2 byte pattern" which
    looks a bit scary. But afaict it's solid.

    - backlight updates

    - lib/ feature work (notably the addition and use of memweight())

    - checkpatch updates

    - rtc updates

    - nilfs updates

    - fatfs updates (partial, still waiting for acks)

    - kdump, proc, fork, IPC, sysctl, taskstats, pps, etc

    - new fault-injection feature work"

    * Merge emailed patches from Andrew Morton : (128 commits)
    drivers/misc/lkdtm.c: fix missing allocation failure check
    lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table()
    fault-injection: add tool to run command with failslab or fail_page_alloc
    fault-injection: add selftests for cpu and memory hotplug
    powerpc: pSeries reconfig notifier error injection module
    memory: memory notifier error injection module
    PM: PM notifier error injection module
    cpu: rewrite cpu-notifier-error-inject module
    fault-injection: notifier error injection
    c/r: fcntl: add F_GETOWNER_UIDS option
    resource: make sure requested range is included in the root range
    include/linux/aio.h: cpp->C conversions
    fs: cachefiles: add support for large files in filesystem caching
    pps: return PTR_ERR on error in device_create
    taskstats: check nla_reserve() return
    sysctl: suppress kmemleak messages
    ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
    ipc: compat: use signed size_t types for msgsnd and msgrcv
    ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC
    ipc: add COMPAT_SHMLBA support
    ...

    Linus Torvalds
     
  • Add patterns for Exynos DP header to MAINTAINERS file.

    Signed-off-by: Jingoo Han
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jingoo Han
     
  • Pull MFD bits from Samuel Ortiz:
    "We have support for a few new drivers:
    - Samsung s2mps11
    - Wolfson Microelectronics wm5102 and wm5110
    - Marvell 88PM800 and 88PM805
    - TI twl6041

    We also have our regular driver improvements:
    - Device tree and IRQ domain support for STE AB8500
    - Regmap and devm_* API conversion for TI tps6586x
    - Device tree support for Samsung max77686
    - devm_* API conversion for STE AB3100

    Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
    tps65090, da9052 and twl-core."

    Fix up mostly trivial conflicts, with the exception of
    drivers/usb/host/ehci-omap.c in particular, which had some
    re-organization of the reset sequence (commit 1a49e2ac9651: "EHCI:
    centralize controller initialization") that clashed with commit
    2761a6394516 ("mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix
    issues").

    In particular, commit 2761a6394516 moved the usb_add_hcd() to the
    *middle* of the reset sequence, which clashes fairly badly with the
    reset sequence re-organization (although it could have been done inside
    the new omap_ehci_init() function).

    I left that part of commit 2761a6394516 just undone.

    * tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (110 commits)
    mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core
    mfd: Arizone core should select MFD_CORE
    mfd: Fix arizona-irq.c build by selecting REGMAP_IRQ
    mfd: Add debug trace on entering and leaving arizone runtime suspend
    mfd: Correct tps65090 cell names
    mfd: Remove gpio support from tps6586x core driver
    ARM: tegra: defconfig: Enable tps6586x gpio
    gpio: tps6586x: Add gpio support through platform driver
    mfd: Cache tps6586x register through regmap
    mfd: Use regmap for tps6586x register access.
    mfd: Use devm managed resources for tps6586x
    input: Add onkey support for 88PM80X PMIC
    mfd: Add support for twl6041
    mfd: Fix twl6040 revision information
    mfd: Matches should be NULL when populate anatop child devices
    input: ab8500-ponkey: Create AB8500 domain IRQ mapping
    mfd: Add missing out of memory check for pcf50633
    Documentation: Describe the AB8500 Device Tree bindings
    mfd: Add tps65910 32-kHz-crystal-input init
    mfd: Drop modifying mc13xxx driver's id_table in probe
    ...

    Linus Torvalds
     
  • Pull PWM subsystem from Thierry Reding:
    "The new PWM subsystem aims at collecting all implementations of the
    legacy PWM API and to eventually replace it completely.

    The subsystem has been in development for over half a year now and
    many drivers have already been converted. It has been in linux-next
    for a couple of weeks and there have been no major issues so I think
    it is ready for inclusion in your tree."

    Arnd Bergmann :
    "Very much Ack on the new subsystem. It uses the interface
    declarations as the previously separate pwm drivers, so nothing
    changes for now in the drivers using it, although it enables us to
    change those more easily in the future if we want to.

    This work is also one of the missing pieces that are required to
    eventually build ARM kernels for multiple platforms, which is
    currently prohibited (amongs other things) by the fact that you cannot
    have more than one driver exporting the pwm functions."

    Tested-and-acked-by: Alexandre Courbot
    Acked-by: Mark Brown
    Acked-by: Philip, Avinash # TI's AM33xx platforms
    Acked-By: Alexandre Pereira da Silva # LPC32XX
    Acked-by: Arnd Bergmann
    Acked-by: Sachin Kamat

    Fix up trivial conflicts with other cleanups and DT updates.

    * 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm: (36 commits)
    pwm: pwm-tiehrpwm: PWM driver support for EHRPWM
    pwm: pwm-tiecap: PWM driver support for ECAP APWM
    pwm: fix used-uninitialized warning in pwm_get()
    pwm: add lpc32xx PWM support
    pwm_backlight: pass correct brightness to callback
    pwm: Use pr_* functions in pwm-samsung.c file
    pwm: Convert pwm-samsung to use devm_* APIs
    pwm: Convert pwm-tegra to use devm_clk_get()
    pwm: pwm-mxs: Return proper error if pwmchip_remove() fails
    pwm: pwm-bfin: Return proper error if pwmchip_remove() fails
    pwm: pxa: Propagate pwmchip_remove() error
    pwm: Convert pwm-pxa to use devm_* APIs
    pwm: Convert pwm-vt8500 to use devm_* APIs
    pwm: Convert pwm-imx to use devm_* APIs
    pwm: Conflict with legacy PWM API
    pwm: pwm-mxs: add pinctrl support
    pwm: pwm-mxs: use devm_* managed functions
    pwm: pwm-mxs: use global reset function stmp_reset_block
    pwm: pwm-mxs: encode soc name in compatible string
    pwm: Take over maintainership of the PWM subsystem
    ...

    Linus Torvalds
     

27 Jul, 2012

6 commits

  • Pull ARM SoC fixes from Olof Johansson:
    "A mixed bag of fixes, some for merge window fallout (tegra, MXS), and
    a short series of fixes for marvell platforms that didn't make it in
    before 3.5."

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: mxs: fix compile error caused by prom_update_property change
    ARM: dt: tegra trimslice: enable USB2 port
    ARM: dt: tegra trimslice: add vbus-gpio property
    ARM: vt8500: Add maintainer for VT8500 architecture
    ARM: Kirkwood: Replace mrvl with marvell
    ARM: Orion: fix driver probe error handling with respect to clk
    ARM: Dove: Fixup ge00 initialisation
    ARM: Kirkwood: Fix PHY disable clk problems
    ARM: Kirkwood: Ensure runit clock always ticks.
    ARM: versatile: Don't use platform clock for Integrator & VE
    ARM: tegra: harmony: add regulator supply name and its input supply

    Linus Torvalds
     
  • Pull LED subsystem update from Bryan Wu.

    * 'for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (50 commits)
    leds-lp8788: forgotten unlock at lp8788_led_work
    LEDS: propagate error codes in blinkm_detect()
    LEDS: memory leak in blinkm_led_common_set()
    leds: add new lp8788 led driver
    LEDS: add BlinkM RGB LED driver, documentation and update MAINTAINERS
    leds: max8997: Simplify max8997_led_set_mode implementation
    leds/leds-s3c24xx: use devm_gpio_request
    leds: convert Network Space v2 LED driver to devm_kzalloc() and cleanup error exit path
    leds: convert DAC124S085 LED driver to devm_kzalloc()
    leds: convert LM3530 LED driver to devm_kzalloc() and cleanup error exit path
    leds: convert TCA6507 LED driver to devm_kzalloc()
    leds: convert Freescale MC13783 LED driver to devm_kzalloc() and cleanup error exit path
    leds: convert ADP5520 LED driver to devm_kzalloc() and cleanup error exit path
    leds: convert PCA955x LED driver to devm_kzalloc() and cleanup error exit path
    leds: convert Sun Fire LED driver to devm_kzalloc() and cleanup error exit path
    leds: convert PCA9532 LED driver to devm_kzalloc()
    leds: convert LT3593 LED driver to devm_kzalloc()
    leds: convert Renesas TPU LED driver to devm_kzalloc() and cleanup error exit path
    leds: convert LP5523 LED driver to devm_kzalloc() and cleanup error exit path
    leds: convert PCA9633 LED driver to devm_kzalloc()
    ...

    Linus Torvalds
     
  • Pull remoteproc update from Ohad Ben-Cohen:
    - custom binary format support from Sjur Brændeland
    - groundwork for recovery and runtime pm support
    - some cleanups and API simplifications

    Fix up conflicts in drivers/remoteproc/remoteproc_core.c due to clashes
    with earlier cleanups by Sjur Brændeland (with part of the cleanups
    moved into the new remoteproc_elf_loader.c file).

    * tag 'remoteproc-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
    MAINTAINERS: add remoteproc's git
    remoteproc: Support custom firmware handlers
    remoteproc: Move Elf related functions to separate file
    remoteproc: Add function rproc_get_boot_addr
    remoteproc: Pass struct fw to load_segments and find_rsc_table.
    remoteproc: adopt the driver core's alloc/add/del/put naming
    remoteproc: remove the get_by_name/put API
    remoteproc: support non-iommu carveout assignment
    remoteproc: simplify unregister/free interfaces
    remoteproc: remove the now-redundant kref
    remoteproc: maintain a generic child device for each rproc
    remoteproc: allocate vrings on demand, free when not needed

    Linus Torvalds
     
  • Pull ACPI & power management update from Len Brown:
    "Re-write of the turbostat tool.
    lower overhead was necessary for measuring very large system when
    they are very idle.

    IVB support in intel_idle
    It's what I run on my IVB, others should be able to also:-)

    ACPICA core update
    We have found some bugs due to divergence between Linux and the
    upstream ACPICA base. Most of these patches are to reduce that
    divergence to reduce the risk of future bugs.

    Some cpuidle updates, mostly for non-Intel
    More will be coming, as they depend on this part.

    Some thermal management changes needed by non-ACPI systems.

    Some _OST (OS Status Indication) updates for hot ACPI hot-plug."

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (51 commits)
    Thermal: Documentation update
    Thermal: Add Hysteresis attributes
    Thermal: Make Thermal trip points writeable
    ACPI/AC: prevent OOPS on some boxes due to missing check power_supply_register() return value check
    tools/power: turbostat: fix large c1% issue
    tools/power: turbostat v2 - re-write for efficiency
    ACPICA: Update to version 20120711
    ACPICA: AcpiSrc: Fix some translation issues for Linux conversion
    ACPICA: Update header files copyrights to 2012
    ACPICA: Add new ACPI table load/unload external interfaces
    ACPICA: Split file: tbxface.c -> tbxfload.c
    ACPICA: Add PCC address space to space ID decode function
    ACPICA: Fix some comment fields
    ACPICA: Table manager: deploy new firmware error/warning interfaces
    ACPICA: Add new interfaces for BIOS(firmware) errors and warnings
    ACPICA: Split exception code utilities to a new file, utexcep.c
    ACPI: acpi_pad: tune round_robin_time
    ACPICA: Update to version 20120620
    ACPICA: Add support for implicit notify on multiple devices
    ACPICA: Update comments; no functional change
    ...

    Linus Torvalds
     
  • Pull GPIO changes from Linus Walleij:
    - New driver for AMD-8111 southbridge GPIOs
    - New driver for Wolfson Micro Arizona devices
    - Propagate device tree parse errors
    - Probe deferral finalizations - all expected calls to GPIO will now
    hopefully request deferral where apropriate
    - Misc updates to TCA6424, WM8994, LPC32xx, PCF857x, Samsung MXC, OMAP
    and PCA953X drivers.

    Fix up gpio_idx conflicts in drivers/gpio/gpio-mxc.c

    * tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
    gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available
    gpiolib: Defer failed gpio requests by default
    MAINTAINERS: add entry OMAP GPIO driver
    gpio/pca953x: increase variables size to support 24 bit of data
    GPIO: PCA953X: Increase size of invert variable to support 24 bit
    gpio/omap: move bank->dbck initialization to omap_gpio_mod_init()
    gpio/mxc: use the edge_sel feature if available
    gpio: propagate of_parse_phandle_with_args errors
    gpio: samsung: add flags specifier to device-tree binding
    gpiolib: Add support for Wolfson Microelectronics Arizona class devices
    gpio: gpio-lpc32xx: Add gpio_to_irq mapping
    gpio: pcf857x: share 8/16 bit access functions
    gpio: LPC32xx: Driver cleanup
    MAINTAINERS: Add Wolfson gpiolib drivers to the Wolfson entry
    gpiolib: wm8994: Convert to devm_kzalloc()
    gpiolib: wm8994: Use irq_domain mappings for gpios
    gpio: add a driver for GPIO pins found on AMD-8111 south bridge chips
    gpio/tca6424: merge I2C transactions, remove cast
    gpio/of: fix a typo of comment message

    Linus Torvalds
     
  • Pull driver core changes from Greg Kroah-Hartman:
    "Here's the big driver core pull request for 3.6-rc1.

    Unlike 3.5, this kernel should be a lot tamer, with the printk changes
    now settled down. All we have here is some extcon driver updates, w1
    driver updates, a few printk cleanups that weren't needed for 3.5, but
    are good to have now, and some other minor fixes/changes in the driver
    core.

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

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
    printk: Export struct log size and member offsets through vmcoreinfo
    Drivers: hv: Change the hex constant to a decimal constant
    driver core: don't trigger uevent after failure
    extcon: MAX77693: Add extcon-max77693 driver to support Maxim MAX77693 MUIC device
    sysfs: fail dentry revalidation after namespace change fix
    sysfs: fail dentry revalidation after namespace change
    extcon: spelling of detach in function doc
    extcon: arizona: Stop microphone detection if we give up on it
    extcon: arizona: Update cable reporting calls and split headset
    PM / Runtime: Do not increment device usage counts before probing
    kmsg - do not flush partial lines when the console is busy
    kmsg - export "continuation record" flag to /dev/kmsg
    kmsg - avoid warning for CONFIG_PRINTK=n compilations
    kmsg - properly print over-long continuation lines
    driver-core: Use kobj_to_dev instead of re-implementing it
    driver-core: Move kobj_to_dev from genhd.h to device.h
    driver core: Move deferred devices to the end of dpm_list before probing
    driver core: move uevent call to driver_register
    driver core: fix shutdown races with probe/remove(v3)
    Extcon: Arizona: Add driver for Wolfson Arizona class devices
    ...

    Linus Torvalds
     

26 Jul, 2012

2 commits


25 Jul, 2012

7 commits

  • Pull common clk framework changes from Michael Turquette:
    "This includes a small number of core framework improvments, platform
    ports and new DT bindings."

    Fix up trivial conflicts in drivers/clk/Makefile

    * tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux: (21 commits)
    clk: fix compile for OF && !COMMON_CLK
    clk: fix clk_get on of_clk_get_by_name return check
    clk: mxs: clk_register_clkdev mx28 usb clocks
    clk: add highbank clock support
    dt: add clock binding doc to primecell bindings
    clk: add DT fixed-clock binding support
    clk: add DT clock binding support
    ARM: integrator: convert to common clock
    clk: add versatile ICST307 driver
    ARM: integrator: put symbolic bus names on devices
    ARM: u300: convert to common clock
    clk: cache parent clocks only for muxes
    clk: wm831x: Add initial WM831x clock driver
    clk: Constify struct clk_init_data
    clk: Add CLK_IS_BASIC flag to identify basic clocks
    clk: Add support for rate table based dividers
    clk: Add support for power of two type dividers
    clk: mxs: imx28: decrease the frequency of ref_io1 for SSP2 and SSP3
    clk: mxs: add clkdev lookup for pwm
    clk: mxs: Fix the GPMI clock name
    ...

    Linus Torvalds
     
  • Pull PCI changes from Bjorn Helgaas:
    "Host bridge hotplug:
    - Add MMCONFIG support for hot-added host bridges (Jiang Liu)
    Device hotplug:
    - Move fixups from __init to __devinit (Sebastian Andrzej Siewior)
    - Call FINAL fixups for hot-added devices, too (Myron Stowe)
    - Factor out generic code for P2P bridge hot-add (Yinghai Lu)
    - Remove all functions in a slot, not just those with _EJx (Amos
    Kong)
    Dynamic resource management:
    - Track bus number allocation (struct resource tree per domain)
    (Yinghai Lu)
    - Make P2P bridge 1K I/O windows work with resource reassignment
    (Bjorn Helgaas, Yinghai Lu)
    - Disable decoding while updating 64-bit BARs (Bjorn Helgaas)
    Power management:
    - Add PCIe runtime D3cold support (Huang Ying)
    Virtualization:
    - Add VFIO infrastructure (ACS, DMA source ID quirks) (Alex
    Williamson)
    - Add quirks for devices with broken INTx masking (Jan Kiszka)
    Miscellaneous:
    - Fix some PCI Express capability version issues (Myron Stowe)
    - Factor out some arch code with a weak, generic, pcibios_setup()
    (Myron Stowe)"

    * tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (122 commits)
    PCI: hotplug: ensure a consistent return value in error case
    PCI: fix undefined reference to 'pci_fixup_final_inited'
    PCI: build resource code for M68K architecture
    PCI: pciehp: remove unused pciehp_get_max_lnk_width(), pciehp_get_cur_lnk_width()
    PCI: reorder __pci_assign_resource() (no change)
    PCI: fix truncation of resource size to 32 bits
    PCI: acpiphp: merge acpiphp_debug and debug
    PCI: acpiphp: remove unused res_lock
    sparc/PCI: replace pci_cfg_fake_ranges() with pci_read_bridge_bases()
    PCI: call final fixups hot-added devices
    PCI: move final fixups from __init to __devinit
    x86/PCI: move final fixups from __init to __devinit
    MIPS/PCI: move final fixups from __init to __devinit
    PCI: support sizing P2P bridge I/O windows with 1K granularity
    PCI: reimplement P2P bridge 1K I/O windows (Intel P64H2)
    PCI: disable MEM decoding while updating 64-bit MEM BARs
    PCI: leave MEM and IO decoding disabled during 64-bit BAR sizing, too
    PCI: never discard enable/suspend/resume_early/resume fixups
    PCI: release temporary reference in __nv_msi_ht_cap_quirk()
    PCI: restructure 'pci_do_fixups()'
    ...

    Linus Torvalds
     
  • Pull sound update from Takashi Iwai:
    "This is a fairly quiet release in all sound area. Only a little bit
    of changes in the core side while most of changes are seen in the
    drivers.

    HD-audio:
    - A few new codec additions for Nvidia, Realtek and VIA
    - Intel Haswell audio support
    - Support for "phantom" jacks for consistent jack reporting
    - Major clean-ups in HDMI/DP driver codes
    - A workaround for inverted digital-mic pins with Realtek codecs
    - Removal of beep_mode=2 option

    ASoC:
    - Added the ability to add and remove DAPM paths dynamically, mostly
    for reparenting on clock changes
    - New machine drivers for Marvell Brownstone, ST-Ericsson Ux500
    reference platform and ttc-dkp
    - New CPU drivers for Blackfin BF6xx SPORTs in I2S mode, Marvell MMP,
    Synopsis Designware I2S controllers, and SPEAr DMA and S/PDIF
    - New CODEC drivers for Dialog DA732x, ST STA529, ST-Ericsson AB8500,
    TI Isabelle and Wolfson Microelectronics WM5102 and WM5110
    - DAPM fixes for the recent locking changes
    - Fix for _PRE and _POST widgets (which have been broken for a few
    releases now)
    - A couple of minor driver updates

    Misc
    - Conversion to new dev_pm_ops in platform and PCI drivers
    - LTC support and some fixes in PCXHR driver
    - A few fixes and PM support for ISA OPti9xx and WSS cards
    - Some TLV code cleanup
    - Move driver-specific headers from include/sound to local dirs"

    * tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (212 commits)
    ASoC: dapm: Fix _PRE and _POST events for DAPM performance improvements
    ALSA: hda - add dock support for Thinkpad X230 Tablet
    ALSA: hda - Turn on PIN_OUT from hdmi playback prepare.
    ASoC imx-audmux: add MX31_AUDMUX_PORT7_SSI_PINS_7 define
    ASoC: littlemill: Add userspace control of the WM1250 I/O
    ASoC: wm8994: Update micdet for irqdomain conversion
    ALSA: hda - make sure alc268 does not OOPS on codec parse
    ALSA: hda - Add support for Realtek ALC282
    ALSA: hda - Fix index number conflicts of phantom jacks
    ALSA: opti9xx: Fix section mismatch by PM support
    ALSA: snd-opti9xx: Implement suspend/resume
    ALSA: hda - Add new GPU codec ID to snd-hda
    ALSA: hda - Fix driver type of Haswell controller to AZX_DRIVER_SCH
    ALSA: hda - add Haswell HDMI codec id
    ALSA: hda - Add DeviceID for Haswell HDA
    ALSA: wss_lib: Fix resume on Yamaha OPL3-SAx
    ALSA: wss_lib: fix suspend/resume
    ALSA: es1938: replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE
    ALSA: tlv: add DECLARE_TLV_DB_RANGE()
    ALSA: tlv: add DECLARE_TLV_CONTAINER()
    ...

    Linus Torvalds
     
  • Pull trivial tree from Jiri Kosina:
    "Trivial updates all over the place as usual."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
    Fix typo in include/linux/clk.h .
    pci: hotplug: Fix typo in pci
    iommu: Fix typo in iommu
    video: Fix typo in drivers/video
    Documentation: Add newline at end-of-file to files lacking one
    arm,unicore32: Remove obsolete "select MISC_DEVICES"
    module.c: spelling s/postition/position/g
    cpufreq: Fix typo in cpufreq driver
    trivial: typo in comment in mksysmap
    mach-omap2: Fix typo in debug message and comment
    scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
    Change email address for Steve Glendinning
    Btrfs: fix typo in convert_extent_bit
    via: Remove bogus if check
    netprio_cgroup.c: fix comment typo
    backlight: fix memory leak on obscure error path
    Documentation: asus-laptop.txt references an obsolete Kconfig item
    Documentation: ManagementStyle: fixed typo
    mm/vmscan: cleanup comment error in balance_pgdat
    mm: cleanup on the comments of zone_reclaim_stat
    ...

    Linus Torvalds
     
  • Pull HID updates from Jiri Kosina:
    "The list of changes worth pointing out explicitly:

    - We are getting 'UHID', which is a new framework for implementing HID
    transport drivers in userspace (this is different from HIDRAW, which
    is transport-independent and provides report parsing facilities;
    uhid is for the other (transport) part of the pipeline).

    It's needed for (and currently being used by) Bluetooth-LowEnergy,
    as its specification mandates things we don't want in the kernel.

    Written by David Herrmann.

    - there have been quite a few bugs in runtime suspend/resume paths
    (probably never reported to actually happen in the wild, but still).
    Alan Stern fixed those.

    - a few other driver updates and fixes and random new device support."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (45 commits)
    HID: add ASUS AIO keyboard model AK1D
    HID: add support for Cypress barcode scanner 04B4:ED81
    HID: Allow drivers to be their own listener
    HID: usbhid: fix error paths in suspend
    HID: usbhid: check for suspend or reset before restarting
    HID: usbhid: replace HID_REPORTED_IDLE with HID_SUSPENDED
    HID: usbhid: inline some simple routines
    HID: usbhid: fix autosuspend calls
    HID: usbhid: fix use-after-free bug
    HID: hid-core: optimize in case of hidraw
    HID: hidraw: fix list->buffer memleak
    HID: uhid: Fix sending events with invalid data
    HID: roccat: added sensor sysfs attribute for Savu
    HID: Add driver for Holtek based keyboards with broken HID
    HID: Add suport for the brightness control keys on HP keyboards
    HID: magicmouse: Implement Multi-touch Protocol B (MT-B)
    HID: magicmouse: Removing report_touches switch
    HID: roccat: rename roccat_common functions to roccat_common2
    HID: roccat: fix wrong hid_err usage on struct usb_device
    HID: roccat: move functionality to roccat-common
    ...

    Linus Torvalds
     
  • Pull KVM updates from Avi Kivity:
    "Highlights include
    - full big real mode emulation on pre-Westmere Intel hosts (can be
    disabled with emulate_invalid_guest_state=0)
    - relatively small ppc and s390 updates
    - PCID/INVPCID support in guests
    - EOI avoidance; 3.6 guests should perform better on 3.6 hosts on
    interrupt intensive workloads)
    - Lockless write faults during live migration
    - EPT accessed/dirty bits support for new Intel processors"

    Fix up conflicts in:
    - Documentation/virtual/kvm/api.txt:

    Stupid subchapter numbering, added next to each other.

    - arch/powerpc/kvm/booke_interrupts.S:

    PPC asm changes clashing with the KVM fixes

    - arch/s390/include/asm/sigp.h, arch/s390/kvm/sigp.c:

    Duplicated commits through the kvm tree and the s390 tree, with
    subsequent edits in the KVM tree.

    * tag 'kvm-3.6-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (93 commits)
    KVM: fix race with level interrupts
    x86, hyper: fix build with !CONFIG_KVM_GUEST
    Revert "apic: fix kvm build on UP without IOAPIC"
    KVM guest: switch to apic_set_eoi_write, apic_write
    apic: add apic_set_eoi_write for PV use
    KVM: VMX: Implement PCID/INVPCID for guests with EPT
    KVM: Add x86_hyper_kvm to complete detect_hypervisor_platform check
    KVM: PPC: Critical interrupt emulation support
    KVM: PPC: e500mc: Fix tlbilx emulation for 64-bit guests
    KVM: PPC64: booke: Set interrupt computation mode for 64-bit host
    KVM: PPC: bookehv: Add ESR flag to Data Storage Interrupt
    KVM: PPC: bookehv64: Add support for std/ld emulation.
    booke: Added crit/mc exception handler for e500v2
    booke/bookehv: Add host crit-watchdog exception support
    KVM: MMU: document mmu-lock and fast page fault
    KVM: MMU: fix kvm_mmu_pagetable_walk tracepoint
    KVM: MMU: trace fast page fault
    KVM: MMU: fast path of handling guest page fault
    KVM: MMU: introduce SPTE_MMU_WRITEABLE bit
    KVM: MMU: fold tlb flush judgement into mmu_spte_update
    ...

    Linus Torvalds
     
  • Pull networking changes from David S Miller:

    1) Remove the ipv4 routing cache. Now lookups go directly into the FIB
    trie and use prebuilt routes cached there.

    No more garbage collection, no more rDOS attacks on the routing
    cache. Instead we now get predictable and consistent performance,
    no matter what the pattern of traffic we service.

    This has been almost 2 years in the making. Special thanks to
    Julian Anastasov, Eric Dumazet, Steffen Klassert, and others who
    have helped along the way.

    I'm sure that with a change of this magnitude there will be some
    kind of fallout, but such things ought the be simple to fix at this
    point. Luckily I'm not European so I'll be around all of August to
    fix things :-)

    The major stages of this work here are each fronted by a forced
    merge commit whose commit message contains a top-level description
    of the motivations and implementation issues.

    2) Pre-demux of established ipv4 TCP sockets, saves a route demux on
    input.

    3) TCP SYN/ACK performance tweaks from Eric Dumazet.

    4) Add namespace support for netfilter L4 conntrack helpers, from Gao
    Feng.

    5) Add config mechanism for Energy Efficient Ethernet to ethtool, from
    Yuval Mintz.

    6) Remove quadratic behavior from /proc/net/unix, from Eric Dumazet.

    7) Support for connection tracker helpers in userspace, from Pablo
    Neira Ayuso.

    8) Allow userspace driven TX load balancing functions in TEAM driver,
    from Jiri Pirko.

    9) Kill off NLMSG_PUT and RTA_PUT macros, more gross stuff with
    embedded gotos.

    10) TCP Small Queues, essentially minimize the amount of TCP data queued
    up in the packet scheduler layer. Whereas the existing BQL (Byte
    Queue Limits) limits the pkt_sched --> netdevice queuing levels,
    this controls the TCP --> pkt_sched queueing levels.

    From Eric Dumazet.

    11) Reduce the number of get_page/put_page ops done on SKB fragments,
    from Alexander Duyck.

    12) Implement protection against blind resets in TCP (RFC 5961), from
    Eric Dumazet.

    13) Support the client side of TCP Fast Open, basically the ability to
    send data in the SYN exchange, from Yuchung Cheng.

    Basically, the sender queues up data with a sendmsg() call using
    MSG_FASTOPEN, then they do the connect() which emits the queued up
    fastopen data.

    14) Avoid all the problems we get into in TCP when timers or PMTU events
    hit a locked socket. The TCP Small Queues changes added a
    tcp_release_cb() that allows us to queue work up to the
    release_sock() caller, and that's what we use here too. From Eric
    Dumazet.

    15) Zero copy on TX support for TUN driver, from Michael S. Tsirkin.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1870 commits)
    genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
    r8169: revert "add byte queue limit support".
    ipv4: Change rt->rt_iif encoding.
    net: Make skb->skb_iif always track skb->dev
    ipv4: Prepare for change of rt->rt_iif encoding.
    ipv4: Remove all RTCF_DIRECTSRC handliing.
    ipv4: Really ignore ICMP address requests/replies.
    decnet: Don't set RTCF_DIRECTSRC.
    net/ipv4/ip_vti.c: Fix __rcu warnings detected by sparse.
    ipv4: Remove redundant assignment
    rds: set correct msg_namelen
    openvswitch: potential NULL deref in sample()
    tcp: dont drop MTU reduction indications
    bnx2x: Add new 57840 device IDs
    tcp: avoid oops in tcp_metrics and reset tcpm_stamp
    niu: Change niu_rbr_fill() to use unlikely() to check niu_rbr_add_page() return value
    niu: Fix to check for dma mapping errors.
    net: Fix references to out-of-scope variables in put_cmsg_compat()
    net: ethernet: davinci_emac: add pm_runtime support
    net: ethernet: davinci_emac: Remove unnecessary #include
    ...

    Linus Torvalds
     

24 Jul, 2012

4 commits

  • Conflicts:
    drivers/hid/Kconfig

    Jiri Kosina
     
  • Add driver for BlinkM device to drivers/leds/.
    Add entry to MAINTAINERS file.
    Add documentation in Documentation/leds/.

    A BlinkM is a RGB LED controlled through I2C.

    This driver implements an interface to the LED framework
    and another sysfs group to access the internal options
    of the BlinkM.

    rev6: Use module_i2c_driver().
    rev5: Removed own workqueue in favor of events wq.
    rev4: Fixed comments by Bryan Wu.
    rev3: Fixed issues found by Jonathan Neuschäfer.

    (bryan.wu@canonical.com: remove 2 trailing whitespace)

    Signed-off-by: Jan-Simon Möller
    Signed-off-by: Bryan Wu

    Jan-Simon Möller
     
  • Pull security subsystem updates from James Morris:
    "Nothing groundbreaking for this kernel, just cleanups and fixes, and a
    couple of Smack enhancements."

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (21 commits)
    Smack: Maintainer Record
    Smack: don't show empty rules when /smack/load or /smack/load2 is read
    Smack: user access check bounds
    Smack: onlycap limits on CAP_MAC_ADMIN
    Smack: fix smack_new_inode bogosities
    ima: audit is compiled only when enabled
    ima: ima_initialized is set only if successful
    ima: add policy for pseudo fs
    ima: remove unused cleanup functions
    ima: free securityfs violations file
    ima: use full pathnames in measurement list
    security: Fix nommu build.
    samples: seccomp: add .gitignore for untracked executables
    tpm: check the chip reference before using it
    TPM: fix memleak when register hardware fails
    TPM: chip disabled state erronously being reported as error
    MAINTAINERS: TPM maintainers' contacts update
    Merge branches 'next-queue' and 'next' into next
    Remove unused code from MPI library
    Revert "crypto: GnuPG based MPI lib - additional sources (part 4)"
    ...

    Linus Torvalds
     
  • Pull support for three new arm SoC types from Arnd Bergmann:

    - The mvebu platform includes Marvell's Armada XP and Armada 370 chips,
    made by the mvebu business unit inside of Marvell. Since the same
    group also made the older but similar platforms we call "orion5x",
    "kirkwood", "mv78xx0" and "dove", we plan to move all of them into
    the mach-mvebu directory in the future.

    - socfpga is Altera's platform based on Cortex-A9 cores and a lot of
    FPGA space. This is similar to the Xilinx zynq platform we already
    support. The code is particularly clean, which is helped by the fact
    that the hardware doesn't do much besides the parts that are expected
    to get added in the FPGA.

    - The OMAP subarchitecture gains support for the latest generation, the
    OMAP5 based on the new Cortex-A15 core. Support is rather
    rudimentary for now, but will be extended in the future.

    * tag 'newsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (25 commits)
    ARM: socfpga: initial support for Altera's SOCFPGA platform
    arm: mvebu: generate DTBs for supported SoCs
    ARM: mvebu: MPIC: read number of interrupts from control register
    arm: mach-mvebu: add entry to MAINTAINERS
    arm: mach-mvebu: add compilation/configuration change
    arm: mach-mvebu: add defconfig
    arm: mach-mvebu: add documentation for new device tree bindings
    arm: mach-mvebu: add support for Armada 370 and Armada XP with DT
    arm: mach-mvebu: add source files
    arm: mach-mvebu: add header
    clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
    ARM: Kconfig update to support additional GPIOs in OMAP5
    ARM: OMAP5: Add the build support
    arm/dts: OMAP5: Add omap5 dts files
    ARM: OMAP5: board-generic: Add device tree support
    ARM: omap2+: board-generic: clean up the irq data from board file
    ARM: OMAP5: Add SMP support
    ARM: OMAP5: Add the WakeupGen IP updates
    ARM: OMAP5: l3: Add l3 error handler support for omap5
    ARM: OMAP5: gpmc: Update gpmc_init()
    ...

    Conflicts:
    Documentation/devicetree/bindings/arm/omap/omap.txt
    arch/arm/mach-omap2/Makefile
    drivers/clocksource/Kconfig
    drivers/clocksource/Makefile

    Linus Torvalds
     

23 Jul, 2012

1 commit


21 Jul, 2012

1 commit


20 Jul, 2012

1 commit


19 Jul, 2012

3 commits


18 Jul, 2012

1 commit

  • Since I've been maintaining this, making it official at the request of the
    GPIO maintainers.

    Cc: Grant Likely
    Cc: Linus Walleij
    Cc: Santosh Shilimkar
    Cc: Andrew Morton
    Signed-off-by: Kevin Hilman
    [corrected file path]
    Signed-off-by: Linus Walleij

    Kevin Hilman
     

17 Jul, 2012

2 commits

  • Pull networking fixes from David Miller:

    1) IPVS oops'ers:
    a) Should not reset skb->nf_bridge in forwarding hook (Lin Ming)
    b) 3.4 commit can cause ip_vs_control_cleanup to be invoked after
    the ipvs_core_ops are unregistered during rmmod (Julian ANastasov)

    2) ixgbevf bringup failure can crash in TX descriptor cleanup
    (Alexander Duyck)

    3) AX25 switch missing break statement hoses ROSE sockets (Alan Cox)

    4) CAIF accesses freed per-net memory (Sjur Brandeland)

    5) Network cgroup code has out-or-bounds accesses (Eric DUmazet), and
    accesses freed memory (Gao Feng)

    6) Fix a crash in SCTP reported by Dave Jones caused by freeing an
    association still on a list (Neil HOrman)

    7) __netdev_alloc_skb() regresses on GFP_DMA using drivers because that
    GFP flag is not being retained for the allocation (Eric Dumazet).

    8) Missing NULL hceck in sch_sfb netlink message parsing (Alan Cox)

    9) bnx2 crashes because TX index iteration is not bounded correctly
    (Michael Chan)

    10) IPoIB generates warnings in TCP queue collapsing (via
    skb_try_coalesce) because it does not set skb->truesize correctly
    (Eric Dumazet)

    11) vlan_info objects leak for the implicit vlan with ID 0 (Amir
    Hanania)

    12) A fix for TX time stamp handling in gianfar does not transfer socket
    ownership from one packet to another correctly, resulting in a
    socket write space imbalance (Eric Dumazet)

    13) Julia Lawall found several cases where we do a list iteration, and
    then at the loop termination unconditionally assume we ended up with
    real list object, rather than the list head itself (CNIC, RXRPC,
    mISDN).

    14) The bonding driver handles procfs moving incorrectly when a device
    it manages is moved from one namespace to another (Eric Biederman)

    15) Missing memory barriers in stmmac descriptor accesses result in
    various crashes (Deepak Sikri)

    16) Fix handling of broadcast packets in batman-adv (Simon Wunderlich)

    17) Properly check the sanity of sendmsg() lengths in ieee802154's
    dgram_sendmsg(). Dave Jones and others have hit and reported this
    bug (Sasha Levin)

    18) Some drivers (b44 and b43legacy) on 64-bit machines stopped working
    because of how netdev_alloc_skb() was adjusted. Such drivers should
    now use alloc_skb() for obtaining bounce buffers. (Eric Dumazet)

    19) atl1c mis-managed it's link state in that it stops the queue by hand
    on link down. The generic networking takes care of that and this
    double stop locks the queue down. So simply removing the driver's
    queue stop call fixes the problem (Cloud Ren)

    20) Fix out-of-memory due to mis-accounting in net_em packet scheduler
    (Eric Dumazet)

    21) If DCB and SR-IOV are configured at the same time in IXGBE the chip
    will hang because this is not supported (Alexander Duyck)

    22) A commit to stop drivers using netdev->base_addr broke the CNIC
    driver (Michael Chan)

    23) Timeout regression in ipset caused by an attempt to fix an overflow
    bug (Jozsef Kadlecsik).

    24) mac80211 minstrel code allocates memory using incorrect size
    (Thomas Huehn)

    25) llcp_sock_getname() needs to check for a NULL device otherwise we
    OOPS (Sasha Levin)

    26) mwifiex leaks memory (Bing Zhao)

    27) Propagate iwlwifi fix to iwlegacy, even when we're not associated
    we need to monitor for stuck queues in the watchdog handler
    (Stanislaw Geuszka)

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
    ipvs: fix oops in ip_vs_dst_event on rmmod
    ipvs: fix oops on NAT reply in br_nf context
    ixgbevf: Fix panic when loading driver
    ax25: Fix missing break
    MAINTAINERS: reflect actual changes in IEEE 802.15.4 maintainership
    caif: Fix access to freed pernet memory
    net: cgroup: fix access the unallocated memory in netprio cgroup
    ixgbevf: Prevent RX/TX statistics getting reset to zero
    sctp: Fix list corruption resulting from freeing an association on a list
    net: respect GFP_DMA in __netdev_alloc_skb()
    e1000e: fix test for PHY being accessible on 82577/8/9 and I217
    e1000e: Correct link check logic for 82571 serdes
    sch_sfb: Fix missing NULL check
    bnx2: Fix bug in bnx2_free_tx_skbs().
    IPoIB: fix skb truesize underestimatiom
    net: Fix memory leak - vlan_info struct
    gianfar: fix potential sk_wmem_alloc imbalance
    drivers/net/ethernet/broadcom/cnic.c: remove invalid reference to list iterator variable
    net/rxrpc/ar-peer.c: remove invalid reference to list iterator variable
    drivers/isdn/mISDN/stack.c: remove invalid reference to list iterator variable
    ...

    Linus Torvalds
     
  • I no longer have a mailbox at smsc.com, and I've had two reports
    that that email address now bounces from people trying to
    contact me. This patch updates all references to that invalid
    address to one that I can be contacted on more permanently.

    This patch also updates the maintainer status to reflect
    the fact I'm no longer directly paid to maintain these drivers.

    Signed-off-by: Steve Glendinning
    Signed-off-by: Jiri Kosina

    Steve Glendinning