Skip to contentSkip to conversation

chrome-platform changes for v5.8

GIT PULL Merged Benson Leung 3 participants 3 messages Jun 4, 2020

lore
Share & tools
lore
#0 lore raw

Hi Linus,

The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:

Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git tags/tag-chrome-platform-for-v5.8

for you to fetch changes up to bbb7ad49b8350b79261ce087c8e101d92f15533d:

platform/chrome: cros_usbpd_logger: Add __printf annotation to append_str() (2020-05-04 14:02:01 -0700)

----------------------------------------------------------------
chrome platform changes for 5.8

* cros_ec_typec
- Add notifier for update, and register port partner

* Sensors/iio:
- Fixes to cros_ec_sensorhub around allocation of resources, and send_sample.

* Wilco EC
- Fix to output format of h1_gpio

* Misc
- Misc fixes to appease kernel-doc and other warnings.
- Set user space log size in chromeos_pstore

----------------------------------------------------------------
Benson Leung (1):
Merge remote-tracking branch 'origin/chrome-platform-5.7-fixes' into for-kernelci

Bernardo Perez Priego (1):
platform/chrome: wilco_ec: Provide correct output format to 'h1_gpio' file

Christophe JAILLET (1):
platform/chrome: cros_ec_sensorhub: Add missing '\n' in log messages

Dan Carpenter (1):
platform/chrome: cros_ec_sensorhub: Off by one in cros_sensorhub_send_sample()

Enric Balletbo i Serra (3):
Merge remote-tracking branch 'origin/chrome-platform-5.7-fixes' into for-kernelci platform/chrome: cros_ec_i2c: Appease the kernel-doc deity platform/chrome: cros_usbpd_logger: Add __printf annotation to append_str()

Gwendal Grignou (1):
platform/chrome: cros_ec_sensorhub: Allocate sensorhub resource before claiming sensors

Jett Rink (2):
platform/chrome: cros_ec_ishtp: skip old cros_ec responses platform/chrome: cros_ec_ishtp: free ishtp buffer before sending event

Prashant Malani (4):
platform/chrome: cros_ec_typec: Use notifier for updates platform/chrome: cros_ec_typec: Add struct for port data platform/chrome: cros_ec_typec: Register port partner platform/chrome: typec: Fix ret value check error

Sarthak Kukreti (1):
platform/chrome: chromeos_pstore: set user space log size

 drivers/platform/chrome/Kconfig                  |   1 +
 drivers/platform/chrome/chromeos_pstore.c        |   1 +
 drivers/platform/chrome/cros_ec_i2c.c            |   2 +-
 drivers/platform/chrome/cros_ec_ishtp.c          |  45 ++++++---
 drivers/platform/chrome/cros_ec_sensorhub.c      |  80 ++++++++-------
 drivers/platform/chrome/cros_ec_sensorhub_ring.c |  81 +++++++++------
 drivers/platform/chrome/cros_ec_typec.c          | 119 +++++++++++++++++++----
 drivers/platform/chrome/cros_usbpd_logger.c      |   1 +
 drivers/platform/chrome/wilco_ec/debugfs.c       |   7 +-
 include/linux/platform_data/cros_ec_sensorhub.h  |   1 +
 10 files changed, 242 insertions(+), 96 deletions(-)
Signature · 7 lines
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]
#1 lore raw

Hmm. Your pull requests are confused.

Several of these commits were already merged long before 5.7.

For example:

Quoted 3 lines · Benson Leung

Gwendal Grignou (1):
platform/chrome: cros_ec_sensorhub: Allocate sensorhub resource before claiming sensors

was merged back in early May because you sent me a pull request for "tag-chrome-platform-fixes-for-v5.7-rc5"

Now you're not supposed to pull in my tree into your development tree, but you can certainly do a "git fetch origin" or similar to _see_ what I have merged previously and not report stuff that has already been merged long ago as new..

Linus

merge bot Merged
#2 lore raw
In reply to Benson Leung
The pull request you sent on Wed, 3 Jun 2020 17:14:41 -0700:

The pull request you sent on Wed, 3 Jun 2020 17:14:41 -0700:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git tags/tag-chrome-platform-for-v5.8

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9875b201e05a8dfd107530853a0d021c8eea95d1

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker