1. 28 Aug, 2017 2 commits
    • Yong Wu's avatar
      iommu/mediatek: Fix a build warning of BIT(32) in ARM · 41939980
      Yong Wu authored
      The commit ("iommu/mediatek: Enlarge the validate PA range
      for 4GB mode") introduce the following build warning while ARCH=arm:
      
         drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_iova_to_phys':
         include/linux/bitops.h:6:24: warning: left shift count >= width
      of type [-Wshift-count-overflow]
          #define BIT(nr)   (1UL << (nr))
                                 ^
      >> drivers/iommu/mtk_iommu.c:407:9: note: in expansion of macro 'BIT'
            pa |= BIT(32);
      
        drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_probe':
         include/linux/bitops.h:6:24: warning: left shift count >= width
      of type [-Wshift-count-overflow]
          #define BIT(nr)   (1UL << (nr))
                                 ^
         drivers/iommu/mtk_iommu.c:589:35: note: in expansion of macro 'BIT'
           data->enable_4GB = !!(max_pfn > (BIT(32) >> PAGE_SHIFT));
      
      Use BIT_ULL instead of BIT.
      Reported-by: default avatarkernel test robot <lkp@intel.com>
      Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      41939980
    • Yong Wu's avatar
      iommu/mediatek: Fix a build fail of m4u_type · 4f1c8ea1
      Yong Wu authored
      The commit ("iommu/mediatek: Enlarge the validate PA range
      for 4GB mode") introduce the following build error:
      
         drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_hw_init':
      >> drivers/iommu/mtk_iommu.c:536:30: error: 'const struct mtk_iommu_data'
       has no member named 'm4u_type'; did you mean 'm4u_dom'?
           if (data->enable_4GB && data->m4u_type != M4U_MT8173) {
      
      This patch fix it, use "m4u_plat" instead of "m4u_type".
      Reported-by: default avatarkernel test robot <lkp@intel.com>
      Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      4f1c8ea1
  2. 22 Aug, 2017 8 commits
    • Yong Wu's avatar
      memory: mtk-smi: Degrade SMI init to module_init · 4f608d38
      Yong Wu authored
      The initialization of MediaTek power manager(SCPSYS) is
      builtin_platform_driver, and SMI must depend on power-domain.
      Thus, currently subsys_initcall for SMI is unnecessary, SMI will be
      always probe defered by power-domain. Degrade it to module_init.
      
      In addition, there are two small changes about the probe sequence:
      1) Delete this two lines.
          	if (!dev->pm_domain)
      		return -EPROBE_DEFER;
         This is not helpful. the platform driver framework guarantee this.
         The "dev_pm_domain_attach" in the "platform_drv_probe" will return
         EPROBE_DEFER if its powerdomain is not ready.
      
      2) Add the probe-defer for the smi-larb device should waiting for
         smi-common.
         In mt2712, there are 2 smi-commons, 10 smi-larbs. All will be
         probe-defered by the power-domain, there is seldom case that
         smi-larb probe done before smi-common. then it will hang like
         this:
      
         Unable to handle kernel NULL pointer dereference at virtual address
      00000000 pgd = ffffff800a4e0000
      [00000000] *pgd=00000000beffe003[   17.610026] , *pud=00000000beffe003
      ...
      [<ffffff800897fe04>] mtk_smi_enable+0x1c/0xd0
      [<ffffff800897fee8>] mtk_smi_larb_get+0x30/0x98
      [<ffffff80088edfa8>] mtk_mipicsi0_resume+0x38/0x1b8
      [<ffffff8008634f44>] pm_generic_runtime_resume+0x3c/0x58
      [<ffffff8008644ff8>] __genpd_runtime_resume+0x38/0x98
      [<ffffff8008647434>] genpd_runtime_resume+0x164/0x220
      [<ffffff80086372f8>] __rpm_callback+0x78/0xa0
      [<ffffff8008637358>] rpm_callback+0x38/0xa0
      [<ffffff8008638a4c>] rpm_resume+0x4a4/0x6f8
      [<ffffff8008638d04>] __pm_runtime_resume+0x64/0xa0
      [<ffffff80088ed05c>] mtk_mipicsi0_probe+0x40c/0xb70
      [<ffffff800862cdc0>] platform_drv_probe+0x58/0xc0
      [<ffffff800862a514>] driver_probe_device+0x284/0x438
      [<ffffff800862a8ac>] __device_attach_driver+0xb4/0x160
      [<ffffff8008627d58>] bus_for_each_drv+0x68/0xa8
      [<ffffff800862a0a4>] __device_attach+0xd4/0x168
      [<ffffff800862a9d4>] device_initial_probe+0x24/0x30
      [<ffffff80086291d8>] bus_probe_device+0xa0/0xa8
      [<ffffff8008629784>] deferred_probe_work_func+0x94/0xf0
      [<ffffff80080f03a8>] process_one_work+0x1d8/0x6e0
      Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      4f608d38
    • Yong Wu's avatar
      iommu/mediatek: Enlarge the validate PA range for 4GB mode · 30e2fccf
      Yong Wu authored
      This patch is for 4GB mode, mainly for 4 issues:
      1) Fix a 4GB bug:
         if the dram base is 0x4000_0000, the dram size is 0xc000_0000.
         then the code just meet a corner case because max_pfn is
         0x10_0000.
         data->enable_4GB = !!(max_pfn > (0xffffffffUL >> PAGE_SHIFT));
         It's true at the case above. That is unexpected.
      2) In mt2712, there is a new register for the 4GB PA range(0x118)
         we should enlarge the max PA range, or the HW will report
         error.
         The dram range is from 0x1_0000_0000 to 0x1_ffff_ffff in the 4GB
         mode, we cut out the bit[32:30] of the SA(Start address) and
         EA(End address) into this REG_MMU_VLD_PA_RNG(0x118).
      3) In mt2712, the register(0x13c) is extended for 4GB mode.
         bit[7:6] indicate the valid PA[32:33]. Thus, we don't mask the
         value and print it directly for debug.
      4) if 4GB is enabled, the dram PA range is from 0x1_0000_0000 to
         0x1_ffff_ffff. Thus, the PA from iova_to_pa should also '|' BIT(32)
      Signed-off-by: default avatarHonghui Zhang <honghui.zhang@mediatek.com>
      Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      30e2fccf
    • Yong Wu's avatar
      iommu/mediatek: Disable iommu clock when system suspend · 6254b64f
      Yong Wu authored
      When system suspend, infra power domain may be off, and the iommu's
      clock must be disabled when system off, or the iommu's bclk clock maybe
      disabled after system resume.
      Signed-off-by: default avatarHonghui Zhang <honghui.zhang@mediatek.com>
      Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      6254b64f
    • Yong Wu's avatar
      iommu/mediatek: Move pgtable allocation into domain_alloc · 4b00f5ac
      Yong Wu authored
      After adding the global list for M4U HW, We get a chance to
      move the pagetable allocation into the mtk_iommu_domain_alloc.
      Let the domain_alloc do the right thing.
      
      This patch is for fixing this problem[1].
      [1]: https://patchwork.codeaurora.org/patch/53987/Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      4b00f5ac
    • Yong Wu's avatar
      iommu/mediatek: Merge 2 M4U HWs into one iommu domain · 7c3a2ec0
      Yong Wu authored
      In theory, If there are 2 M4U HWs, there should be 2 IOMMU domains.
      But one IOMMU domain(4GB iova range) is enough for us currently,
      It's unnecessary to maintain 2 pagetables.
      
      Besides, This patch can simplify our consumer code largely. They don't
      need map a iova range from one domain into another, They can share the
      iova address easily.
      Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      7c3a2ec0
    • Yong Wu's avatar
      iommu/mediatek: Add mt2712 IOMMU support · e6dec923
      Yong Wu authored
      The M4U IP blocks in mt2712 is MTK's generation2 M4U which use the
      ARM Short-descriptor like mt8173, and most of the HW registers are
      the same.
      
      The difference is that there are 2 M4U HWs in mt2712 while there's
      only one in mt8173. The purpose of 2 M4U HWs is for balance the
      bandwidth.
      
      Normally if there are 2 M4U HWs, there should be 2 iommu domains,
      each M4U has a iommu domain.
      Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      e6dec923
    • Yong Wu's avatar
      iommu/mediatek: Move MTK_M4U_TO_LARB/PORT into mtk_iommu.c · a9467d95
      Yong Wu authored
      The definition of MTK_M4U_TO_LARB and MTK_M4U_TO_PORT are shared by
      all the gen2 M4U HWs. Thus, Move them out from mt8173-larb-port.h,
      and put them into the c file.
      Suggested-by: default avatarHonghui Zhang <honghui.zhang@mediatek.com>
      Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      a9467d95
    • Joerg Roedel's avatar
      894901b5
  3. 15 Aug, 2017 2 commits
  4. 11 Aug, 2017 1 commit
  5. 04 Aug, 2017 3 commits
  6. 26 Jul, 2017 1 commit
    • Joerg Roedel's avatar
      iommu/amd: Fix schedule-while-atomic BUG in initialization code · 74ddda71
      Joerg Roedel authored
      The register_syscore_ops() function takes a mutex and might
      sleep. In the IOMMU initialization code it is invoked during
      irq-remapping setup already, where irqs are disabled.
      
      This causes a schedule-while-atomic bug:
      
       BUG: sleeping function called from invalid context at kernel/locking/mutex.c:747
       in_atomic(): 0, irqs_disabled(): 1, pid: 1, name: swapper/0
       no locks held by swapper/0/1.
       irq event stamp: 304
       hardirqs last  enabled at (303): [<ffffffff818a87b6>] _raw_spin_unlock_irqrestore+0x36/0x60
       hardirqs last disabled at (304): [<ffffffff8235d440>] enable_IR_x2apic+0x79/0x196
       softirqs last  enabled at (36): [<ffffffff818ae75f>] __do_softirq+0x35f/0x4ec
       softirqs last disabled at (31): [<ffffffff810c1955>] irq_exit+0x105/0x120
       CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.13.0-rc2.1.el7a.test.x86_64.debug #1
       Hardware name:          PowerEdge C6145 /040N24, BIOS 3.5.0 10/28/2014
       Call Trace:
        dump_stack+0x85/0xca
        ___might_sleep+0x22a/0x260
        __might_sleep+0x4a/0x80
        __mutex_lock+0x58/0x960
        ? iommu_completion_wait.part.17+0xb5/0x160
        ? register_syscore_ops+0x1d/0x70
        ? iommu_flush_all_caches+0x120/0x150
        mutex_lock_nested+0x1b/0x20
        register_syscore_ops+0x1d/0x70
        state_next+0x119/0x910
        iommu_go_to_state+0x29/0x30
        amd_iommu_enable+0x13/0x23
      
      Fix it by moving the register_syscore_ops() call to the next
      initialization step, which runs with irqs enabled.
      Reported-by: default avatarArtem Savkov <asavkov@redhat.com>
      Tested-by: default avatarArtem Savkov <asavkov@redhat.com>
      Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Fixes: 2c0ae172 ('iommu/amd: Convert iommu initialization to state machine')
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      74ddda71
  7. 25 Jul, 2017 2 commits
  8. 23 Jul, 2017 8 commits
  9. 22 Jul, 2017 6 commits
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.13-rc2' of... · 4b162c53
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fix from Guenter Roeck:
       "Avoid buffer overruns in applesmc driver"
      
      * tag 'hwmon-for-linus-v4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (applesmc) Avoid buffer overruns
      4b162c53
    • Linus Torvalds's avatar
      Merge tag 'tty-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · ae75d1ae
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here are some small tty and serial driver fixes for 4.13-rc2. Nothing
        huge at all, a revert of a patch that turned out to break things, a
        fix up for a new tty ioctl we added in 4.13-rc1 to get the uapi
        definition correct, and a few minor serial driver fixes for reported
        issues.
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'tty-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: Fix TIOCGPTPEER ioctl definition
        tty: hide unused pty_get_peer function
        tty: serial: lpuart: Fix the logic for detecting the 32-bit type UART
        serial: imx: Prevent TX buffer PIO write when a DMA has been started
        Revert "serial: imx-serial - move DMA buffer configuration to DT"
        serial: sh-sci: Uninitialized variables in sysfs files
        serial: st-asc: Potential error pointer dereference
      ae75d1ae
    • Linus Torvalds's avatar
      Merge tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · dedaff2f
      Linus Torvalds authored
      Pull char/misc driver fixes from Greg KH:
       "Here are some small char and misc driver fixes for 4.13-rc2. All fix
        reported problems with 4.13-rc1 or older kernels (like the binder
        fixes). Full details in the shortlog.
      
        All have been in linux-next with no reported issues"
      
      * tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        w1: omap-hdq: fix error return code in omap_hdq_probe()
        regmap: regmap-w1: Fix build troubles
        w1: Fix slave count on 1-Wire bus (resend)
        mux: mux-core: unregister mux_class in mux_exit()
        mux: remove the Kconfig question for the subsystem
        nvmem: rockchip-efuse: amend compatible rk322x-efuse to rk3228-efuse
        drivers/fsi: fix fsi_slave_mode prototype
        fsi: core: register with postcore_initcall
        thunderbolt: Correct access permissions for active NVM contents
        vmbus: re-enable channel tasklet
        spmi: pmic-arb: Always allocate ppid_to_apid table
        MAINTAINERS: Add entry for SPMI subsystem
        spmi: Include OF based modalias in device uevent
        binder: Use wake up hint for synchronous transactions.
        binder: use group leader instead of open thread
        Revert "android: binder: Sanity check at binder ioctl"
      dedaff2f
    • Linus Torvalds's avatar
      Merge tag 'usb-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 55fd939e
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some small USB fixes for 4.13-rc2.
      
        The usual batch, gadget fixes for reported issues, as well as xhci
        fixes, and a small random collection of other fixes for reported
        issues.
      
        All have been in linux-next with no reported issues"
      
      * tag 'usb-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (25 commits)
        xhci: fix memleak in xhci_run()
        usb: xhci: fix spinlock recursion for USB2 test mode
        xhci: fix 20000ms port resume timeout
        usb: xhci: Issue stop EP command only when the EP state is running
        xhci: Bad Ethernet performance plugged in ASM1042A host
        xhci: Fix NULL pointer dereference when cleaning up streams for removed host
        usb: renesas_usbhs: gadget: disable all eps when the driver stops
        usb: renesas_usbhs: fix usbhsc_resume() for !USBHSF_RUNTIME_PWCTRL
        usb: gadget: udc: renesas_usb3: protect usb3_ep->started in usb3_start_pipen()
        usb: gadget: udc: renesas_usb3: fix zlp transfer by the dmac
        usb: gadget: udc: renesas_usb3: fix free size in renesas_usb3_dma_free_prd()
        usb: gadget: f_uac2: endianness fixes.
        usb: gadget: f_uac1: endianness fixes.
        include: usb: audio: specify exact endiannes of descriptors
        usb: gadget: udc: start_udc() can be static
        usb: dwc2: gadget: On USB RESET reset device address to zero
        usb: storage: return on error to avoid a null pointer dereference
        usb: typec: include linux/device.h in ucsi.h
        USB: cdc-acm: add device-id for quirky printer
        usb: dwc3: gadget: only unmap requests from DMA if mapped
        ...
      55fd939e
    • Linus Torvalds's avatar
      Merge tag 'staging-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · bcb53e57
      Linus Torvalds authored
      Pull staging driver fixes from Greg KH:
       "Here are some small staging driver fixes for reported issues for
        4.13-rc2.
      
        Also in here is a new driver, the virtualbox DRM driver. It's
        stand-alone and got acks from the DRM developers to go in through this
        tree. It's a new thing, but it should be fine for this point in the rc
        cycle due to it being independent.
      
        All of this has been in linux-next for a while with no reported
        issues"
      
      * tag 'staging-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: rtl8188eu: add TL-WN722N v2 support
        staging: speakup: safely register and unregister ldisc
        staging: speakup: add functions to register and unregister ldisc
        staging: speakup: safely close tty
        staging: sm750fb: avoid conflicting vesafb
        staging: lustre: ko2iblnd: check copy_from_iter/copy_to_iter return code
        staging: vboxvideo: Add vboxvideo to drivers/staging
        staging: sm750fb: fixed a assignment typo
        staging: rtl8188eu: memory leak in rtw_free_cmd_obj()
        staging: vchiq_arm: fix error codes in probe
        staging: comedi: ni_mio_common: fix AO timer off-by-one regression
      bcb53e57
    • Randy Dunlap's avatar
      MAINTAINERS: fix alphabetical ordering · 82abbea7
      Randy Dunlap authored
      Fix major alphabetic errors.  No attempt to fix items that all begin
      with the same word (like ARM, BROADCOM, DRM, EDAC, FREESCALE, INTEL,
      OMAP, PCI, SAMSUNG, TI, USB, etc.).
      
      (diffstat +/- is different by one line because TI KEYSTONE MULTICORE
      had 2 blank lines after it.)
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      82abbea7
  10. 21 Jul, 2017 7 commits
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.13-2' of git://git.linux-nfs.org/projects/anna/linux-nfs · 505d5c11
      Linus Torvalds authored
      Pull NFS client bugfixes from Anna Schumaker:
       "Stable bugfix:
         - Fix error reporting regression
      
        Bugfixes:
         - Fix setting filelayout ds address race
         - Fix subtle access bug when using ACLs
         - Fix setting mnt3_counts array size
         - Fix a couple of pNFS commit races"
      
      * tag 'nfs-for-4.13-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
        NFS/filelayout: Fix racy setting of fl->dsaddr in filelayout_check_deviceid()
        NFS: Be more careful about mapping file permissions
        NFS: Store the raw NFS access mask in the inode's access cache
        NFSv3: Convert nfs3_proc_access() to use nfs_access_set_mask()
        NFS: Refactor NFS access to kernel access mask calculation
        net/sunrpc/xprt_sock: fix regression in connection error reporting.
        nfs: count correct array for mnt3_counts array size
        Revert commit 722f0b89 ("pNFS: Don't send COMMITs to the DSes if...")
        pNFS/flexfiles: Handle expired layout segments in ff_layout_initiate_commit()
        NFS: Fix another COMMIT race in pNFS
        NFS: Fix a COMMIT race in pNFS
        mount: copy the port field into the cloned nfs_server structure.
        NFS: Don't run wake_up_bit() when nobody is waiting...
        nfs: add export operations
      505d5c11
    • Linus Torvalds's avatar
      Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · 99313414
      Linus Torvalds authored
      Pull overlayfs fixes from Miklos Szeredi:
       "This fixes a crash with SELinux and several other old and new bugs"
      
      * 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: check for bad and whiteout index on lookup
        ovl: do not cleanup directory and whiteout index entries
        ovl: fix xattr get and set with selinux
        ovl: remove unneeded check for IS_ERR()
        ovl: fix origin verification of index dir
        ovl: mark parent impure on ovl_link()
        ovl: fix random return value on mount
      99313414
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 0151ef00
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "A small set of fixes for -rc2 - two fixes for BFQ, documentation and
        code, and a removal of an unused variable in nbd. Outside of that, a
        small collection of fixes from the usual crew on the nvme side"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        nvmet: don't report 0-bytes in serial number
        nvmet: preserve controller serial number between reboots
        nvmet: Move serial number from controller to subsystem
        nvmet: prefix version configfs file with attr
        nvme-pci: Fix an error handling path in 'nvme_probe()'
        nvme-pci: Remove nvme_setup_prps BUG_ON
        nvme-pci: add another device ID with stripe quirk
        nvmet-fc: fix byte swapping in nvmet_fc_ls_create_association
        nvme: fix byte swapping in the streams code
        nbd: kill unused ret in recv_work
        bfq: dispatch request to prevent queue stalling after the request completion
        bfq: fix typos in comments about B-WF2Q+ algorithm
      0151ef00
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · bb236dbe
      Linus Torvalds authored
      Pull more rdma fixes from Doug Ledford:
       "As per my previous pull request, there were two drivers that each had
        a rather large number of legitimate fixes still to be sent.
      
        As it turned out, I also missed a reasonably large set of fixes from
        one person across the stack that are all important fixes. All in all,
        the bnxt_re, i40iw, and Dan Carpenter are 3/4 to 2/3rds of this pull
        request.
      
        There were some other random fixes that I didn't send in the last pull
        request that I added to this one. This catches the rdma stack up to
        the fixes from up to about the beginning of this week. Any more fixes
        I'll wait and batch up later in the -rc cycle. This will give us a
        good base to start with for basing a for-next branch on -rc2.
      
        Summary:
      
         - i40iw fixes
      
         - bnxt_re fixes
      
         - Dan Carpenter bugfixes across stack
      
         - ten more random fixes, no more than two from any one person"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (37 commits)
        RDMA/core: Initialize port_num in qp_attr
        RDMA/uverbs: Fix the check for port number
        IB/cma: Fix reference count leak when no ipv4 addresses are set
        RDMA/iser: don't send an rkey if all data is written as immadiate-data
        rxe: fix broken receive queue draining
        RDMA/qedr: Prevent memory overrun in verbs' user responses
        iw_cxgb4: don't use WR keys/addrs for 0 byte reads
        IB/mlx4: Fix CM REQ retries in paravirt mode
        IB/rdmavt: Setting of QP timeout can overflow jiffies computation
        IB/core: Fix sparse warnings
        RDMA/bnxt_re: Fix the value reported for local ack delay
        RDMA/bnxt_re: Report MISSED_EVENTS in req_notify_cq
        RDMA/bnxt_re: Fix return value of poll routine
        RDMA/bnxt_re: Enable atomics only if host bios supports
        RDMA/bnxt_re: Specify RDMA component when allocating stats context
        RDMA/bnxt_re: Fixed the max_rd_atomic support for initiator and destination QP
        RDMA/bnxt_re: Report supported value to IB stack in query_device
        RDMA/bnxt_re: Do not free the ctx_tbl entry if delete GID fails
        RDMA/bnxt_re: Fix WQE Size posted to HW to prevent it from throwing error
        RDMA/bnxt_re: Free doorbell page index (DPI) during dealloc ucontext
        ...
      bb236dbe
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.13-rc2' of git://people.freedesktop.org/~airlied/linux · 24a1635a
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "A bunch of fixes for rc2: two imx regressions, vc4 fix, dma-buf fix,
        some displayport mst fixes, and an amdkfd fix.
      
        Nothing too crazy, I assume we just haven't see much rc1 testing yet"
      
      * tag 'drm-fixes-for-v4.13-rc2' of git://people.freedesktop.org/~airlied/linux:
        drm/mst: Avoid processing partially received up/down message transactions
        drm/mst: Avoid dereferencing a NULL mstb in drm_dp_mst_handle_up_req()
        drm/mst: Fix error handling during MST sideband message reception
        drm/imx: parallel-display: Accept drm_of_find_panel_or_bridge failure
        drm/imx: fix typo in ipu_plane_formats[]
        drm/vc4: Fix VBLANK handling in crtc->enable() path
        dma-buf/fence: Avoid use of uninitialised timestamp
        drm/amdgpu: Remove unused field kgd2kfd_shared_resources.num_mec
        drm/radeon: Remove initialization of shared_resources.num_mec
        drm/amdkfd: Remove unused references to shared_resources.num_mec
        drm/amdgpu: Fix KFD oversubscription by tracking queues correctly
      24a1635a
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · f79ec886
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
       "Three minor updates
      
         - Use the new GFP_RETRY_MAYFAIL to be more aggressive in allocating
           memory for the ring buffer without causing OOMs
      
         - Fix a memory leak in adding and removing instances
      
         - Add __rcu annotation to be able to debug RCU usage of function
           tracing a bit better"
      
      * tag 'trace-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        trace: fix the errors caused by incompatible type of RCU variables
        tracing: Fix kmemleak in instance_rmdir
        tracing/ring_buffer: Try harder to allocate
      f79ec886
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · b0a75281
      Linus Torvalds authored
      Pull KVM fixes from Radim Krčmář:
       "A bunch of small fixes for x86"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        kvm: x86: hyperv: avoid livelock in oneshot SynIC timers
        KVM: VMX: Fix invalid guest state detection after task-switch emulation
        x86: add MULTIUSER dependency for KVM
        KVM: nVMX: Disallow VM-entry in MOV-SS shadow
        KVM: nVMX: track NMI blocking state separately for each VMCS
        KVM: x86: masking out upper bits
      b0a75281