1. 23 Dec, 2014 3 commits
  2. 13 Dec, 2014 1 commit
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · f96fe225
      Linus Torvalds authored
      Pull another networking update from David Miller:
       "Small follow-up to the main merge pull from the other day:
      
        1) Alexander Duyck's DMA memory barrier patch set.
      
        2) cxgb4 driver fixes from Karen Xie.
      
        3) Add missing export of fixed_phy_register() to modules, from Mark
           Salter.
      
        4) DSA bug fixes from Florian Fainelli"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (24 commits)
        net/macb: add TX multiqueue support for gem
        linux/interrupt.h: remove the definition of unused tasklet_hi_enable
        jme: replace calls to redundant function
        net: ethernet: davicom: Allow to select DM9000 for nios2
        net: ethernet: smsc: Allow to select SMC91X for nios2
        cxgb4: Add support for QSA modules
        libcxgbi: fix freeing skb prematurely
        cxgb4i: use set_wr_txq() to set tx queues
        cxgb4i: handle non-pdu-aligned rx data
        cxgb4i: additional types of negative advice
        cxgb4/cxgb4i: set the max. pdu length in firmware
        cxgb4i: fix credit check for tx_data_wr
        cxgb4i: fix tx immediate data credit check
        net: phy: export fixed_phy_register()
        fib_trie: Fix trie balancing issue if new node pushes down existing node
        vlan: Add ability to always enable TSO/UFO
        r8169:update rtl8168g pcie ephy parameter
        net: dsa: bcm_sf2: force link for all fixed PHY devices
        fm10k/igb/ixgbe: Use dma_rmb on Rx descriptor reads
        r8169: Use dma_rmb() and dma_wmb() for DescOwn checks
        ...
      f96fe225
  3. 12 Dec, 2014 36 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 55437989
      Linus Torvalds authored
      Pull IDE update from David Miller:
       "Two small IDE layer adjustments"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        drivers: ide: Fix mostly harmless off-by-one hardcoded value
        IDE: Deletion of an unnecessary check before the function call "module_put"
      55437989
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · a7e8ddd8
      Linus Torvalds authored
      Pull sparc update from David Miller:
       "Not a lot of stuff this time around, mostly bug fixing:
      
         - Fix alignment of 32-bit crosscall datastructure on Leon, from
           Andreas Larsson.
      
         - Several fixes to the virtual disk driver on sparc64 by Dwight
           Engen, including handling resets of the service domain properly"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sunvdc: reconnect ldc after vds service domain restarts
        sparc/ldc: create separate ldc_unbind from ldc_free
        vio: create routines for inc,dec vio dring indexes
        sunvdc: fix module unload/reload
        sparc32, leon: Align ccall_info to prevent unaligned traps on crosscall
      a7e8ddd8
    • Jaedon Shin's avatar
      MIPS: Use phys_addr_t instead of phys_t · ad8f723a
      Jaedon Shin authored
      Ralf Baechle says:
       "This should have been part of the merge commit c0222ac0 (Merge
        branch 'upstream' of git://git.linux-mips.org/pub/scm/-
        ralf/upstream-linus) but I forgot to mention the need for this in my
        pull request"
      Signed-off-by: default avatarJaedon Shin <jaedon.shin@gmail.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ad8f723a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 26ceb127
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "The major updates included in this update are:
      
         - Clang compatible stack pointer accesses by Behan Webster.
         - SA11x0 updates from Dmitry Eremin-Solenikov.
         - kgdb handling of breakpoints with read-only text/modules
         - Support for Privileged-no-execute feature on ARMv7 to prevent
           userspace code execution by the kernel.
         - AMBA primecell bus handling of irq-safe runtime PM
         - Unwinding support for memset/memzero/memmove/memcpy functions
         - VFP fixes for Krait CPUs and improvements in detecting the VFP
           architecture
         - A number of code cleanups (using pr_*, removing or reducing the
           severity of a couple of kernel messages, splitting ftrace asm code
           out to a separate file, etc.)
         - Add machine name to stack dump output"
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (62 commits)
        ARM: 8247/2: pcmcia: sa1100: make use of device clock
        ARM: 8246/2: pcmcia: sa1111: provide device clock
        ARM: 8245/1: pcmcia: soc-common: enable/disable socket clocks
        ARM: 8244/1: fbdev: sa1100fb: make use of device clock
        ARM: 8243/1: sa1100: add a clock alias for sa1111 pcmcia device
        ARM: 8242/1: sa1100: add cpu clock
        ARM: 8221/1: PJ4: allow building in Thumb-2 mode
        ARM: 8234/1: sa1100: reorder IRQ handling code
        ARM: 8233/1: sa1100: switch to hwirq usage
        ARM: 8232/1: sa1100: merge GPIO multiplexer IRQ to "normal" irq domain
        ARM: 8231/1: sa1100: introduce irqdomains support
        ARM: 8230/1: sa1100: shift IRQs by one
        ARM: 8229/1: sa1100: replace irq numbers with names in irq driver
        ARM: 8228/1: sa1100: drop entry-macro.S
        ARM: 8227/1: sa1100: switch to MULTI_IRQ_HANDLER
        ARM: 8241/1: Update processor_modes for hyp and monitor mode
        ARM: 8240/1: MCPM: document mcpm_sync_init()
        ARM: 8239/1: Introduce {set,clear}_pte_bit
        ARM: 8238/1: mm: Refine set_memory_* functions
        ARM: 8237/1: fix flush_pfn_alias
        ...
      26ceb127
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 8d140667
      Linus Torvalds authored
      Pull IOMMU updates from Joerg Roedel:
       "This time with:
      
         - A new IOMMU-API call: iommu_map_sg() to map multiple non-contiguous
           pages into an IO address space with only one API call.  This allows
           certain optimizations in the IOMMU driver.
      
         - DMAR device hotplug in the Intel VT-d driver.  It is now possible
           to hotplug the IOMMU itself.
      
         - A new IOMMU driver for the Rockchip ARM platform.
      
         - Couple of cleanups and improvements in the OMAP IOMMU driver.
      
         - Nesting support for the ARM-SMMU driver.
      
         - Various other small cleanups and improvements.
      
        Please note that this time some branches were also pulled into other
        trees, like the DRI and the Tegra tree.  The VT-d branch was also
        pulled into tip/x86/apic.
      
        Some patches for the AMD IOMMUv2 driver are not in the IOMMU tree but
        were merged by Andrew (or finally ended up in the DRI tree)"
      
      * tag 'iommu-updates-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (42 commits)
        iommu: Decouple iommu_map_sg from CPU page size
        iommu/vt-d: Fix an off-by-one bug in __domain_mapping()
        pci, ACPI, iommu: Enhance pci_root to support DMAR device hotplug
        iommu/vt-d: Enhance intel-iommu driver to support DMAR unit hotplug
        iommu/vt-d: Enhance error recovery in function intel_enable_irq_remapping()
        iommu/vt-d: Enhance intel_irq_remapping driver to support DMAR unit hotplug
        iommu/vt-d: Search for ACPI _DSM method for DMAR hotplug
        iommu/vt-d: Implement DMAR unit hotplug framework
        iommu/vt-d: Dynamically allocate and free seq_id for DMAR units
        iommu/vt-d: Introduce helper function dmar_walk_resources()
        iommu/arm-smmu: add support for DOMAIN_ATTR_NESTING attribute
        iommu/arm-smmu: Play nice on non-ARM/SMMU systems
        iommu/amd: remove compiler warning due to IOMMU_CAP_NOEXEC
        iommu/arm-smmu: add IOMMU_CAP_NOEXEC to the ARM SMMU driver
        iommu: add capability IOMMU_CAP_NOEXEC
        iommu/arm-smmu: change IOMMU_EXEC to IOMMU_NOEXEC
        iommu/amd: Fix accounting of device_state
        x86/vt-d: Fix incorrect bit operations in setting values
        iommu/rockchip: Allow to compile with COMPILE_TEST
        iommu/ipmmu-vmsa: Return proper error if devm_request_irq fails
        ...
      8d140667
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma · 87c779ba
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "Main features this time are:
      
         - BAM v1.3.0 support form qcom bam dma
         - support for Allwinner sun8i dma
         - atmels eXtended DMA Controller driver
         - chancnt cleanup by Maxime
         - fixes spread over drivers"
      
      * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (56 commits)
        dmaenegine: Delete a check before free_percpu()
        dmaengine: ioatdma: fix dma mapping errors
        dma: cppi41: add a delay while setting the TD bit
        dma: cppi41: wait longer for the HW to return the descriptor
        dmaengine: fsl-edma: fixup reg offset and hw S/G support in big-endian model
        dmaengine: fsl-edma: fix calculation of remaining bytes
        drivers/dma/pch_dma: declare pch_dma_id_table as static
        dmaengine: ste_dma40: fix error return code
        dma: imx-sdma: clarify about firmware not found error
        Documentation: devicetree: Fix Xilinx VDMA specification
        dmaengine: pl330: update author info
        dmaengine: clarify the issue_pending expectations
        dmaengine: at_xdmac: Add DMA_PRIVATE
        ARM: dts: at_xdmac: fix bad value of dma-cells in documentation
        dmaengine: at_xdmac: fix missing spin_unlock
        dmaengine: at_xdmac: fix a bug in transfer residue computation
        dmaengine: at_xdmac: fix software lockup at_xdmac_tx_status()
        dmaengine: at_xdmac: remove chancnt affectation
        dmaengine: at_xdmac: prefer usage of readl/writel_relaxed
        dmaengine: xdmac: fix print warning on dma_addr_t variable
        ...
      87c779ba
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.code.sf.net/p/openipmi/linux-ipmi · eea0cf3f
      Linus Torvalds authored
      Pull IPMI driver updates from Corey Minyard:
        - Quite a few bug fixes
        - A new driver for the powernv
        - A new driver for the SMBus interface from the IPMI 2.0 specification
      
      * tag 'for-linus' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi: Check the BT interrupt enable periodically
        ipmi: Fix attention handling for system interfaces
        ipmi: Periodically check to see if irqs and messages are set right
        drivers/char/ipmi: Add powernv IPMI driver
        ipmi: Add SMBus interface driver (SSIF)
        ipmi: Remove the now unused priority from SMI sender
        ipmi: Remove the now unnecessary message queue
        ipmi: Make the message handler easier to use for SMI interfaces
        ipmi: Move message sending into its own function
        ipmi: rename waiting_msgs to waiting_rcv_msgs
        ipmi: Fix handling of BMC flags
        ipmi: Initialize BMC device attributes
        ipmi: Unregister previously registered driver in error case
        ipmi: Use the proper type for acpi_handle
        ipmi: Fix a bug in hot add/remove
        ipmi: Remove useless sysfs_name parameters
        ipmi: clean up the device handling for the bmc device
        ipmi: Move the address source to string to ipmi-generic code
        ipmi: Ignore SSIF in the PNP handling
      eea0cf3f
    • Linus Torvalds's avatar
      Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6 · 823e334e
      Linus Torvalds authored
      Pull documentation update from Jonathan Corbet:
       "Here's my set of accumulated documentation changes for 3.19.
      
        It includes a couple of additions to the coding style document, some
        fixes for minor build problems within the documentation tree, the
        relocation of the kselftest docs, and various tweaks and additions.
      
        A couple of changes reach outside of Documentation/; they only make
        trivial comment changes and I did my best to get the required acks.
      
        Complete with a shiny signed tag this time around"
      
      * tag 'docs-for-linus' of git://git.lwn.net/linux-2.6:
        kobject: grammar fix
        Input: xpad - update docs to reflect current state
        Documentation: Build mic/mpssd only for x86_64
        cgroups: Documentation: fix wrong cgroupfs paths
        Documentation/email-clients.txt: add info about Claws Mail
        CodingStyle: add some more error handling guidelines
        kselftest: Move the docs to the Documentation dir
        Documentation: fix formatting to make 's' happy
        Documentation: power: Fix typo in Documentation/power
        Documentation: vm: Add 1GB large page support information
        ipv4: add kernel parameter tcpmhash_entries
        Documentation: Fix a typo in mailbox.txt
        treewide: Fix typo in Documentation/DocBook/device-drivers
        CodingStyle: Add a chapter on conditional compilation
      823e334e
    • Rasmus Villemoes's avatar
      drivers: ide: Fix mostly harmless off-by-one hardcoded value · ca957b6a
      Rasmus Villemoes authored
      The string "IOMEGA Clik!" has length 12, not 11. Using strstarts
      avoids the error-prone hardcoding of the prefix length. For
      consistency, also change the occurence just above.
      Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ca957b6a
    • Markus Elfring's avatar
      IDE: Deletion of an unnecessary check before the function call "module_put" · 1746fbe5
      Markus Elfring authored
      The module_put() function tests whether its argument is NULL and then
      returns immediately. Thus the test around the call is not needed.
      
      This issue was detected by using the Coccinelle software.
      Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1746fbe5
    • David S. Miller's avatar
      Merge branch 'gem' · eea3e8fd
      David S. Miller authored
      Cyrille Pitchen says:
      
      ====================
      net/macb: add TX multiqueue support for gem
      
      ChangeLog
      
      v3:
      - reduce the number of added #define in macb.h
      - simplify the queue initialization
      - add some more comments
      - use "hw_q" index when dealing with the hardware queue mask and "q" index for
        linux (software) queue index in "for" loops
      
      v2:
      fix compilation warnings for netdev_vdbg("%u...", queue - bp->queues, ...) calls
      
      v1:
      At the first look this patch may look quite big but it cannot be splitted.
      Each queue has its own dedicated IRQ, which should be handled.
      Also the Transmit Base Queue Pointer register of each available queue must be
      initialized before starting the transmission, otherwise the transmission will be
      halted immediately as HRESP errors are likely to occur.
      In addition, some fields had to be moved from struct macb into struct macb_queue
      so a common code could manage the queues.
      
      This patch was applied to net-next and tested on a sama5d36ek board, which embeds
      both macb and gem IPs, to check the backward compatibility.
      
      Also it was tested on a sama5dx FPGA platform with a gem designed to use 3 queues.
      Then we used the tc program to set a queue discipline policy as describe in the
      Documentation/networking/multiqueue.txt: we successfully used each queue.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      eea3e8fd
    • Cyrille Pitchen's avatar
      net/macb: add TX multiqueue support for gem · 02c958dd
      Cyrille Pitchen authored
      gem devices designed with multiqueue CANNOT work without this patch.
      
      When probing a gem device, the driver must first prepare and enable the
      peripheral clock before accessing I/O registers. The second step is to read the
      MID register to find whether the device is a gem or an old macb IP.
      For gem devices, it reads the Design Configuration Register 6 (DCFG6) to
      compute to total number of queues, whereas macb devices always have a single
      queue.
      Only then it can call alloc_etherdev_mq() with the correct number of queues.
      This is the reason why the order of some initializations has been changed in
      macb_probe().
      Eventually, the dedicated IRQ and TX ring buffer descriptors are initialized
      for each queue.
      
      For backward compatibility reasons, queue0 uses the legacy registers ISR, IER,
      IDR, IMR, TBQP and RBQP. On the other hand, the other queues use new registers
      ISR[1..7], IER[1..7], IDR[1..7], IMR[1..7], TBQP[1..7] and RBQP[1..7].
      Except this hardware detail there is no real difference between queue0 and the
      others. The driver hides that thanks to the struct macb_queue.
      This structure allows us to share a common set of functions for all the queues.
      
      Besides when a TX error occurs, the gem MUST be halted before writing any of
      the TBQP registers to reset the relevant queue. An immediate side effect is
      that the other queues too aren't processed anymore by the gem.
      So macb_tx_error_task() calls netif_tx_stop_all_queues() to notify the Linux
      network engine that all transmissions are stopped.
      
      Also macb_tx_error_task() now calls spin_lock_irqsave() to prevent the
      interrupt handlers of the other queues from running as each of them may wake
      its associated queue up (please refer to macb_tx_interrupt()).
      
      Finally, as all queues have previously been stopped, they should be restarted
      calling netif_tx_start_all_queues() and setting the TSTART bit into the Network
      Control Register. Before this patch, when dealing with a single queue, the
      driver used to defer the reset of the faulting queue and the write of the
      TSTART bit until the next call of macb_start_xmit().
      As explained before, this bit is now set by macb_tx_error_task() too. That's
      why the faulting queue MUST be reset by setting the TX_USED bit in its first
      buffer descriptor before writing the TSTART bit.
      
      Queue 0 always exits and is the lowest priority when other queues are available.
      The higher the index of the queue is, the higher its priority is.
      
      When transmitting frames, the TX queue is selected by the skb->queue_mapping
      value. So queue discipline can be used to define the queue priority policy.
      Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@atmel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      02c958dd
    • David S. Miller's avatar
      Merge branch 'kill_tasklet_hi_enable' · d717e904
      David S. Miller authored
      Quentin Lambert says:
      
      ====================
      Remove redundant function
      
      tasklet_hi_enable and tasklet_enable are redundant. Since
      tasklet_hi_enable is used only 6 times in 1 file, the first
      patch changes calls to the function with calls to tasklet_enable.
      
      The second patch removes tasklet_hi_enable definition.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d717e904
    • Quentin Lambert's avatar
    • Quentin Lambert's avatar
      jme: replace calls to redundant function · 06f66529
      Quentin Lambert authored
      Calls to tasklet_hi_enable are replaced by calls to
      tasklet_enable since the 2 functions are redundant.
      Signed-off-by: default avatarQuentin Lambert <lambert.quentin@gmail.com>
      Signed-off-by: default avatarValentin Rothberg <valentinrothberg@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      06f66529
    • Linus Torvalds's avatar
      Merge tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 6ce4436c
      Linus Torvalds authored
      Pull pstore update #2 from Tony Luck:
       "Couple of pstore-ram enhancements to allow use of different memory
        attributes"
      
      * tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore-ram: Allow optional mapping with pgprot_noncached
        pstore-ram: Fix hangs by using write-combine mappings
      6ce4436c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · bdeb03ca
      Linus Torvalds authored
      Pull btrfs update from Chris Mason:
       "From a feature point of view, most of the code here comes from Miao
        Xie and others at Fujitsu to implement scrubbing and replacing devices
        on raid56.  This has been in development for a while, and it's a big
        improvement.
      
        Filipe and Josef have a great assortment of fixes, many of which solve
        problems corruptions either after a crash or in error conditions.  I
        still have a round two from Filipe for next week that solves
        corruptions with discard and block group removal"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (62 commits)
        Btrfs: make get_caching_control unconditionally return the ctl
        Btrfs: fix unprotected deletion from pending_chunks list
        Btrfs: fix fs mapping extent map leak
        Btrfs: fix memory leak after block remove + trimming
        Btrfs: make btrfs_abort_transaction consider existence of new block groups
        Btrfs: fix race between writing free space cache and trimming
        Btrfs: fix race between fs trimming and block group remove/allocation
        Btrfs, replace: enable dev-replace for raid56
        Btrfs: fix freeing used extents after removing empty block group
        Btrfs: fix crash caused by block group removal
        Btrfs: fix invalid block group rbtree access after bg is removed
        Btrfs, raid56: fix use-after-free problem in the final device replace procedure on raid56
        Btrfs, replace: write raid56 parity into the replace target device
        Btrfs, replace: write dirty pages into the replace target device
        Btrfs, raid56: support parity scrub on raid56
        Btrfs, raid56: use a variant to record the operation type
        Btrfs, scrub: repair the common data on RAID5/6 if it is corrupted
        Btrfs, raid56: don't change bbio and raid_map
        Btrfs: remove unnecessary code of stripe_index assignment in __btrfs_map_block
        Btrfs: remove noused bbio_ret in __btrfs_map_block in condition
        ...
      bdeb03ca
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 0349678c
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       - i2c-hid race condition fix from Jean-Baptiste Maneyrol
       - Logitech driver now supports vendor-specific HID++ protocol, allowing
         us to deliver a full multitouch support on wider range of Logitech
         touchpads.  Written by Benjamin Tissoires
       - MS Surface Pro 3 Type Cover support added by Alan Wu
       - RMI touchpad support improvements from Andrew Duggan
       - a lot of updates to Wacom driver from Jason Gerecke and Ping Cheng
       - various small fixes all over the place
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (56 commits)
        HID: rmi: The address of query8 must be calculated based on which query registers are present
        HID: rmi: Check for additional ACM registers appended to F11 data report
        HID: i2c-hid: prevent buffer overflow in early IRQ
        HID: logitech-hidpp: disable io in probe error path
        HID: logitech-hidpp: add boundary check for name retrieval
        HID: logitech-hidpp: check name retrieval return code
        HID: logitech-hidpp: do not return the name length
        HID: wacom: Report input events for each finger on generic devices
        HID: wacom: Initialize MT slots for generic devices at post_parse_hid
        HID: wacom: Update maximum X/Y accounding to outbound offset
        HID: wacom: Add support for DTU-1031X
        HID: wacom: add defines for new Cintiq and DTU outbound tracking
        HID: wacom: fix freeze on open when autosuspend is on
        HID: wacom: re-add accidentally dropped Lenovo PID
        HID: make hid_report_len as a static inline function in hid.h
        HID: wacom: Consult the application usage when determining field type
        HID: wacom: PAD is independent with pen/touch
        HID: multitouch: Add quirk for VTL touch panels
        HID: i2c-hid: fix race condition reading reports
        HID: wacom: Add angular resolution data to some ABS axes
        ...
      0349678c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · a7cb7bb6
      Linus Torvalds authored
      Pull trivial tree update from Jiri Kosina:
       "Usual stuff: documentation updates, printk() fixes, etc"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
        intel_ips: fix a type in error message
        cpufreq: cpufreq-dt: Move newline to end of error message
        ps3rom: fix error return code
        treewide: fix typo in printk and Kconfig
        ARM: dts: bcm63138: change "interupts" to "interrupts"
        Replace mentions of "list_struct" to "list_head"
        kernel: trace: fix printk message
        scsi: mpt2sas: fix ioctl in comment
        zbud, zswap: change module author email
        clocksource: Fix 'clcoksource' typo in comment
        arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help
        gpio: msm-v1: make boolean argument more obvious
        usb: Fix typo in usb-serial-simple.c
        PCI: Fix comment typo 'COMFIG_PM_OPS'
        powerpc: Fix comment typo 'CONIFG_8xx'
        powerpc: Fix comment typos 'CONFiG_ALTIVEC'
        clk: st: Spelling s/stucture/structure/
        isci: Spelling s/stucture/structure/
        usb: gadget: zero: Spelling s/infrastucture/infrastructure/
        treewide: Fix company name in module descriptions
        ...
      a7cb7bb6
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.19-rc1' of git://git.infradead.org/linux-ubifs · ccb5a491
      Linus Torvalds authored
      Pull UBI/UBIFS updates from Artem Bityutskiy:
       "This includes the following UBI/UBIFS changes:
         - UBI debug messages now include the UBI device number.  This change
           is responsible for the big diffstat since it touched every
           debugging print statement.
         - An Xattr bug-fix which fixes SELinux support
         - Several error path fixes in UBI/UBIFS"
      
      * tag 'upstream-3.19-rc1' of git://git.infradead.org/linux-ubifs:
        UBI: Fix invalid vfree()
        UBI: Fix double free after do_sync_erase()
        UBIFS: fix a couple bugs in UBIFS xattr length calculation
        UBI: vtbl: Use ubi_eba_atomic_leb_change()
        UBI: Extend UBI layer debug/messaging capabilities
        UBIFS: fix budget leak in error path
      ccb5a491
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · c05e14f7
      Linus Torvalds authored
      Pull xfs update from Dave Chinner:
       "There's relatively little change in this update; it is mainly bug
        fixes, cleanups and more of the on-going libxfs restructuring and
        on-disk format header consolidation work.
      
        Details:
         - more on-disk format header consolidation
         - move some structures shared with userspace to libxfs
         - new per-mount workqueue to fix for deadlocks between nested loop
           mounted filesystems
         - various bug fixes for ENOSPC, stats, quota off and preallocation
         - a bunch of compiler warning fixes for set-but-unused variables
         - various code cleanups"
      
      * tag 'xfs-for-linus-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (24 commits)
        xfs: split metadata and log buffer completion to separate workqueues
        xfs: fix set-but-unused warnings
        xfs: move type conversion functions to xfs_dir.h
        xfs: move ftype conversion functions to libxfs
        xfs: lobotomise xfs_trans_read_buf_map()
        xfs: active inodes stat is broken
        xfs: cleanup xfs_bmse_merge returns
        xfs: cleanup xfs_bmse_shift_one goto mess
        xfs: fix premature enospc on inode allocation
        xfs: overflow in xfs_iomap_eof_align_last_fsb
        xfs: fix simple_return.cocci warning in xfs_bmse_shift_one
        xfs: fix simple_return.cocci warning in xfs_file_readdir
        libxfs: fix simple_return.cocci warnings
        xfs: remove unnecessary null checks
        xfs: merge xfs_inum.h into xfs_format.h
        xfs: move most of xfs_sb.h to xfs_format.h
        xfs: merge xfs_ag.h into xfs_format.h
        xfs: move acl structures to xfs_format.h
        xfs: merge xfs_dinode.h into xfs_format.h
        xfs: catch invalid negative blknos in _xfs_buf_find()
        ...
      c05e14f7
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 9bfccec2
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "Lots of bugs fixes, including Zheng and Jan's extent status shrinker
        fixes, which should improve CPU utilization and potential soft lockups
        under heavy memory pressure, and Eric Whitney's bigalloc fixes"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (26 commits)
        ext4: ext4_da_convert_inline_data_to_extent drop locked page after error
        ext4: fix suboptimal seek_{data,hole} extents traversial
        ext4: ext4_inline_data_fiemap should respect callers argument
        ext4: prevent fsreentrance deadlock for inline_data
        ext4: forbid journal_async_commit in data=ordered mode
        jbd2: remove unnecessary NULL check before iput()
        ext4: Remove an unnecessary check for NULL before iput()
        ext4: remove unneeded code in ext4_unlink
        ext4: don't count external journal blocks as overhead
        ext4: remove never taken branch from ext4_ext_shift_path_extents()
        ext4: create nojournal_checksum mount option
        ext4: update comments regarding ext4_delete_inode()
        ext4: cleanup GFP flags inside resize path
        ext4: introduce aging to extent status tree
        ext4: cleanup flag definitions for extent status tree
        ext4: limit number of scanned extents in status tree shrinker
        ext4: move handling of list of shrinkable inodes into extent status code
        ext4: change LRU to round-robin in extent status tree shrinker
        ext4: cache extent hole in extent status tree for ext4_da_map_blocks()
        ext4: fix block reservation for bigalloc filesystems
        ...
      9bfccec2
    • Tobias Klauser's avatar
      net: ethernet: davicom: Allow to select DM9000 for nios2 · a169758a
      Tobias Klauser authored
      This chip is present on older revisions of the DE2 development kit.
      Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a169758a
    • Tobias Klauser's avatar
      net: ethernet: smsc: Allow to select SMC91X for nios2 · 5499776b
      Tobias Klauser authored
      This chip is present on the Nios2 Development Kit 2C35.
      Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5499776b
    • Hariprasad Shenai's avatar
      cxgb4: Add support for QSA modules · 40e9de4b
      Hariprasad Shenai authored
      Firmware 1.12.25.0 added support for QSA module, adding the driver code for it.
      Also fixes some ethtool get settings for other module types.
      Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      40e9de4b
    • David S. Miller's avatar
      Merge branch 'cxgb4' · 3a923f5a
      David S. Miller authored
      Karen Xie says:
      
      ====================
      cxgb4/cxgbi: misc. fixes for cxgb4i
      
      This patch set fixes cxgb4i's tx credit calculation and adds handling of
      additional rx message and negative advice types. It also removes the duplicate
      code in cxgb4i to set the outgoing queues of a packet.
      
      Karen Xie (7):
      cxgb4i: fix tx immediate data credit check
      cxgb4i: fix credit check for tx_data_wr
      cxgb4/cxgb4i: set max. outgoing pdu length in the f/w
      cxgb4i: add more types of negative advice
      cxgb4i: handle non pdu-aligned rx data
      cxgb4i: use cxgb4's set_wr_txq() for setting outgoing queues
      libcxgbi: fix the debug print accessing skb after it is freed
      
      Sending to net as the fixes are mostly in the network area and it touches
      cxgb4's header file (t4fw_api.h).
      
      v2 corrects the "CHECK"s flagged by checkpatch.pl --strict.
      
      v3 splits the 3rd patch from v2 to two separate patches. Adds detailed commit
      messages and makes subject more concise. Patch 3/6 also changes the return
      value of is_neg_adv() from int to bool.
      
      v4 -- please ignore.
      
      v5 splits the 1st patch from v3 to two separate patches and reduces code
      duplication in make_tx_data_wr().
      
      v6 removed the code style cleanup in the 2nd patch. The style update will be
      addressed in a separate patch.
      
      v7 updates the 7th patch with more detailed commit message.
      
      v8 removes the duplicate subject lines from the message bodies.
      
      v9 reformatted the commit messages to be max. 80 characters per line.
      
      v10 rebased to net-next tree.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3a923f5a
    • Karen Xie's avatar
      libcxgbi: fix freeing skb prematurely · ed481a33
      Karen Xie authored
      With debug turned on the debug print would access the skb after it is freed.
      Fix it to free the skb after the debug print.
      Signed-off-by: default avatarKaren Xie <kxie@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ed481a33
    • Karen Xie's avatar
      cxgb4i: use set_wr_txq() to set tx queues · 2126bc5e
      Karen Xie authored
      use cxgb4's set_wr_txq() for setting of the tx queue for a outgoing packet.
      remove the similar function in cxgb4i.
      Signed-off-by: default avatarKaren Xie <kxie@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2126bc5e
    • Karen Xie's avatar
      cxgb4i: handle non-pdu-aligned rx data · f7bcd2e1
      Karen Xie authored
      Abort the connection upon receiving of cpl_rx_data, which means the pdu cannot
      be recovered from the tcp stream. This generally is due to pdu header
      corruption.
      Signed-off-by: default avatarKaren Xie <kxie@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f7bcd2e1
    • Karen Xie's avatar
      cxgb4i: additional types of negative advice · 928567ad
      Karen Xie authored
      Treat both CPL_ERR_KEEPALV_NEG_ADVICE and CPL_ERR_PERSIST_NEG_ADVICE as
      negative advice.
      Signed-off-by: default avatarKaren Xie <kxie@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      928567ad
    • Karen Xie's avatar
      cxgb4/cxgb4i: set the max. pdu length in firmware · 64bfead8
      Karen Xie authored
      Programs the firmware of the maximum outgoing iscsi pdu length per connection.
      Signed-off-by: default avatarKaren Xie <kxie@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      64bfead8
    • Karen Xie's avatar
      cxgb4i: fix credit check for tx_data_wr · 7857c62a
      Karen Xie authored
      make sure any tx credit related checking is done before adding the wr header.
      Signed-off-by: default avatarKaren Xie <kxie@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7857c62a
    • Karen Xie's avatar
      cxgb4i: fix tx immediate data credit check · 84944d8c
      Karen Xie authored
      Only data skbs need the wr header added while control skbs do not. Make sure
      they are treated differently.
      Signed-off-by: default avatarKaren Xie <kxie@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      84944d8c
    • Mark Salter's avatar
      net: phy: export fixed_phy_register() · 37e9a690
      Mark Salter authored
      When building the bcmgenet driver as module, I get:
      
      ERROR: "fixed_phy_register" [drivers/net/ethernet/broadcom/genet/genet.ko] undefined!
      
      commit b0ba512e225d72 ("net: bcmgenet: enable driver to work without device
      tree") which added a call to fixed_phy_register. But fixed_phy_register
      needs to be exported if used from a module.
      Signed-off-by: default avatarMark Salter <msalter@redhat.com>
      Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      37e9a690
    • Alexander Duyck's avatar
      fib_trie: Fix trie balancing issue if new node pushes down existing node · e962f302
      Alexander Duyck authored
      This patch addresses an issue with the level compression of the fib_trie.
      Specifically in the case of adding a new leaf that triggers a new node to
      be added that takes the place of the old node.  The result is a trie where
      the 1 child tnode is on one side and one leaf is on the other which gives
      you a very deep trie.  Below is the script I used to generate a trie on
      dummy0 with a 10.X.X.X family of addresses.
      
        ip link add type dummy
        ipval=184549374
        bit=2
        for i in `seq 1 23`
        do
          ifconfig dummy0:$bit $ipval/8
          ipval=`expr $ipval - $bit`
          bit=`expr $bit \* 2`
        done
        cat /proc/net/fib_triestat
      
      Running the script before the patch:
      
      	Local:
      		Aver depth:     10.82
      		Max depth:      23
      		Leaves:         29
      		Prefixes:       30
      		Internal nodes: 27
      		  1: 26  2: 1
      		Pointers: 56
      	Null ptrs: 1
      	Total size: 5  kB
      
      After applying the patch and repeating:
      
      	Local:
      		Aver depth:     4.72
      		Max depth:      9
      		Leaves:         29
      		Prefixes:       30
      		Internal nodes: 12
      		  1: 3  2: 2  3: 7
      		Pointers: 70
      	Null ptrs: 30
      	Total size: 4  kB
      
      What this fix does is start the rebalance at the newly created tnode
      instead of at the parent tnode.  This way if there is a gap between the
      parent and the new node it doesn't prevent the new tnode from being
      coalesced with any pre-existing nodes that may have been pushed into one
      of the new nodes child branches.
      Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e962f302
    • Toshiaki Makita's avatar
      vlan: Add ability to always enable TSO/UFO · 53f6b708
      Toshiaki Makita authored
      Since the real device can segment packets by software, a vlan device
      can set TSO/UFO even when the real device doesn't have those features.
      Unlike GSO, this allows packets to be segmented after Qdisc.
      Signed-off-by: default avatarToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      53f6b708