diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-07 14:49:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-07 14:49:18 -0700 |
| commit | dd860052c99b1e088352bdd4fb7aef46f8d2ef47 (patch) | |
| tree | 0f5e175be825c635067b33f9d1a143a5e84acbd0 /net/netfilter/nfnetlink_osf.c | |
| parent | Merge tag 'i3c/for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux (diff) | |
| parent | platform/chrome: cros_ec_lpc: Use DEFINE_MUTEX() for mutex lock (diff) | |
| download | linux-dev-dd860052c99b1e088352bdd4fb7aef46f8d2ef47.tar.xz linux-dev-dd860052c99b1e088352bdd4fb7aef46f8d2ef47.zip | |
Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux
Pull chrome platform updates from Benson Leung:
"cros_ec_typec:
- Changes around DP mode check, hard reset, tracking port change.
cros_ec misc:
- wilco_ec: Convert stream-like files from nonseekable to stream open
- cros_usbpd_notify: Listen to EC_HSOT_EVENT_USB_MUX host event
- fix format warning in cros_ec_typec"
* tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
platform/chrome: cros_ec_lpc: Use DEFINE_MUTEX() for mutex lock
platform/chrome: cros_usbpd_notify: Listen to EC_HOST_EVENT_USB_MUX host event
platform/chrome: cros_ec_typec: Add DP mode check
platform/chrome: cros_ec_typec: Handle hard reset
platform/chrome: cros_ec: Add Type C hard reset
platform/chrome: cros_ec_typec: Track port role
platform/chrome: cros_ec_typec: fix clang -Wformat warning
platform/chrome: cros_ec_typec: Check for device within remove function
platform/chrome: wilco_ec: convert stream-like files from nonseekable_open -> stream_open
Diffstat (limited to 'net/netfilter/nfnetlink_osf.c')
0 files changed, 0 insertions, 0 deletions