1. 05 12月, 2019 38 次提交
  2. 04 12月, 2019 2 次提交
    • L
      Merge tag 'tag-chrome-platform-for-v5.5' of... · 63de3747
      Linus Torvalds 提交于
      Merge tag 'tag-chrome-platform-for-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux
      
      Pull chrome platform changes from Benson Leung:
       "CrOS EC / MFD / IIO:
      
         - Contains tag-ib-chrome-mfd-iio-input-5.5, which is the first part
           of a series from Gwendal to refactor sensor code between MFD, CrOS
           EC, iio and input in order to add a new sensorhub driver and FIFO
           processing
      
        Wilco EC:
      
         - Add support for Dell's USB PowerShare policy control, keyboard
           backlight LED driver, and a new test_event file.
      
         - Fixes use after free in wilco_ec's telemetry driver.
      
        Misc:
      
         - bugfix in cros_usbpd_logger (missing destroy workqueue)"
      
      * tag 'tag-chrome-platform-for-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
        platform/chrome: wilco_ec: fix use after free issue
        platform/chrome: cros_ec: Add Kconfig default for cros-ec-sensorhub
        Revert "Input: cros_ec_keyb: mask out extra flags in event_type"
        Revert "Input: cros_ec_keyb - add back missing mask for event_type"
        platform/chrome: cros_ec: handle MKBP more events flag
        platform/chrome: cros_ec: Do not attempt to register a non-positive IRQ number
        platform/chrome: cros-ec: Record event timestamp in the hard irq
        mfd / platform / iio: cros_ec: Register sensor through sensorhub
        iio / platform: cros_ec: Add cros-ec-sensorhub driver
        mfd / platform: cros_ec: Add sensor_count and make check_features public
        platform/chrome: cros_ec: Put docs with the code
        platform/chrome: cros_usbpd_logger: add missed destroy_workqueue in remove
        platform/chrome: cros_ec: Fix Kconfig indentation
        platform/chrome: wilco_ec: Add keyboard backlight LED support
        platform/chrome: wilco_ec: Add charging config driver
        platform/chrome: wilco_ec: Add Dell's USB PowerShare Policy control
        platform/chrome: wilco_ec: Add debugfs test_event file
      63de3747
    • L
      Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx · 388c645a
      Linus Torvalds 提交于
      Pull SPDX fix from Greg KH:
       "Here is a single SPDX fixup for 5.5-rc1
      
        It resolves an issue where we had missed a few .h files with the
        auto-tagging scripts because they had "GPL" text in strings within the
        file themselves. This single patch fixes up the issue and provides the
        proper SPDX tags at the top of them as needed.
      
        This patch has been in linux-next for many many weeks now with no
        reported issues"
      
      * tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx:
        export,module: add SPDX GPL-2.0 license identifier to headers with no license
      388c645a