1. 06 10月, 2017 7 次提交
    • L
      Merge branch 'core-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 27efed3e
      Linus Torvalds 提交于
      Pull watchddog clean-up and fixes from Thomas Gleixner:
       "The watchdog (hard/softlockup detector) code is pretty much broken in
        its current state. The patch series addresses this by removing all
        duct tape and refactoring it into a workable state.
      
        The reasons why I ask for inclusion that late in the cycle are:
      
         1) The code causes lockdep splats vs. hotplug locking which get
            reported over and over. Unfortunately there is no easy fix.
      
         2) The risk of breakage is minimal because it's already broken
      
         3) As 4.14 is a long term stable kernel, I prefer to have working
            watchdog code in that and the lockdep issues resolved. I wouldn't
            ask you to pull if 4.14 wouldn't be a LTS kernel or if the
            solution would be easy to backport.
      
         4) The series was around before the merge window opened, but then got
            delayed due to the UP failure caused by the for_each_cpu()
            surprise which we discussed recently.
      
        Changes vs. V1:
      
         - Addressed your review points
      
         - Addressed the warning in the powerpc code which was discovered late
      
         - Changed two function names which made sense up to a certain point
           in the series. Now they match what they do in the end.
      
         - Fixed a 'unused variable' warning, which got not detected by the
           intel robot. I triggered it when trying all possible related config
           combinations manually. Randconfig testing seems not random enough.
      
        The changes have been tested by and reviewed by Don Zickus and tested
        and acked by Micheal Ellerman for powerpc"
      
      * 'core-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits)
        watchdog/core: Put softlockup_threads_initialized under ifdef guard
        watchdog/core: Rename some softlockup_* functions
        powerpc/watchdog: Make use of watchdog_nmi_probe()
        watchdog/core, powerpc: Lock cpus across reconfiguration
        watchdog/core, powerpc: Replace watchdog_nmi_reconfigure()
        watchdog/hardlockup/perf: Fix spelling mistake: "permanetely" -> "permanently"
        watchdog/hardlockup/perf: Cure UP damage
        watchdog/hardlockup: Clean up hotplug locking mess
        watchdog/hardlockup/perf: Simplify deferred event destroy
        watchdog/hardlockup/perf: Use new perf CPU enable mechanism
        watchdog/hardlockup/perf: Implement CPU enable replacement
        watchdog/hardlockup/perf: Implement init time detection of perf
        watchdog/hardlockup/perf: Implement init time perf validation
        watchdog/core: Get rid of the racy update loop
        watchdog/core, powerpc: Make watchdog_nmi_reconfigure() two stage
        watchdog/sysctl: Clean up sysctl variable name space
        watchdog/sysctl: Get rid of the #ifdeffery
        watchdog/core: Clean up header mess
        watchdog/core: Further simplify sysctl handling
        watchdog/core: Get rid of the thread teardown/setup dance
        ...
      27efed3e
    • L
      Merge tag 'pm-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 7a92616c
      Linus Torvalds 提交于
      Pull power management fix from Rafael Wysocki:
       "This fixes a code ordering issue in the main suspend-to-idle loop that
        causes some "low power S0 idle" conditions to be incorrectly reported
        as unmet with suspend/resume debug messages enabled"
      
      * tag 'pm-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / s2idle: Invoke the ->wake() platform callback earlier
      7a92616c
    • R
      Merge branch 'pm-sleep' · ca935f8e
      Rafael J. Wysocki 提交于
      * pm-sleep:
        PM / s2idle: Invoke the ->wake() platform callback earlier
      ca935f8e
    • L
      Merge tag 'for-4.14/dm-fixes' of... · 076264ad
      Linus Torvalds 提交于
      Merge tag 'for-4.14/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
      
      Pull device mapper fixes from Mike Snitzer:
      
       - a stable fix for the alignment of the event number reported at the
         end of the 'DM_LIST_DEVICES' ioctl.
      
       - a couple stable fixes for the DM crypt target.
      
       - a DM raid health status reporting fix.
      
      * tag 'for-4.14/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm raid: fix incorrect status output at the end of a "recover" process
        dm crypt: reject sector_size feature if device length is not aligned to it
        dm crypt: fix memory leak in crypt_ctr_cipher_old()
        dm ioctl: fix alignment of event number in the device list
      076264ad
    • J
      dm raid: fix incorrect status output at the end of a "recover" process · 41dcf197
      Jonathan Brassow 提交于
      There are three important fields that indicate the overall health and
      status of an array: dev_health, sync_ratio, and sync_action.  They tell
      us the condition of the devices in the array, and the degree to which
      the array is synchronized.
      
      This commit fixes a condition that is reported incorrectly.  When a member
      of the array is being rebuilt or a new device is added, the "recover"
      process is used to synchronize it with the rest of the array.  When the
      process is complete, but the sync thread hasn't yet been reaped, it is
      possible for the state of MD to be:
       mddev->recovery = [ MD_RECOVERY_RUNNING MD_RECOVERY_RECOVER MD_RECOVERY_DONE ]
       curr_resync_completed = <max dev size> (but not MaxSector)
       and all rdevs to be In_sync.
      This causes the 'array_in_sync' output parameter that is passed to
      rs_get_progress() to be computed incorrectly and reported as 'false' --
      or not in-sync.  This in turn causes the dev_health status characters to
      be reported as all 'a', rather than the proper 'A'.
      
      This can cause erroneous output for several seconds at a time when tools
      will want to be checking the condition due to events that are raised at
      the end of a sync process.  Fix this by properly calculating the
      'array_in_sync' return parameter in rs_get_progress().
      
      Also, remove an unnecessary intermediate 'recovery_cp' variable in
      rs_get_progress().
      Signed-off-by: NJonathan Brassow <jbrassow@redhat.com>
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      41dcf197
    • L
      Merge tag 'sound-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 0f380715
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "A collection of small fixes, mostly with stable ones:
      
       - X32 ABI fix for PCM; likely not so many people suffer from it, but
         still better to fix
      
       - Two minor kernel warning fixes on USB audio devices spotted by
         syzkaller
      
       - Regression fix of echoaudio due to its inconsistent dimension
      
       - Fix for HBR support on Intel DP audio, on some recent chips
      
       - USB-audio quirk for yet another Plantronics devices
      
       - Fix for potential double-fetch in ASIHPI FIFO queue"
      
      * tag 'sound-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usx2y: Suppress kernel warning at page allocation failures
        Revert "ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members"
        ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor
        ALSA: pcm: Fix structure definition for X32 ABI
        ALSA: usb-audio: Add sample rate quirk for Plantronics C310/C520-M
        ALSA: hda - program ICT bits to support HBR audio
        ALSA: asihpi: fix a potential double-fetch bug when copying puhm
        ALSA: compress: Remove unused variable
      0f380715
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 77ede3a0
      Linus Torvalds 提交于
      Pull HID subsystem fixes from Jiri Kosina:
      
       - buffer management size fix for i2c-hid driver, from Adrian Salido
      
       - tool ID regression fixes for Wacom driver from Jason Gerecke
      
       - a few small assorted fixes and a few device ID additions
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A"
        HID: hidraw: fix power sequence when closing device
        HID: wacom: Always increment hdev refcount within wacom_get_hdev_data
        HID: wacom: generic: Clear ABS_MISC when tool leaves proximity
        HID: wacom: generic: Send MSC_SERIAL and ABS_MISC when leaving prox
        HID: i2c-hid: allocate hid buffers for real worst case
        HID: rmi: Make sure the HID device is opened on resume
        HID: multitouch: Support ALPS PTP stick with pid 0x120A
        HID: multitouch: support buttons and trackpoint on Lenovo X1 Tab Gen2
        HID: wacom: Correct coordinate system of touchring and pen twist
        HID: wacom: Properly report negative values from Intuos Pro 2 Bluetooth
        HID: multitouch: Fix system-control buttons not working
        HID: add multi-input quirk for IDC6680 touchscreen
        HID: wacom: leds: Don't try to control the EKR's read-only LEDs
        HID: wacom: bits shifted too much for 9th and 10th buttons
      77ede3a0
  2. 05 10月, 2017 8 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 9a431ef9
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Check iwlwifi 9000 reorder buffer out-of-space condition properly,
          from Sara Sharon.
      
       2) Fix RCU splat in qualcomm rmnet driver, from Subash Abhinov
          Kasiviswanathan.
      
       3) Fix session and tunnel release races in l2tp, from Guillaume Nault
          and Sabrina Dubroca.
      
       4) Fix endian bug in sctp_diag_dump(), from Dan Carpenter.
      
       5) Several mlx5 driver fixes from the Mellanox folks (max flow counters
          cap check, invalid memory access in IPoIB support, etc.)
      
       6) tun_get_user() should bail if skb->len is zero, from Alexander
          Potapenko.
      
       7) Fix RCU lookups in inetpeer, from Eric Dumazet.
      
       8) Fix locking in packet_do_bund().
      
       9) Handle cb->start() error properly in netlink dump code, from Jason
          A. Donenfeld.
      
      10) Handle multicast properly in UDP socket early demux code. From Paolo
          Abeni.
      
      11) Several erspan bug fixes in ip_gre, from Xin Long.
      
      12) Fix use-after-free in socket filter code, in order to handle the
          fact that listener lock is no longer taken during the three-way TCP
          handshake. From Eric Dumazet.
      
      13) Fix infoleak in RTM_GETSTATS, from Nikolay Aleksandrov.
      
      14) Fix tail call generation in x86-64 BPF JIT, from Alexei Starovoitov.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (77 commits)
        net: 8021q: skip packets if the vlan is down
        bpf: fix bpf_tail_call() x64 JIT
        net: stmmac: dwmac-rk: Add RK3128 GMAC support
        rndis_host: support Novatel Verizon USB730L
        net: rtnetlink: fix info leak in RTM_GETSTATS call
        socket, bpf: fix possible use after free
        mlxsw: spectrum_router: Track RIF of IPIP next hops
        mlxsw: spectrum_router: Move VRF refcounting
        net: hns3: Fix an error handling path in 'hclge_rss_init_hw()'
        net: mvpp2: Fix clock resource by adding an optional bus clock
        r8152: add Linksys USB3GIGV1 id
        l2tp: fix l2tp_eth module loading
        ip_gre: erspan device should keep dst
        ip_gre: set tunnel hlen properly in erspan_tunnel_init
        ip_gre: check packet length and mtu correctly in erspan_xmit
        ip_gre: get key from session_id correctly in erspan_rcv
        tipc: use only positive error codes in messages
        ppp: fix __percpu annotation
        udp: perform source validation for mcast early demux
        IPv4: early demux can return an error code
        ...
      9a431ef9
    • V
      net: 8021q: skip packets if the vlan is down · e769fcec
      Vishakha Narvekar 提交于
      If the vlan is down, free the packet instead of proceeding with other
      processing, or counting it as received.  If vlan interfaces are used
      as slaves for bonding, with arp monitoring for connectivity, if the rx
      counter is seen to be incrementing, then the bond device will not
      observe that the interface is down.
      
      CC: David S. Miller <davem@davemloft.net>
      Signed-off-by: NVishakha Narvekar <Vishakha.Narvekar@dell.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e769fcec
    • L
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 42b76d0e
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "Our first batch of fixes this release cycle, unfortunately a bit
        noisier than usual. Two major groups stand out:
      
         - Some pinctril dts/dtsi changes for stm32 due to a new driver being
           merged during the merge window, and this aligns the DT contents
           between the old format and the new. This could arguably be moved to
           the next merge window but it also seemed relatively harmless to
           include now.
      
         - Amlogic/meson had driver changes merged that required devicetree
           changes to avoid functional/performance regressions. I've already
           asked them to be more careful about this going forward, and making
           sure drivers are compatible with older DTs when they make these
           kind of changes. The platform is actively being upstreamed so
           there's a few things in flight, we've seen this happen before and
           sometimes it's hard to catch in time.
      
        Besides that there is the usual mix of minor fixes"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (33 commits)
        ARM: dts: stm32: use right pinctrl compatible for stm32f469
        ARM: dts: stm32: Fix STMPE1600 binding on stm32429i-eval board
        ARM: defconfig: update Gemini defconfig
        ARM: defconfig: FRAMEBUFFER_CONSOLE can no longer be =m
        arm64: dts: rockchip: add the grf clk for dw-mipi-dsi on rk3399
        reset: Restrict RESET_HSDK to ARC_SOC_HSDK or COMPILE_TEST
        ARM: dts: da850-evm: add serial and ethernet aliases
        ARM: dts: am43xx-epos-evm: Remove extra CPSW EMAC entry
        ARM: dts: am33xx: Add spi alias to match SOC schematics
        ARM: OMAP2+: hsmmc: fix logic to call either omap_hsmmc_init or omap_hsmmc_late_init but not both
        ARM: dts: dra7: Set a default parent to mcasp3_ahclkx_mux
        ARM: OMAP2+: dra7xx: Set OPT_CLKS_IN_RESET flag for gpio1
        ARM: dts: nokia n900: drop unneeded/undocumented parts of the dts
        arm64: dts: rockchip: Correct MIPI DPHY PLL clock on rk3399
        arm64: dt marvell: Fix AP806 system controller size
        MAINTAINERS: add Macchiatobin maintainers entry
        ARC: reset: remove the misleading v1 suffix all over
        ARC: reset: add missing DT binding documentation for HSDKv1 reset driver
        ARC: reset: Only build on archs that have IOMEM
        ARM: at91: Replace uses of virt_to_phys with __pa_symbol
        ...
      42b76d0e
    • J
      Update James Hogan's email address · e0a86312
      James Hogan 提交于
      Update my imgtec.com and personal email address to my kernel.org one in
      a few places as MIPS will soon no longer be part of Imagination
      Technologies, and add mappings in .mailcap so get_maintainer.pl reports
      the right address.
      Signed-off-by: NJames Hogan <jhogan@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e0a86312
    • O
      Merge tag 'stm32-dt-fixes-for-v4.14' of... · 08f8c880
      Olof Johansson 提交于
      Merge tag 'stm32-dt-fixes-for-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into fixes
      
      STM32 fixes for v4.14:
      ---------------------
      
      -Fix STMPE1600 bindings for stm32429i-eval board
      -Use right compatible for stm32f469 pinctrl. It implies to use
      pinctrl dedicated files for F4 SoCs.
      
      * tag 'stm32-dt-fixes-for-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
        ARM: dts: stm32: use right pinctrl compatible for stm32f469
        ARM: dts: stm32: Fix STMPE1600 binding on stm32429i-eval board
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      08f8c880
    • O
      Merge tag 'amlogic-dt64-3' of... · eab5c002
      Olof Johansson 提交于
      Merge tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes
      
      Amlogic 64-bit DT updates for v4.14 (round 3)
      - updates for new MMC driver features/fixes
      - support high-speed modes
      
      * tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
        ARM64: dts: meson-gxbb: nanopi-k2: enable sdr104 mode
        ARM64: dts: meson-gxbb: nanopi-k2: enable sdcard UHS modes
        ARM64: dts: meson-gxbb: p20x: enable sdcard UHS modes
        ARM64: dts: meson-gxl: libretech-cc: enable high speed modes
        ARM64: dts: meson-gxl: libretech-cc: add card regulator settle times
        ARM64: dts: meson-gxbb: nanopi-k2: add card regulator settle times
        ARM64: dts: meson: add mmc clk gate pins
        ARM64: dts: meson: remove cap-sd-highspeed from emmc nodes
        ARM64: dts: meson-gx: Use correct mmc clock source 0
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      eab5c002
    • L
      Merge branch 'akpm' (patches from Andrew) · b7e14164
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "A lot of stuff, sorry about that. A week on a beach, then a bunch of
        time catching up then more time letting it bake in -next. Shan't do
        that again!"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (51 commits)
        include/linux/fs.h: fix comment about struct address_space
        checkpatch: fix ignoring cover-letter logic
        m32r: fix build failure
        lib/ratelimit.c: use deferred printk() version
        kernel/params.c: improve STANDARD_PARAM_DEF readability
        kernel/params.c: fix an overflow in param_attr_show
        kernel/params.c: fix the maximum length in param_get_string
        mm/memory_hotplug: define find_{smallest|biggest}_section_pfn as unsigned long
        mm/memory_hotplug: change pfn_to_section_nr/section_nr_to_pfn macro to inline function
        kernel/kcmp.c: drop branch leftover typo
        memremap: add scheduling point to devm_memremap_pages
        mm, page_alloc: add scheduling point to memmap_init_zone
        mm, memory_hotplug: add scheduling point to __add_pages
        lib/idr.c: fix comment for idr_replace()
        mm: memcontrol: use vmalloc fallback for large kmem memcg arrays
        kernel/sysctl.c: remove duplicate UINT_MAX check on do_proc_douintvec_conv()
        include/linux/bitfield.h: remove 32bit from FIELD_GET comment block
        lib/lz4: make arrays static const, reduces object code size
        exec: binfmt_misc: kill the onstack iname[BINPRM_BUF_SIZE] array
        exec: binfmt_misc: fix race between load_misc_binary() and kill_node()
        ...
      b7e14164
    • L
      Merge branch 'fixes-v4.14-rc4' of... · 6c795b30
      Linus Torvalds 提交于
      Merge branch 'fixes-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
      
      Pull smack fix from James Morris:
       "It fixes a bug in xattr_getsecurity() where security_release_secctx()
        was being called instead of kfree(), which leads to a memory leak in
        the capabilities code. smack_inode_getsecurity is also fixed to behave
        correctly when called from there"
      
      * 'fixes-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        lsm: fix smack_inode_removexattr and xattr_getsecurity memleak
      6c795b30
  3. 04 10月, 2017 25 次提交