Re: [PATCH 1/2] pstore: fix build by re-resolving botched merge conflict

2019-11-27 Thread Sascha Hauer
On Tue, Nov 26, 2019 at 11:56:59AM +0100, Ahmad Fatoum wrote: > 297ac7288 ("pstore: Only capture log messages") removed the pstore console. > v3 of the eventually merged 75a74b5c ("console: fix out-of-bounds read > in dputc(/dev/*, ...)") reinstated part of this code, which broke the > pstore build

[PATCH 1/2] pstore: fix build by re-resolving botched merge conflict

2019-11-26 Thread Ahmad Fatoum
297ac7288 ("pstore: Only capture log messages") removed the pstore console. v3 of the eventually merged 75a74b5c ("console: fix out-of-bounds read in dputc(/dev/*, ...)") reinstated part of this code, which broke the pstore build because the now removed bufsize member had a user reintroduced in the