1. 13 5月, 2017 18 次提交
    • M
      gcov: support GCC 7.1 · 05384213
      Martin Liska 提交于
      Starting from GCC 7.1, __gcov_exit is a new symbol expected to be
      implemented in a profiling runtime.
      
      [akpm@linux-foundation.org: coding-style fixes]
      [mliska@suse.cz: v2]
        Link: http://lkml.kernel.org/r/e63a3c59-0149-c97e-4084-20ca8f146b26@suse.cz
      Link: http://lkml.kernel.org/r/8c4084fa-3885-29fe-5fc4-0d4ca199c785@suse.czSigned-off-by: NMartin Liska <mliska@suse.cz>
      Acked-by: NPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      05384213
    • R
      mm, vmstat: Remove spurious WARN() during zoneinfo print · 8d35bb31
      Reza Arbab 提交于
      After commit e2ecc8a7 ("mm, vmstat: print non-populated zones in
      zoneinfo"), /proc/zoneinfo will show unpopulated zones.
      
      A memoryless node, having no populated zones at all, was previously
      ignored, but will now trigger the WARN() in is_zone_first_populated().
      
      Remove this warning, as its only purpose was to warn of a situation that
      has since been enabled.
      
      Aside: The "per-node stats" are still printed under the first populated
      zone, but that's not necessarily the first stanza any more.  I'm not
      sure which criteria is more important with regard to not breaking
      parsers, but it looks a little weird to the eye.
      
      Fixes:  e2ecc8a7 ("mm, vmstat: print node-based stats in zoneinfo file")
      Link: http://lkml.kernel.org/r/1493854905-10918-1-git-send-email-arbab@linux.vnet.ibm.comSigned-off-by: NReza Arbab <arbab@linux.vnet.ibm.com>
      Cc: David Rientjes <rientjes@google.com>
      Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com>
      Cc: Vlastimil Babka <vbabka@suse.cz>
      Cc: Mel Gorman <mgorman@techsingularity.net>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8d35bb31
    • D
      time: delete current_fs_time() · 572e0ca9
      Deepa Dinamani 提交于
      All uses of the current_fs_time() function have been replaced by other
      time interfaces.
      
      And, its use cases can be fulfilled by current_time() or ktime_get_*
      variants.
      
      Link: http://lkml.kernel.org/r/1491613030-11599-13-git-send-email-deepa.kernel@gmail.comSigned-off-by: NDeepa Dinamani <deepa.kernel@gmail.com>
      Reviewed-by: NArnd Bergmann <arnd@arndb.de>
      Cc: John Stultz <john.stultz@linaro.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      572e0ca9
    • M
      hwpoison, memcg: forcibly uncharge LRU pages · 18365225
      Michal Hocko 提交于
      Laurent Dufour has noticed that hwpoinsoned pages are kept charged.  In
      his particular case he has hit a bad_page("page still charged to
      cgroup") when onlining a hwpoison page.  While this looks like something
      that shouldn't happen in the first place because onlining hwpages and
      returning them to the page allocator makes only little sense it shows a
      real problem.
      
      hwpoison pages do not get freed usually so we do not uncharge them (at
      least not since commit 0a31bc97 ("mm: memcontrol: rewrite uncharge
      API")).  Each charge pins memcg (since e8ea14cc ("mm: memcontrol:
      take a css reference for each charged page")) as well and so the
      mem_cgroup and the associated state will never go away.  Fix this leak
      by forcibly uncharging a LRU hwpoisoned page in delete_from_lru_cache().
      We also have to tweak uncharge_list because it cannot rely on zero ref
      count for these pages.
      
      [akpm@linux-foundation.org: coding-style fixes]
      Fixes: 0a31bc97 ("mm: memcontrol: rewrite uncharge API")
      Link: http://lkml.kernel.org/r/20170502185507.GB19165@dhcp22.suse.czSigned-off-by: NMichal Hocko <mhocko@suse.com>
      Reported-by: NLaurent Dufour <ldufour@linux.vnet.ibm.com>
      Tested-by: NLaurent Dufour <ldufour@linux.vnet.ibm.com>
      Reviewed-by: NBalbir Singh <bsingharora@gmail.com>
      Reviewed-by: NNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      18365225
    • L
      Merge tag 'sound-fix-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · deac8429
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "This contains a one-liner change that has a significant impact:
        disabling the build of OSS. It's been unmaintained for long time, and
        we'd like to drop the stuff. Finally, as the first step, stop the
        build. Let's see whether it works without much complaints.
      
        Other than that, there are two small fixes for HD-audio"
      
      * tag 'sound-fix-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        sound: Disable the build of OSS drivers
        ALSA: hda: Fix cpu lockup when stopping the cmd dmas
        ALSA: hda - Add mute led support for HP EliteBook 840 G3
      deac8429
    • L
      Merge tag 'for-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · 6b402bdf
      Linus Torvalds 提交于
      Pull more power-supply updates from Sebastian Reichel:
       "The power-supply subsystem has a few more changes for the v4.12 merge
        window:
      
         - New battery driver for AXP20X and AXP22X PMICs
      
         - Improve max17042_battery for usage on x86
      
         - Misc small cleanups & fixes"
      
      * tag 'for-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (34 commits)
        power: supply: cpcap-charger: Keep trickle charger bits disabled
        power: supply: cpcap-charger: Fix enable for 3.8V charge setting
        power: supply: cpcap-charger: Fix charge voltage configuration
        power: supply: cpcap-charger: Fix charger name
        power: supply: twl4030-charger: make twl4030_bci_property_is_writeable static
        power: supply: sbs-battery: Add alert callback
        mailmap: add Sebastian Reichel
        power: supply: avoid unused twl4030-madc.h
        power: supply: sbs-battery: Correct supply status with current draw
        power: supply: sbs-battery: Don't ignore the first external power change
        power: supply: pda_power: move from timer to delayed_work
        power: supply: max17042_battery: Add support for the SCOPE property
        power: supply: max17042_battery: Add support for the CHARGE_NOW property
        power: supply: max17042_battery: Add support for the CHARGE_FULL_DESIGN property
        power: supply: max17042_battery: mAh readings depend on r_sns value
        power: supply: max17042_battery: Add support for the VOLT_MIN property
        power: supply: max17042_battery: Add support for the TECHNOLOGY attribute
        power: supply: max17042_battery: Add external_power_changed callback
        power: supply: max17042_battery: Add support for the STATUS property
        power: supply: max17042_battery: Add default platform_data fallback data
        ...
      6b402bdf
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 6a776e47
      Linus Torvalds 提交于
      Pull thermal management updates from Zhang Rui:
      
       - Fix a problem where orderly_shutdown() is called for multiple times
         due to multiple critical overheating events raised in a short period
         by platform thermal driver. (Keerthy)
      
       - Introduce a backup thermal shutdown mechanism, which invokes
         kernel_power_off()/emergency_restart() directly, after
         orderly_shutdown() being issued for certain amount of time(specified
         via Kconfig). This is useful in certain conditions that userspace may
         be unable to power off the system in a clean manner and leaves the
         system in a critical state, like in the middle of driver probing
         phase. (Keerthy)
      
       - Introduce a new interface in thermal devfreq_cooling code so that the
         driver can provide more precise data regarding actual power to the
         thermal governor every time the power budget is calculated. (Lukasz
         Luba)
      
       - Introduce BCM 2835 soc thermal driver and northstar thermal driver,
         within a new sub-folder. (Rafał Miłecki)
      
       - Introduce DA9062/61 thermal driver. (Steve Twiss)
      
       - Remove non-DT booting on TI-SoC driver. Also add support to fetching
         coefficients from DT. (Keerthy)
      
       - Refactorf RCAR Gen3 thermal driver. (Niklas Söderlund)
      
       - Small fix on MTK and intel-soc-dts thermal driver. (Dawei Chien,
         Brian Bian)
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (25 commits)
        thermal: core: Add a back up thermal shutdown mechanism
        thermal: core: Allow orderly_poweroff to be called only once
        Thermal: Intel SoC DTS: Change interrupt request behavior
        trace: thermal: add another parameter 'power' to the tracing function
        thermal: devfreq_cooling: add new interface for direct power read
        thermal: devfreq_cooling: refactor code and add get_voltage function
        thermal: mt8173: minor mtk_thermal.c cleanups
        thermal: bcm2835: move to the broadcom subdirectory
        thermal: broadcom: ns: specify myself as MODULE_AUTHOR
        thermal: da9062/61: Thermal junction temperature monitoring driver
        Documentation: devicetree: thermal: da9062/61 TJUNC temperature binding
        thermal: broadcom: add Northstar thermal driver
        dt-bindings: thermal: add support for Broadcom's Northstar thermal
        thermal: bcm2835: add thermal driver for bcm2835 SoC
        dt-bindings: Add thermal zone to bcm2835-thermal example
        thermal: rcar_gen3_thermal: add suspend and resume support
        thermal: rcar_gen3_thermal: store device match data in private structure
        thermal: rcar_gen3_thermal: enable hardware interrupts for trip points
        thermal: rcar_gen3_thermal: record and check number of TSCs found
        thermal: rcar_gen3_thermal: check that TSC exists before memory allocation
        ...
      6a776e47
    • L
      Merge tag 'drm-fixes-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux · a34ab101
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "AMD, nouveau, one i915, and one EDID fix for v4.12-rc1
      
        Some fixes that it would be good to have in rc1. It contains the i915
        quiet fix that you reported.
      
        It also has an amdgpu fixes pull, with lots of ongoing work on Vega10
        which is new in this kernel and is preliminary support so may have a
        fair bit of movement.
      
        Otherwise a few non-Vega10 AMD fixes, one EDID fix and some nouveau
        regression fixers"
      
      * tag 'drm-fixes-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux: (144 commits)
        drm/i915: Make vblank evade warnings optional
        drm/nouveau/therm: remove ineffective workarounds for alarm bugs
        drm/nouveau/tmr: avoid processing completed alarms when adding a new one
        drm/nouveau/tmr: fix corruption of the pending list when rescheduling an alarm
        drm/nouveau/tmr: handle races with hw when updating the next alarm time
        drm/nouveau/tmr: ack interrupt before processing alarms
        drm/nouveau/core: fix static checker warning
        drm/nouveau/fb/ram/gf100-: remove 0x10f200 read
        drm/nouveau/kms/nv50: skip core channel cursor update on position-only changes
        drm/nouveau/kms/nv50: fix source-rect-only plane updates
        drm/nouveau/kms/nv50: remove pointless argument to window atomic_check_acquire()
        drm/amd/powerplay: refine pwm1_enable callback functions for CI.
        drm/amd/powerplay: refine pwm1_enable callback functions for vi.
        drm/amd/powerplay: refine pwm1_enable callback functions for Vega10.
        drm/amdgpu: refine amdgpu pwm1_enable sysfs interface.
        drm/amdgpu: add amd fan ctrl mode enums.
        drm/amd/powerplay: add more smu message on Vega10.
        drm/amdgpu: fix dependency issue
        drm/amd: fix init order of sched job
        drm/amdgpu: add some additional vega10 pci ids
        ...
      a34ab101
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · bd1286f9
      Linus Torvalds 提交于
      Pull SCSI target updates from Nicholas Bellinger:
       "Things were a lot more calm than previously expected. It's primarily
        fixes in various areas, with most of the new functionality centering
        around TCMU backend driver work that Xiubo Li has been driving.
      
        Here's the summary on the feature side:
      
         - Make T10-PI verify configurable for emulated (FILEIO + RD) backends
          (Dmitry Monakhov)
         - Allow target-core/TCMU pass-through to use in-kernel SPC-PR logic
          (Bryant Ly + MNC)
         - Add TCMU support for growing ring buffer size (Xiubo Li + MNC)
         - Add TCMU support for global block data pool (Xiubo Li + MNC)
      
        and on the bug-fix side:
      
         - Fix COMPARE_AND_WRITE non GOOD status handling for READ phase
          failures (Gary Guo + nab)
         - Fix iscsi-target hang with explicitly changing per NodeACL
          CmdSN number depth with concurrent login driven session
          reinstatement.  (Gary Guo + nab)
         - Fix ibmvscsis fabric driver ABORT task handling (Bryant Ly)
         - Fix target-core/FILEIO zero length handling (Bart Van Assche)
      
        Also, there was an OOPs introduced with the WRITE_VERIFY changes that
        I ended up reverting at the last minute, because as not unusual Bart
        and I could not agree on the fix in time for -rc1. Since it's specific
        to a conformance test, it's been reverted for now.
      
        There is a separate patch in the queue to address the underlying
        control CDB write overflow regression in >= v4.3 separate from the
        WRITE_VERIFY revert here, that will be pushed post -rc1"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (30 commits)
        Revert "target: Fix VERIFY and WRITE VERIFY command parsing"
        IB/srpt: Avoid that aborting a command triggers a kernel warning
        IB/srpt: Fix abort handling
        target/fileio: Fix zero-length READ and WRITE handling
        ibmvscsis: Do not send aborted task response
        tcmu: fix module removal due to stuck thread
        target: Don't force session reset if queue_depth does not change
        iscsi-target: Set session_fall_back_to_erl0 when forcing reinstatement
        target: Fix compare_and_write_callback handling for non GOOD status
        tcmu: Recalculate the tcmu_cmd size to save cmd area memories
        tcmu: Add global data block pool support
        tcmu: Add dynamic growing data area feature support
        target: fixup error message in target_tg_pt_gp_tg_pt_gp_id_store()
        target: fixup error message in target_tg_pt_gp_alua_access_type_store()
        target/user: PGR Support
        target: Add WRITE_VERIFY_16
        Documentation/target: add an example script to configure an iSCSI target
        target: Use kmalloc_array() in transport_kmap_data_sg()
        target: Use kmalloc_array() in compare_and_write_callback()
        target: Improve size determinations in two functions
        ...
      bd1286f9
    • L
      Merge branch 'work.sane_pwd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 05045329
      Linus Torvalds 提交于
      Pull misc vfs updates from Al Viro:
       "Making sure that something like a referral point won't end up as pwd
        or root.
      
        The main part is the last commit (fixing mntns_install()); that one
        fixes a hard-to-hit race. The fchdir() commit is making fchdir(2) a
        bit more robust - it should be impossible to get opened files (even
        O_PATH ones) for referral points in the first place, so the existing
        checks are OK, but checking the same thing as in chdir(2) is just as
        cheap.
      
        The path_init() commit removes a redundant check that shouldn't have
        been there in the first place"
      
      * 'work.sane_pwd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        make sure that mntns_install() doesn't end up with referral for root
        path_init(): don't bother with checking MAY_EXEC for LOOKUP_ROOT
        make sure that fchdir() won't accept referral points, etc.
      05045329
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e0c4a5fc
      Linus Torvalds 提交于
      Pull perf updates/fixes from Ingo Molnar:
       "Mostly tooling updates, but also two kernel fixes: a call chain
        handling robustness fix and an x86 PMU driver event definition fix"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/callchain: Force USER_DS when invoking perf_callchain_user()
        tools build: Fixup sched_getcpu feature test
        perf tests kmod-path: Don't fail if compressed modules aren't supported
        perf annotate: Fix AArch64 comment char
        perf tools: Fix spelling mistakes
        perf/x86: Fix Broadwell-EP DRAM RAPL events
        perf config: Refactor a duplicated code for obtaining config file name
        perf symbols: Allow user probes on versioned symbols
        perf symbols: Accept symbols starting at address 0
        tools lib string: Adopt prefixcmp() from perf and subcmd
        perf units: Move parse_tag_value() to units.[ch]
        perf ui gtk: Move gtk .so name to the only place where it is used
        perf tools: Move HAS_BOOL define to where perl headers are used
        perf memswap: Split the byteswap memory range wrappers from util.[ch]
        perf tools: Move event prototypes from util.h to event.h
        perf buildid: Move prototypes from util.h to build-id.h
      e0c4a5fc
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · dfcb7b23
      Linus Torvalds 提交于
      Pull timer fix from Ingo Molnar:
       "A single ARM Juno clocksource driver fix"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clocksource/arm_arch_timer: Fix arch_timer_mem_find_best_frame()
      dfcb7b23
    • L
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1b84fc15
      Linus Torvalds 提交于
      Pull stackprotector fixlet from Ingo Molnar:
       "A single fix/enhancement to increase stackprotector canary randomness
        on 64-bit kernels with very little cost"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms
      1b84fc15
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f1e0527d
      Linus Torvalds 提交于
      Pull x86 fixes from Ingo Molnar:
       "Misc fixes:
      
         - two boot crash fixes
         - unwinder fixes
         - kexec related kernel direct mappings enhancements/fixes
         - more Clang support quirks
         - minor cleanups
         - Documentation fixes"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/intel_rdt: Fix a typo in Documentation
        x86/build: Don't add -maccumulate-outgoing-args w/o compiler support
        x86/boot/32: Fix UP boot on Quark and possibly other platforms
        x86/mm/32: Set the '__vmalloc_start_set' flag in initmem_init()
        x86/kexec/64: Use gbpages for identity mappings if available
        x86/mm: Add support for gbpages to kernel_ident_mapping_init()
        x86/boot: Declare error() as noreturn
        x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility
        x86/mm: Fix boot crash caused by incorrect loop count calculation in sync_global_pgds()
        x86/asm: Don't use RBP as a temporary register in csum_partial_copy_generic()
        x86/microcode/AMD: Remove redundant NULL check on mc
      f1e0527d
    • L
      Merge tag 'for-linus-4.12b-rc0c-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 5836e422
      Linus Torvalds 提交于
      Pull xen fixes from Juergen Gross:
       "This contains two fixes for booting under Xen introduced during this
        merge window and two fixes for older problems, where one is just much
        more probable due to another merge window change"
      
      * tag 'for-linus-4.12b-rc0c-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen: adjust early dom0 p2m handling to xen hypervisor behavior
        x86/amd: don't set X86_BUG_SYSRET_SS_ATTRS when running under Xen
        xen/x86: Do not call xen_init_time_ops() until shared_info is initialized
        x86/xen: fix xsave capability setting
      5836e422
    • L
      Merge tag 'powerpc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · dc2a2481
      Linus Torvalds 提交于
      Pull more powerpc updates from Michael Ellerman:
       "The change to the Linux page table geometry was delayed for more
        testing with 16G pages, and there's the new CPU features stuff which
        just needed one more polish before going in. Plus a few changes from
        Scott which came in a bit late. And then various fixes, mostly minor.
      
        Summary highlights:
      
         - rework the Linux page table geometry to lower memory usage on
           64-bit Book3S (IBM chips) using the Hash MMU.
      
         - support for a new device tree binding for discovering CPU features
           on future firmwares.
      
         - Freescale updates from Scott:
            "Includes a fix for a powerpc/next mm regression on 64e, a fix for
             a kernel hang on 64e when using a debugger inside a relocated
             kernel, a qman fix, and misc qe improvements."
      
        Thanks to: Christophe Leroy, Gavin Shan, Horia Geantă, LiuHailong,
        Nicholas Piggin, Roy Pledge, Scott Wood, Valentin Longchamp"
      
      * tag 'powerpc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/64s: Support new device tree binding for discovering CPU features
        powerpc: Don't print cpu_spec->cpu_name if it's NULL
        of/fdt: introduce of_scan_flat_dt_subnodes and of_get_flat_dt_phandle
        powerpc/64s: Fix unnecessary machine check handler relocation branch
        powerpc/mm/book3s/64: Rework page table geometry for lower memory usage
        powerpc: Fix distclean with Makefile.postlink
        powerpc/64e: Don't place the stack beyond TASK_SIZE
        powerpc/powernv: Block PCI config access on BCM5718 during EEH recovery
        powerpc/8xx: Adding support of IRQ in MPC8xx GPIO
        soc/fsl/qbman: Disable IRQs for deferred QBMan work
        soc/fsl/qe: add EXPORT_SYMBOL for the 2 qe_tdm functions
        soc/fsl/qe: only apply QE_General4 workaround on affected SoCs
        soc/fsl/qe: round brg_freq to 1kHz granularity
        soc/fsl/qe: get rid of immrbar_virt_to_phys()
        net: ethernet: ucc_geth: fix MEM_PART_MURAM mode
        powerpc/64e: Fix hang when debugging programs with relocated kernel
      dc2a2481
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · ac3c4aa2
      Linus Torvalds 提交于
      Pull MIPS updates from James Hogan:
       "math-emu:
         - Add missing clearing of BLTZALL and BGEZALL emulation counters
         - Fix BC1EQZ and BC1NEZ condition handling
         - Fix BLEZL and BGTZL identification
      
        BPF:
         - Add JIT support for SKF_AD_HATYPE
         - Use unsigned access for unsigned SKB fields
         - Quit clobbering callee saved registers in JIT code
         - Fix multiple problems in JIT skb access helpers
      
        Loongson 3:
         - Select MIPS_L1_CACHE_SHIFT_6
      
        Octeon:
         - Remove vestiges of CONFIG_CAVIUM_OCTEON_2ND_KERNEL
         - Remove unused L2C types and macros.
         - Remove unused SLI types and macros.
         - Fix compile error when USB is not enabled.
         - Octeon: Remove unused PCIERCX types and macros.
         - Octeon: Clean up platform code.
      
        SNI:
         - Remove recursive include of cpu-feature-overrides.h
      
        Sibyte:
         - Export symbol periph_rev to sb1250-mac network driver.
         - Fix Kconfig warning.
      
        Generic platform:
         - Enable Root FS on NFS in generic_defconfig
      
        SMP-MT:
         - Use CPU interrupt controller IPI IRQ domain support
      
        UASM:
         - Add support for LHU for uasm.
         - Remove needless ISA abstraction
      
        mm:
         - Add 48-bit VA space and 4-level page tables for 4K pages.
      
        PCI:
         - Add controllers before the specified head
      
        irqchip driver for MIPS CPU:
         - Replace magic 0x100 with IE_SW0
         - Prepare for non-legacy IRQ domains
         - Introduce IPI IRQ domain support
      
        MAINTAINERS:
         - Update email-id of Rahul Bedarkar
      
        NET:
         - sb1250-mac: Add missing MODULE_LICENSE()
      
        CPUFREQ:
         - Loongson2: drop set_cpus_allowed_ptr()
      
        Misc:
         - Disable Werror when W= is set
         - Opt into HAVE_COPY_THREAD_TLS
         - Enable GENERIC_CPU_AUTOPROBE
         - Use common outgoing-CPU-notification code
         - Remove dead define of ST_OFF
         - Remove CONFIG_ARCH_HAS_ILOG2_U{32,64}
         - Stengthen IPI IRQ domain sanity check
         - Remove confusing else statement in __do_page_fault()
         - Don't unnecessarily include kmalloc.h into <asm/cache.h>.
         - Delete unused definition of SMP_CACHE_SHIFT.
         - Delete redundant definition of SMP_CACHE_BYTES"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (39 commits)
        MIPS: Sibyte: Fix Kconfig warning.
        MIPS: Sibyte: Export symbol periph_rev to sb1250-mac network driver.
        NET: sb1250-mac: Add missing MODULE_LICENSE()
        MAINTAINERS: Update email-id of Rahul Bedarkar
        MIPS: Remove confusing else statement in __do_page_fault()
        MIPS: Stengthen IPI IRQ domain sanity check
        MIPS: smp-mt: Use CPU interrupt controller IPI IRQ domain support
        irqchip: mips-cpu: Introduce IPI IRQ domain support
        irqchip: mips-cpu: Prepare for non-legacy IRQ domains
        irqchip: mips-cpu: Replace magic 0x100 with IE_SW0
        MIPS: Remove CONFIG_ARCH_HAS_ILOG2_U{32,64}
        MIPS: generic: Enable Root FS on NFS in generic_defconfig
        MIPS: mach-rm: Remove recursive include of cpu-feature-overrides.h
        MIPS: Opt into HAVE_COPY_THREAD_TLS
        CPUFREQ: Loongson2: drop set_cpus_allowed_ptr()
        MIPS: uasm: Remove needless ISA abstraction
        MIPS: Remove dead define of ST_OFF
        MIPS: Use common outgoing-CPU-notification code
        MIPS: math-emu: Fix BC1EQZ and BC1NEZ condition handling
        MIPS: r2-on-r6-emu: Clear BLTZALL and BGEZALL debugfs counters
        ...
      ac3c4aa2
    • L
      Merge tag 'nios2-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 · 0ba1c195
      Linus Torvalds 提交于
      Pull nios2 updates from Ley Foon Tan:
       "nios2 fixes/enhancements and adding nios2 R2 support"
      
      * tag 'nios2-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
        nios2: remove custom early console implementation
        nios2: use generic strncpy_from_user() and strnlen_user()
        nios2: Add CDX support
        nios2: Add BMX support
        nios2: Add NIOS2_ARCH_REVISION to select between R1 and R2
        nios2: implement flush_dcache_mmap_lock/unlock
        nios2: enable earlycon support
        nios2: constify irq_domain_ops
        nios2: remove wrapper header for cmpxchg.h
        nios2: add .gitignore entries for auto-generated files
      0ba1c195
  2. 12 5月, 2017 21 次提交
    • T
      sound: Disable the build of OSS drivers · 31cbee6a
      Takashi Iwai 提交于
      OSS drivers are left as badly unmaintained, and now we're facing a
      problem to clean up the hackish set_fs() usage in their codes.  Since
      most of drivers have been covered by ALSA, and the others are dead old
      and inactive, let's leave them RIP.
      
      This patch is the first step: disable the build of OSS drivers.
      We'll eventually drop the whole codes and clean up later.
      
      Note that sound/oss/dmasound is still kept, since it's a completely
      different implementation of OSS, and it doesn't suffer from set_fs()
      hack.  Moreover, the build of ALSA is disabled on M68K by some reason,
      thus disabling it shall result in a regression.  This one will be
      disabled / removed once when we add the support in ALSA side.
      Tested-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      31cbee6a
    • V
      drm/i915: Make vblank evade warnings optional · 7b8cd336
      Ville Syrjälä 提交于
      Add a new Kconfig option to enable/disable the extra warnings
      from the vblank evade code. For now we'll keep the warning
      about an actually missed vblank always enabled as that can have
      an actual user visible impact. But if we miss the deadline
      othrwise there's no real need to bother the user with that.
      We'll want these warnings enabled during development however
      so that we can catch regressions.
      
      Based on the reports it looks like this is still very easy
      to hit on SKL, so we have more work ahead of us to optimize
      the crtiical section further.
      
      Cc: Daniel Vetter <daniel@ffwll.ch>
      Cc: Jani Nikula <jani.nikula@linux.intel.com>
      Cc: Dave Airlie <airlied@redhat.com>
      Cc: Jens Axboe <axboe@kernel.dk>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Reported-by: NJens Axboe <axboe@kernel.dk>
      Reported-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Fixes: e1edbd44 ("drm/i915: Complain if we take too long under vblank evasion.")
      Signed-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      7b8cd336
    • D
      Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next · bb57d041
      Dave Airlie 提交于
      Quite a few patches, but not much code changed:
      - Fixes regression from atomic when only the source rect of a plane
      changes (ie. xrandr --right-of)
      - Fixes another issue where atomic changed behaviour underneath us,
      potentially causing laggy cursor position updates
      - Fixes for a bunch of races in thermal code, which lead to random
      lockups for a lot of users
      
      * 'linux-4.12' of git://github.com/skeggsb/linux:
        drm/nouveau/therm: remove ineffective workarounds for alarm bugs
        drm/nouveau/tmr: avoid processing completed alarms when adding a new one
        drm/nouveau/tmr: fix corruption of the pending list when rescheduling an alarm
        drm/nouveau/tmr: handle races with hw when updating the next alarm time
        drm/nouveau/tmr: ack interrupt before processing alarms
        drm/nouveau/core: fix static checker warning
        drm/nouveau/fb/ram/gf100-: remove 0x10f200 read
        drm/nouveau/kms/nv50: skip core channel cursor update on position-only changes
        drm/nouveau/kms/nv50: fix source-rect-only plane updates
        drm/nouveau/kms/nv50: remove pointless argument to window atomic_check_acquire()
      bb57d041
    • D
      Merge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux into drm-next · 7ec27233
      Dave Airlie 提交于
      Fixes for 4.12.  This is a bit bigger than usual since it's 3 weeks
      worth of fixes and most of these changes are for vega10 which is
      new for 4.12 and still in a fair amount of flux.  It looks like
      you missed my last pull request, so those patches are included here
      as well.  Highlights:
      - Lots of vega10 fixes
      - Fix interruptable wait mixup
      - Fan control method fixes
      - Misc display fixes for radeon and amdgpu
      - Misc bug fixes
      
      * 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux: (132 commits)
        drm/amd/powerplay: refine pwm1_enable callback functions for CI.
        drm/amd/powerplay: refine pwm1_enable callback functions for vi.
        drm/amd/powerplay: refine pwm1_enable callback functions for Vega10.
        drm/amdgpu: refine amdgpu pwm1_enable sysfs interface.
        drm/amdgpu: add amd fan ctrl mode enums.
        drm/amd/powerplay: add more smu message on Vega10.
        drm/amdgpu: fix dependency issue
        drm/amd: fix init order of sched job
        drm/amdgpu: add some additional vega10 pci ids
        drm/amdgpu/soc15: use atomfirmware for setting bios scratch for reset
        drm/amdgpu/atomfirmware: add function to update engine hang status
        drm/radeon: only warn once in radeon_ttm_bo_destroy if va list not empty
        drm/amdgpu: fix mutex list null pointer reference
        drm/amd/powerplay: fix bug sclk/mclk level can't be set on vega10.
        drm/amd/powerplay: Setup sw CTF to allow graceful exit when temperature exceeds maximum.
        drm/amd/powerplay: delete dead code in powerplay.
        drm/amdgpu: Use less generic enum definitions
        drm/amdgpu/gfx9: derive tile pipes from golden settings
        drm/amdgpu/gfx: drop max_gs_waves_per_vgt
        drm/amd/powerplay: disable engine spread spectrum feature on Vega10.
        ...
      7ec27233
    • D
      Merge tag 'drm-misc-next-fixes-2017-05-05' of... · bab1e2fe
      Dave Airlie 提交于
      Merge tag 'drm-misc-next-fixes-2017-05-05' of git://anongit.freedesktop.org/git/drm-misc into drm-next
      
      Core Changes:
      - Add quirk for LGD 764 panel to default 10bpc (Mario)
      
      Cc: Mario Kleiner <mario.kleiner.de@gmail.com>
      
      * tag 'drm-misc-next-fixes-2017-05-05' of git://anongit.freedesktop.org/git/drm-misc:
        drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2
      bab1e2fe
    • B
      drm/nouveau/therm: remove ineffective workarounds for alarm bugs · e4311ee5
      Ben Skeggs 提交于
      These were ineffective due to touching the list without the alarm lock,
      but should no longer be required.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      Cc: stable@vger.kernel.org
      e4311ee5
    • B
      drm/nouveau/tmr: avoid processing completed alarms when adding a new one · 330bdf62
      Ben Skeggs 提交于
      The idea here was to avoid having to "manually" program the HW if there's
      a new earliest alarm.  This was lazy and bad, as it leads to loads of fun
      races between inter-related callers (ie. therm).
      
      Turns out, it's not so difficult after all.  Go figure ;)
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      Cc: stable@vger.kernel.org
      330bdf62
    • B
      drm/nouveau/tmr: fix corruption of the pending list when rescheduling an alarm · 9fc64667
      Ben Skeggs 提交于
      At least therm/fantog "attempts" to work around this issue, which could
      lead to corruption of the pending alarm list.
      
      Fix it properly by not updating the timestamp without the lock held, or
      trying to add an already pending alarm to the pending alarm list....
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      Cc: stable@vger.kernel.org
      9fc64667
    • B
      drm/nouveau/tmr: handle races with hw when updating the next alarm time · 1b0f8438
      Ben Skeggs 提交于
      If the time to the next alarm is short enough, we could race with HW and
      end up with an ~4 second delay until it triggers.
      
      Fix this by checking again after we update HW.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      Cc: stable@vger.kernel.org
      1b0f8438
    • B
      drm/nouveau/tmr: ack interrupt before processing alarms · 3733bd8b
      Ben Skeggs 提交于
      Fixes a race where we can miss an alarm that triggers while we're already
      processing previous alarms.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      Cc: stable@vger.kernel.org
      3733bd8b
    • B
      drm/nouveau/core: fix static checker warning · 89ed10a5
      Ben Skeggs 提交于
      object->engine cannot be NULL, it's either valid, or an error pointer.
      
      This particular condition shouldn't actually be possible, but just in
      case, we'll keep it.
      Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      89ed10a5
    • B
      drm/nouveau/fb/ram/gf100-: remove 0x10f200 read · 80a92865
      Ben Skeggs 提交于
      This reg has moved on Pascal, and causes a bus fault.
      
      We never use the value anyway, so just remove the read.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      80a92865
    • B
      drm/nouveau/kms/nv50: skip core channel cursor update on position-only changes · e6db9579
      Ben Skeggs 提交于
      The DRM core used to only call prepare_fb/cleanup_fb() when a plane's
      framebuffer changed, which achieved the desired effect.
      
      It's apparently now up to the driver to decide on its own.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      Cc: stable@vger.kernel.org [4.11+]
      e6db9579
    • B
      drm/nouveau/kms/nv50: fix source-rect-only plane updates · 36601c2b
      Ben Skeggs 提交于
      This "optimisation" (which was originally meant to skip updating cursor
      settings in the core channel on position-only updates) turned out to be
      pointless in the final design of the code before it was merged.
      
      Remove it completely, as it breaks other cases.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      Cc: stable@vger.kernel.org [4.10+]
      36601c2b
    • B
    • L
      Merge tag 'docs-4.12-2' of git://git.lwn.net/linux · 09d79d10
      Linus Torvalds 提交于
      Pull more documentation updates from Jonathan Corbet:
       "Connect the newly RST-formatted documentation to the rest; this had to
        wait until the input pull was done. There's also a few small fixes
        that wandered in"
      
      * tag 'docs-4.12-2' of git://git.lwn.net/linux:
        doc: replace FTP URL to kernel.org with HTTPS one
        docs: update references to the device io book
        Documentation: earlycon: fix Marvell Armada 3700 UART name
        docs-rst: add input docs at main index and use kernel-figure
      09d79d10
    • L
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · e47b40a2
      Linus Torvalds 提交于
      Pull more arm64 updates from Catalin Marinas:
      
       - Silence module allocation failures when CONFIG_ARM*_MODULE_PLTS is
         enabled. This requires a check for __GFP_NOWARN in alloc_vmap_area()
      
       - Improve/sanitise user tagged pointers handling in the kernel
      
       - Inline asm fixes/cleanups
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y
        ARM: Silence first allocation with CONFIG_ARM_MODULE_PLTS=y
        mm: Silence vmap() allocation failures based on caller gfp_flags
        arm64: uaccess: suppress spurious clang warning
        arm64: atomic_lse: match asm register sizes
        arm64: armv8_deprecated: ensure extension of addr
        arm64: uaccess: ensure extension of access_ok() addr
        arm64: ensure extension of smp_store_release value
        arm64: xchg: hazard against entire exchange variable
        arm64: documentation: document tagged pointer stack constraints
        arm64: entry: improve data abort handling of tagged pointers
        arm64: hw_breakpoint: fix watchpoint matching for tagged pointers
        arm64: traps: fix userspace cache maintenance emulation on a tagged pointer
      e47b40a2
    • L
      Merge tag 'fbdev-v4.12' of git://github.com/bzolnier/linux · 4892c6f7
      Linus Torvalds 提交于
      Pull fbdev updates from Bartlomiej Zolnierkiewicz:
       "There is nothing really major here, just a couple of small bugfixes,
        improvements and cleanups.
      
         - fix handling of probing errors in omapfb (Arvind Yadav)
      
         - remove incorrect __exit markups in few drivers (Dmitry Torokhov)
      
         - fix boot time logo support for drivers using deferred probe
           (Takeshi Kihara)
      
         - fix DMA allocation size for ARM CLCD driver (Liam Beguin)
      
         - add support for specifying size via xenstore in xen-frontfb
           (Juergen Gross)
      
         - support for AUS mode in imxfb driver (Martin Kaiser)
      
         - fix buffer on stack usage in udlfb driver (Maksim Salau)
      
         - probe failure path fixup in sm501fb driver (Alexey Khoroshilov)
      
         - fix config dependency loop for stifb driver (Arnd Bergmann)
      
         - misc cleanups (Joe Perches, Christophe Leroy, Karim Eshapa, Pushkar
           Jambhlekar)"
      
      * tag 'fbdev-v4.12' of git://github.com/bzolnier/linux:
        fbdev: sti: don't select CONFIG_VT
        drivers/video/fbdev/omap/lcd_mipid.c: Use time comparison kernel macros
        sm501fb: don't return zero on failure path in sm501fb_start()
        video: fbdev: udlfb: Fix buffer on stack
        video: console: Remove reference to CONFIG_8xx
        dt-bindings: display: imx: entry for AUS mode
        video: fbdev: imxfb: support AUS mode
        drivers/video/fbdev: Fixing coding guidelines in acornfb.c
        xen, fbfront: add support for specifying size via xenstore
        video: ARM CLCD: fix dma allocation size
        drivers/video: Convert remaining uses of pr_warning to pr_warn
        video/logo: tidyup fb_logo_late_init initcall timing
        video: fbdev: i810: remove incorrect __exit markups
        video: fbdev: pmag-aa-fb: remove incorrect __exit markups
        video: fbdev: pmagb-b-fb: remove incorrect __exit markups
        video: fbdev: pmag-ba-fb: remove incorrect __exit markups
        omapfb: dss: Handle return errors in dss_init_ports()
      4892c6f7
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 55a1ab56
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
       "A smaller collection of fixes that should go into -rc1. This contains:
      
         - A fix from Christoph, fixing a regression with the WRITE_SAME and
           partial completions. Caused a BUG() on ppc.
      
         - Fixup for __blk_mq_stop_hw_queues(), it should be static. From
           Colin.
      
         - Removal of dmesg error messages on elevator switching, when invoked
           from sysfs. From me.
      
         - Fix for blk-stat, using this_cpu_ptr() in a section only protected
           by rcu_read_lock(). This breaks when PREEMPT_RCU is enabled. From
           me.
      
         - Two fixes for BFQ from Paolo, one fixing a crash and one updating
           the documentation.
      
         - An error handling lightnvm memory leak, from Rakesh.
      
         - The previous blk-mq hot unplug lock reversal depends on the CPU
           hotplug rework that isn't in mainline yet. This caused a lockdep
           splat when people unplugged CPUs with blk-mq devices. From Wanpeng.
      
         - A regression fix for DIF/DIX on blk-mq. From Wen"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: handle partial completions for special payload requests
        blk-mq: NVMe 512B/4K+T10 DIF/DIX format returns I/O error on dd with split op
        blk-stat: don't use this_cpu_ptr() in a preemptable section
        elevator: remove redundant warnings on IO scheduler switch
        block, bfq: stress that low_latency must be off to get max throughput
        block, bfq: use pointer entity->sched_data only if set
        nvme: lightnvm: fix memory leak
        blk-mq: make __blk_mq_stop_hw_queues static
        lightnvm: remove unused rq parameter of nvme_nvm_rqtocmd() to kill warning
        block/mq: fix potential deadlock during cpu hotplug
      55a1ab56
    • M
      doc: replace FTP URL to kernel.org with HTTPS one · 25a0da73
      Michael Heimpold 提交于
      FTP services were shutdown some weeks ago, so the FTP URL
      does not work anymore. Fix this by replacing it with
      corresponding HTTPS URL.
      Signed-off-by: NMichael Heimpold <michael.heimpold@i2se.com>
      Signed-off-by: NJonathan Corbet <corbet@lwn.net>
      25a0da73
    • L
      Merge tag 'for-linus-20170510' of git://git.infradead.org/linux-mtd · 9786e34e
      Linus Torvalds 提交于
      Pull MTD updates from Brian Norris:
       "NAND, from Boris:
         - some minor fixes/improvements on existing drivers (fsmc, gpio, ifc,
           davinci, brcmnand, omap)
         - a huge cleanup/rework of the denali driver accompanied with core
           fixes/improvements to simplify the driver code
         - a complete rewrite of the atmel driver to support new DT bindings
           make future evolution easier
         - the addition of per-vendor detection/initialization steps to avoid
           extending the nand_ids table with more extended-id entries
      
        SPI NOR, from Cyrille:
         - fixes in the hisi, intel and Mediatek SPI controller drivers
         - fixes to some SPI flash memories not supporting the Chip Erase
           command.
         - add support to some new memory parts (Winbond, Macronix, Micron,
           ESMT).
         - add new driver for the STM32 QSPI controller
      
        And a few fixes for Gemini and Versatile platforms on physmap-of"
      
      * tag 'for-linus-20170510' of git://git.infradead.org/linux-mtd: (100 commits)
        MAINTAINERS: Update NAND subsystem git repositories
        mtd: nand: gpio: update binding
        mtd: nand: add ooblayout for old hamming layout
        mtd: oxnas_nand: Allocating more than necessary in probe()
        dt-bindings: mtd: Document the STM32 QSPI bindings
        mtd: mtk-nor: set controller's address width according to nor flash
        mtd: spi-nor: add driver for STM32 quad spi flash controller
        mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program
        mtd: nand: davinci: add comment on NAND subpage write status on keystone
        mtd: nand: omap2: Fix partition creation via cmdline mtdparts
        mtd: nand: NULL terminate a of_device_id table
        mtd: nand: Fix a couple error codes
        mtd: nand: allow drivers to request minimum alignment for passed buffer
        mtd: nand: allocate aligned buffers if NAND_OWN_BUFFERS is unset
        mtd: nand: denali: allow to override revision number
        mtd: nand: denali_dt: use pdev instead of ofdev for platform_device
        mtd: nand: denali_dt: remove dma-mask DT property
        mtd: nand: denali: support 64bit capable DMA engine
        mtd: nand: denali_dt: enable HW_ECC_FIXUP for Altera SOCFPGA variant
        mtd: nand: denali: support HW_ECC_FIXUP capability
        ...
      9786e34e
  3. 11 5月, 2017 1 次提交