1. 01 Apr, 2017 6 commits
    • Linus Torvalds's avatar
      Merge tag 'acpi-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 7ece03b0
      Linus Torvalds authored
      Pull ACPI fixes from Rafael Wysocki:
       "These fix two issues related to IOAPIC hotplug, an overzealous build
        optimization that prevents the function graph tracer from working with
        the ACPI subsystem correctly and an RCU synchronization issue in the
        ACPI APEI code.
      
        Specifics:
      
         - drop the unconditional setting of the '-Os' gcc flag from the ACPI
           Makefile to make the function graph tracer work correctly with the
           ACPI subsystem (Josh Poimboeuf).
      
         - add missing synchronize_rcu() to ghes_remove() which removes an
           element from an RCU-protected list, but fails to synchronize it
           properly afterward (James Morse).
      
         - fix two problems related to IOAPIC hotplug, a local variable
           initialization in setup_res() and the creation of platform device
           objects for IO(x)APICs which are (a) unused and (b) leaked on
           hot-removal (Joerg Roedel)"
      
      * tag 'acpi-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: Fix incompatibility with mcount-based function graph tracing
        ACPI / APEI: Add missing synchronize_rcu() on NOTIFY_SCI removal
        ACPI: Do not create a platform_device for IOAPIC/IOxAPIC
        ACPI: ioapic: Clear on-stack resource before using it
      7ece03b0
    • Linus Torvalds's avatar
      Merge tag 'pm-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 0d2ceec6
      Linus Torvalds authored
      Pull power management fixes from Rafael Wysocki:
       "These fix a cpufreq core issue with the initialization of the cpufreq
        sysfs interface and a cpuidle powernv driver initialization issue.
      
        Specifics:
      
         - symbolic links from CPU directories to the corresponding cpufreq
           policy directories in sysfs are not created during initialization
           in some cases which confuses user space, so prevent that from
           happening (Rafael Wysocki).
      
         - the powernv cpuidle driver fails to pass a correct cpumaks to the
           cpuidle core in some cases which causes subsequent failures to
           occur, so fix it (Vaidyanathan Srinivasan)"
      
      * tag 'pm-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpuidle: powernv: Pass correct drv->cpumask for registration
        cpufreq: Fix creation of symbolic links to policy directories
      0d2ceec6
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 1300dc68
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "Two bugfixes from I2C, specifically the I2C mux section. Thanks to
        peda for collecting them"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: mux: pca954x: Add missing pca9546 definition to chip_desc
        Revert "i2c: mux: pca954x: Add ACPI support for pca954x"
      1300dc68
    • Linus Torvalds's avatar
      Merge tag 'arc-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · dcbcb491
      Linus Torvalds authored
      Pull ARC fixes from Vineet Gupta:
       "Accumulated fixes for ARC which I've been been sitting on for a while:
      
         - reading clk from driver vs device tree [Vlad]
      
         - fix support for UIO in VDK platform [Alexey]
      
         - SLC busy bit reading workaround
      
         - build warning with kprobes header reorg"
      
      * tag 'arc-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: fix build warnings with !CONFIG_KPROBES
        ARCv2: SLC: Make sure busy bit is set properly on SLC flushing
        ARC: vdk: Fix support of UIO
        ARCv2: make unimplemented vectors as no-ops rather than halt core
        ARC: get rate from clk driver instead of reading device tree
        ARC: [dts] add cpu nodes to ARCHS SMP device tree
        ARC: [dts] add input clocks for cpu nodes
      dcbcb491
    • Linus Torvalds's avatar
      Merge tag 'nfsd-4.11-1' of git://linux-nfs.org/~bfields/linux · 09c8b3d1
      Linus Torvalds authored
      Pull nfsd fixes from Bruce Fields:
       "The restriction of NFSv4 to TCP went overboard and also broke the
        backchannel; fix.
      
        Also some minor refinements to the nfsd version-setting interface that
        we'd like to get fixed before release"
      
      * tag 'nfsd-4.11-1' of git://linux-nfs.org/~bfields/linux:
        svcrdma: set XPT_CONG_CTRL flag for bc xprt
        NFSD: fix nfsd_reset_versions for NFSv4.
        NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)
        NFSD: further refinement of content of /proc/fs/nfsd/versions
        nfsd: map the ENOKEY to nfserr_perm for avoiding warning
        SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt
      09c8b3d1
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · fe8e12b5
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "We have three small fixes queued up in my for-linus-4.11 branch"
      
      * 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix an integer overflow check
        btrfs: Change qgroup_meta_rsv to 64bit
        Btrfs: bring back repair during read
      fe8e12b5
  2. 31 Mar, 2017 18 commits
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-cpufreq-fixes' and 'pm-cpuidle-fixes' · 46e1d5e9
      Rafael J. Wysocki authored
      * pm-cpufreq-fixes:
        cpufreq: Fix creation of symbolic links to policy directories
      
      * pm-cpuidle-fixes:
        cpuidle: powernv: Pass correct drv->cpumask for registration
      46e1d5e9
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-hotplug-fixes', 'acpi-build-fixes' and 'acpi-apei-fixes' · a0793066
      Rafael J. Wysocki authored
      * acpi-hotplug-fixes:
        ACPI: Do not create a platform_device for IOAPIC/IOxAPIC
        ACPI: ioapic: Clear on-stack resource before using it
      
      * acpi-build-fixes:
        ACPI: Fix incompatibility with mcount-based function graph tracing
      
      * acpi-apei-fixes:
        ACPI / APEI: Add missing synchronize_rcu() on NOTIFY_SCI removal
      a0793066
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.11-3' of git://git.linux-nfs.org/projects/anna/linux-nfs · f9799ad2
      Linus Torvalds authored
      Pull NFS client fixes from Anna Schumaker:
       "Here are a few more bugfixes that came in over the last couple of
        weeks. Most of these fix various hangs and loops that people found,
        but we also had a few error handling fixes.
      
        Stable Bugfixes:
         - fix infinite loop on BAD_STATEID error
      
        Other Bugfixes:
         - fix old dentry rehash after move
         - fix pnfs GETDEVINFO hangs
         - fix pnfs fallback to MDS on commit errors
         - fix flexfiles kernel oops"
      
      * tag 'nfs-for-4.11-3' of git://git.linux-nfs.org/projects/anna/linux-nfs:
        nfs: flexfiles: fix kernel OOPS if MDS returns unsupported DS type
        NFSv4.1 fix infinite loop on IO BAD_STATEID error
        PNFS fix fallback to MDS if got error on commit to DS
        NFS filelayout:call GETDEVICEINFO after pnfs_layout_process completes
        NFS store nfs4_deviceid in struct nfs4_filelayout_segment
        NFS cleanup struct nfs4_filelayout_segment
        NFS: Fix old dentry rehash after move
      f9799ad2
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · e39bccf2
      Linus Torvalds authored
      Pull arm64 fixes from Will Deacon:
       "The main thing is a fix for a NULL dereference on systems that boot
        using spin-tables or the ACPI parking protocol, but there are also a
        couple of trivial one-liners too.
      
        We're currently debugging a page flags corruption issue under
        syzkaller, but we're still some way from fixing that as it's proving
        fiddly to reproduce.
      
        Summary:
      
         - fix cpu_die() NULL dereference when booting secondary CPUs using
           spin-table
      
         - remove redundant #include
      
         - remove obsolete .gitignore entry"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: drop non-existing vdso-offsets.h from .gitignore
        arm64: remove redundant header file in current.h
        arm64: fix NULL dereference in have_cpu_die()
      e39bccf2
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 035f0cd3
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This fixes the following issues:
      
         - memory corruption when kmalloc fails in xts/lrw
      
         - mark some CCP DMA channels as private
      
         - fix reordering race in padata
      
         - regression in omap-rng DT description"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: xts,lrw - fix out-of-bounds write after kmalloc failure
        crypto: ccp - Make some CCP DMA channels private
        padata: avoid race in reordering
        dt-bindings: rng: clocks property on omap_rng not always mandatory
      035f0cd3
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · 728f4b3a
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
       "Here are a couple of mmc fixes intended for v4.11 rc5.
      
        MMC host:
         - sdhci: Fix bug when using SDIO IRQ
         - sdhci-of-at91: Fix eMMC DDR52 card detection"
      
      * tag 'mmc-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
        mmc: sdhci-of-at91: fix MMC_DDR_52 timing selection
        mmc: sdhci: Disable runtime pm when the sdio_irq is enabled
      728f4b3a
    • Linus Torvalds's avatar
      Merge tag 'sound-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 0fc04f91
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "At this time, most of changes are for ASoC, while we got one fix for
        yet another race of ALSA sequencer core and a usual HD-audio quirk.
      
        The ASoC changes are mostly small and device-specific fixes. A
        slightly large volume is seen in sun8i-codec, which is a new code in
        4.11, and we'd like to fix user-visible stuff before the official 4.1
        release"
      
      * tag 'sound-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (27 commits)
        ALSA: hda - fix a problem for lineout on a Dell AIO machine
        ASoC: simple-card: fix simple_dai clk lookup
        ASoC: STI: Fix reader substream pointer set
        ALSA: seq: Fix race during FIFO resize
        ARM: dts: sun8i: Update audio-routing with renamed widgets
        ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN
        ASoC: sun8i-codec: Fix space on audio-routing widget
        ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE
        ASoC: sun8i-codec: Remove analog "HP" widget
        ASoC: rt5665: fix wrong shift rt5665_if2_1_adc_in_enum
        ASoC: rt5665: fix define of RT5665_HP_DRIVER_5X
        ASoC: rcar: dma: remove unnecessary "volatile"
        ASoC: rcar: clear DE bit only in PDMACHCR when it stops
        ASoC: rsnd: fix sound route path when using SRC6/SRC9
        ASoC: don't dereference NULL pcm_{new,free}
        ASoC: rt5665: CLKDET is also a power of ASRC
        ASoC: rt5665: Vref3 is necessary for Mono Amp
        ASoC: rt5665: increase LDO level
        ASoC: rt5665: fix getting wrong work handler container
        ASoC: atmel-classd: fix audio clock rate
        ...
      0fc04f91
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · eee551df
      Linus Torvalds authored
      Pull HID fixes from Jiri Kosina:
      
       - Wacom regression fixes, from Aaron Armstrong Skomra
      
       - new device ID addition by Peter Stein
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: wacom: call _query_tablet_data() for BAMBOO_TOUCH
        HID: wacom: Don't add ghost interface as shared data
        HID: xinmo: fix for out of range for THT 2P arcade controller.
      eee551df
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.11-rc5' of git://people.freedesktop.org/~airlied/linux · 5559394d
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Seems to be quietening down, which means someone will make a liar of
        me for rc6.
      
        Just one vc4, one etnvaiv, one radeon, and a few i915 GVT fixes, and
        one i915 normal fixes"
      
      * tag 'drm-fixes-for-v4.11-rc5' of git://people.freedesktop.org/~airlied/linux:
        drm/vc4: Allocate the right amount of space for boot-time CRTC state.
        drm/etnaviv: (re-)protect fence allocation with GPU mutex
        drm/radeon: Override fpfn for all VRAM placements in radeon_evict_flags
        drm/i915: Restore marking context objects as dirty on pinning
        drm/i915/gvt: Use force single submit flag to distinguish gvt request from i915 request
        drm/i915/gvt: set shadow entry to scratch page while p2m failed
        drm/i915/gvt: Fix guest fail to read EDID leading to black guest console issue.
        drm/i915/gvt: fix wrong offset when loading RCS mocs
        drm/i915/gvt: add write handler for mmio mbctl
        drm/i915/kvmgt: Hold struct kvm reference
      5559394d
    • Tigran Mkrtchyan's avatar
      nfs: flexfiles: fix kernel OOPS if MDS returns unsupported DS type · f17f8a14
      Tigran Mkrtchyan authored
      this fix aims to fix dereferencing of a mirror in an error state when MDS
      returns unsupported DS type (IOW, not v3), which causes the following oops:
      
      [  220.370709] BUG: unable to handle kernel NULL pointer dereference at 0000000000000065
      [  220.370842] IP: ff_layout_mirror_valid+0x2d/0x110 [nfs_layout_flexfiles]
      [  220.370920] PGD 0
      
      [  220.370972] Oops: 0000 [#1] SMP
      [  220.371013] Modules linked in: nfnetlink_queue nfnetlink_log bluetooth nfs_layout_flexfiles rpcsec_gss_krb5 nfsv4 dns_resolver nfs fscache nf_conntrack_netbios_ns nf_conntrack_broadcast xt_CT ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 xt_conntrack ip_set nfnetlink ebtable_nat ebtable_broute bridge stp llc ip6table_raw ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_security iptable_raw iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack libcrc32c iptable_mangle iptable_security ebtable_filter ebtables ip6table_filter ip6_tables binfmt_misc intel_rapl x86_pkg_temp_thermal intel_powerclamp coretemp kvm_intel btrfs kvm arc4 snd_hda_codec_hdmi iwldvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel intel_cstate mac80211 xor uvcvideo
      [  220.371814]  videobuf2_vmalloc videobuf2_memops snd_hda_codec_idt mei_wdt videobuf2_v4l2 snd_hda_codec_generic iTCO_wdt ppdev videobuf2_core iTCO_vendor_support dell_rbtn dell_wmi iwlwifi sparse_keymap dell_laptop dell_smbios snd_hda_intel dcdbas videodev snd_hda_codec dell_smm_hwmon snd_hda_core media cfg80211 intel_uncore snd_hwdep raid6_pq snd_seq intel_rapl_perf snd_seq_device joydev i2c_i801 rfkill lpc_ich snd_pcm parport_pc mei_me parport snd_timer dell_smo8800 mei snd shpchp soundcore tpm_tis tpm_tis_core tpm nfsd auth_rpcgss nfs_acl lockd grace sunrpc i915 nouveau mxm_wmi ttm i2c_algo_bit drm_kms_helper crc32c_intel e1000e drm sdhci_pci firewire_ohci sdhci serio_raw mmc_core firewire_core ptp crc_itu_t pps_core wmi fjes video
      [  220.372568] CPU: 7 PID: 4988 Comm: cat Not tainted 4.10.5-200.fc25.x86_64 #1
      [  220.372647] Hardware name: Dell Inc. Latitude E6520/0J4TFW, BIOS A06 07/11/2011
      [  220.372729] task: ffff94791f6ea580 task.stack: ffffb72b88c0c000
      [  220.372802] RIP: 0010:ff_layout_mirror_valid+0x2d/0x110 [nfs_layout_flexfiles]
      [  220.372883] RSP: 0018:ffffb72b88c0f970 EFLAGS: 00010246
      [  220.372945] RAX: 0000000000000000 RBX: ffff9479015ca600 RCX: ffffffffffffffed
      [  220.373025] RDX: ffffffffffffffed RSI: ffff9479753dc980 RDI: 0000000000000000
      [  220.373104] RBP: ffffb72b88c0f988 R08: 000000000001c980 R09: ffffffffc0ea6112
      [  220.373184] R10: ffffef17477d9640 R11: ffff9479753dd6c0 R12: ffff9479211c7440
      [  220.373264] R13: ffff9478f45b7790 R14: 0000000000000001 R15: ffff9479015ca600
      [  220.373345] FS:  00007f555fa3e700(0000) GS:ffff9479753c0000(0000) knlGS:0000000000000000
      [  220.373435] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [  220.373506] CR2: 0000000000000065 CR3: 0000000196044000 CR4: 00000000000406e0
      [  220.373586] Call Trace:
      [  220.373627]  nfs4_ff_layout_prepare_ds+0x5e/0x200 [nfs_layout_flexfiles]
      [  220.373708]  ff_layout_pg_init_read+0x81/0x160 [nfs_layout_flexfiles]
      [  220.373806]  __nfs_pageio_add_request+0x11f/0x4a0 [nfs]
      [  220.373886]  ? nfs_create_request.part.14+0x37/0x330 [nfs]
      [  220.373967]  nfs_pageio_add_request+0xb2/0x260 [nfs]
      [  220.374042]  readpage_async_filler+0xaf/0x280 [nfs]
      [  220.374103]  read_cache_pages+0xef/0x1b0
      [  220.374166]  ? nfs_read_completion+0x210/0x210 [nfs]
      [  220.374239]  nfs_readpages+0x129/0x200 [nfs]
      [  220.374293]  __do_page_cache_readahead+0x1d0/0x2f0
      [  220.374352]  ondemand_readahead+0x17d/0x2a0
      [  220.374403]  page_cache_sync_readahead+0x2e/0x50
      [  220.374460]  generic_file_read_iter+0x6c8/0x950
      [  220.374532]  ? nfs_mapping_need_revalidate_inode+0x17/0x40 [nfs]
      [  220.374617]  nfs_file_read+0x6e/0xc0 [nfs]
      [  220.374670]  __vfs_read+0xe2/0x150
      [  220.374715]  vfs_read+0x96/0x130
      [  220.374758]  SyS_read+0x55/0xc0
      [  220.374801]  entry_SYSCALL_64_fastpath+0x1a/0xa9
      [  220.374856] RIP: 0033:0x7f555f570bd0
      [  220.374900] RSP: 002b:00007ffeb73e1b38 EFLAGS: 00000246 ORIG_RAX: 0000000000000000
      [  220.374986] RAX: ffffffffffffffda RBX: 00007f555f839ae0 RCX: 00007f555f570bd0
      [  220.375066] RDX: 0000000000020000 RSI: 00007f555fa41000 RDI: 0000000000000003
      [  220.375145] RBP: 0000000000021010 R08: ffffffffffffffff R09: 0000000000000000
      [  220.375226] R10: 00007f555fa40010 R11: 0000000000000246 R12: 0000000000022000
      [  220.375305] R13: 0000000000021010 R14: 0000000000001000 R15: 0000000000002710
      [  220.375386] Code: 66 66 90 55 48 89 e5 41 54 53 49 89 fc 48 83 ec 08 48 85 f6 74 2e 48 8b 4e 30 48 89 f3 48 81 f9 00 f0 ff ff 77 1e 48 85 c9 74 15 <48> 83 79 78 00 b8 01 00 00 00 74 2c 48 83 c4 08 5b 41 5c 5d c3
      [  220.375653] RIP: ff_layout_mirror_valid+0x2d/0x110 [nfs_layout_flexfiles] RSP: ffffb72b88c0f970
      [  220.375748] CR2: 0000000000000065
      [  220.403538] ---[ end trace bcdca752211b7da9 ]---
      Signed-off-by: default avatarTigran Mkrtchyan <tigran.mkrtchyan@desy.de>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      f17f8a14
    • Olga Kornievskaia's avatar
      NFSv4.1 fix infinite loop on IO BAD_STATEID error · 0e3d3e5d
      Olga Kornievskaia authored
      Commit 63d63cbf "NFSv4.1: Don't recheck delegations that
      have already been checked" introduced a regression where when a
      client received BAD_STATEID error it would not send any TEST_STATEID
      and instead go into an infinite loop of resending the IO that caused
      the BAD_STATEID.
      
      Fixes: 63d63cbf ("NFSv4.1: Don't recheck delegations that have already been checked")
      Signed-off-by: default avatarOlga Kornievskaia <kolga@netapp.com>
      Cc: stable@vger.kernel.org # 4.9+
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      0e3d3e5d
    • Hui Wang's avatar
      ALSA: hda - fix a problem for lineout on a Dell AIO machine · 2f726aec
      Hui Wang authored
      On this Dell AIO machine, the lineout jack does not work.
      
      We found the pin 0x1a is assigned to lineout on this machine, and in
      the past, we applied ALC298_FIXUP_DELL1_MIC_NO_PRESENCE to fix the
      heaset-set mic problem for this machine, this fixup will redefine
      the pin 0x1a to headphone-mic, as a result the lineout doesn't
      work anymore.
      
      After consulting with Dell, they told us this machine doesn't support
      microphone via headset jack, so we add a new fixup which only defines
      the pin 0x18 as the headset-mic.
      
      [rearranged the fixup insertion position by tiwai in order to make the
       merge with other branches easier -- tiwai]
      
      Fixes: 59ec4b57 ("ALSA: hda - Fix headset mic detection problem for two dell machines")
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarHui Wang <hui.wang@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      2f726aec
    • Dave Airlie's avatar
      Merge tag 'drm-misc-fixes-2017-03-31' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes · 3a2d7822
      Dave Airlie authored
      Just one vc4 fix from Eric, cc: stable
      
      * tag 'drm-misc-fixes-2017-03-31' of git://anongit.freedesktop.org/git/drm-misc:
        drm/vc4: Allocate the right amount of space for boot-time CRTC state.
      3a2d7822
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2017-03-29' of... · b61d6075
      Dave Airlie authored
      Merge tag 'drm-intel-fixes-2017-03-29' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes
      
      drm/i915 fixes for v4.11-rc5
      
      * tag 'drm-intel-fixes-2017-03-29' of git://anongit.freedesktop.org/git/drm-intel:
        drm/i915: Restore marking context objects as dirty on pinning
        drm/i915/gvt: Use force single submit flag to distinguish gvt request from i915 request
        drm/i915/gvt: set shadow entry to scratch page while p2m failed
        drm/i915/gvt: Fix guest fail to read EDID leading to black guest console issue.
        drm/i915/gvt: fix wrong offset when loading RCS mocs
        drm/i915/gvt: add write handler for mmio mbctl
        drm/i915/kvmgt: Hold struct kvm reference
      b61d6075
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 4adf0436
      Dave Airlie authored
       One small fix for radeon.
      
      * 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: Override fpfn for all VRAM placements in radeon_evict_flags
      4adf0436
    • Dave Airlie's avatar
      Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes · 7502add2
      Dave Airlie authored
      a single fix to keep fence seqnos of completed jobs monotonically
      increasing, as expected in various locations of the driver code. Also
      tagged for stable.
      
      * 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux:
        drm/etnaviv: (re-)protect fence allocation with GPU mutex
      7502add2
    • Vineet Gupta's avatar
      ARC: fix build warnings with !CONFIG_KPROBES · 4c6fabda
      Vineet Gupta authored
      |   CC      lib/nmi_backtrace.o
      | In file included from ../include/linux/kprobes.h:43:0,
      |                  from ../lib/nmi_backtrace.c:17:
      | ../arch/arc/include/asm/kprobes.h:57:13: warning: 'trap_is_kprobe' defined but not used [-Wunused-function]
      |  static void trap_is_kprobe(unsigned long address, struct pt_regs *regs)
      |              ^~~~~~~~~~~~~~
      
      The warning started with 7d134b2c ("kprobes: move kprobe declarations
      to asm-generic/kprobes.h") which started including <asm/kprobes.h>
      unconditionally into <linux/kprobes.h> exposing a stub function for
      !CONFIG_KPROBES to rest of world. Fix that by making the stub a macro
      Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
      4c6fabda
    • Alexey Brodkin's avatar
      ARCv2: SLC: Make sure busy bit is set properly on SLC flushing · c70c4733
      Alexey Brodkin authored
      As reported in STAR 9001165532, an SLC control reg read (for checking
      busy state) right after SLC invalidate command may incorrectly return
      NOT busy causing software to NOT spin-wait while operation is underway.
      (and for some reason this only happens if L1 cache is also disabled - as
      required by IOC programming model)
      
      Suggested workaround is to do an additional Control Reg read, which
      ensures the 2nd read gets the right status.
      
      Cc: stable@vger.kernel.org  #4.10
      Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
      [vgupta: reworte changelog a bit]
      Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
      c70c4733
  3. 30 Mar, 2017 13 commits
  4. 29 Mar, 2017 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 806276b7
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "Five fixes for this series:
      
         - a fix from me to ensure that blk-mq drivers that terminate IO in
           their ->queue_rq() handler by returning QUEUE_ERROR don't stall
           with a scheduler enabled.
      
         - four nbd fixes from Josef and Ratna, fixing various problems that
           are critical enough to go in for this cycle. They have been well
           tested"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        nbd: replace kill_bdev() with __invalidate_device()
        nbd: set queue timeout properly
        nbd: set rq->errors to actual error code
        nbd: handle ERESTARTSYS properly
        blk-mq: include errors in did_work calculation
      806276b7
    • Vaidyanathan Srinivasan's avatar
      cpuidle: powernv: Pass correct drv->cpumask for registration · 293d264f
      Vaidyanathan Srinivasan authored
      drv->cpumask defaults to cpu_possible_mask in __cpuidle_driver_init().
      On PowerNV platform cpu_present could be less than cpu_possible in cases
      where firmware detects the cpu, but it is not available to the OS.  When
      CONFIG_HOTPLUG_CPU=n, such cpus are not hotplugable at runtime and hence
      we skip creating cpu_device.
      
      This breaks cpuidle on powernv where register_cpu() is not called for
      cpus in cpu_possible_mask that cannot be hot-added at runtime.
      
      Trying cpuidle_register_device() on cpu without cpu_device will cause
      crash like this:
      
      cpu 0xf: Vector: 380 (Data SLB Access) at [c000000ff1503490]
          pc: c00000000022c8bc: string+0x34/0x60
          lr: c00000000022ed78: vsnprintf+0x284/0x42c
          sp: c000000ff1503710
         msr: 9000000000009033
         dar: 6000000060000000
        current = 0xc000000ff1480000
        paca    = 0xc00000000fe82d00   softe: 0        irq_happened: 0x01
          pid   = 1, comm = swapper/8
      Linux version 4.11.0-rc2 (sv@sagarika) (gcc version 4.9.4
      (Buildroot 2017.02-00004-gc28573e) ) #15 SMP Fri Mar 17 19:32:02 IST 2017
      enter ? for help
      [link register   ] c00000000022ed78 vsnprintf+0x284/0x42c
      [c000000ff1503710] c00000000022ebb8 vsnprintf+0xc4/0x42c (unreliable)
      [c000000ff1503800] c00000000022ef40 vscnprintf+0x20/0x44
      [c000000ff1503830] c0000000000ab61c vprintk_emit+0x94/0x2cc
      [c000000ff15038a0] c0000000000acc9c vprintk_func+0x60/0x74
      [c000000ff15038c0] c000000000619694 printk+0x38/0x4c
      [c000000ff15038e0] c000000000224950 kobject_get+0x40/0x60
      [c000000ff1503950] c00000000022507c kobject_add_internal+0x60/0x2c4
      [c000000ff15039e0] c000000000225350 kobject_init_and_add+0x70/0x78
      [c000000ff1503a60] c00000000053c288 cpuidle_add_sysfs+0x9c/0xe0
      [c000000ff1503ae0] c00000000053aeac cpuidle_register_device+0xd4/0x12c
      [c000000ff1503b30] c00000000053b108 cpuidle_register+0x98/0xcc
      [c000000ff1503bc0] c00000000085eaf0 powernv_processor_idle_init+0x140/0x1e0
      [c000000ff1503c60] c00000000000cd60 do_one_initcall+0xc0/0x15c
      [c000000ff1503d20] c000000000833e84 kernel_init_freeable+0x1a0/0x25c
      [c000000ff1503dc0] c00000000000d478 kernel_init+0x24/0x12c
      [c000000ff1503e30] c00000000000b564 ret_from_kernel_thread+0x5c/0x78
      
      This patch fixes the bug by passing correct cpumask from
      powernv-cpuidle driver.
      Signed-off-by: default avatarVaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
      Reviewed-by: default avatarGautham R. Shenoy <ego@linux.vnet.ibm.com>
      Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      [ rjw: Comment massage ]
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      293d264f
    • Linus Torvalds's avatar
      Merge branch 'apw' (xfrm_user fixes) · 52b9c816
      Linus Torvalds authored
      Merge xfrm_user validation fixes from Andy Whitcroft:
       "Two patches we are applying to Ubuntu for XFRM_MSG_NEWAE validation
        issue reported by ZDI.
      
        The first of these is the primary fix, and the second is for a more
        theoretical issue that Kees pointed out when reviewing the first"
      
      * emailed patches from Andy Whitcroft <apw@canonical.com>:
        xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder
        xfrm_user: validate XFRM_MSG_NEWAE XFRMA_REPLAY_ESN_VAL replay_window
      52b9c816