From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Jun 2020 17:54:45 +0000 (-0700)
Subject: Merge tag 'tag-chrome-platform-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.10.7~2458
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9875b201e05a8dfd107530853a0d021c8eea95d1;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'tag-chrome-platform-for-v5.8' of git://git./linux/kernel/git/chrome-platform/linux

Pull chrome platform updates from Benson Leung:
 "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"

* tag 'tag-chrome-platform-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: cros_usbpd_logger: Add __printf annotation to append_str()
  platform/chrome: cros_ec_i2c: Appease the kernel-doc deity
  platform/chrome: typec: Fix ret value check error
  platform/chrome: cros_ec_typec: Register port partner
  platform/chrome: cros_ec_typec: Add struct for port data
  platform/chrome: cros_ec_typec: Use notifier for updates
  platform/chrome: cros_ec_ishtp: free ishtp buffer before sending event
  platform/chrome: cros_ec_ishtp: skip old cros_ec responses
  platform/chrome: wilco_ec: Provide correct output format to 'h1_gpio' file
  platform/chrome: chromeos_pstore: set user space log size
---

9875b201e05a8dfd107530853a0d021c8eea95d1
diff --cc drivers/platform/chrome/chromeos_pstore.c
index fa51153,82dea8c..f37c0ef
--- a/drivers/platform/chrome/chromeos_pstore.c
+++ b/drivers/platform/chrome/chromeos_pstore.c
@@@ -57,7 -57,8 +57,8 @@@ static struct ramoops_platform_data chr
  	.record_size	= 0x40000,
  	.console_size	= 0x20000,
  	.ftrace_size	= 0x20000,
+ 	.pmsg_size	= 0x20000,
 -	.dump_oops	= 1,
 +	.max_reason	= KMSG_DUMP_OOPS,
  };
  
  static struct platform_device chromeos_ramoops = {