1. 01 Jul, 2015 17 commits
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d5fb8213
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
       "This contains:
      
         - a series of fixes for interrupt drivers to prevent a potential race
           when installing a chained interrupt handler
      
         - a fix for cpumask pointer misuse
      
         - a fix for using the wrong interrupt number from struct irq_data
      
         - removal of unused code and outdated comments
      
         - a few new helper functions which allow us to cleanup the interrupt
           handling code further in 4.3
      
         I decided against doing the cleanup at the end of this merge window
         and rather do the preparatory steps for 4.3, so we can run the final
         ABI change at the end of the 4.3 merge window with less risk"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (26 commits)
        ARM/LPC32xx: Use irq not hwirq for __irq_set_handler_locked()
        genirq: Implement irq_set_handler_locked()/irq_set_chip_handler_name_locked()
        genirq: Introduce helper irq_desc_get_irq()
        genirq: Remove irq_node()
        genirq: Clean up outdated comments related to include/linux/irqdesc.h
        mn10300: Fix incorrect use of irq_data->affinity
        MIPS/ralink: Fix race in installing chained IRQ handler
        MIPS/pci: Fix race in installing chained IRQ handler
        MIPS/ath25: Fix race in installing chained IRQ handler
        MIPS/ath25: Fix race in installing chained IRQ handler
        m68k/psc: Fix race in installing chained IRQ handler
        avr32/at32ap: Fix race in installing chained IRQ handler
        sh/intc: Fix race in installing chained IRQ handler
        sh/intc: Fix potential race in installing chained IRQ handler
        pinctrl/sun4i: Fix race in installing chained IRQ handler
        pinctrl/samsung: Fix race in installing chained IRQ handler
        pinctrl/samsung: Fix race in installing chained IRQ handler
        pinctrl/exynos: Fix race in installing chained IRQ handler
        pinctrl/st: Fix race in installing chained IRQ handler
        pinctrl/adi2: Fix race in installing chained IRQ handler
        ...
      d5fb8213
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 8fff7755
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This fixes the aesni setkey error and removes a couple of unnecessary
        NULL checks in the Intel qat driver"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: aesni - fix failing setkey for rfc4106-gcm-aesni
        crypto: qat - Deletion of unnecessary checks before two function calls
      8fff7755
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 47ebed96
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) mlx4 driver bug fixes (TX queue wakeups, csum complete indications)
          from Ido Shamay, Eran Ben Elisha, and Or Gerlitz.
      
       2) Missing unlock in error path of PTP support in renesas driver, from
          Dan Carpenter.
      
       3) Add Vitesse 8641 phy IDs to vitesse PHY driver, from Shaohui Xie.
      
       4) Bnx2x driver bug fixes (linearization of encap packets, scratchpad
          parity error notifications, flow-control and speed settings) from
          Yuval Mintz, Manish Chopra, Shahed Shaikh, and Ariel Elior.
      
       5) ipv6 extension header parsing in the igb chip has a HW errata,
          disable it.  Frm Todd Fujinaka.
      
       6) Fix PCI link state locking issue in e1000e driver, from Yanir
          Lubetkin.
      
       7) Cure panics during MTU change in i40e, from Mitch Williams.
      
       8) Don't leak promisc refs in DSA slave driver, from Gilad Ben-Yossef.
      
       9) Add missing HAS_DMA dep to VIA Rhine driver, from Geery
          Uytterhoeven.
      
      10) Make sure DMA map/unmap calls are symmetric in bnx2x driver, from
          Michal Schmidt.
      
      11) Workaround for MDIO access problems in bcm7xxx devices, from FLorian
          Fainelli.
      
      12) Fix races in SCTP protocol between OTTB responses and route
          removals, from Alexander Sverdlin.
      
      13) Fix jumbo frame checksum issue with some mvneta devices, from Simon
          Guinot.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (58 commits)
        sock_diag: don't broadcast kernel sockets
        net: mvneta: disable IP checksum with jumbo frames for Armada 370
        ARM: mvebu: update Ethernet compatible string for Armada XP
        net: mvneta: introduce compatible string "marvell, armada-xp-neta"
        api: fix compatibility of linux/in.h with netinet/in.h
        net: icplus: fix typo in constant name
        sis900: Trivial: Fix typos in enums
        stmmac: Trivial: fix typo in constant name
        sctp: Fix race between OOTB responce and route removal
        net-Liquidio: Delete unnecessary checks before the function call "vfree"
        vmxnet3: Bump up driver version number
        amd-xgbe: Add the __GFP_NOWARN flag to Rx buffer allocation
        net: phy: mdio-bcm-unimac: workaround initial read failures for integrated PHYs
        net: bcmgenet: workaround initial read failures for integrated PHYs
        net: phy: bcm7xxx: workaround MDIO management controller initial read
        bnx2x: fix DMA API usage
        net: via: VIA_RHINE and VIA_VELOCITY should depend on HAS_DMA
        net/phy: tune get_phy_c45_ids to support more c45 phy
        bnx2x: fix lockdep splat
        net: fec: don't access RACC register when not available
        ...
      47ebed96
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 44b061f7
      Linus Torvalds authored
      Pul IOMMU fixes from Joerg Roedel:
       "Four fixes have queued up to fix regressions introduced after v4.1:
      
         - Don't fail IOMMU driver initialization when the add_device
           call-back returns -ENODEV, as that just means that the device is
           not translated by the IOMMU.  This is pretty common on ARM.
      
         - Two fixes for the ARM-SMMU driver for a wrong feature check and to
           remove a redundant NULL check.
      
         - A fix for the AMD IOMMU driver to fix a boot panic on systems where
           the BIOS requests Unity Mappings in the IVRS table"
      
      * tag 'iommu-fixes-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/amd: Introduce protection_domain_init() function
        iommu/arm-smmu: Delete an unnecessary check before the function call "free_io_pgtable_ops"
        iommu/arm-smmu: Fix broken ATOS check
        iommu: Ignore -ENODEV errors from add_device call-back
      44b061f7
    • Linus Torvalds's avatar
      Merge tag 'sound-fix-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · f822dcc6
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Here are a bunch of small fixes, mostly for HD-audio quirks, in
        addition to a few regression fixes and trivial cleanups"
      
      * tag 'sound-fix-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: Fix uninintialized error return
        ALSA: hda: Delete an unnecessary check before the function call "snd_info_free_entry"
        ALSA: hda - Add a fixup for Dell E7450
        ALSA: hda - Fix the dock headphone output on Fujitsu Lifebook E780
        ALSA: hda - Add headset support to Acer Aspire V5
        ALSA: hda - restore the MIC FIXUP for some Dell machines
        ALSA: jack: Fix endless loop at unique index detection
        ALSA: hda - set proper caps for newer AMD hda audio in KB/KV
        ALSA: hda - Disable widget power-save for VIA codecs
        ALSA: hda - Fix Dock Headphone on Thinkpad X250 seen as a Line Out
      f822dcc6
    • Christoph Lameter's avatar
      Add __init attribute to new_kmalloc_cache · ae6f2462
      Christoph Lameter authored
      Avoid the warning:
      
        WARNING: mm/built-in.o(.text.unlikely+0xc22): Section mismatch in reference from the function .new_kmalloc_cache() to the variable .init.rodata:kmalloc_info
        The function .new_kmalloc_cache() references
        the variable __initconst kmalloc_info.
      Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ae6f2462
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 5c395097
      Linus Torvalds authored
      Pull power management and ACPI fixes from Rafael Wysocki:
       "These are fixes that didn't make it to the previous PM+ACPI pull
        request or are fixing issues introduced by it.
      
        Specifics:
      
         - Fix a recently added memory leak in an error path in the ACPI
           resources management code (Dan Carpenter)
      
         - Fix a build warning triggered by an ACPI video header function that
           should be static inline (Borislav Petkov)
      
         - Change names of helper function converting struct fwnode_handle
           pointers to either struct device_node or struct acpi_device
           pointers so they don't conflict with local variable names
           (Alexander Sverdlin)
      
         - Make the hibernate core re-enable nonboot CPUs on failures to
           disable them as expected (Vitaly Kuznetsov)
      
         - Increase the default timeout of the device suspend watchdog to
           prevent it from triggering too early on some systems (Takashi Iwai)
      
         - Prevent the cpuidle powernv driver from registering idle states
           with CPUIDLE_FLAG_TIMER_STOP set if CONFIG_TICK_ONESHOT is unset
           which leads to boot hangs (Preeti U Murthy)"
      
      * tag 'pm+acpi-4.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        tick/idle/powerpc: Do not register idle states with CPUIDLE_FLAG_TIMER_STOP set in periodic mode
        PM / sleep: Increase default DPM watchdog timeout to 60
        PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure
        ACPI / OF: Rename of_node() and acpi_node() to to_of_node() and to_acpi_node()
        ACPI / video: Inline acpi_video_set_dmi_backlight_type
        ACPI / resources: free memory on error in add_region_before()
      5c395097
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 7adf12b8
      Linus Torvalds authored
      Pull xen updates from David Vrabel:
       "Xen features and cleanups for 4.2-rc0:
      
         - add "make xenconfig" to assist in generating configs for Xen guests
      
         - preparatory cleanups necessary for supporting 64 KiB pages in ARM
           guests
      
         - automatically use hvc0 as the default console in ARM guests"
      
      * tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        block/xen-blkback: s/nr_pages/nr_segs/
        block/xen-blkfront: Remove invalid comment
        block/xen-blkfront: Remove unused macro MAXIMUM_OUTSTANDING_BLOCK_REQS
        arm/xen: Drop duplicate define mfn_to_virt
        xen/grant-table: Remove unused macro SPP
        xen/xenbus: client: Fix call of virt_to_mfn in xenbus_grant_ring
        xen: Include xen/page.h rather than asm/xen/page.h
        kconfig: add xenconfig defconfig helper
        kconfig: clarify kvmconfig is for kvm
        xen/pcifront: Remove usage of struct timeval
        xen/tmem: use BUILD_BUG_ON() in favor of BUG_ON()
        hvc_xen: avoid uninitialized variable warning
        xenbus: avoid uninitialized variable warning
        xen/arm: allow console=hvc0 to be omitted for guests
        arm,arm64/xen: move Xen initialization earlier
        arm/xen: Correctly check if the event channel interrupt is present
      7adf12b8
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 02201e3f
      Linus Torvalds authored
      Pull module updates from Rusty Russell:
       "Main excitement here is Peter Zijlstra's lockless rbtree optimization
        to speed module address lookup.  He found some abusers of the module
        lock doing that too.
      
        A little bit of parameter work here too; including Dan Streetman's
        breaking up the big param mutex so writing a parameter can load
        another module (yeah, really).  Unfortunately that broke the usual
        suspects, !CONFIG_MODULES and !CONFIG_SYSFS, so those fixes were
        appended too"
      
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (26 commits)
        modules: only use mod->param_lock if CONFIG_MODULES
        param: fix module param locks when !CONFIG_SYSFS.
        rcu: merge fix for Convert ACCESS_ONCE() to READ_ONCE() and WRITE_ONCE()
        module: add per-module param_lock
        module: make perm const
        params: suppress unused variable error, warn once just in case code changes.
        modules: clarify CONFIG_MODULE_COMPRESS help, suggest 'N'.
        kernel/module.c: avoid ifdefs for sig_enforce declaration
        kernel/workqueue.c: remove ifdefs over wq_power_efficient
        kernel/params.c: export param_ops_bool_enable_only
        kernel/params.c: generalize bool_enable_only
        kernel/module.c: use generic module param operaters for sig_enforce
        kernel/params: constify struct kernel_param_ops uses
        sysfs: tightened sysfs permission checks
        module: Rework module_addr_{min,max}
        module: Use __module_address() for module_address_lookup()
        module: Make the mod_tree stuff conditional on PERF_EVENTS || TRACING
        module: Optimize __module_address() using a latched RB-tree
        rbtree: Implement generic latch_tree
        seqlock: Introduce raw_read_seqcount_latch()
        ...
      02201e3f
    • Linus Torvalds's avatar
      Merge tag 'arc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 0890a264
      Linus Torvalds authored
      Pull ARC architecture updates from Vineet Gupta:
      
       - support for HS38 cores based on ARCv2 ISA
      
           ARCv2 is the next generation ISA from Synopsys and basis for the
           HS3{4,6,8} families of processors which retain the traditional ARC mantra of
           low power and configurability and are now more performant and feature rich.
      
           HS38x is a 10 stage pipeline core which supports MMU (with huge pages) and
           SMP (upto 4 cores) among other features.
      
           + www.synopsys.com/dw/ipdir.php?ds=arc-hs38-processor
           + http://news.synopsys.com/2014-10-14-New-DesignWare-ARC-HS38-Processor-Doubles-Performance-for-Embedded-Linux-Applications
           + http://www.embedded.com/electronics-news/4435975/Synopsys-ARC-HS38-core-gives-2X-boost-to-Linux-based-apps
      
       - support for ARC SDP (Software Development platform): Main Board + CPU Cards
          = AXS101: CPU Card with ARC700 in silicon @ 700 MHz
          = AXS103: CPU Card with HS38x in FPGA
      
       - refactoring of ARCompact port to accomodate new ARCv2 ISA
      
       - misc updates/cleanups
      
      * tag 'arc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (72 commits)
        ARC: Fix build failures for ARCompact in linux-next after ARCv2 support
        ARCv2: Allow older gcc to cope with new regime of ARCv2/ARCompact support
        ARCv2: [vdk] dts files and defconfig for HS38 VDK
        ARCv2: [axs103] Support ARC SDP FPGA platform for HS38x cores
        ARC: [axs101] Prepare for AXS103
        ARCv2: [nsim*hs*] Support simulation platforms for HS38x cores
        ARCv2: All bits in place, allow ARCv2 builds
        ARCv2: SLC: Handle explcit flush for DMA ops (w/o IO-coherency)
        ARCv2: STAR 9000837815 workaround hardware exclusive transactions livelock
        ARC: Reduce bitops lines of code using macros
        ARCv2: barriers
        arch: conditionally define smp_{mb,rmb,wmb}
        ARC: add smp barriers around atomics per Documentation/atomic_ops.txt
        ARC: add compiler barrier to LLSC based cmpxchg
        ARCv2: SMP: intc: IDU 2nd level intc for dynamic IRQ distribution
        ARCv2: SMP: clocksource: Enable Global Real Time counter
        ARCv2: SMP: ARConnect debug/robustness
        ARCv2: SMP: Support ARConnect (MCIP) for Inter-Core-Interrupts et al
        ARC: make plat_smp_ops weak to allow over-rides
        ARCv2: clocksource: Introduce 64bit local RTC counter
        ...
      0890a264
    • Joerg Roedel's avatar
      iommu/amd: Introduce protection_domain_init() function · 7a5a566e
      Joerg Roedel authored
      This function contains the common parts between the
      initialization of dma_ops_domains and usual protection
      domains. This also fixes a long-standing bug which was
      uncovered by recent changes, in which the api_lock was not
      initialized for dma_ops_domains.
      Reported-by: default avatarGeorge Wang <xuw2015@gmail.com>
      Tested-by: default avatarGeorge Wang <xuw2015@gmail.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      7a5a566e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 05a8256c
      Linus Torvalds authored
      Pull arch/tile updates from Chris Metcalf:
       "These are a grab bag of changes to improve debugging and respond to a
        variety of issues raised on LKML over the last couple of months"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: avoid a "label not used" warning in do_page_fault()
        tile: vdso: use raw_read_seqcount_begin() in vdso
        tile: force CONFIG_TILEGX if ARCH != tilepro
        tile: improve stack backtrace
        tile: fix "odd fault" warning for stack backtraces
        tile: set up initial stack top to honor STACK_TOP_DELTA
        tile: support delivering NMIs for multicore backtrace
        drivers/tty/hvc/hvc_tile.c: properly return -EAGAIN
        tile: add <asm/word-at-a-time.h> and enable support functions
        tile: use READ_ONCE() in arch_spin_is_locked()
        tile: modify arch_spin_unlock_wait() semantics
      05a8256c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 0161b6e0
      Linus Torvalds authored
      Pull more s390 updates from Martin Schwidefsky:
       "There is one larger patch for the AP bus code to make it work with the
        longer reset periods of the latest crypto cards.
      
        A new default configuration, a naming cleanup for SMP and a few fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/kdump: fix compile for !SMP
        s390/kdump: fix nosmt kernel parameter
        s390: new default configuration
        s390/smp: cleanup core vs. cpu in the SCLP interface
        s390/smp: fix sigp cpu detection loop
        s390/zcrypt: Fixed reset and interrupt handling of AP queues
        s390/kdump: fix REGSET_VX_LOW vector register ELF notes
        s390/bpf: Fix backward jumps
      0161b6e0
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 94521ca3
      Linus Torvalds authored
      Pull CIFS/SMB3 updates from Steve French:
       "Includes two bug fixes, as well as (minimal) support for the new
        protocol dialect (SMB3.1.1), and support for two ioctls including
        reflink (duplicate extents) file copy and set integrity"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: Unset CIFS_MOUNT_POSIX_PATHS flag when following dfs mounts
        Update negotiate protocol for SMB3.11 dialect
        Add ioctl to set integrity
        Add Get/Set Integrity Information structure definitions
        Add reflink copy over SMB3.11 with new FSCTL_DUPLICATE_EXTENTS
        Add SMB3.11 mount option synonym for new dialect
        add struct FILE_STANDARD_INFO
        Make dialect negotiation warning message easier to read
        Add defines and structs for smb3.1 dialect
        Allow parsing vers=3.11 on cifs mount
        client MUST ignore EncryptionKeyLength if CAP_EXTENDED_SECURITY is set
      94521ca3
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · 68b4449d
      Linus Torvalds authored
      Pul xfs updates from Dave Chinner:
       "There's a couple of small API changes to the core DAX code which
        required small changes to the ext2 and ext4 code bases, but otherwise
        everything is within the XFS codebase.
      
        This update contains:
      
         - A new sparse on-disk inode record format to allow small extents to
           be used for inode allocation when free space is fragmented.
      
         - DAX support.  This includes minor changes to the DAX core code to
           fix problems with lock ordering and bufferhead mapping abuse.
      
         - transaction commit interface cleanup
      
         - removal of various unnecessary XFS specific type definitions
      
         - cleanup and optimisation of freelist preparation before allocation
      
         - various minor cleanups
      
         - bug fixes for
      	- transaction reservation leaks
      	- incorrect inode logging in unwritten extent conversion
      	- mmap lock vs freeze ordering
      	- remote symlink mishandling
      	- attribute fork removal issues"
      
      * tag 'xfs-for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (49 commits)
        xfs: don't truncate attribute extents if no extents exist
        xfs: clean up XFS_MIN_FREELIST macros
        xfs: sanitise error handling in xfs_alloc_fix_freelist
        xfs: factor out free space extent length check
        xfs: xfs_alloc_fix_freelist() can use incore perag structures
        xfs: remove xfs_caddr_t
        xfs: use void pointers in log validation helpers
        xfs: return a void pointer from xfs_buf_offset
        xfs: remove inst_t
        xfs: remove __psint_t and __psunsigned_t
        xfs: fix remote symlinks on V5/CRC filesystems
        xfs: fix xfs_log_done interface
        xfs: saner xfs_trans_commit interface
        xfs: remove the flags argument to xfs_trans_cancel
        xfs: pass a boolean flag to xfs_trans_free_items
        xfs: switch remaining xfs_trans_dup users to xfs_trans_roll
        xfs: check min blks for random debug mode sparse allocations
        xfs: fix sparse inodes 32-bit compile failure
        xfs: add initial DAX support
        xfs: add DAX IO path support
        ...
      68b4449d
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 043cd049
      Linus Torvalds authored
      Pull btrfs updates from Chris Mason:
       "Outside of our usual batch of fixes, this integrates the subvolume
        quota updates that Qu Wenruo from Fujitsu has been working on for a
        few releases now.  He gets an extra gold star for making btrfs smaller
        this time, and fixing a number of quota corners in the process.
      
        Dave Sterba tested and integrated Anand Jain's sysfs improvements.
        Outside of exporting a symbol (ack'd by Greg) these are all internal
        to btrfs and it's mostly cleanups and fixes.  Anand also attached some
        of our sysfs objects to our internal device management structs instead
        of an object off the super block.  It will make device management
        easier overall and it's a better fit for how the sysfs files are used.
        None of the existing sysfs files are moved around.
      
        Thanks for all the fixes everyone"
      
      * 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (87 commits)
        btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()
        Btrfs: Check if kobject is initialized before put
        lib: export symbol kobject_move()
        Btrfs: sysfs: add support to show replacing target in the sysfs
        Btrfs: free the stale device
        Btrfs: use received_uuid of parent during send
        Btrfs: fix use-after-free in btrfs_replay_log
        btrfs: wait for delayed iputs on no space
        btrfs: qgroup: Make snapshot accounting work with new extent-oriented qgroup.
        btrfs: qgroup: Add the ability to skip given qgroup for old/new_roots.
        btrfs: ulist: Add ulist_del() function.
        btrfs: qgroup: Cleanup the old ref_node-oriented mechanism.
        btrfs: qgroup: Switch self test to extent-oriented qgroup mechanism.
        btrfs: qgroup: Switch to new extent-oriented qgroup mechanism.
        btrfs: qgroup: Switch rescan to new mechanism.
        btrfs: qgroup: Add new qgroup calculation function btrfs_qgroup_account_extents().
        btrfs: backref: Add special time_seq == (u64)-1 case for btrfs_find_all_roots().
        btrfs: qgroup: Add new function to record old_roots.
        btrfs: qgroup: Record possible quota-related extent for qgroup.
        btrfs: qgroup: Add function qgroup_update_counters().
        ...
      043cd049
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 43baed34
      Linus Torvalds authored
      Pull more block layer patches from Jens Axboe:
       "A few later arrivers that I didn't fold into the first pull request,
        so we had a chance to run some testing.  This contains:
      
         - NVMe:
              - Set of fixes from Keith
              - 4.4 and earlier gcc build fix from Andrew
      
         - small set of xen-blk{back,front} fixes from Bob Liu.
      
         - warnings fix for bogus inline statement in I_BDEV() from Geert.
      
         - error code fixup for SG_IO ioctl from Paolo Bonzini"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        drivers/block/nvme-core.c: fix build with gcc-4.4.4
        bdi: Remove "inline" keyword from exported I_BDEV() implementation
        block: fix bogus EFAULT error from SG_IO ioctl
        NVMe: Fix filesystem deadlock on removal
        NVMe: Failed controller initialization fixes
        NVMe: Unify controller probe and resume
        NVMe: Don't use fake status on cancelled command
        NVMe: Fix device cleanup on initialization failure
        drivers: xen-blkfront: only talk_to_blkback() when in XenbusStateInitialising
        xen/block: add multi-page ring support
        driver: xen-blkfront: move talk_to_blkback to a more suitable place
        drivers: xen-blkback: delay pending_req allocation to connect_ring
      43baed34
  2. 30 Jun, 2015 6 commits
  3. 29 Jun, 2015 17 commits
    • Nik Nyby's avatar
      net: icplus: fix typo in constant name · 1625fecf
      Nik Nyby authored
      This fixes a typo in the IPG_FRAMETOOLONGERRORS constant.
      Signed-off-by: default avatarNik Nyby <nikolas@gnu.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1625fecf
    • Markus Elfring's avatar
      iommu/arm-smmu: Delete an unnecessary check before the function call "free_io_pgtable_ops" · a6e08fb2
      Markus Elfring authored
      The free_io_pgtable_ops() 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 avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      a6e08fb2
    • Will Deacon's avatar
      iommu/arm-smmu: Fix broken ATOS check · d38f0ff9
      Will Deacon authored
      Commit 83a60ed8 ("iommu/arm-smmu: fix ARM_SMMU_FEAT_TRANS_OPS
      condition") accidentally negated the ID0_ATOSNS predicate in the ATOS
      feature check, causing the driver to attempt ATOS requests on SMMUv2
      hardware without the ATOS feature implemented.
      
      This patch restores the predicate to the correct value.
      
      Cc: <stable@vger.kernel.org> # 4.0+
      Reported-by: default avatarVarun Sethi <varun.sethi@freescale.com>
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      d38f0ff9
    • Joerg Roedel's avatar
      iommu: Ignore -ENODEV errors from add_device call-back · 38667f18
      Joerg Roedel authored
      The -ENODEV error just means that the device is not
      translated by an IOMMU. We shouldn't bail out of iommu
      driver initialization when that happens, as this is a common
      scenario on ARM.
      
      Not returning -ENODEV in the drivers would be a bad idea, as
      the IOMMU core would have no indication whether a device is
      translated or not. This indication is not used at the
      moment, but will probably be in the future.
      
      Fixes: 19762d70 ("iommu: Propagate error in add_iommu_group")
      Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
      Tested-by: default avatarEric Auger <eric.auger@linaro.org>
      Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      38667f18
    • Nik Nyby's avatar
      sis900: Trivial: Fix typos in enums · 47af6b0c
      Nik Nyby authored
      "reigster" -> "register"
      Signed-off-by: default avatarNik Nyby <nikolas@gnu.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      47af6b0c
    • Sachin Prabhu's avatar
      cifs: Unset CIFS_MOUNT_POSIX_PATHS flag when following dfs mounts · 1dfd18d0
      Sachin Prabhu authored
      In a dfs setup where the client transitions from a server which supports
      posix paths to a server which doesn't support posix paths, the flag
      CIFS_MOUNT_POSIX_PATHS is not reset. This leads to the wrong directory
      separator being used causing smb commands to fail.
      
      Consider the following case where a dfs share on a samba server points
      to a share on windows smb server.
       # mount -t cifs -o .. //vm140-31/dfsroot/testwin/
       # ls -l /mnt; touch /mnt/a
       total 0
       touch: cannot touch ‘/mnt/a’: No such file or directory
      Signed-off-by: default avatarSachin Prabhu <sprabhu@redhat.com>
      Acked-by: default avatarJeff Layton <jlayton@samba.org>
      Signed-off-by: default avatarSteve French <steve.french@primarydata.com>
      1dfd18d0
    • Nik Nyby's avatar
      stmmac: Trivial: fix typo in constant name · 55d91614
      Nik Nyby authored
      This fixes a typo in the MMC_RX_CRC_ERROR constant.
      Signed-off-by: default avatarNik Nyby <nikolas@gnu.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      55d91614
    • Linus Torvalds's avatar
      Merge tag 'md/4.2' of git://neil.brown.name/md · 6aaf0da8
      Linus Torvalds authored
      Pull md updates from Neil Brown:
       "A mixed bag
      
         - a few bug fixes
         - some performance improvement that decrease lock contention
         - some clean-up
      
        Nothing major"
      
      * tag 'md/4.2' of git://neil.brown.name/md:
        md: clear Blocked flag on failed devices when array is read-only.
        md: unlock mddev_lock on an error path.
        md: clear mddev->private when it has been freed.
        md: fix a build warning
        md/raid5: ignore released_stripes check
        md/raid5: per hash value and exclusive wait_for_stripe
        md/raid5: split wait_for_stripe and introduce wait_for_quiescent
        wait: introduce wait_event_exclusive_cmd
        md: convert to kstrto*()
        md/raid10: make sync_request_write() call bio_copy_data()
      6aaf0da8
    • Christoph Lameter's avatar
      Fix kmalloc slab creation sequence · a9730fca
      Christoph Lameter authored
      This patch restores the slab creation sequence that was broken by commit
      4066c33d and also reverts the portions that introduced the
      KMALLOC_LOOP_XXX macros. Those can never really work since the slab creation
      is much more complex than just going from a minimum to a maximum number.
      
      The latest upstream kernel boots cleanly on my machine with a 64 bit x86
      configuration under KVM using either SLAB or SLUB.
      
      Fixes: 4066c33d ("support the slub_debug boot option")
      Reported-by: default avatarTheodore Ts'o <tytso@mit.edu>
      Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a9730fca
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm · 88793e5c
      Linus Torvalds authored
      Pull libnvdimm subsystem from Dan Williams:
       "The libnvdimm sub-system introduces, in addition to the
        libnvdimm-core, 4 drivers / enabling modules:
      
        NFIT:
          Instantiates an "nvdimm bus" with the core and registers memory
          devices (NVDIMMs) enumerated by the ACPI 6.0 NFIT (NVDIMM Firmware
          Interface table).
      
          After registering NVDIMMs the NFIT driver then registers "region"
          devices.  A libnvdimm-region defines an access mode and the
          boundaries of persistent memory media.  A region may span multiple
          NVDIMMs that are interleaved by the hardware memory controller.  In
          turn, a libnvdimm-region can be carved into a "namespace" device and
          bound to the PMEM or BLK driver which will attach a Linux block
          device (disk) interface to the memory.
      
        PMEM:
          Initially merged in v4.1 this driver for contiguous spans of
          persistent memory address ranges is re-worked to drive
          PMEM-namespaces emitted by the libnvdimm-core.
      
          In this update the PMEM driver, on x86, gains the ability to assert
          that writes to persistent memory have been flushed all the way
          through the caches and buffers in the platform to persistent media.
          See memcpy_to_pmem() and wmb_pmem().
      
        BLK:
          This new driver enables access to persistent memory media through
          "Block Data Windows" as defined by the NFIT.  The primary difference
          of this driver to PMEM is that only a small window of persistent
          memory is mapped into system address space at any given point in
          time.
      
          Per-NVDIMM windows are reprogrammed at run time, per-I/O, to access
          different portions of the media.  BLK-mode, by definition, does not
          support DAX.
      
        BTT:
          This is a library, optionally consumed by either PMEM or BLK, that
          converts a byte-accessible namespace into a disk with atomic sector
          update semantics (prevents sector tearing on crash or power loss).
      
          The sinister aspect of sector tearing is that most applications do
          not know they have a atomic sector dependency.  At least today's
          disk's rarely ever tear sectors and if they do one almost certainly
          gets a CRC error on access.  NVDIMMs will always tear and always
          silently.  Until an application is audited to be robust in the
          presence of sector-tearing the usage of BTT is recommended.
      
        Thanks to: Ross Zwisler, Jeff Moyer, Vishal Verma, Christoph Hellwig,
        Ingo Molnar, Neil Brown, Boaz Harrosh, Robert Elliott, Matthew Wilcox,
        Andy Rudoff, Linda Knippers, Toshi Kani, Nicholas Moulin, Rafael
        Wysocki, and Bob Moore"
      
      * tag 'libnvdimm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm: (33 commits)
        arch, x86: pmem api for ensuring durability of persistent memory updates
        libnvdimm: Add sysfs numa_node to NVDIMM devices
        libnvdimm: Set numa_node to NVDIMM devices
        acpi: Add acpi_map_pxm_to_online_node()
        libnvdimm, nfit: handle unarmed dimms, mark namespaces read-only
        pmem: flag pmem block devices as non-rotational
        libnvdimm: enable iostat
        pmem: make_request cleanups
        libnvdimm, pmem: fix up max_hw_sectors
        libnvdimm, blk: add support for blk integrity
        libnvdimm, btt: add support for blk integrity
        fs/block_dev.c: skip rw_page if bdev has integrity
        libnvdimm: Non-Volatile Devices
        tools/testing/nvdimm: libnvdimm unit test infrastructure
        libnvdimm, nfit, nd_blk: driver for BLK-mode access persistent memory
        nd_btt: atomic sector updates
        libnvdimm: infrastructure for btt devices
        libnvdimm: write blk label set
        libnvdimm: write pmem label set
        libnvdimm: blk labels and namespace instantiation
        ...
      88793e5c
    • Colin Ian King's avatar
      ALSA: Fix uninintialized error return · 0755e74b
      Colin Ian King authored
      Static analysis with cppcheck found the following error:
        [sound/core/init.c:118]: (error) Uninitialized variable: err
      
      ..this was introduced by commit 2471b6c8
      ("ALSA: info: Register proc entries recursively, too") where the call
      to snd_info_card_register was removed and no longer setting the error
      return in err.  When snd_info_create_card_entry fails to allocate a
      an entry, the error path exits with garbage in err.  Fix is to return
      -ENOMEM if entry fails to be allocated.
      
      Fixes: 2471b6c8 ("ALSA: info: Register proc entries recursively, too")
      Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      0755e74b
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 1bc5e157
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "This time we have support for few new devices, few new features and
        odd fixes spread thru the subsystem.
      
        New devices added:
         - support for CSRatlas7 dma controller
         - Allwinner H3(sun8i) controller
         - TI DMA crossbar driver on DRA7x
         - new pxa driver
      
        New features added:
         - memset support is bought back now that we have a user in xdmac controller
         - interleaved transfers support different source and destination strides
         - supporting DMA routers and configuration thru DT
         - support for reusing descriptors
         - xdmac memset and interleaved transfer support
         - hdmac support for interleaved transfers
         - omap-dma support for memcpy
      
        Others:
         - Constify platform_device_id
         - mv_xor fixes and improvements"
      
      * tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
        dmaengine: xgene: fix file permission
        dmaengine: fsl-edma: clear pending interrupts on initialization
        dmaengine: xdmac: Add memset support
        Documentation: dmaengine: document DMA_CTRL_ACK
        dmaengine: virt-dma: don't always free descriptor upon completion
        dmaengine: Revert "drivers/dma: remove unused support for MEMSET operations"
        dmaengine: hdmac: Implement interleaved transfers
        dmaengine: Move icg helpers to global header
        dmaengine: mv_xor: improve descriptors list handling and reduce locking
        dmaengine: mv_xor: Enlarge descriptor pool size
        dmaengine: mv_xor: add support for a38x command in descriptor mode
        dmaengine: mv_xor: Rename function for consistent naming
        dmaengine: mv_xor: bug fix for racing condition in descriptors cleanup
        dmaengine: pl330: fix wording in mcbufsz message
        dmaengine: sirf: add CSRatlas7 SoC support
        dmaengine: xgene-dma: Fix "incorrect type in assignement" warnings
        dmaengine: fix kernel-doc documentation
        dmaengine: pxa_dma: add support for legacy transition
        dmaengine: pxa_dma: add debug information
        dmaengine: pxa: add pxa dmaengine driver
        ...
      1bc5e157
    • Alexander Sverdlin's avatar
      sctp: Fix race between OOTB responce and route removal · 29c4afc4
      Alexander Sverdlin authored
      There is NULL pointer dereference possible during statistics update if the route
      used for OOTB responce is removed at unfortunate time. If the route exists when
      we receive OOTB packet and we finally jump into sctp_packet_transmit() to send
      ABORT, but in the meantime route is removed under our feet, we take "no_route"
      path and try to update stats with IP_INC_STATS(sock_net(asoc->base.sk), ...).
      
      But sctp_ootb_pkt_new() used to prepare responce packet doesn't call
      sctp_transport_set_owner() and therefore there is no asoc associated with this
      packet. Probably temporary asoc just for OOTB responces is overkill, so just
      introduce a check like in all other places in sctp_packet_transmit(), where
      "asoc" is dereferenced.
      
      To reproduce this, one needs to
      0. ensure that sctp module is loaded (otherwise ABORT is not generated)
      1. remove default route on the machine
      2. while true; do
           ip route del [interface-specific route]
           ip route add [interface-specific route]
         done
      3. send enough OOTB packets (i.e. HB REQs) from another host to trigger ABORT
         responce
      
      On x86_64 the crash looks like this:
      
      BUG: unable to handle kernel NULL pointer dereference at 0000000000000020
      IP: [<ffffffffa05ec9ac>] sctp_packet_transmit+0x63c/0x730 [sctp]
      PGD 0
      Oops: 0000 [#1] PREEMPT SMP
      Modules linked in: ...
      CPU: 0 PID: 0 Comm: swapper/0 Tainted: G           O    4.0.5-1-ARCH #1
      Hardware name: ...
      task: ffffffff818124c0 ti: ffffffff81800000 task.ti: ffffffff81800000
      RIP: 0010:[<ffffffffa05ec9ac>]  [<ffffffffa05ec9ac>] sctp_packet_transmit+0x63c/0x730 [sctp]
      RSP: 0018:ffff880127c037b8  EFLAGS: 00010296
      RAX: 0000000000000000 RBX: 0000000000000000 RCX: 00000015ff66b480
      RDX: 00000015ff66b400 RSI: ffff880127c17200 RDI: ffff880123403700
      RBP: ffff880127c03888 R08: 0000000000017200 R09: ffffffff814625af
      R10: ffffea00047e4680 R11: 00000000ffffff80 R12: ffff8800b0d38a28
      R13: ffff8800b0d38a28 R14: ffff8800b3e88000 R15: ffffffffa05f24e0
      FS:  0000000000000000(0000) GS:ffff880127c00000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
      CR2: 0000000000000020 CR3: 00000000c855b000 CR4: 00000000000007f0
      Stack:
       ffff880127c03910 ffff8800b0d38a28 ffffffff8189d240 ffff88011f91b400
       ffff880127c03828 ffffffffa05c94c5 0000000000000000 ffff8800baa1c520
       0000000000000000 0000000000000001 0000000000000000 0000000000000000
      Call Trace:
       <IRQ>
       [<ffffffffa05c94c5>] ? sctp_sf_tabort_8_4_8.isra.20+0x85/0x140 [sctp]
       [<ffffffffa05d6b42>] ? sctp_transport_put+0x52/0x80 [sctp]
       [<ffffffffa05d0bfc>] sctp_do_sm+0xb8c/0x19a0 [sctp]
       [<ffffffff810b0e00>] ? trigger_load_balance+0x90/0x210
       [<ffffffff810e0329>] ? update_process_times+0x59/0x60
       [<ffffffff812c7a40>] ? timerqueue_add+0x60/0xb0
       [<ffffffff810e0549>] ? enqueue_hrtimer+0x29/0xa0
       [<ffffffff8101f599>] ? read_tsc+0x9/0x10
       [<ffffffff8116d4b5>] ? put_page+0x55/0x60
       [<ffffffff810ee1ad>] ? clockevents_program_event+0x6d/0x100
       [<ffffffff81462b68>] ? skb_free_head+0x58/0x80
       [<ffffffffa029a10b>] ? chksum_update+0x1b/0x27 [crc32c_generic]
       [<ffffffff81283f3e>] ? crypto_shash_update+0xce/0xf0
       [<ffffffffa05d3993>] sctp_endpoint_bh_rcv+0x113/0x280 [sctp]
       [<ffffffffa05dd4e6>] sctp_inq_push+0x46/0x60 [sctp]
       [<ffffffffa05ed7a0>] sctp_rcv+0x880/0x910 [sctp]
       [<ffffffffa05ecb50>] ? sctp_packet_transmit_chunk+0xb0/0xb0 [sctp]
       [<ffffffffa05ecb70>] ? sctp_csum_update+0x20/0x20 [sctp]
       [<ffffffff814b05a5>] ? ip_route_input_noref+0x235/0xd30
       [<ffffffff81051d6b>] ? ack_ioapic_level+0x7b/0x150
       [<ffffffff814b27be>] ip_local_deliver_finish+0xae/0x210
       [<ffffffff814b2e15>] ip_local_deliver+0x35/0x90
       [<ffffffff814b2a15>] ip_rcv_finish+0xf5/0x370
       [<ffffffff814b3128>] ip_rcv+0x2b8/0x3a0
       [<ffffffff81474193>] __netif_receive_skb_core+0x763/0xa50
       [<ffffffff81476c28>] __netif_receive_skb+0x18/0x60
       [<ffffffff81476cb0>] netif_receive_skb_internal+0x40/0xd0
       [<ffffffff814776c8>] napi_gro_receive+0xe8/0x120
       [<ffffffffa03946aa>] rtl8169_poll+0x2da/0x660 [r8169]
       [<ffffffff8147896a>] net_rx_action+0x21a/0x360
       [<ffffffff81078dc1>] __do_softirq+0xe1/0x2d0
       [<ffffffff8107912d>] irq_exit+0xad/0xb0
       [<ffffffff8157d158>] do_IRQ+0x58/0xf0
       [<ffffffff8157b06d>] common_interrupt+0x6d/0x6d
       <EOI>
       [<ffffffff810e1218>] ? hrtimer_start+0x18/0x20
       [<ffffffffa05d65f9>] ? sctp_transport_destroy_rcu+0x29/0x30 [sctp]
       [<ffffffff81020c50>] ? mwait_idle+0x60/0xa0
       [<ffffffff810216ef>] arch_cpu_idle+0xf/0x20
       [<ffffffff810b731c>] cpu_startup_entry+0x3ec/0x480
       [<ffffffff8156b365>] rest_init+0x85/0x90
       [<ffffffff818eb035>] start_kernel+0x48b/0x4ac
       [<ffffffff818ea120>] ? early_idt_handlers+0x120/0x120
       [<ffffffff818ea339>] x86_64_start_reservations+0x2a/0x2c
       [<ffffffff818ea49c>] x86_64_start_kernel+0x161/0x184
      Code: 90 48 8b 80 b8 00 00 00 48 89 85 70 ff ff ff 48 83 bd 70 ff ff ff 00 0f 85 cd fa ff ff 48 89 df 31 db e8 18 63 e7 e0 48 8b 45 80 <48> 8b 40 20 48 8b 40 30 48 8b 80 68 01 00 00 65 48 ff 40 78 e9
      RIP  [<ffffffffa05ec9ac>] sctp_packet_transmit+0x63c/0x730 [sctp]
       RSP <ffff880127c037b8>
      CR2: 0000000000000020
      ---[ end trace 5aec7fd2dc983574 ]---
      Kernel panic - not syncing: Fatal exception in interrupt
      Kernel Offset: 0x0 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffff9fffffff)
      drm_kms_helper: panic occurred, switching back to text console
      ---[ end Kernel panic - not syncing: Fatal exception in interrupt
      Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@nokia.com>
      Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
      Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      29c4afc4
    • Markus Elfring's avatar
      net-Liquidio: Delete unnecessary checks before the function call "vfree" · 9686f310
      Markus Elfring authored
      The vfree() function performs also input parameter validation.
      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>
      9686f310
    • Shreyas Bhatewara's avatar
      vmxnet3: Bump up driver version number · a6947174
      Shreyas Bhatewara authored
      Bump up the driver version number to reflect the changes done to
      work with vmxnet3 adapter version 2
      Signed-off-by: default avatarShreyas N Bhatewara <sbhatewara@vmware.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a6947174
    • Tom Lendacky's avatar
      amd-xgbe: Add the __GFP_NOWARN flag to Rx buffer allocation · 472cfe71
      Tom Lendacky authored
      When allocating Rx related buffers, alloc_pages is called using an order
      number that is decreased until successful. A system under stress can
      experience failures during this allocation process resulting in a warning
      being issued. This message can be of concern to end users even though the
      failure is not fatal. Since the failure is not fatal and can occur
      multiple times, the driver should include the __GFP_NOWARN flag to
      suppress the warning message from being issued.
      Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      472cfe71
    • Linus Torvalds's avatar
      Merge tag 'please-pull-misc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · f199b663
      Linus Torvalds authored
      Pull ia64 updates from Tony Luck:
       "Pair of ia64 cleanups"
      
      * tag 'please-pull-misc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64: Use setup_timer
        ia64: export flush_icache_range for module use
      f199b663