[GIT PULL] pstore updates for v6.11-rc1

[GIT PULL] pstore updates for v6.11-rc1

[Kees Cook]

Hi Linus,

Please pull these small pstore updates for v6.11-rc1. (Note that since there
were no pstore updates for v6.10, this is based on v6.9-rc2. I forgot
to do my traditional merge-on-rc2 for this tree when v6.10-rc2 happened.)

Thanks!

-Kees

The following changes since commit 39cd87c4eb2b893354f3b850f916353f2658ae6f:

  Linux 6.9-rc2 (2024-03-31 14:32:39 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git tags/pstore-v6.11-rc1

for you to fetch changes up to 9b3c13c9ea4ecb2b95948f666560b8df8f358b40:

  pstore: platform: add missing MODULE_DESCRIPTION() macro (2024-06-17 11:56:12 -0700)

----------------------------------------------------------------
pstore updates for v6.11-rc1

- Add missing MODULE_DESCRIPTION() macro (Jeff Johnson)

- Replace deprecated strncpy() with strscpy() (Justin Stitt)

----------------------------------------------------------------
Jeff Johnson (1):
      pstore: platform: add missing MODULE_DESCRIPTION() macro

Justin Stitt (1):
      pstore/blk: replace deprecated strncpy with strscpy

 fs/pstore/blk.c      | 2 +-
 fs/pstore/platform.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
Kees Cook

Re: [GIT PULL] pstore updates for v6.11-rc1

[Linus Torvalds]

On Mon, 15 Jul 2024 at 09:29, Kees Cook <kees@kernel.org> wrote:
>
> Please pull these small pstore updates for v6.11-rc1. (Note that since there
> were no pstore updates for v6.10, this is based on v6.9-rc2. I forgot
> to do my traditional merge-on-rc2 for this tree when v6.10-rc2 happened.)

Note that this is exactly what should happen. No need to do any
back-merges if some sub-area has been quiet.

Sure, if some branch is *really* old, you might want to do a
test-merge just to see if there are conflicts (either textual or just
due to infrastructure changes elsewhere that cause old changes to not
work in a modern context), but honestly, even that is just a "nice to
have".

But "missed one release" is not very old in the big picture. We do
releases relatively often, after all.

So then merge conflicts like that are on me as a top-level maintainer,
and if they end up being very complex I might come back to you and ask
for guidance. But honestly, that's quite rare.

IOW, I'd much rather developers concentrate on their own branch and on
making it very solid, rather than worry too much about what has
happened elsewhere meantime.

(Of course, that's all for the simple and good case where you have
clearly separate trees - which pstore largely is. Some other areas get
a lot more "this is affected by other changes and in turn affects
other areas", and then people there have to inevitably be more
involved with what has been going on).

                 Linus

Re: [GIT PULL] pstore updates for v6.11-rc1

[pr-tracker-bot]

The pull request you sent on Mon, 15 Jul 2024 09:29:29 -0700:

> https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git tags/pstore-v6.11-rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8050258bd1eed0f77dd7e3fa15feb23bbcc38e63

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html