2021-11-16 18:16:11

by Kees Cook

Subject: [PATCH] Revert "mark pstore-blk as broken"

This reverts commit d07f3b081ee632268786601f55e1334d1f68b997.

pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc
("pstore/blk: Use the normal block device I/O path"), which landed in
the same release as the commit adding BROKEN.

Cc: Jens Axboe <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: [email protected]
Signed-off-by: Kees Cook <[email protected]>
---
fs/pstore/Kconfig | 1 -
1 file changed, 1 deletion(-)

diff --git a/fs/pstore/Kconfig b/fs/pstore/Kconfig
index 328da35da390..8adabde685f1 100644
--- a/fs/pstore/Kconfig
+++ b/fs/pstore/Kconfig
@@ -173,7 +173,6 @@ config PSTORE_BLK
tristate "Log panic/oops to a block device"
depends on PSTORE
depends on BLOCK
- depends on BROKEN
select PSTORE_ZONE
default n
help
--
2.30.2

2021-11-17 00:23:48

by Jens Axboe

Subject: Re: [PATCH] Revert "mark pstore-blk as broken"

On Tue, 16 Nov 2021 10:15:59 -0800, Kees Cook wrote:
> This reverts commit d07f3b081ee632268786601f55e1334d1f68b997.
>
> pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc
> ("pstore/blk: Use the normal block device I/O path"), which landed in
> the same release as the commit adding BROKEN.
>
>
> [...]

Applied, thanks!

[1/1] Revert "mark pstore-blk as broken"
commit: d1faacbf67b1944f0e0c618dc581d929263f6fe9

Best regards,
--
Jens Axboe

2021-11-18 18:29:27

by Kees Cook

Subject: Re: [PATCH] Revert "mark pstore-blk as broken"

On Tue, Nov 16, 2021 at 05:23:44PM -0700, Jens Axboe wrote:
> On Tue, 16 Nov 2021 10:15:59 -0800, Kees Cook wrote:
> > This reverts commit d07f3b081ee632268786601f55e1334d1f68b997.
> >
> > pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc
> > ("pstore/blk: Use the normal block device I/O path"), which landed in
> > the same release as the commit adding BROKEN.
> >
> >
> > [...]
>
> Applied, thanks!
>
> [1/1] Revert "mark pstore-blk as broken"
> commit: d1faacbf67b1944f0e0c618dc581d929263f6fe9

Thanks! I realize now what Geert meant in an earlier thread that I
actually can't split this change from a warning fix that was living in
the pstore tree (and was masked by the now removed BROKEN). Can you take
this patch as well? I've removed it from my tree now...

https://lore.kernel.org/lkml/[email protected]/

--
Kees Cook

2021-11-21 10:25:44

by Geert Uytterhoeven

Subject: Re: [PATCH] Revert "mark pstore-blk as broken"

On Thu, Nov 18, 2021 at 7:29 PM Kees Cook <[email protected]> wrote:
> On Tue, Nov 16, 2021 at 05:23:44PM -0700, Jens Axboe wrote:
> > On Tue, 16 Nov 2021 10:15:59 -0800, Kees Cook wrote:
> > > This reverts commit d07f3b081ee632268786601f55e1334d1f68b997.
> > >
> > > pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc
> > > ("pstore/blk: Use the normal block device I/O path"), which landed in
> > > the same release as the commit adding BROKEN.
> > >
> > >
> > > [...]
> >
> > Applied, thanks!
> >
> > [1/1] Revert "mark pstore-blk as broken"
> > commit: d1faacbf67b1944f0e0c618dc581d929263f6fe9
>
> Thanks! I realize now what Geert meant in an earlier thread that I
> actually can't split this change from a warning fix that was living in
> the pstore tree (and was masked by the now removed BROKEN). Can you take
> this patch as well? I've removed it from my tree now...
>
> https://lore.kernel.org/lkml/[email protected]/

Which is now a build error instead of a warning in Linus' tree.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2021-11-21 13:36:23

by Jens Axboe

Subject: Re: [PATCH] Revert "mark pstore-blk as broken"

On 11/21/21 3:25 AM, Geert Uytterhoeven wrote:
> On Thu, Nov 18, 2021 at 7:29 PM Kees Cook <[email protected]> wrote:
>> On Tue, Nov 16, 2021 at 05:23:44PM -0700, Jens Axboe wrote:
>>> On Tue, 16 Nov 2021 10:15:59 -0800, Kees Cook wrote:
>>>> This reverts commit d07f3b081ee632268786601f55e1334d1f68b997.
>>>>
>>>> pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc
>>>> ("pstore/blk: Use the normal block device I/O path"), which landed in
>>>> the same release as the commit adding BROKEN.
>>>>
>>>>
>>>> [...]
>>>
>>> Applied, thanks!
>>>
>>> [1/1] Revert "mark pstore-blk as broken"
>>> commit: d1faacbf67b1944f0e0c618dc581d929263f6fe9
>>
>> Thanks! I realize now what Geert meant in an earlier thread that I
>> actually can't split this change from a warning fix that was living in
>> the pstore tree (and was masked by the now removed BROKEN). Can you take
>> this patch as well? I've removed it from my tree now...
>>
>> https://lore.kernel.org/lkml/[email protected]/
>
> Which is now a build error instead of a warning in Linus' tree.

Sorry, missed this reply. Kees, can you just send this one to Linus
directly? I already flushed my block patches for this week. If there's
some reason you can't let me know, and I'll do another one...

--
Jens Axboe

2021-11-21 17:46:38

by Linus Torvalds

Subject: Re: [PATCH] Revert "mark pstore-blk as broken"

On Sun, Nov 21, 2021 at 5:36 AM Jens Axboe <[email protected]> wrote:
>
> Sorry, missed this reply. Kees, can you just send this one to Linus
> directly?

I took it from that thread.

Thanks,
Linus

2021-11-21 18:05:00

by Jens Axboe

Subject: Re: [PATCH] Revert "mark pstore-blk as broken"

On 11/21/21 10:46 AM, Linus Torvalds wrote:
> On Sun, Nov 21, 2021 at 5:36 AM Jens Axboe <[email protected]> wrote:
>>
>> Sorry, missed this reply. Kees, can you just send this one to Linus
>> directly?
>
> I took it from that thread.

Great, thank you!

--
Jens Axboe