Skip to content
Commits on May 13, 2012
  1. Linux 3.4-rc7

    .. and this should hopefully be the last -rc before final 3.4 release.
    committed May 12, 2012
  2. Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/arm/arm-soc
    
    Pull ARM: SoC fixes from Olof Johansson:
     "I was hoping to be done with fixes for 3.4 but we got two branches
      from subarch maintainers the last couple of days.  So here is one
      last(?) pull request for arm-soc containing 7 patches:
    
       - Five of them are for shmobile dealing with SMP setup and compile
         failures
       - The remaining two are for regressions on the Samsung platforms"
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1
      ARM: EXYNOS: use s5p-timer for UniversalC210 board
      ARM / mach-shmobile: Invalidate caches when booting secondary cores
      ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix
      ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix
      ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper
      ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper
    committed May 12, 2012
  3. Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

    Pull a few more GPIO bug fixes from Grant Likely:
     "Oops, missed a couple.  Here's an updated pull req for GPIO"
    
    A set of PCH bug fixes, and one patch to fix up compile warnings
    
    * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
      gpio/exynos: Fix compiler warnings when non-exynos machines are selected
      gpio: pch9: Use proper flow type handlers
    committed May 12, 2012
Commits on May 12, 2012
  1. @olofj

    Merge branch 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/kgene/linux-samsung into fixes
    
    * 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1
      ARM: EXYNOS: use s5p-timer for UniversalC210 board
    olofj committed May 12, 2012
  2. @kgene

    ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1

    It should be (1 << 2) for ctrlbit of exynos5_clk_pdma1.
    
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
    kgene committed May 12, 2012
  3. @kgene

    ARM: EXYNOS: use s5p-timer for UniversalC210 board

    Commit 069d4e7 ("ARM: EXYNOS4: Remove clock event timers using
    ARM private timers") removed support for local timers and forced
    to use MCT as event source. However MCT is not operating properly
    on early revision of EXYNOS4 SoCs. All UniversalC210 boards are
    based on it, so that commit broke support for it. This patch
    provides a workaround that enables UniversalC210 boards to boot
    again. s5p-timer is used as an event source, it works only for
    non-SMP builds.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
    Marek Szyprowski committed with kgene May 12, 2012
  4. @olofj

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/rafael/renesas into fixes
    
    By Guennadi Liakhovetski (2) and others via Rafael J. Wysocki:
    "[...] urgent fixes for Renesas ARM-based platforms.  Four of these
    commits are fixes of regressions new in 3.4-rc and the last one is
    necessary for SMP to work on those systems in general."
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
      ARM / mach-shmobile: Invalidate caches when booting secondary cores
      ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix
      ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix
      ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper
      ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper
    olofj committed May 12, 2012
  5. @rjwysocki

    ARM / mach-shmobile: Invalidate caches when booting secondary cores

    Make sure L1 caches are invalidated when booting secondary
    cores. Needed to boot all mach-shmobile SMP systems that
    are using Cortex-A9 including sh73a0, r8a7779 and EMEV2.
    
    Thanks to imx and tegra guys for actual code.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Magnus Damm committed with rjwysocki May 9, 2012
  6. @morimoto @rjwysocki

    ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix

    Fix SMP TWD boot regression on sh73a0 based platforms caused by:
    
    4200b16 ARM: shmobile: convert to twd_local_timer_register() interface
    
    After the merge of the above commit it has been impossible to boot
    sh73a0 based SoCs with SMP enabled and CONFIG_HAVE_ARM_TWD=y. The
    kernel crashes at smp_init_cpus() timing which is before the console
    has been initialized, so to the user this looks like a kernel lock up
    without any particular error message.
    
    This patch fixes the regression on sh73a0 by moving the TWD
    registration code from smp_init_cpus() to sys_timer->init() time.
    
    This patch removed shmobile_twd_init() which is no longer needed
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    morimoto committed with rjwysocki May 10, 2012
  7. @rjwysocki

    ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix

    Fix SMP TWD boot regression on r8a7779 based platforms caused by:
    
    4200b16 ARM: shmobile: convert to twd_local_timer_register() interface
    
    After the merge of the above commit it has been impossible to boot
    r8a7779 based SoCs with SMP enabled and CONFIG_HAVE_ARM_TWD=y. The
    kernel crashes at smp_init_cpus() timing which is before the console
    has been initialized, so to the user this looks like a kernel lock up
    without any particular error message.
    
    This patch fixes the regression on r8a7779 by moving the TWD
    registration code from smp_init_cpus() to sys_timer->init() time.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Acked-by: Marc Zyngier <marc.zyngier@arm.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Magnus Damm committed with rjwysocki May 10, 2012
  8. @lyakh @rjwysocki

    ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplu…

    …g helper
    
    This also fixes the following modular mmc build failure:
    
    arch/arm/mach-shmobile/built-in.o: In function `mackerel_sdhi0_gpio_cd':
    pfc-sh7372.c:(.text+0x1138): undefined reference to `mmc_detect_change'
    
    on this platform by eliminating the use of an inline function, which
    calls into the mmc core.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Reviewed-by: Simon Horman <horms@verge.net.au>
    Acked-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    lyakh committed with rjwysocki Apr 16, 2012
  9. @lyakh @rjwysocki

    ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotp…

    …lug helper
    
    This also fixes the following modular mmc build failure:
    
    arch/arm/mach-shmobile/built-in.o: In function `ag5evm_sdhi0_gpio_cd':
    pfc-sh73a0.c:(.text+0x7c0): undefined reference to `mmc_detect_change'
    
    on this platform by eliminating the use of an inline function, which
    calls into the mmc core.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Tested-by: Simon Horman <horms@verge.net.au>
    Acked-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    lyakh committed with rjwysocki Apr 16, 2012
  10. Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/jejb/scsi
    
    Pull SCSI fixes from James Bottomley:
     "This is a set of minor qla and virto fixes plus one major regression
      fix (oops in all legacy host drivers)."
    
    * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
      [SCSI] virtio_scsi: fix TMF use-after-free
      [SCSI] fix oops in all legacy host adapters caused by 6f381fa
      [SCSI] qla2xxx: Update version number to 8.04.00.03-k.
      [SCSI] qla2xxx: Properly check for current state after the fabric-login request.
      [SCSI] qla2xxx: Proper completion to scsi-ml for scsi status task_set_full and busy.
      [SCSI] qla2xxx: Block flash access from application when device is initialized for ISP82xx.
      [SCSI] qla2xxx: Fix reset time out as qla2xxx not ack to reset request.
    committed May 12, 2012
  11. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    Pull networking fixes from David S. Miller:
    
     1) Since we do RCU lookups on ipv4 FIB entries, we have to test if the
        entry is dead before returning it to our caller.
    
     2) openvswitch locking and packet validation fixes from Ansis Atteka,
        Jesse Gross, and Pravin B Shelar.
    
     3) Fix PM resume locking in IGB driver, from Benjamin Poirier.
    
     4) Fix VLAN header handling in vhost-net and macvtap, from Basil Gor.
    
     5) Revert a bogus network namespace isolation change that was causing
        regressions on S390 networking devices.
    
     6) If bonding decides to process and handle a LACPDU frame, we
        shouldn't bump the rx_dropped counter.  From Jiri Bohac.
    
     7) Fix mis-calculation of available TX space in r8169 driver when doing
        TSO, which can lead to crashes and/or hung device.  From Julien
        Ducourthial.
    
     8) SCTP does not validate cached routes properly in all cases, from
        Nicolas Dichtel.
    
     9) Link status interrupt needs to be handled in ks8851 driver, from
        Stephen Boyd.
    
    10) Use capable(), not cap_raised(), in connector/userns netlink code.
        From Eric W. Biederman via Andrew Morton.
    
    11) Fix pktgen OOPS on module unload, from Eric Dumazet.
    
    12) iwlwifi under-estimates SKB truesizes, also from Eric Dumazet.
    
    13) Cure division by zero in SFC driver, from Ben Hutchings.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
      ks8851: Update link status during link change interrupt
      macvtap: restore vlan header on user read
      vhost-net: fix handle_rx buffer size
      bonding: don't increase rx_dropped after processing LACPDUs
      connector/userns: replace netlink uses of cap_raised() with capable()
      sctp: check cached dst before using it
      pktgen: fix crash at module unload
      Revert "net: maintain namespace isolation between vlan and real device"
      ehea: fix losing of NEQ events when one event occurred early
      igb: fix rtnl race in PM resume path
      ipv4: Do not use dead fib_info entries.
      r8169: fix unsigned int wraparound with TSO
      sfc: Fix division by zero when using one RX channel and no SR-IOV
      openvswitch: Validation of IPv6 set port action uses IPv4 header
      net: compare_ether_addr[_64bits]() has no ordering
      cdc_ether: Ignore bogus union descriptor for RNDIS devices
      bnx2x: bug fix when loading after SAN boot
      e1000: Silence sparse warnings by correcting type
      igb, ixgbe: netdev_tx_reset_queue incorrectly called from tx init path
      openvswitch: Release rtnl_lock if ovs_vport_cmd_build_info() failed.
      ...
    committed May 12, 2012
  12. Merge tag 'dm-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/agk/linux-dm
    
    Pull device-mapper fixes from Alasdair G Kergon:
     "Fix a couple of serious memory leaks in device-mapper thin
      provisioning and tidy its MODULE_DESCRIPTION.
    
      Mitigate occasional reported hangs associated with multipath scsi_dh
      module loading."
    
    * tag 'dm-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm:
      dm mpath: check if scsi_dh module already loaded before trying to load
      dm thin: correct module description
      dm thin: fix unprotected use of prepared_discards list
      dm thin: reinstate missing mempool_free in cell_release_singleton
    committed May 12, 2012
  13. @rjwysocki

    MAINTAINERS: Add myself as the cpufreq maintainer

    Since cpufreq has no official maintainer at the moment, I'm willing
    to maintain it along some other power management core code I've been
    maintaining already.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    rjwysocki committed with May 11, 2012
  14. @snitm @kergon

    dm mpath: check if scsi_dh module already loaded before trying to load

    If the requested scsi_dh module is already loaded then skip
    request_module().
    
    Multipath table loads can hang in an unnecessary __request_module.
    
    Reported-by: Ben Marzinski <bmarzins@redhat.com>
    Cc: stable@kernel.org
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    Signed-off-by: Alasdair G Kergon <agk@redhat.com>
    snitm committed with kergon May 12, 2012
  15. @kergon

    dm thin: correct module description

    Remove duplicate copy of string "device-mapper" (DM_NAME) from
    MODULE_DESCRIPTION.
    
    Signed-off-by: Alasdair G Kergon <agk@redhat.com>
    kergon committed May 12, 2012
  16. @snitm @kergon

    dm thin: fix unprotected use of prepared_discards list

    Fix two places in commit 104655f ("dm thin: support discards") that
    didn't use pool->lock to protect against concurrent changes to the
    prepared_discards list.
    
    Without this fix, thin_endio() can race with process_discard(), leading
    to concurrent list_add()s that result in the processes locking up with
    an error like the following:
    
    WARNING: at lib/list_debug.c:32 __list_add+0x8f/0xa0()
    ...
    list_add corruption. next->prev should be prev (ffff880323b96140), but was ffff8801d2c48440. (next=ffff8801d2c485c0).
    ...
    Pid: 17205, comm: kworker/u:1 Tainted: G        W  O 3.4.0-rc3.snitm+ #1
    Call Trace:
     [<ffffffff8103ca1f>] warn_slowpath_common+0x7f/0xc0
     [<ffffffff8103cb16>] warn_slowpath_fmt+0x46/0x50
     [<ffffffffa04f6ce6>] ? bio_detain+0xc6/0x210 [dm_thin_pool]
     [<ffffffff8124ff3f>] __list_add+0x8f/0xa0
     [<ffffffffa04f70d2>] process_discard+0x2a2/0x2d0 [dm_thin_pool]
     [<ffffffffa04f6a78>] ? remap_and_issue+0x38/0x50 [dm_thin_pool]
     [<ffffffffa04f7c3b>] process_deferred_bios+0x7b/0x230 [dm_thin_pool]
     [<ffffffffa04f7df0>] ? process_deferred_bios+0x230/0x230 [dm_thin_pool]
     [<ffffffffa04f7e42>] do_worker+0x52/0x60 [dm_thin_pool]
     [<ffffffff81056fa9>] process_one_work+0x129/0x450
     [<ffffffff81059b9c>] worker_thread+0x17c/0x3c0
     [<ffffffff81059a20>] ? manage_workers+0x120/0x120
     [<ffffffff8105eabe>] kthread+0x9e/0xb0
     [<ffffffff814ceda4>] kernel_thread_helper+0x4/0x10
     [<ffffffff8105ea20>] ? kthread_freezable_should_stop+0x70/0x70
     [<ffffffff814ceda0>] ? gs_change+0x13/0x13
    ---[ end trace 7e0a523bc5e52692 ]---
    
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    Signed-off-by: Alasdair G Kergon <agk@redhat.com>
    snitm committed with kergon May 12, 2012
  17. @snitm @kergon

    dm thin: reinstate missing mempool_free in cell_release_singleton

    Fix a significant memory leak inadvertently introduced during
    simplification of cell_release_singleton() in commit
    6f94a4c ("dm thin: fix stacked bi_next
    usage").
    
    A cell's hlist_del() must be accompanied by a mempool_free().
    Use __cell_release() to do this, like before.
    
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    Signed-off-by: Alasdair G Kergon <agk@redhat.com>
    snitm committed with kergon May 12, 2012
  18. @glikely

    gpio/exynos: Fix compiler warnings when non-exynos machines are selected

    Fixes the following compiler warnings:
    
    drivers/gpio/gpio-samsung.c: In function ‘samsung_gpiolib_init’:
    drivers/gpio/gpio-samsung.c:2980:1: warning: label ‘err_ioremap1’ defined but not used [-Wunused-label]
    drivers/gpio/gpio-samsung.c:2978:1: warning: label ‘err_ioremap2’ defined but not used [-Wunused-label]
    drivers/gpio/gpio-samsung.c:2976:1: warning: label ‘err_ioremap3’ defined but not used [-Wunused-label]
    drivers/gpio/gpio-samsung.c:2974:1: warning: label ‘err_ioremap4’ defined but not used [-Wunused-label]
    drivers/gpio/gpio-samsung.c:2722:55: warning: unused variable ‘gpio_base4’ [-Wunused-variable]
    
    drivers/gpio/gpio-samsung.c:455:32: warning: ‘exynos_gpio_cfg’ defined but not used [-Wunused-variable]
    drivers/gpio/gpio-samsung.c:2126:33: warning: ‘exynos4_gpios_1’ defined but not used [-Wunused-variable]
    drivers/gpio/gpio-samsung.c:2228:33: warning: ‘exynos4_gpios_2’ defined but not used [-Wunused-variable]
    drivers/gpio/gpio-samsung.c:2373:33: warning: ‘exynos4_gpios_3’ defined but not used [-Wunused-variable]
    
    Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Sachin Kamat committed with glikely Apr 30, 2012
  19. @glikely

    gpio: pch9: Use proper flow type handlers

    Jean-Francois Dagenais reported:
    
     Configuring a gpio pin with the gpio-pch driver with
     "IRQF_TRIGGER_LOW | IRQF_ONESHOT" generates an interrupt storm for
     threaded ISR until the ISR thread actually gets to physically clear
     the interrupt on the triggering chip!! The immediate observable
     symptom is the high CPU usage for my ISR thread task and the
     interrupt count in /proc/interrupts incrementing radically.
    
    The driver is wrong in several ways:
    
    1) Using handle_simple_irq() does not provide proper flow control
       handling. In the case of oneshot threaded handlers for the
       demultiplexed interrupts this results in an interrupt storm because
       the simple handler does not deal with masking/unmasking.  Even
       without threaded oneshot handlers an interrupt storm for level type
       interrupts can easily be triggered when the interrupt is disabled
       and the interrupt line is activated from the device.
    
    2) Acknowlegding the demultiplexed interrupt before calling the
       handler is wrong for level type interrupts.
    
    3) The set_type function unconditionally enables the interrupt. It's
       supposed to set the type and nothing else. The unmasking is done by
       the core code.
    
    Move the acknowledge code into a separate function and add it to the
    demux irqchip callbacks.
    
    Remove the unconditional enabling from the set_type() callback and set
    the proper flow handlers depending on the selected type (level/edge).
    
    Reported-and-tested-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Thomas Gleixner committed with glikely Apr 28, 2012
Commits on May 11, 2012
  1. Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

    Pull GPIO omap bug fix from Grant Likely.
    
    * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
      gpio/omap: fix incorrect initialization of omap_gpio_mod_init
    committed May 11, 2012
  2. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/benh/powerpc
    
    Pull another powerpc irq fix from Benjamin Herrenschmidt:
     "It looks like my previous fix for the lazy irq masking problem wasn't
      quite enough.  There was another problem related to performance
      monitor interrupts acting as NMIs leaving the flags in an incorrect
      state.  Here's a fix that finally seems to make perf solid again."
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc/irq: Fix another case of lazy IRQ state getting out of sync
    committed May 11, 2012
  3. Merge branch '3.4-urgent' of git://git.kernel.org/pub/scm/linux/kerne…

    …l/git/nab/target-pending
    
    Pull target fix from Nicholas Bellinger:
     "This patch removes some incorrect legacy code to free se_lun_acl
      memory in the NodeACL release path that could potentially trigger an
      OOPS during shutdown once dynamic -> explicit initiator NodeACL
      conversion has occurred.
    
      That said, we've been able to trigger an OOPS in v4.0 code for this
      special case when the associated MappedLUNs had not also been made
      explicit based on active TPG LUN layout during the conversion, so it
      really makes senses to go ahead and drop this extra cruft to avoid any
      possible issues here.
    
      This ends up only effecting iscsi-target module code (it's the only
      user) and is CC'ed to stable."
    
    * '3.4-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
      target: Drop incorrect se_lun_acl release for dynamic -> explict ACL conversion
    committed May 11, 2012
  4. @ozbenh

    powerpc/irq: Fix another case of lazy IRQ state getting out of sync

    So we have another case of paca->irq_happened getting out of
    sync with the HW irq state. This can happen when a perfmon
    interrupt occurs while soft disabled, as it will return to a
    soft disabled but hard enabled context while leaving a stale
    PACA_IRQ_HARD_DIS flag set.
    
    This patch fixes it, and also adds a test for the condition
    of those flags being out of sync in arch_local_irq_restore()
    when CONFIG_TRACE_IRQFLAGS is enabled.
    
    This helps catching those gremlins faster (and so far I
    can't seem see any anymore, so that's good news).
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    ozbenh committed May 10, 2012
  5. @bebarino @davem330

    ks8851: Update link status during link change interrupt

    If a link change interrupt comes in we just clear the interrupt
    and continue along without notifying the upper networking layers
    that the link has changed. Use the mii_check_link() function to
    update the link status whenever a link change interrupt occurs.
    
    Cc: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    bebarino committed with davem330 May 10, 2012
  6. @basilgor @davem330

    macvtap: restore vlan header on user read

    Ethernet vlan header is not on the packet and kept in the skb->vlan_tci
    when it comes from lower dev. This patch inserts vlan header in user
    buffer during skb copy on user read.
    
    Signed-off-by: Basil Gor <basil.gor@gmail.com>
    Acked-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    basilgor committed with davem330 May 3, 2012
  7. @basilgor @davem330

    vhost-net: fix handle_rx buffer size

    Take vlan header length into account, when vlan id is stored as
    vlan_tci. Otherwise tagged packets coming from macvtap will be
    truncated.
    
    Signed-off-by: Basil Gor <basil.gor@gmail.com>
    Acked-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    basilgor committed with davem330 May 3, 2012
  8. @nablio3000

    target: Drop incorrect se_lun_acl release for dynamic -> explict ACL …

    …conversion
    
    This patch removes some potentially problematic legacy code within
    core_clear_initiator_node_from_tpg() that was originally intended to
    release left over se_lun_acl setup during dynamic NodeACL+MappedLUN
    generate when running with TPG demo-mode operation.
    
    Since we now only ever expect to allocate and release se_lun_acl from
    within target_core_fabric_configfs.c:target_fabric_make_mappedlun() and
    target_fabric_drop_mappedlun() context respectively, this code for
    demo-mode release is incorrect and needs to be removed.
    
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Andy Grover <agrover@redhat.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
    nablio3000 committed May 10, 2012
  9. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/gerg/m68knommu
    
    Pull a m68knommu fix from Greg Ungerer:
     "It contains a single fix for including the ColdFire QSPI interface
      setup code when enabled as a module.  This was broken in the
      consolidation of the ColdFire SoC device tables in the 3.4 merge
      window."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
      m68knommu: enable qspi support when SPI_COLDFIRE_QSPI = m
    committed May 11, 2012
  10. mm: raise MemFree by reverting percpu_pagelist_fraction to 0

    Why is there less MemFree than there used to be?  It perturbed a test,
    so I've just been bisecting linux-next, and now find the offender went
    upstream yesterday.
    
    Commit 9327881 "mm: fix division by 0 in percpu_pagelist_fraction()"
    mistakenly initialized percpu_pagelist_fraction to the sysctl's minimum 8,
    which leaves 1/8th of memory on percpu lists (on each cpu??); but most of
    us expect it to be left unset at 0 (and it's not then used as a divisor).
    
      MemTotal: 8061476kB  8061476kB  8061476kB  8061476kB  8061476kB  8061476kB
      Repetitive test with percpu_pagelist_fraction 8:
      MemFree:  6948420kB  6237172kB  6949696kB  6840692kB  6949048kB  6862984kB
      Same test with percpu_pagelist_fraction back to 0:
      MemFree:  7945000kB  7944908kB  7948568kB  7949060kB  7948796kB  7948812kB
    
    Signed-off-by: Hugh Dickins <hughd@google.com>
    [ We really should fix the crazy sysctl interface too, but that's a
      separate thing - Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Hugh Dickins committed with May 11, 2012
  11. @jiribohac @davem330

    bonding: don't increase rx_dropped after processing LACPDUs

    Since commit 3aba891, bonding processes LACP frames (802.3ad
    mode) with bond_handle_frame(). Currently a copy of the skb is
    made and the original is left to be processed by other
    rx_handlers and the rest of the network stack by returning
    RX_HANDLER_ANOTHER.  As there is no protocol handler for
    PKT_TYPE_LACPDU, the frame is dropped and dev->rx_dropped
    increased.
    
    Fix this by making bond_handle_frame() return RX_HANDLER_CONSUMED
    if bonding has processed the LACP frame.
    
    Signed-off-by: Jiri Bohac <jbohac@suse.cz>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    jiribohac committed with davem330 May 9, 2012
  12. @ebiederm @davem330

    connector/userns: replace netlink uses of cap_raised() with capable()

    In 2009 Philip Reiser notied that a few users of netlink connector
    interface needed a capability check and added the idiom
    cap_raised(nsp->eff_cap, CAP_SYS_ADMIN) to a few of them, on the premise
    that netlink was asynchronous.
    
    In 2011 Patrick McHardy noticed we were being silly because netlink is
    synchronous and removed eff_cap from the netlink_skb_params and changed
    the idiom to cap_raised(current_cap(), CAP_SYS_ADMIN).
    
    Looking at those spots with a fresh eye we should be calling
    capable(CAP_SYS_ADMIN).  The only reason I can see for not calling capable
    is that it once appeared we were not in the same task as the caller which
    would have made calling capable() impossible.
    
    In the initial user_namespace the only difference between between
    cap_raised(current_cap(), CAP_SYS_ADMIN) and capable(CAP_SYS_ADMIN) are a
    few sanity checks and the fact that capable(CAP_SYS_ADMIN) sets
    PF_SUPERPRIV if we use the capability.
    
    Since we are going to be using root privilege setting PF_SUPERPRIV seems
    the right thing to do.
    
    The motivation for this that patch is that in a child user namespace
    cap_raised(current_cap(),...) tests your capabilities with respect to that
    child user namespace not capabilities in the initial user namespace and
    thus will allow processes that should be unprivielged to use the kernel
    services that are only protected with cap_raised(current_cap(),..).
    
    To fix possible user_namespace issues and to just clean up the code
    replace cap_raised(current_cap(), CAP_SYS_ADMIN) with
    capable(CAP_SYS_ADMIN).
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Cc: Patrick McHardy <kaber@trash.net>
    Cc: Philipp Reisner <philipp.reisner@linbit.com>
    Acked-by: Serge E. Hallyn <serge.hallyn@canonical.com>
    Acked-by: Andrew G. Morgan <morgan@kernel.org>
    Cc: Vasiliy Kulikov <segoon@openwall.com>
    Cc: David Howells <dhowells@redhat.com>
    Reviewed-by: James Morris <james.l.morris@oracle.com>
    Cc: David Miller <davem@davemloft.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    ebiederm committed with davem330 May 4, 2012
  13. @NicolasDichtel @davem330

    sctp: check cached dst before using it

    dst_check() will take care of SA (and obsolete field), hence
    IPsec rekeying scenario is taken into account.
    
    Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Acked-by: Vlad Yaseivch <vyasevich@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    NicolasDichtel committed with davem330 May 4, 2012
Something went wrong with that request. Please try again.