1. 23 Dec, 2020 2 commits
    • Linus Torvalds's avatar
      Merge tag 'tag-chrome-platform-for-v5.11' of... · a0881596
      Linus Torvalds authored
      Merge tag 'tag-chrome-platform-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux
      
      Pull chrome platform updates from Benson Leung:
       "cros_ec_typec:
      
         - A series from Prashant for Type-C to implement TYPEC_STATUS,
           parsing USB PD Partner ID VDOs, and registering partner altmodes.
      
        cros_ec misc:
      
         - Don't treat RTC events as wakeup sources in cros_ec_proto"
      
      * tag 'tag-chrome-platform-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
        platform/chrome: cros_ec_typec: Tolerate unrecognized mux flags
        platform/chrome: cros_ec_typec: Register partner altmodes
        platform/chrome: cros_ec_typec: Parse partner PD ID VDOs
        platform/chrome: cros_ec_typec: Introduce TYPEC_STATUS
        platform/chrome: cros_ec: Import Type C host commands
        platform/chrome: cros_ec_typec: Clear partner identity on device removal
        platform/chrome: cros_ec_typec: Fix remove partner logic
        platform/chrome: cros_ec_typec: Relocate set_port_params_v*() functions
        platform/chrome: Don't treat RTC events as wakeup sources
      a0881596
    • Linus Torvalds's avatar
      Merge tag 'linux-watchdog-5.11-rc1' of git://www.linux-watchdog.org/linux-watchdog · 6755f456
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
      
       - Removal of the pnx83xx driver
      
       - Add a binding for A100's watchdog controller
      
       - Add Rockchip compatibles to snps,dw-wdt.yaml
      
       - hpwdt: Disable NMI in Crash Kernel
      
       - Fix potential dereferencing of null pointer in watchdog_core
      
       - Several other small fixes and improvements
      
      * tag 'linux-watchdog-5.11-rc1' of git://www.linux-watchdog.org/linux-watchdog: (23 commits)
        watchdog: convert comma to semicolon
        watchdog: iTCO_wdt: use dev_*() instead of pr_*() for logging
        dt-binding: watchdog: add Rockchip compatibles to snps,dw-wdt.yaml
        watchdog: coh901327: add COMMON_CLK dependency
        dt-bindings: watchdog: sun4i: Add A100 compatible
        watchdog: qcom: Avoid context switch in restart handler
        watchdog: iTCO_wdt: use module_platform_device() macro
        watchdog: Fix potential dereferencing of null pointer
        watchdog: wdat_wdt: Fix missing kerneldoc reported by W=1
        watchdog/hpwdt: Reflect changes
        watchdog/hpwdt: Disable NMI in Crash Kernel
        wdt: sp805: add watchdog_stop on reboot
        watchdog: sbc_fitpc2_wdt: add __user annotations
        watchdog: geodewdt: remove unneeded break
        watchdog: rti-wdt: fix reference leak in rti_wdt_probe
        watchdog: qcom_wdt: set WDOG_HW_RUNNING bit when appropriate
        watchdog: remove pnx83xx driver
        watchdog: stm32_iwdg: don't print an error on probe deferral
        watchdog: sprd: change to use usleep_range() instead of busy loop
        watchdog: sprd: check busy bit before new loading rather than after that
        ...
      6755f456
  2. 22 Dec, 2020 38 commits