01 Jun, 2015

3 commits

  • Pull ARM fixes from Russell King:
    "Three fixes this time around:

    - fix a memory leak which occurs when probing performance monitoring
    unit interrupts

    - fix handling of non-PMD aligned end of RAM causing boot failures

    - fix missing syscall trace exit path with syscall tracing enabled
    causing a kernel oops in the audit code"

    * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
    ARM: 8357/1: perf: fix memory leak when probing PMU PPIs
    ARM: fix missing syscall trace exit
    ARM: 8356/1: mm: handle non-pmd-aligned end of RAM

    Linus Torvalds
     
  • Pull MIPS fixes from Ralf Baechle:
    "MIPS fixes for 4.1 all across the tree"

    * 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux:
    MIPS: strnlen_user.S: Fix a CPU_DADDI_WORKAROUNDS regression
    MIPS: BMIPS: Fix bmips_wr_vec()
    MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set
    MIPS: Fuloong 2E: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760
    MIPS: irq: Use DECLARE_BITMAP
    ttyFDC: Fix to use native endian MMIO reads
    MIPS: Fix CDMM to use native endian MMIO reads

    Linus Torvalds
     
  • Pull turbostat tool fixes from Len Brown:
    "Just one minor kernel dependency in this batch -- added a #define to
    msr-index.h"

    * 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
    tools/power turbostat: update version number to 4.7
    tools/power turbostat: allow running without cpu0
    tools/power turbostat: correctly decode of ENERGY_PERFORMANCE_BIAS
    tools/power turbostat: enable turbostat to support Knights Landing (KNL)
    tools/power turbostat: correctly display more than 2 threads/core

    Linus Torvalds
     

30 May, 2015

5 commits

  • Pull PCI / ACPI fix from Rafael Wysocki:
    "This fixes a bug uncovered by a recent driver core change that
    modified the implementation of the ACPI_COMPANION_SET() macro to
    strictly rely on its second argument to be either NULL or a valid
    pointer to struct acpi_device.

    As it turns out, pcibios_root_bridge_prepare() on x86 and ia64 works
    with the assumption that the only code path calling pci_create_root_bus()
    is pci_acpi_scan_root() and therefore the sysdata argument passed to
    it will always match the expectations of pcibios_root_bridge_prepare().

    That need not be the case, however, and in particular it is not the
    case for the Xen pcifront driver that passes a pointer to its own
    private data strcture as sysdata to pci_scan_bus_parented() which then
    passes it to pci_create_root_bus() and it ends up being used incorrectly
    by pcibios_root_bridge_prepare()"

    * tag 'acpi-pci-4.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    PCI / ACPI: Do not set ACPI companions for host bridges with parents

    Linus Torvalds
     
  • Pull ARM SoC fixes from Arnd Bergmann:
    "Two weeks worth of small bug fixes this time, nothing sticking out
    this time:

    - one defconfig change to adapt to a modified Kconfig symbol

    - two fixes for i.MX for backwards compatibility with older DT files
    that was accidentally broken

    - one regression fix for irq handling on pxa

    - three small dt files on omap, and one each for imx and exynos"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: multi_v7_defconfig: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760
    ARM: imx6: gpc: don't register power domain if DT data is missing
    ARM: imx6: allow booting with old DT
    ARM: dts: set display clock correctly for exynos4412-trats2
    ARM: pxa: pxa_cplds: signedness bug in probe
    ARM: dts: Fix WLAN interrupt line for AM335x EVM-SK
    ARM: dts: omap3-devkit8000: Fix NAND DT node
    ARM: dts: am335x-boneblack: disable RTC-only sleep
    ARM: dts: fix imx27 dtb build rule
    ARM: dts: imx27: only map 4 Kbyte for fec registers

    Linus Torvalds
     
  • Correct a regression introduced with 8453eebd [MIPS: Fix strnlen_user()
    return value in case of overlong strings.] causing assembler warnings
    and broken code generated in __strnlen_kernel_nocheck_asm:

    arch/mips/lib/strnlen_user.S: Assembler messages:
    arch/mips/lib/strnlen_user.S:64: Warning: Macro instruction expanded into multiple instructions in a branch delay slot

    with the CPU_DADDI_WORKAROUNDS option set, resulting in the function
    looping indefinitely upon mounting NFS root.

    Use conditional assembly to avoid a microMIPS code size regression.
    Using $at unconditionally would cause such a regression as there are no
    16-bit instruction encodings available for ALU operations using this
    register. Using $v1 unconditionally would produce short microMIPS
    encodings, but would prevent this register from being used across calls
    to this function.

    The extra LI operation introduced is free, replacing a NOP originally
    scheduled into the delay slot of the branch that follows.

    Signed-off-by: Maciej W. Rozycki
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/10205/
    Signed-off-by: Ralf Baechle

    Maciej W. Rozycki
     
  • bmips_wr_vec() copies exception vector code from start to dst.

    The call to dma_cache_wback() needs to flush (end-start) bytes,
    starting at dst, from write-back cache to memory.

    Signed-off-by: Petri Gynther
    Acked-by: Florian Fainelli
    Reviewed-by: Kevin Cernekee
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/10193/
    Signed-off-by: Ralf Baechle

    Petri Gynther
     
  • initrd_start is defined in init/do_mounts_initrd.c, which is only
    included in kernel if CONFIG_BLK_DEV_INITRD=y.

    Signed-off-by: Laurent Fasnacht
    Cc: linux-mips@linux-mips.org
    Cc: trivial@kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/10198/
    Signed-off-by: Ralf Baechle

    Laurent Fasnacht
     

29 May, 2015

4 commits

  • Since commit 100832abf065bc18 ("usb: isp1760: Make HCD support
    optional"), CONFIG_USB_ISP1760_HCD is automatically selected when
    needed. Enabling that option in the defconfig is now a no-op, and no
    longer enables ISP1760 HCD support.

    Re-enable the ISP1760 driver in the defconfig by enabling
    USB_ISP1760_HOST_ROLE instead.

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Arnd Bergmann

    Geert Uytterhoeven
     
  • …wnguo/linux into fixes

    Merge "The i.MX fixes for 4.1, 3rd round" from Shawn Guo:

    It includes a couple of fixes for i.MX6 GPC code to let the new kernel
    be able to boot with old DTBs:

    - Booting v4.1-rc kernel with old DTBs will fail with a fat warning
    (require low-level debug to be seen), due to the adoption of stacked
    IRQ domain. The first fix improves the situation by allowing kernel
    boot up with old DTBs, although suspend/resume still breaks.

    - Booting new kernel with old DTBs that do not have power-domain info
    will result in a hang. The second patch fixes the hang by skipping
    the kernel power-domain registration if DTB has no power-domain info.

    * tag 'imx-fixes-4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
    ARM: imx6: gpc: don't register power domain if DT data is missing
    ARM: imx6: allow booting with old DT

    Arnd Bergmann
     
  • …ne/linux-samsung into fixes

    Merge "Samsung fix for v4.1" from Kukjin Kim:

    - Set display clock correctly for exynos4412-trats2
    : fix the following error

    exynos-drm: No connectors reported connected with modes
    [drm] Cannot find any crtc or sizes - going 1024x768

    * tag 'samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
    ARM: dts: set display clock correctly for exynos4412-trats2

    Arnd Bergmann
     
  • Pull Xtensa fix from Chris Zankel:
    "This fixes allmodconfig, which fails to build due to missing
    dma_alloc_attrs() and dma_free_attrs() functions"

    * tag 'xtensa-20150526' of git://github.com/czankel/xtensa-linux:
    xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs()

    Linus Torvalds
     

28 May, 2015

4 commits

  • Commit 97badf873ab6 (device property: Make it possible to use
    secondary firmware nodes) uncovered a bug in the x86 (and ia64) PCI
    host bridge initialization code that assumes bridge->bus->sysdata
    to always point to a struct pci_sysdata object which need not be
    the case (in particular, the Xen PCI frontend driver sets it to point
    to a different data type). If it is not the case, an incorrect
    pointer (or a piece of data that is not a pointer at all) will be
    passed to ACPI_COMPANION_SET() and that may cause interesting
    breakage to happen going forward.

    To work around this problem use the observation that the ACPI
    host bridge initialization always passes NULL as parent to
    pci_create_root_bus(), so if pcibios_root_bridge_prepare() sees
    a non-NULL parent of the bridge, it should not attempt to set
    an ACPI companion for it, because that means that
    pci_create_root_bus() has been called by someone else.

    Fixes: 97badf873ab6 (device property: Make it possible to use secondary firmware nodes)
    Reported-and-tested-by: Sander Eikelenboom
    Signed-off-by: Rafael J. Wysocki
    Acked-by: Bjorn Helgaas

    Rafael J. Wysocki
     
  • Changes mainly to account for minor differences in Knights Landing(KNL):
    1. KNL supports C1 and C6 core states.
    2. KNL supports PC2, PC3 and PC6 package states.
    3. KNL has a different encoding of the TURBO_RATIO_LIMIT MSR

    Signed-off-by: Dasaratharaman Chandramouli
    Signed-off-by: Len Brown

    Dasaratharaman Chandramouli
     
  • Pull networking fixes from David Miller:

    1) Don't use MMIO on certain iwlwifi devices otherwise we get a
    firmware crash.

    2) Don't corrupt the GRO lists of mac80211 contexts by doing sends via
    timer interrupt, from Johannes Berg.

    3) SKB tailroom is miscalculated in AP_VLAN crypto code, from Michal
    Kazior.

    4) Fix fw_status memory leak in iwlwifi, from Haim Dreyfuss.

    5) Fix use after free in iwl_mvm_d0i3_enable_tx(), from Eliad Peller.

    6) JIT'ing of large BPF programs is broken on x86, from Alexei
    Starovoitov.

    7) EMAC driver ethtool register dump size is miscalculated, from Ivan
    Mikhaylov.

    8) Fix PHY initial link mode when autonegotiation is disabled in
    amd-xgbe, from Tom Lendacky.

    9) Fix NULL deref on SOCK_DEAD socket in AF_UNIX and CAIF protocols,
    from Mark Salyzyn.

    10) credit_bytes not initialized properly in xen-netback, from Ross
    Lagerwall.

    11) Fallback from MSI-X to INTx interrupts not handled properly in mlx4
    driver, fix from Benjamin Poirier.

    12) Perform ->attach() after binding dev->qdisc in packet scheduler,
    otherwise we can crash. From Cong WANG.

    13) Don't clobber data in sctp_v4_map_v6(). From Jason Gunthorpe.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (30 commits)
    sctp: Fix mangled IPv4 addresses on a IPv6 listening socket
    net_sched: invoke ->attach() after setting dev->qdisc
    xen-netfront: properly destroy queues when removing device
    mlx4_core: Fix fallback from MSI-X to INTx
    xen/netback: Properly initialize credit_bytes
    net: netxen: correct sysfs bin attribute return code
    tools: bpf_jit_disasm: fix segfault on disabled debugging log output
    unix/caif: sk_socket can disappear when state is unlocked
    amd-xgbe-phy: Fix initial mode when autoneg is disabled
    net: dp83640: fix improper double spin locking.
    net: dp83640: reinforce locking rules.
    net: dp83640: fix broken calibration routine.
    net: stmmac: create one debugfs dir per net-device
    net/ibm/emac: fix size of emac dump memory areas
    x86: bpf_jit: fix compilation of large bpf programs
    net: phy: bcm7xxx: Fix 7425 PHY ID and flags
    iwlwifi: mvm: avoid use-after-free on iwl_mvm_d0i3_enable_tx()
    iwlwifi: mvm: clean net-detect info if device was reset during suspend
    iwlwifi: mvm: take the UCODE_DOWN reference when resuming
    iwlwifi: mvm: BT Coex - duplicate the command if sent ASYNC
    ...

    Linus Torvalds
     
  • Pull x86 fixes from Ingo Molnar:
    "This tree includes:

    - a fix that disables the compacted FPU XSAVE format by disabling
    XSAVES support: the fixes are too complex and the breakages
    ABI-affecting, so we want this to be quirked off in a robust way
    and backported, to make sure no broken kernel is exposed to the new
    hardware (which exposure is still very limited).

    - an MCE printk message fix

    - a documentation fix"

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86/fpu: Disable XSAVES* support for now
    x86/Documentation: Update the contact email for L3 cache index disable functionality
    x86/mce: Fix MCE severity messages

    Linus Torvalds
     

27 May, 2015

11 commits

  • If the devicetree is too old and does not provide the regulator and clocks
    for the power domain, we need to avoid registering the power domain.
    Otherwise runtime PM will try to control the domain, which will lead to
    machine hangs without the proper DT configuration data.

    This restores functionality to the kernel 4.0 level if an old DT is
    detected, where the power domain is constantly powered on.

    Signed-off-by: Lucas Stach
    Signed-off-by: Shawn Guo

    Lucas Stach
     
  • The GPC rewrite to IRQ domains has been on the premise that it may break
    suspend/resume for new kernels on old DT, but otherwise keep things working
    from a user perspective. This was an accepted compromise to be able to move
    the GIC cleanup forward.

    What actually happened was that booting a new kernel on an old DT crashes
    before even the console is up, so the user does not even see the warning
    that the DT is too old. The warning message suggests that this has been
    known before, which is clearly unacceptable.

    Fix the early crash by mapping the GPC memory space if the IRQ controller
    doesn't claim it. This keeps at least CPUidle and the needed CPU wakeup
    workarounds working. With this fixed the system is able to boot up
    properly minus the expected suspend/resume breakage.

    Signed-off-by: Lucas Stach
    Signed-off-by: Shawn Guo

    Lucas Stach
     
  • The related warning:

    CC init/do_mounts.o
    arch/alpha/kernel/osf_sys.c: In function 'SyS_osf_settimeofday':
    arch/alpha/kernel/osf_sys.c:1028:14: warning: 'kts.tv_nsec' may be used uninitialized in this function [-Wmaybe-uninitialized]
    kts.tv_nsec *= 1000;
    ^
    arch/alpha/kernel/osf_sys.c:1016:18: note: 'kts' was declared here
    struct timespec kts;
    ^

    Signed-off-by: Chen Gang
    Signed-off-by: Matt Turner

    Chen Gang
     
  • And still left the missing unimplemented syscalls as warnings. The
    related warnings for missing implemented syscalls:

    CALL scripts/checksyscalls.sh
    :1241:2: warning: #warning syscall getrandom not implemented [-Wcpp]
    :1244:2: warning: #warning syscall memfd_create not implemented [-Wcpp]
    :1250:2: warning: #warning syscall execveat not implemented [-Wcpp]

    Signed-off-by: Chen Gang
    Signed-off-by: Matt Turner

    Chen Gang
     
  • Fix the bootpfile and bootpzfile make targets to creat BOOTP images.
    Both targets were broken due to some missing defines to re-map ELF
    constants. In addition the old code used the generic vsprintf function
    of the kernel which we now replace by a simple and much smaller
    implementation for the bootloader.

    Signed-off-by: Helge Deller
    Signed-off-by: Matt Turner

    Helge Deller
     
  • The 'arg' argument to copy_thread() is only ever used when forking a new
    kernel thread. Hence, rename it to 'kthread_arg' for clarity (and consistency
    with do_fork() and other arch-specific implementations of copy_thread()).

    Signed-off-by: Alex Dowad
    Signed-off-by: Matt Turner

    Alex Dowad
     
  • None of these files are actually using any __init type directives
    and hence don't need to include . Most are just a
    left over from __devinit and __cpuinit removal, or simply due to
    code getting copied from one driver to the next.

    Acked-by: Richard Henderson
    Cc: Ivan Kokshaysky
    Cc: Matt Turner
    Cc: linux-alpha@vger.kernel.org
    Signed-off-by: Paul Gortmaker
    Signed-off-by: Matt Turner

    Paul Gortmaker
     
  • The srm console is always built in. It will never be modular,
    so using module_init as an alias for __initcall is rather
    misleading.

    Fix this up now, so that we can relocate module_init from
    init.h into module.h in the future. If we don't do this, we'd
    have to add module.h to obviously non-modular code, and that
    would be a worse thing.

    Direct use of __initcall is discouraged, vs prioritized ones.
    Use of device_initcall is consistent with what __initcall
    maps onto, and hence does not change the init order, making the
    impact of this change zero. Should someone with real hardware
    for boot testing want to change it later to arch_initcall or
    console_initcall, they can do that at a later date.

    Reviewed-by: Richard Henderson
    Cc: Ivan Kokshaysky
    Acked-by: Matt Turner
    Cc: linux-alpha@vger.kernel.org
    Signed-off-by: Paul Gortmaker
    Signed-off-by: Matt Turner

    Paul Gortmaker
     
  • Commit 9a46ad6d6df3b54 "smp: make smp_call_function_many() use logic
    similar to smp_call_function_single()" has unified the way to handle
    single and multiple cross-CPU function calls. Now only one interrupt
    is needed for architecture specific code to support generic SMP function
    call interfaces, so kill the redundant single function call interrupt.

    Cc: Andrew Morton
    Cc: Shaohua Li
    Cc: Peter Zijlstra
    Cc: Ingo Molnar
    Cc: Steven Rostedt
    Cc: Jiri Kosina
    Cc: Richard Henderson
    Cc: Ivan Kokshaysky
    Acked-by: Matt Turner
    Cc: linux-alpha@vger.kernel.org
    Signed-off-by: Jiang Liu
    Signed-off-by: Matt Turner

    Jiang Liu
     
  • Everything in arch/alpha/include/uapi/asm/types.h is protected by
    "#ifndef __KERNEL__", so it's unused for kernelspace.

    Signed-off-by: Geert Uytterhoeven
    Cc: Richard Henderson
    Cc: Ivan Kokshaysky
    Acked-by: Matt Turner
    Cc: linux-alpha@vger.kernel.org
    Signed-off-by: Matt Turner

    Geert Uytterhoeven
     
  • PCI core will initialize device MSI/MSI-X capability in
    pci_msi_init_pci_dev(). So device driver should use
    pci_dev->msi_cap/msix_cap to determine whether the device
    support MSI/MSI-X instead of using
    pci_find_capability(pci_dev, PCI_CAP_ID_MSI/MSIX).
    Access to PCIe device config space again will consume more time.

    Signed-off-by: Yijing Wang
    Cc: Richard Henderson
    Cc: Ivan Kokshaysky
    Acked-by: Matt Turner
    Cc: Phil Carmody
    Cc: linux-alpha@vger.kernel.org
    Signed-off-by: Matt Turner

    Yijing Wang
     

26 May, 2015

3 commits

  • Since commit 100832abf065bc18 ("usb: isp1760: Make HCD support
    optional"), CONFIG_USB_ISP1760_HCD is automatically selected when
    needed. Enabling that option in the defconfig is now a no-op, and no
    longer enables ISP1760 HCD support.

    Re-enable the ISP1760 driver in the defconfig by enabling
    USB_ISP1760_HOST_ROLE instead.

    Signed-off-by: Geert Uytterhoeven
    Cc: Laurent Pinchart
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/10180/
    Signed-off-by: Ralf Baechle

    Geert Uytterhoeven
     
  • Use the generic mechanism to declare a bitmap instead of unsigned long.

    This could fix an overwrite defect of whatever follows irq_map.

    Not all "#define NR_IRQS " are a multiple of BITS_PER_LONG so
    using DECLARE_BITMAP allocates the proper number of longs required
    for the possible bits.

    For instance:

    arch/mips/include/asm/mach-ath79/irq.h:#define NR_IRQS 51
    arch/mips/include/asm/mach-db1x00/irq.h:#define NR_IRQS 152
    arch/mips/include/asm/mach-lantiq/falcon/irq.h:#define NR_IRQS 328

    Signed-off-by: Joe Perches
    Cc: linux-mips
    Cc: LKML
    Cc: Gabor Juhos
    Cc: Manuel Lauss
    Cc: John Crispin
    Patchwork: https://patchwork.linux-mips.org/patch/10091/
    Signed-off-by: Ralf Baechle

    Joe Perches
     
  • xtensa:allmodconfig fails to build with the following errors.

    drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:
    In function ‘gk20a_instobj_dtor_dma’:
    drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:154:2: error:
    implicit declaration of function ‘dma_free_attrs’
    drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:
    In function ‘gk20a_instobj_ctor_dma’:
    drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:218:2: error:
    implicit declaration of function ‘dma_alloc_attrs’

    Xtensa does not provide those functions at this time.
    Provide dummy implementations to avoid build errors.

    Acked-by: Max Filippov
    Signed-off-by: Guenter Roeck
    Signed-off-by: Chris Zankel

    Guenter Roeck
     

25 May, 2015

1 commit

  • x86 has variable length encoding. x86 JIT compiler is trying
    to pick the shortest encoding for given bpf instruction.
    While doing so the jump targets are changing, so JIT is doing
    multiple passes over the program. Typical program needs 3 passes.
    Some very short programs converge with 2 passes. Large programs
    may need 4 or 5. But specially crafted bpf programs may hit the
    pass limit and if the program converges on the last iteration
    the JIT compiler will be producing an image full of 'int 3' insns.
    Fix this corner case by doing final iteration over bpf program.

    Fixes: 0a14842f5a3c ("net: filter: Just In Time compiler for x86-64")
    Reported-by: Daniel Borkmann
    Signed-off-by: Alexei Starovoitov
    Tested-by: Daniel Borkmann
    Acked-by: Daniel Borkmann
    Signed-off-by: David S. Miller

    Alexei Starovoitov
     

23 May, 2015

4 commits

  • This patch sets display clock correctly. If Display clock isn't set
    correctly then you would find below messages and Display controller
    doesn't work correctly.

    exynos-drm: No connectors reported connected with modes
    [drm] Cannot find any crtc or sizes - going 1024x768

    Fixes: abc0b1447d49 ("drm: Perform basic sanity checks on probed modes")
    Cc:
    Signed-off-by: Inki Dae
    Reviewed-by: Krzysztof Kozlowski
    Tested-by: Krzysztof Kozlowski
    Signed-off-by: Kukjin Kim

    Inki Dae
     
  • Pull networking fixes from David Miller:

    1) Don't leak ipvs->sysctl_tbl, from Tommi Rentala.

    2) Fix neighbour table entry leak in rocker driver, from Ying Xue.

    3) Do not emit bonding notifications for unregistered interfaces, from
    Nicolas Dichtel.

    4) Set ipv6 flow label properly when in TIME_WAIT state, from Florent
    Fourcot.

    5) Fix regression in ipv6 multicast filter test, from Henning Rogge.

    6) do_replace() in various footables netfilter modules is missing a
    check for 0 counters in the datastructure provided by the user. Fix
    from Dave Jones, and found with trinity.

    7) Fix RCU bug in packet scheduler classifier module unloads, from
    Daniel Borkmann.

    8) Avoid deadlock in tcp_get_info() by using u64_sync. From Eric
    Dumzaet.

    9) Input packet processing can race with inetdev_destroy() teardown,
    fix potential OOPS in ip_error() by explicitly testing whether the
    inetdev is still attached. From Eric W Biederman.

    10) MLDv2 parser in bridge multicast code breaks too early while
    parsing. Fix from Thadeu Lima de Souza Cascardo.

    11) Asking for settings on non-zero PHYID doesn't work because we do not
    import the command structure from the user and use the PHYID
    provided there. Fix from Arun Parameswaran.

    12) Fix UDP checksums with IPV6 RAW sockets, from Vlad Yasevich.

    13) Missing NF_TABLES depends for TPROXY etc can cause build failures,
    fix from Florian Westphal.

    14) Fix netfilter conntrack to handle RFC5961 challenge ACKs properly,
    from Jesper Dangaard Brouer.

    15) If netlink autobind retry fails, we have to reset the sockets portid
    back to zero. From Herbert Xu.

    16) VXLAN netns exit code unregisters using wrong device, from John W
    Linville.

    17) Add some USB device IDs to ath3k and btusb bluetooth drivers, from
    Dmitry Tunin and Wen-chien Jesse Sung.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
    bridge: fix lockdep splat
    net: core: 'ethtool' issue with querying phy settings
    bridge: fix parsing of MLDv2 reports
    ARM: zynq: DT: Use the zynq binding with macb
    net: macb: Disable half duplex gigabit on Zynq
    net: macb: Document zynq gem dt binding
    ipv4: fill in table id when replacing a route
    cdc_ncm: Fix tx_bytes statistics
    ipv4: Avoid crashing in ip_error
    tcp: fix a potential deadlock in tcp_get_info()
    net: sched: fix call_rcu() race on classifier module unloads
    net: phy: Make sure phy_start() always re-enables the phy interrupts
    ipv6: fix ECMP route replacement
    ipv6: do not delete previously existing ECMP routes if add fails
    Revert "netfilter: bridge: query conntrack about skb dnat"
    netfilter: ensure number of counters is >0 in do_replace()
    netfilter: nfnetlink_{log,queue}: Register pernet in first place
    tcp: don't over-send F-RTO probes
    tcp: only undo on partial ACKs in CA_Loss
    net/ipv6/udp: Fix ipv6 multicast socket filter regression
    ...

    Linus Torvalds
     
  • Pull another crypto fix from Herbert Xu:
    "Fix ICV corruption in s390/ghash when the same tfm is used by more
    than one thread"

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
    crypto: s390/ghash - Fix incorrect ghash icv buffer handling.

    Linus Torvalds
     
  • Use the new zynq binding for macb ethernet, since it will disable half
    duplex gigabit like the Zynq TRM says to do.

    Signed-off-by: Nathan Sullivan
    Signed-off-by: David S. Miller

    Nathan Sullivan
     

22 May, 2015

5 commits

  • "base_irq" needs to be signed for the error handling to work. Also we
    can remove the initialization because we re-assign it later.

    Fixes: aa8d6b73ea33 ('ARM: pxa: pxa_cplds: add lubbock and mainstone IO')
    Signed-off-by: Dan Carpenter
    Signed-off-by: Robert Jarzmik
    Signed-off-by: Arnd Bergmann

    Robert Jarzmik
     
  • Multitheaded tests showed that the icv buffer in the current ghash
    implementation is not handled correctly. A move of this working ghash
    buffer value to the descriptor context fixed this. Code is tested and
    verified with an multithreaded application via af_alg interface.

    Cc: stable@vger.kernel.org
    Signed-off-by: Harald Freudenberger
    Signed-off-by: Gerald Schaefer
    Reported-by: Herbert Xu
    Signed-off-by: Herbert Xu

    Harald Freudenberger
     
  • Pull two xen bugfixes from David Vrabel:

    - fix ARM build regression.

    - fix VIRQ_CONSOLE related oops.

    * tag 'for-linus-4.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
    xen/events: don't bind non-percpu VIRQs with percpu chip
    xen/arm: Define xen_arch_suspend()

    Linus Torvalds
     
  • Pull KVM fixes from Paolo Bonzini:
    "This includes a fix for two oopses, one on PPC and on x86.

    The rest is fixes for bugs with newer Intel processors"

    * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    kvm/fpu: Enable eager restore kvm FPU for MPX
    Revert "KVM: x86: drop fpu_activate hook"
    kvm: fix crash in kvm_vcpu_reload_apic_access_page
    KVM: MMU: fix SMAP virtualization
    KVM: MMU: fix CR4.SMEP=1, CR0.WP=0 with shadow pages
    KVM: MMU: fix smap permission check
    KVM: PPC: Book3S HV: Fix list traversal in error case

    Linus Torvalds
     
  • Pull s390 fixes from Martin Schwidefsky:
    "Bug fixes.

    Three for our crypto code, two for eBPF, and one memory management fix
    to get machines with memory > 8TB working"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
    s390/mm: correct return value of pmd_pfn
    s390/crypto: fix stckf loop
    s390/zcrypt: Fix invalid domain handling during ap module unload
    s390/bpf: Fix gcov stack space problem
    s390/zcrypt: fixed ap poll timer behavior
    s390/bpf: Adjust ALU64_DIV/MOD to match interpreter change

    Linus Torvalds