06 Nov, 2012

1 commit


31 Oct, 2012

5 commits

  • Masaki found and patched a kallsyms issue: the last symbol in a
    module's symtab wasn't transferred. This is because we manually copy
    the zero'th entry (which is always empty) then copy the rest in a loop
    starting at 1, though from src[0]. His fix was minimal, I prefer to
    rewrite the loops in more standard form.

    There are two loops: one to get the size, and one to copy. Make these
    identical: always count entry 0 and any defined symbol in an allocated
    non-init section.

    This bug exists since the following commit was introduced.
    module: reduce symbol table for loaded modules (v2)
    commit: 4a4962263f07d14660849ec134ee42b63e95ea9a

    LKML: http://lkml.org/lkml/2012/10/24/27
    Reported-by: Masaki Kimura
    Cc: stable@kernel.org

    Rusty Russell
     
  • Pull GPIO fixes from Linus Walleij:
    - Fix a potential bit wrap issue in the Timberdale driver
    - Fix up the buffer allocation size in the 74x164 driver
    - Set the value in direction_output() right in the mvebu driver
    - Return proper error codes for invalid GPIOs
    - Fix an off-mode bug for the OMAP
    - Don't initialize the mask_cach on the mvebu driver

    * tag 'gpio-fixes-v3.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
    GPIO: mvebu-gpio: Don't initialize the mask_cache
    gpio/omap: fix off-mode bug: clear debounce settings on free/reset
    gpiolib: Don't return -EPROBE_DEFER to sysfs, or for invalid gpios
    gpio: mvebu: correctly set the value in direction_output()
    gpio-74x164: Fix buffer allocation size
    gpio-timberdale: fix a potential wrapping issue

    Linus Torvalds
     
  • Pull ext4 bugfix from Ted Ts'o:
    "This fixes the root cause of the ext4 data corruption bug which raised
    a ruckus on LWN, Phoronix, and Slashdot.

    This bug only showed up when non-standard mount options
    (journal_async_commit and/or journal_checksum) were enabled, and when
    the file system was not cleanly unmounted, but the root cause was the
    inode bitmap modifications was not being properly journaled.

    This could potentially lead to minor file system corruptions (pass 5
    complaints with the inode allocation bitmap) after an unclean shutdown
    under the wrong/unlucky workloads, but it turned into major failure if
    the journal_checksum and/or jouaral_async_commit was enabled."

    * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
    ext4: fix unjournaled inode bitmap modification

    Linus Torvalds
     
  • Pull block driver update from Jens Axboe:
    "Distilled down variant, the rest will pass over to 3.8. I pulled it
    into the for-linus branch I had waiting for a pull request as well, in
    case you are wondering why there are new entries in here too. This
    also got rid of two reverts and the ones of the mtip32xx patches that
    went in later in the 3.6 cycle, so the series looks a bit cleaner."

    * 'for-linus' of git://git.kernel.dk/linux-block:
    loop: Make explicit loop device destruction lazy
    mtip32xx:Added appropriate timeout value for secure erase
    xen/blkback: Change xen_vbd's flush_support and discard_secure to have type unsigned int, rather than bool
    cciss: select CONFIG_CHECK_SIGNATURE
    cciss: remove unneeded memset()
    xen/blkback: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
    pktcdvd: update MAINTAINERS
    floppy: remove dr, reuse drive on do_floppy_init
    floppy: use common function to check if floppies can be registered
    floppy: properly handle failure on add_disk loop
    floppy: do put_disk on current dr if blk_init_queue fails
    floppy: don't call alloc_ordered_workqueue inside the alloc_disk loop
    xen/blkback: Fix compile warning
    block: Add blk_rq_pos(rq) to sort rq when plushing
    drivers/block: remove CONFIG_EXPERIMENTAL
    block: remove CONFIG_EXPERIMENTAL
    vfs: fix: don't increase bio_slab_max if krealloc() fails
    blkcg: stop iteration early if root_rl is the only request list
    blkcg: Fix use-after-free of q->root_blkg and q->root_rl.blkg

    Linus Torvalds
     
  • Due to the SMP nature of some of the chips, which have per CPU
    registers, the driver does not use the generic irq_gc_mask_set_bit() &
    irq_gc_mask_clr_bit() functions, which only support a single register.
    The driver has its own implementation of these functions, which can
    pick the correct register depending on the CPU being used. The
    functions do however use the gc->mask_cache value.

    The call to irq_setup_generic_chip() was passing
    IRQ_GC_INIT_MASK_CACHE, which caused the gc->mask_cache to be
    initialized to the contents of some random register. This resulted in
    unexpected interrupts been delivered from random GPIO lines.

    Signed-off-by: Andrew Lunn
    Tested-by: Jamie Lentin
    Acked-by: Thomas Petazzoni
    Tested-by: Michael Walle
    Signed-off-by: Linus Walleij

    Andrew Lunn
     

30 Oct, 2012

13 commits

  • xfstests has always had random failures of tests due to loop devices
    failing to be torn down and hence leaving filesytems that cannot be
    unmounted. This causes test runs to immediately stop.

    Over the past 6 or 7 years we've added hacks like explicit unmount
    -d commands for loop mounts, losetup -d after unmount -d fails, etc,
    but still the problems persist. Recently, the frequency of loop
    related failures increased again to the point that xfstests 259 will
    reliably fail with a stray loop device that was not torn down.

    That is despite the fact the test is above as simple as it gets -
    loop 5 or 6 times running mkfs.xfs with different paramters:

    lofile=$(losetup -f)
    losetup $lofile "$testfile"
    "$MKFS_XFS_PROG" -b size=512 $lofile >/dev/null || echo "mkfs failed!"
    sync
    losetup -d $lofile

    And losteup -d $lofile is failing with EBUSY on 1-3 of these loops
    every time the test is run.

    Turns out that blkid is running simultaneously with losetup -d, and
    so it sees an elevated reference count and returns EBUSY. But why
    is blkid running? It's obvious, isn't it? udev has decided to try
    and find out what is on the block device as a result of a creation
    notification. And it is racing with mkfs, so might still be scanning
    the device when mkfs finishes and we try to tear it down.

    So, make losetup -d force autoremove behaviour. That is, when the
    last reference goes away, tear down the device. xfstests wants it
    *gone*, not causing random teardown failures when we know that all
    the operations the tests have specifically run on the device have
    completed and are no longer referencing the loop device.

    Signed-off-by: Dave Chinner
    Signed-off-by: Jens Axboe

    Dave Chinner
     
  • Added appropriate timeout value for secure erase based on identify device data

    Signed-off-by: Asai Thambi S P
    Signed-off-by: Selvan Mani
    Signed-off-by: Jens Axboe

    Selvan Mani
     
  • …gned int, rather than bool

    Changing the type of bdev parameters to be unsigned int :1, rather than bool.
    This is more consistent with the types of other features in the block drivers.

    Signed-off-by: Oliver Chick <oliver.chick@citrix.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>

    Oliver Chick
     
  • The patch cciss-use-check_signature.patch in -mm tree introduced
    a build error:

    drivers/built-in.o: In function `CISS_signature_present':
    drivers/block/cciss.c:4270: undefined reference to `check_signature'

    Add missing CONFIG_CHECK_SIGNATURE to fix this issue.

    Reported-by: Fengguang Wu
    Signed-off-by: Akinobu Mita
    Cc: Fengguang Wu
    Cc: Mike Miller
    Cc: Jens Axboe
    Acked-by: "Stephen M. Cameron"
    Signed-off-by: Andrew Morton
    Signed-off-by: Jens Axboe

    Akinobu Mita
     
  • The memory return by kzalloc() or kmem_cache_zalloc() has already be set
    to zero, so remove useless memset(0).

    spatch with a semantic match is used to found this problem.
    (http://coccinelle.lip6.fr/)

    Signed-off-by: Wei Yongjun
    Cc: Mike Miller
    Cc: Jens Axboe
    Cc: Stephen M. Cameron
    Signed-off-by: Andrew Morton
    Signed-off-by: Jens Axboe

    Wei Yongjun
     
  • Using kmem_cache_zalloc() instead of kmem_cache_alloc() and memset().

    spatch with a semantic match is used to found this problem.
    (http://coccinelle.lip6.fr/)

    Signed-off-by: Wei Yongjun
    Signed-off-by: Konrad Rzeszutek Wilk

    Wei Yongjun
     
  • Peter is not going to maintain the driver any more. I have the
    hardware.

    Acked-by: Peter Osterlund
    Signed-off-by: Jiri Kosina

    Jiri Kosina
     
  • This is a small cleanup, that also may turn error handling of
    unitialized disks more readable. We don't need a separate variable to
    track allocated disks, remove dr and reuse drive variable instead.

    Signed-off-by: Herton Ronaldo Krzesinski
    Signed-off-by: Jiri Kosina
    Signed-off-by: Jens Axboe

    Herton Ronaldo Krzesinski
     
  • The same checks to see if a drive can be or is registered are
    repeated through the code, factor out the checks in a common function
    and replace the repeated checks with it.

    Signed-off-by: Herton Ronaldo Krzesinski
    Signed-off-by: Jiri Kosina
    Signed-off-by: Jens Axboe

    Herton Ronaldo Krzesinski
     
  • On floppy initialization, if something failed inside the loop we call
    add_disk, there was no cleanup of previous iterations in the error
    handling.

    Cc: stable@vger.kernel.org
    Signed-off-by: Herton Ronaldo Krzesinski
    Signed-off-by: Jiri Kosina
    Signed-off-by: Jens Axboe

    Herton Ronaldo Krzesinski
     
  • If blk_init_queue fails, we do not call put_disk on the current dr
    (dr is decremented first in the error handling loop).

    Cc: stable@vger.kernel.org
    Reviewed-by: Ben Hutchings
    Signed-off-by: Herton Ronaldo Krzesinski
    Signed-off-by: Jiri Kosina
    Signed-off-by: Jens Axboe

    Herton Ronaldo Krzesinski
     
  • Since commit 070ad7e ("floppy: convert to delayed work and single-thread
    wq"), we end up calling alloc_ordered_workqueue multiple times inside
    the loop, which shouldn't be intended. Besides the leak, other side
    effect in the current code is if blk_init_queue fails, we would end up
    calling unregister_blkdev even if we didn't call yet register_blkdev.

    Just moved the allocation of floppy_wq before the loop, and adjusted the
    code accordingly.

    Cc: stable@vger.kernel.org # 3.5+
    Acked-by: Vivek Goyal
    Reviewed-by: Ben Hutchings
    Signed-off-by: Herton Ronaldo Krzesinski
    Signed-off-by: Jiri Kosina
    Signed-off-by: Jens Axboe

    Herton Ronaldo Krzesinski
     
  • drivers/block/xen-blkback/xenbus.c:260:5: warning: symbol 'xenvbd_sysfs_addif' was not declared. Should it be static?
    drivers/block/xen-blkback/xenbus.c:284:6: warning: symbol 'xenvbd_sysfs_delif' was not declared. Should it be static?

    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     

29 Oct, 2012

14 commits

  • Pull Ceph fixes form Sage Weil:
    "There are two fixes in the messenger code, one that can trigger a NULL
    dereference, and one that error in refcounting (extra put). There is
    also a trivial fix that in the fs client code that is triggered by NFS
    reexport."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
    ceph: fix dentry reference leak in encode_fh()
    libceph: avoid NULL kref_put when osd reset races with alloc_msg
    rbd: reset BACKOFF if unable to re-queue

    Linus Torvalds
     
  • Call to d_find_alias() needs a corresponding dput()

    This fixes http://tracker.newdream.net/issues/3271

    Signed-off-by: David Zafman
    Reviewed-by: Sage Weil

    David Zafman
     
  • commit 119c0d4460b001e44b41dcf73dc6ee794b98bd31 changed
    ext4_new_inode() such that the inode bitmap was being modified
    outside a transaction, which could lead to corruption, and was
    discovered when journal_checksum found a bad checksum in the
    journal during log replay.

    Nix ran into this when using the journal_async_commit mount
    option, which enables journal checksumming. The ensuing
    journal replay failures due to the bad checksums led to
    filesystem corruption reported as the now infamous
    "Apparent serious progressive ext4 data corruption bug"

    [ Changed by tytso to only call ext4_journal_get_write_access() only
    when we're fairly certain that we're going to allocate the inode. ]

    I've tested this by mounting with journal_checksum and
    running fsstress then dropping power; I've also tested by
    hacking DM to create snapshots w/o first quiescing, which
    allows me to test journal replay repeatedly w/o actually
    power-cycling the box. Without the patch I hit a journal
    checksum error every time. With this fix it survives
    many iterations.

    Reported-by: Nix
    Signed-off-by: Eric Sandeen
    Signed-off-by: "Theodore Ts'o"
    Cc: stable@vger.kernel.org

    Eric Sandeen
     
  • Pull i2c subsystem fixes from Jean Delvare.

    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    i2c-i801: Fix comment
    i2c-i801: Simplify dependency towards GPIOLIB
    i2c-stub: Move to drivers/i2c

    Linus Torvalds
     
  • Signed-off-by: Jean Delvare

    Jean Delvare
     
  • Arbitrarily selecting GPIOLIB causes trouble on some architectures,
    so don't do that. Instead, just make the optional multiplexing code
    depend on CONFIG_I2C_MUX_GPIO instead of CONFIG_I2C_MUX for now. We
    can revisit if the i2c-i801 driver ever supports other multiplexing
    flavors.

    Also make that optional code depend on DMI, as it won't do anything
    without that.

    Signed-off-by: Jean Delvare
    Cc: Fengguang Wu

    Jean Delvare
     
  • Move the i2c-stub driver to drivers/i2c, to match the Kconfig entry.
    This is less confusing that way.

    I also fixed all checkpatch warnings and errors.

    Signed-off-by: Jean Delvare
    Cc: Peter Huewe

    Jean Delvare
     
  • Linus Torvalds
     
  • Pull ktest confusion fix from Steven Rostedt:
    "With the v3.7-rc2 kernel, the network cards on my target boxes were
    not being brought up.

    I found that the modules for the network was not being installed.
    This was due to the config CONFIG_MODULES_USE_ELF_RELA that came
    before CONFIG_MODULES, and confused ktest in thinking that
    CONFIG_MODULES=y was not found.

    Ktest needs to test all configs and not just stop if something starts
    with CONFIG_MODULES."

    * tag 'ktest-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
    ktest: Fix ktest confusion with CONFIG_MODULES_USE_ELF_RELA

    Linus Torvalds
     
  • Pull minor spi MXS fixes from Mark Brown:
    "These fixes are both pretty minor ones and are driver local."

    * tag 'spi-mxs' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
    spi: mxs: Terminate DMA in case of DMA timeout
    spi: mxs: Assign message status after transfer finished

    Linus Torvalds
     
  • Pull arm-soc fixes from Arnd Bergmann:
    "Bug fixes for a number of ARM platforms, mostly OMAP, imx and at91.

    These come a little later than I had hoped but unfortunately we had a
    few of these patches cause regressions themselves and had to work out
    how to deal with those in the meantime."

    * tag 'fixes-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
    Revert "ARM i.MX25: Fix PWM per clock lookups"
    ARM: versatile: fix versatile_defconfig
    ARM: mvebu: update defconfig with 3.7 changes
    ARM: at91: fix at91x40 build
    ARM: socfpga: Fix socfpga compilation with early_printk() enabled
    ARM: SPEAr: Remove unused empty files
    MAINTAINERS: Add arm-soc tree entry
    ARM: dts: mxs: add the "clock-names" for gpmi-nand
    ARM: ux500: Correct SDI5 address and add some format changes
    ARM: ux500: Specify AMBA Primecell IDs for Nomadik I2C in DT
    ARM: ux500: Fix build error relating to IRQCHIP_SKIP_SET_WAKE
    ARM: at91: drop duplicated config SOC_AT91SAM9 entry
    ARM: at91/i2c: change id to let i2c-at91 work
    ARM: at91/i2c: change id to let i2c-gpio work
    ARM: at91/dts: at91sam9g20ek_common: Fix typos in buttons labels.
    ARM: at91: fix external interrupt specification in board code
    ARM: at91: fix external interrupts in non-DT case
    ARM: at91: at91sam9g10: fix SOC type detection
    ARM: at91/tc: fix typo in the DT document
    ARM: AM33XX: Fix configuration of dmtimer parent clock by dmtimer driverDate:Wed, 17 Oct 2012 13:55:55 -0500
    ...

    Linus Torvalds
     
  • Functions generic_file_splice_read and generic_file_splice_write access
    the pagecache directly. For block devices these functions must be locked
    so that block size is not changed while they are in progress.

    This patch is an additional fix for commit b87570f5d349 ("Fix a crash
    when block device is read and block size is changed at the same time")
    that locked aio_read, aio_write and mmap against block size change.

    Signed-off-by: Mikulas Patocka
    Signed-off-by: Linus Torvalds

    Mikulas Patocka
     
  • Use rcu_read_lock_sched / rcu_read_unlock_sched / synchronize_sched
    instead of rcu_read_lock / rcu_read_unlock / synchronize_rcu.

    This is an optimization. The RCU-protected region is very small, so
    there will be no latency problems if we disable preempt in this region.

    So we use rcu_read_lock_sched / rcu_read_unlock_sched that translates
    to preempt_disable / preempt_disable. It is smaller (and supposedly
    faster) than preemptible rcu_read_lock / rcu_read_unlock.

    Signed-off-by: Mikulas Patocka
    Signed-off-by: Linus Torvalds

    Mikulas Patocka
     
  • This patch introduces new barrier pair light_mb() and heavy_mb() for
    percpu rw semaphores.

    This patch fixes a bug in percpu-rw-semaphores where a barrier was
    missing in percpu_up_write.

    This patch improves performance on the read path of
    percpu-rw-semaphores: on non-x86 cpus, there was a smp_mb() in
    percpu_up_read. This patch changes it to a compiler barrier and removes
    the "#if defined(X86) ..." condition.

    From: Lai Jiangshan
    Signed-off-by: Mikulas Patocka
    Signed-off-by: Linus Torvalds

    Mikulas Patocka
     

28 Oct, 2012

1 commit

  • This change was originally titled "gpio/omap: fix off-mode bug: clear debounce
    clock enable mask on free/reset". The title has been updated slightly to
    reflect (what should be) the final fix.

    When a GPIO is freed or shutdown, we need to ensure that any debounce settings
    are cleared and if the GPIO is the only GPIO in the bank that is currently
    using debounce, then disable the debounce clock as well to save power.

    Currently, the debounce settings are not cleared on a GPIO free or shutdown and
    so during a context restore on subsequent off-mode transition, the previous
    debounce values are restored from the shadow copies (bank->context.debounce*)
    leading to mismatch state between driver state and hardware state.

    This was discovered when board code was doing

    gpio_request_one()
    gpio_set_debounce()
    gpio_free()

    which was leaving the GPIO debounce settings in a confused state. If that GPIO
    bank is subsequently used with off-mode enabled, bogus state would be restored,
    leaving GPIO debounce enabled which then prevented the CORE powerdomain from
    transitioning.

    To fix this, introduce a new function called _clear_gpio_debounce() to clear
    any debounce settings when the GPIO is freed or shutdown. If this GPIO is the
    last debounce-enabled GPIO in the bank, the debounce will also be cut.

    Please note that we cannot use _gpio_dbck_disable() to disable the debounce
    clock because this has been specifically created for the gpio suspend path
    and is intended to shutdown the debounce clock while debounce is enabled.

    Special thanks to Kevin Hilman for root causing the bug. This fix is a
    collaborative effort with inputs from Kevin Hilman, Grazvydas Ignotas and
    Santosh Shilimkar.

    Testing:
    - This has been unit tested on an OMAP3430 Beagle board, by requesting a gpio,
    enabling debounce and then freeing the gpio and checking the register
    contents, the saved register context and the debounce clock state.
    - Kevin Hilman tested on 37xx/EVM board which configures GPIO debounce for the
    ads7846 touchscreen in its board file using the above sequence, and so was
    failing off-mode tests in dynamic idle. Verified that off-mode tests are
    passing with this patch.

    V5 changes:
    - Corrected author

    Reported-by: Paul Walmsley
    Cc: Igor Grinberg
    Cc: Grazvydas Ignotas
    Cc: Jon Hunter
    Signed-off-by: Jon Hunter
    Reviewed-by: Kevin Hilman
    Tested-by: Kevin Hilman
    Acked-by: Santosh Shilimkar
    Signed-off-by: Linus Walleij

    Jon Hunter
     

27 Oct, 2012

6 commits

  • This reverts commit 92063cee118655d25b50d04eb77b012f3287357a, it
    was applied prematurely, causing this build error for
    imx_v4_v5_defconfig:

    arch/arm/mach-imx/clk-imx25.c: In function 'mx25_clocks_init':
    arch/arm/mach-imx/clk-imx25.c:206:26: error: 'pwm_ipg_per' undeclared (first use in this function)
    arch/arm/mach-imx/clk-imx25.c:206:26: note: each undeclared identifier is reported only once for each function it appears in

    Sascha Hauer explains:
    > There are several gates missing in clk-imx25.c. I have a patch which
    > adds support for them and I seem to have missed that the above depends
    > on it.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • With the introduction of CONFIG_ARCH_MULTIPLATFORM, versatile is
    no longer the default platform, so we need to enable
    CONFIG_ARCH_VERSATILE explicitly in order for that to be selected
    rather than the multiplatform configuration.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • The split of 370 and XP into two Kconfig options and the multiplatform
    kernel support has changed a few Kconfig symbols, so let's update the
    mvebu_defconfig file with the latest changes.

    Signed-off-by: Thomas Petazzoni
    Signed-off-by: Arnd Bergmann

    Thomas Petazzoni
     
  • patch 738a0fd7 "ARM: at91: fix external interrupts in non-DT case"
    fixed a run-time error on some at91 platforms but did not apply
    the same change to at91x40, which now doesn't build.

    This changes at91x40 in the same way that the other platforms
    were changed.

    Signed-off-by: Arnd Bergmann
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD

    Arnd Bergmann
     
  • Pull networking fixes from David Miller:
    "This is what we usually expect at this stage of the game, lots of
    little things, mostly in drivers. With the occasional 'oops didn't
    mean to do that' kind of regressions in the core code."

    1) Uninitialized data in __ip_vs_get_timeouts(), from Arnd Bergmann

    2) Reject invalid ACK sequences in Fast Open sockets, from Jerry Chu.

    3) Lost error code on return from _rtl_usb_receive(), from Christian
    Lamparter.

    4) Fix reset resume on USB rt2x00, from Stanislaw Gruszka.

    5) Release resources on error in pch_gbe driver, from Veaceslav Falico.

    6) Default hop limit not set correctly in ip6_template_metrics[], fix
    from Li RongQing.

    7) Gianfar PTP code requests wrong kind of resource during probe, fix
    from Wei Yang.

    8) Fix VHOST net driver on big-endian, from Michael S Tsirkin.

    9) Mallenox driver bug fixes from Jack Morgenstein, Or Gerlitz, Moni
    Shoua, Dotan Barak, and Uri Habusha.

    10) usbnet leaks memory on TX path, fix from Hemant Kumar.

    11) Use socket state test, rather than presence of FIN bit packet, to
    determine FIONREAD/SIOCINQ value. Fix from Eric Dumazet.

    12) Fix cxgb4 build failure, from Vipul Pandya.

    13) Provide a SYN_DATA_ACKED state to complement SYN_FASTOPEN in socket
    info dumps. From Yuchung Cheng.

    14) Fix leak of security path in kfree_skb_partial(). Fix from Eric
    Dumazet.

    15) Handle RX FIFO overflows more resiliently in pch_gbe driver, from
    Veaceslav Falico.

    16) Fix MAINTAINERS file pattern for networking drivers, from Jean
    Delvare.

    17) Add iPhone5 IDs to IPHETH driver, from Jay Purohit.

    18) VLAN device type change restriction is too strict, and should not
    trigger for the automatically generated vlan0 device. Fix from Jiri
    Pirko.

    19) Make PMTU/redirect flushing work properly again in ipv4, from
    Steffen Klassert.

    20) Fix memory corruptions by using kfree_rcu() in netlink_release().
    From Eric Dumazet.

    21) More qmi_wwan device IDs, from Bjørn Mork.

    22) Fix unintentional change of SNAT/DNAT hooks in generic NAT
    infrastructure, from Elison Niven.

    23) Fix 3.6.x regression in xt_TEE netfilter module, from Eric Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (57 commits)
    tilegx: fix some issues in the SW TSO support
    qmi_wwan/cdc_ether: move Novatel 551 and E362 to qmi_wwan
    net: usb: Fix memory leak on Tx data path
    net/mlx4_core: Unmap UAR also in the case of error flow
    net/mlx4_en: Don't use vlan tag value as an indication for vlan presence
    net/mlx4_en: Fix double-release-range in tx-rings
    bas_gigaset: fix pre_reset handling
    vhost: fix mergeable bufs on BE hosts
    gianfar_ptp: use iomem, not ioports resource tree in probe
    ipv6: Set default hoplimit as zero.
    NET_VENDOR_TI: make available for am33xx as well
    pch_gbe: fix error handling in pch_gbe_up()
    b43: Fix oops on unload when firmware not found
    mwifiex: clean up scan state on error
    mwifiex: return -EBUSY if specific scan request cannot be honored
    brcmfmac: fix potential NULL dereference
    Revert "ath9k_hw: Updated AR9003 tx gain table for 5GHz"
    ath9k_htc: Add PID/VID for a Ubiquiti WiFiStation
    rt2x00: usb: fix reset resume
    rtlwifi: pass rx setup error code to caller
    ...

    Linus Torvalds
     
  • Pull slave-dmaengine fixes from Vinod Koul:
    "Three fixes for slave dmanegine.

    Two are for typo omissions in sifr dmaengine driver and the last one
    is for the imx driver fixing a missing unlock"

    * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
    dmaengine: sirf: fix a typo in moving running dma_desc to active queue
    dmaengine: sirf: fix a typo in dma_prep_interleaved
    dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()

    Linus Torvalds