1. 10 Oct, 2014 7 commits
    • Alexei Starovoitov's avatar
      net: bpf: fix bpf syscall dependence on anon_inodes · 38b3629a
      Alexei Starovoitov authored
      minimal configurations where EPOLL, PERF_EVENTS, etc are disabled,
      but NET is enabled, are failing to build with link error:
      kernel/built-in.o: In function `bpf_prog_load':
      syscall.c:(.text+0x3b728): undefined reference to `anon_inode_getfd'
      
      fix it by selecting ANON_INODES when NET is enabled
      Reported-by: default avatarMichal Sojka <sojkam1@fel.cvut.cz>
      Signed-off-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      38b3629a
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 7b6fa1ee
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fixes for net-next
      
      This batch contains two fixes for what you have in your net-next,
      they are:
      
      1) Remove nf_send_reset6() from header file. This function now resides
         in the nf_reject_ipv6 module. Reported by Eric Dumazet.
      
      2) Fix wrong NFT_REJECT_ICMPX_MAX definition and adjust code to fix
         errors reported by Dan Carpenter's static analysis tools.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7b6fa1ee
    • David S. Miller's avatar
      Merge tag 'master-2014-10-08' of... · 4511a4a5
      David S. Miller authored
      Merge tag 'master-2014-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
      
      John W. Linville says:
      
      ====================
      pull request: wireless-next 2014-10-09
      
      Please pull this batch of fixes intended for the 3.18 stream!
      
      Andrea Merello makes rtl818x_pci use a more reasonable transmission
      rate for HW generated frames.
      
      Fabian Frederick tweaks some kernel-doc bits to avoid warnings.
      
      Larry Finger corrects a possible unaligned access in the rtlwifi code.
      
      Marek Puzyniak avoids a kernel panic in ath9k_hw_reset.
      
      Sujith Manoharan goes for the hat trick -- he fixes a smatch warning
      in the shared ath code, he fixes a crash in ath9k, and he corrects
      a sequence number assignment problem in ath9k too.
      
      For ease of merging, I pulled the last bits of the wireless tree as well...
      
      Please let me know if there are problems!
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4511a4a5
    • Vince Bridgers's avatar
      stmmac: correct mc_filter local variable in set_filter and set_mac_addr call · 3dab99e0
      Vince Bridgers authored
      Testing revealed that the local variable mc_filter was dimensioned
      incorrectly for all possible configurations and get_mac_addr should
      have been set_mac_addr (a typo). Make sure mc_filter is dimensioned
      to 8 32-bit unsigned longs - the largest size of the Synopsys
      multicast filter register set.
      Signed-off-by: default avatarVince Bridgers <vbridger@opensource.altera.com>
      Acked-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3dab99e0
    • Geert Uytterhoeven's avatar
      net: pxa168_eth: PXA168_ETH should depend on HAS_DMA · 3b3d136c
      Geert Uytterhoeven authored
      If NO_DMA=y:
      
      drivers/built-in.o: In function `rxq_deinit':
      pxa168_eth.c:(.text+0x2a2f2e): undefined reference to `dma_free_coherent'
      drivers/built-in.o: In function `txq_reclaim':
      pxa168_eth.c:(.text+0x2a3044): undefined reference to `dma_unmap_single'
      drivers/built-in.o: In function `txq_deinit':
      pxa168_eth.c:(.text+0x2a310a): undefined reference to `dma_free_coherent'
      drivers/built-in.o: In function `txq_init':
      pxa168_eth.c:(.text+0x2a3226): undefined reference to `dma_alloc_coherent'
      drivers/built-in.o: In function `rxq_init':
      pxa168_eth.c:(.text+0x2a32d4): undefined reference to `dma_alloc_coherent'
      drivers/built-in.o: In function `init_hash_table':
      pxa168_eth.c:(.text+0x2a3354): undefined reference to `dma_alloc_coherent'
      drivers/built-in.o: In function `rxq_refill':
      pxa168_eth.c:(.text+0x2a345a): undefined reference to `dma_map_single'
      drivers/built-in.o: In function `rxq_process':
      pxa168_eth.c:(.text+0x2a39cc): undefined reference to `dma_unmap_single'
      drivers/built-in.o: In function `pxa168_eth_remove':
      pxa168_eth.c:(.text+0x2a3b84): undefined reference to `dma_free_coherent'
      drivers/built-in.o: In function `pxa168_eth_start_xmit':
      pxa168_eth.c:(.text+0x2a3e8a): undefined reference to `dma_map_single'
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3b3d136c
    • Pranith Kumar's avatar
      networking: fm10k: Fix build failure · b71b12dc
      Pranith Kumar authored
      The latest linus git tip (3.18-rc1) fails with the following build failure. Fix
      this by making PTP support explicit for fm10k driver.
      
      rivers/built-in.o: In function `fm10k_ptp_register':
      (.text+0x12e760): undefined reference to `ptp_clock_registER'
      drivers/built-in.o: In function `fm10k_ptp_unregister':
      (.text+0x12e7dc): undefined reference to `ptp_clock_unregister'
      Makefile:930: recipe for target 'vmlinux' failed
      Signed-off-by: default avatarPranith Kumar <bobby.prani@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b71b12dc
    • LEROY Christophe's avatar
      net: fs_enet: error: 'SCCE_ENET_TXF' undeclared · 7b4ecf39
      LEROY Christophe authored
      [linux-devel:devel-hourly-2014100909 3763/3915] drivers/net/ethernet/freescale/fs_enet/mac-scc.c:119:32: error: 'SCCE_ENET_TXF' undeclared
      
      Due to patch d43a396a net: fs_enet: Add NAPI TX, it appears that some target
      compilations are broken.
      This is due to the fact that unlike the FEC, the SCC and FCC don't have a TXF
      event (complete Frame transmitted) but only TXB (buffer transmitted).
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7b4ecf39
  2. 09 Oct, 2014 21 commits
  3. 08 Oct, 2014 12 commits
    • Linus Torvalds's avatar
      Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d5935b07
      Linus Torvalds authored
      Pull ARM64 SoC changes from Arnd Bergmann:
       "Starting with 3.18, we are merging SoC-specific changes for arm64
        through the arm-soc tree, like we have been doing for arm32.
      
        This time, there is only one set of changes, adding support for the
        Cavium "Thunder" Soc family.  Since the changes are relatively small,
        this includes Kconfig, defconfig and DT changes.
      
        If all goes well, we will never require adding actual C source code
        for platform support in arm64, given that the architecture is more
        clearly defined and we have moved out a lot of the platform specifics
        into device drivers for arm32 already"
      
      * tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm64, defconfig: Enable Cavium Thunder SoC in defconfig
        arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family
        arm64, thunder: Document devicetree bindings for Cavium Thunder SoC
        arm64, thunder: Add initial dts for Cavium Thunder SoC
      d5935b07
    • Linus Torvalds's avatar
      Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f86dc4b0
      Linus Torvalds authored
      Pull ARM SoC defconfig changes from Arnd Bergmann:
       "This is a collection of the various changes to defconfig files, most
        importantly enabling some additional platforms in the
        multi_v7_defconfig file"
      
      * tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
        ARM: configs: fix duplicate entry in multi_v7
        ARM: multi_v7_defconfig: add missing Tegra options
        ARM: bcm2835: enable USB_DWC2_HOST in defconfig
        ARM: meson: update multi_v7_defconfig
        ARM: multi_v7_defconfig: Enable Mediatek platform
        ARM: qcom: Update defconfig
        ARM: mvebu: add gpio-fan to mvebu_v7_defconfig
        ARM: mvebu: add LED class support built-in in mvebu_v7_defconfig
        ARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig
        ARM: LPC32xx: defconfig update
        ARM: configs: Enable cpufreq-cpu0 for multi_v7_defconfig
        ARM: configs: Remove REGULATOR_VIRTUAL_CONSUMER from defconfigs
        ARM: tegra: enable Atmel touchpad in defconfig
        ARM: at91: sama5: update defconfig
        ARM: at91: at91sam9rl: update defconfig
        ARM: at91: at91sam9g45: update defconfig
        ARM: at91: at91sam9263: update defconfig
        ARM: at91: at91sam9261_9g10: update defconfig
        ARM: at91: at91sam9260_9g20: update defconfig
        ARM: at91: at91_dt: update defconfig
        ...
      f86dc4b0
    • Linus Torvalds's avatar
      Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 8b45bc89
      Linus Torvalds authored
      Pull ARM SoC driver updates from Arnd Bergmann:
       "These are changes for drivers that are intimately tied to some SoC and
        for some reason could not get merged through the respective subsystem
        maintainer tree.
      
        Most of the new code is for the Keystone Navigator driver, which is
        new base support that is going to be needed for their hardware
        accelerated network driver and other units.
      
        Most of the commits are for moving old code around from at91 and omap
        for things that are done in device drivers nowadays.
      
         - at91: move reset, poweroff, memory and clocksource code into
           drivers directories
         - socfpga: add edac driver (through arm-soc, as requested by Boris)
         - omap: move omap-intc code to drivers/irqchip
         - sunxi: added an RTC driver for sun6i
         - omap: mailbox driver related changes
         - keystone: support for the "Navigator" component
         - versatile: new reboot, led and soc drivers"
      
      * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
        bus: arm-ccn: Fix spurious warning message
        leds: add device tree bindings for register bit LEDs
        soc: add driver for the ARM RealView
        power: reset: driver for the Versatile syscon reboot
        leds: add a driver for syscon-based LEDs
        drivers/soc: ti: fix build break with modules
        MAINTAINERS: Add Keystone Multicore Navigator drivers entry
        soc: ti: add Keystone Navigator DMA support
        Documentation: dt: soc: add Keystone Navigator DMA bindings
        soc: ti: add Keystone Navigator QMSS driver
        Documentation: dt: soc: add Keystone Navigator QMSS bindings
        rtc: sunxi: Depend on platforms sun4i/sun7i that actually have the rtc
        rtc: sun6i: Add sun6i RTC driver
        irqchip: omap-intc: remove unnecessary comments
        irqchip: omap-intc: correct maximum number or MIR registers
        irqchip: omap-intc: enable TURBO idle mode
        irqchip: omap-intc: enable IP protection
        irqchip: omap-intc: remove unnecesary of_address_to_resource() call
        irqchip: omap-intc: comment style cleanup
        irqchip: omap-intc: minor improvement to omap_irq_pending()
        ...
      8b45bc89
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · eb785bef
      Linus Torvalds authored
      Pull ARM SoC DT updates from Arnd Bergmann:
       "As usual, this is the largest branch, though this time a little under
        half of the total changes with 307 individual non-merge changesets.
      
        The largest changes are the addition of new machines, in particular
        the Tegra based Chromebook, the Renesas r8a7794 SoC, and DT support
        for the old i.MX1 platform.
      
        Other changes include
         - at91: various sam9 and sama5 updates
         - exynos: much extended Peach Pi/Pit (Chromebook 2) support
         - keystone: new peripherals
         - meson: added DT for meson6 SoC
         - mvebu: new device support for Armada 370/375
         - qcom: improved support for IPQ8064 and MSM8x60
         - rockchip: much improved support for rk3288
         - shmobile: lots of updates all over the place
         - sunxi: dts license change
         - sunxi: more a23 device support
         - vexpress: CLCD DT description"
      
      * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (308 commits)
        ARM: DTS: meson: update DTSI to add watchdog node
        ARM: dts: keystone-k2l: fix mdio io start address
        ARM: dts: keystone-k2e: fix mdio io start address
        ARM: dts: keystone-k2e: update usb1 node for dma properties
        ARM: dts: keystone: fix io range for usb_phy0
        Revert "Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt"
        Revert "ARM: dts: hix5hd2: add wdg node"
        ARM: dts: add rk3288 i2s controller
        ARM: vexpress: Add CLCD Device Tree properties
        ARM: bcm2835: add I2S pinctrl to device tree
        ARM: meson: documentation: add bindings documentation
        ARM: meson: dts: add basic Meson/Meson6/Meson6-atv1200 DTSI/DTS
        ARM: dts: mt6589: Change compatible string for GIC
        ARM: dts: mediatek: Add compatible property for aquaris5
        ARM: dts: mt6589-aquaris5: Add boot argument earlyprintk
        ARM: dts: mt6589: Fix typo in GIC unit address
        ARM: dts: Build dtb for Mediatek board
        ARM: dts: keystone: fix bindings for pcie and usb clock nodes
        ARM: dts: keystone: k2l: Fix chip selects for SPI devices
        ARM: dts: keystone: add dsp gpio controllers nodes
        ...
      eb785bef
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · cf377ad7
      Linus Torvalds authored
      Pull ARM SoC platform changes from Arnd Bergmann:
       "New and updated SoC support.  Among the things new for this release
        are:
      
         - at91: Added support for the new SAMA5D4 SoC, following the earlier
           SAMA5D3
         - bcm: Added support for BCM63XX family of DSL SoCs
         - hisi: Added support for HiP04 server-class SoC
         - meson: Initial support for the Amlogic Meson6 (aka 8726MX) platform
         - shmobile: added support for new r8a7794 (R-Car E2) automotive SoC
      
        Noteworthy changes to existing SoC support are:
      
         - imx: convert i.MX1 to device tree
         - omap: lots of power management work
         - omap: base support to enable moving to standard UART driver
         - shmobile: lots of progress for multiplatform support, still
           ongoing"
      
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (171 commits)
        ARM: hisi: depend on ARCH_MULTI_V7
        CNS3xxx: Fix debug UART.
        ARM: at91: fix nommu build regression
        ARM: meson: add basic support for MesonX SoCs
        ARM: meson: debug: add debug UART for earlyprintk support
        irq: Export handle_fasteoi_irq
        ARM: mediatek: Add earlyprintk support for mt6589
        ARM: hisi: Fix platmcpm compilation when ARMv6 is selected
        ARM: debug: fix alphanumerical order on debug uarts
        ARM: at91: document Atmel SMART compatibles
        ARM: at91: add sama5d4 support to sama5_defconfig
        ARM: at91: dt: add device tree file for SAMA5D4ek board
        ARM: at91: dt: add device tree file for SAMA5D4 SoC
        ARM: at91: SAMA5D4 SoC detection code and low level routines
        ARM: at91: introduce basic SAMA5D4 support
        clk: at91: add a driver for the h32mx clock
        ARM: pxa3xx: provide specific platform_devices for all ssp ports
        ARM: pxa: ssp: provide platform_device_id for PXA3xx
        ARM: OMAP4+: Remove static iotable mappings for SRAM
        ARM: OMAP4+: Move SRAM data to DT
        ...
      cf377ad7
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 212fe84a
      Linus Torvalds authored
      Pull ARM SoC cleanups from Arnd Bergmann:
       "This time around, the cleanup branch contains mostly code removal.  A
        number of board files for at91, imx and msm have become obsolete
        because of the DT conversion and are now ready to be removed.  The
        OMAP platform has traditionally had its own DMA engine abstraction and
        as this is being phased out, a lot of the original code is now unused
        and can be removed as well.
      
        S3C24xx can be simplified now that the restart code is a proper device
        driver.
      
        Finally, a number of cleanups in shmobile are done to prepare for the
        addition of new code in other branches"
      
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
        ARM: at91: Remove the support for the RSI EWS board
        arm: mach-omap2: Convert pr_warning to pr_warn
        ARM: OMAP: Remove unused pieces of legacy DMA API
        ARM: at91: remove board file for Acme Systems Fox G20
        ARM: orion5x: Convert pr_warning to pr_warn
        ARM: S3C24XX: remove separate restart code
        ARM: EXYNOS: Do not calculate boot address twice
        ARM: sunxi: Remove sun4i reboot code from mach directory
        ARM: imx: Remove mach-mxt_td60 board file
        ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()
        ARM: shmobile: r8a7740: Clean up pm domain table
        ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()
        ARM: shmobile: sh7372: Make domain_devices[] static __initdata
        ARM: shmobile: mackerel: Make domain_devices[] static __initdata
        clocksource: tcb_clksrc: sanitize IRQ request
        ARM: at91/tclib: mask interruptions at shutdown and probe
        ARM: at91/tclib: move initialization from alloc to probe
        ARM: at91/tclib: prefer using of devm_* functions
        ARM: clps711x: Switch CLPS711X subarch to use clk and clocksource driver
        ARM: shmobile: r8a7791 is now called "R-Car M2-W"
        ...
      212fe84a
    • Linus Torvalds's avatar
      Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4a4743e8
      Linus Torvalds authored
      Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
       "These are bug fixes for harmless problems that were not important
        enough to get fixed in 3.17.  The majority of these are OMAP specific,
        but there are also a couple for Marvell mvebu, cns3xxx, and others, as
        well as some updates for the MAINTAINERS file.
      
        In particular, Robert Jarzmik and Daniel Mack now volunteered to help
        out maintaining the PXA platform, Krzysztof Halasa took over the
        cns3xxx platform, Carlo Caione is the maintainer for the new Amlogic
        meson platform, and Matthias Brugger is now listed for the mediatek
        platform he recently contributed"
      
      * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits)
        MAINTAINERS: update Shawn's email address
        MAINTAINERS: condense some Tegra related entries
        MAINTAINERS: add Alexandre Courbot for Tegra
        MAINTAINERS: CNS3xxx and IXP4xx update.
        MAINTAINERS: Add maintainers entry for Mediatek SoCs
        arm, vt8500, LLVMLlinux: Use mcr instead of mcr% for mach-vt8500
        MAINTAINERS: add a third maintainer to mach-bcm
        CNS3xxx: Fix PCIe read size limit.
        CNS3xxx: Fix logical PCIe topology.
        CNS3xxx: Fix debug UART.
        MAINTAINERS: Add entry for the Amlogic MesonX SoCs
        MAINTAINERS: update ARM pxa maintainers
        ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks
        ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings
        ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
        ARM: Kirkwood: Fix DT based DSA.
        ARM: OMAP2+: make of_device_ids const
        ARM: omap2: make arrays containing machine compatible strings const
        ARM: LPC32xx: Fix reset function
        ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
        ...
      4a4743e8
    • David S. Miller's avatar
    • Fabian Frederick's avatar
      netlabel: directly return netlbl_unlabel_genl_init() · 16b99a4f
      Fabian Frederick authored
      No need to store netlbl_unlabel_genl_init result and test it before returning.
      Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      16b99a4f
    • Eric Dumazet's avatar
      net: add netdev_txq_bql_{enqueue, complete}_prefetchw() helpers · 53511453
      Eric Dumazet authored
      Add two helpers so that drivers do not have to care of BQL being
      available or not.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarJim Davis <jim.epost@gmail.com>
      Fixes: 29d40c90 ("net/mlx4_en: Use prefetch in tx path")
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      53511453
    • Masanari Iida's avatar
      net: description of dma_cookie cause make xmldocs warning · 709c48b3
      Masanari Iida authored
      In commit 7bced397,
      dma_cookie was removed from struct skbuff.
      But the description of dma_cookie still exist.
      So the "make xmldocs" output following warning.
      
      Warning(.//include/linux/skbuff.h:609): Excess struct/union
      /enum/typedef member 'dma_cookie' description in 'sk_buff'
      
      Remove description of dma_cookie fix the symptom.
      Signed-off-by: default avatarMasanari Iida <standby24x7@gmail.com>
      Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      709c48b3
    • Dan Carpenter's avatar
      cxgb4: clean up a type issue · fb5ac0de
      Dan Carpenter authored
      The tx_desc struct holds 8 __be64 values.  The original code in
      ring_tx_db() took a tx_desc pointer then casted it to an int pointer and
      then casted it to a u64 pointer.  It was confusing and triggered some
      static checker warnings.
      
      I have changed the cxgb_pio_copy() function to only take tx_desc
      pointers.  This isn't really a loss of flexibility because anything else
      was buggy to begin with.
      
      I also removed the casting on the destination pointer since that was
      unnecessary and a bit messy.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fb5ac0de