Re: linux-next: manual merge of the chrome-platform tree with the pstore tree

[Kees Cook <keescook@chromium.org>]

On Thu, May 07, 2020 at 02:55:47PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the chrome-platform tree got a conflict in:
> 
>   drivers/platform/chrome/chromeos_pstore.c
> 
> between commit:
> 
>   7bddec15c574 ("pstore/ram: Introduce max_reason and convert dump_oops")
> 
> from the pstore tree and commit:
> 
>   1c7c51347f2e ("platform/chrome: chromeos_pstore: set user space log size")
> 
> from the chrome-platform tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/platform/chrome/chromeos_pstore.c
> index fa51153688b4,82dea8cb5da1..000000000000
> --- 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 = {

Thanks! Yes, that looks correct.

-- 
Kees Cook