From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Nov 2023 02:07:05 +0000 (-1000)
Subject: Merge tag 'bootconfig-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1b10d2c8c6219bfc86d8c7d53a4f97a0a706d1ba;p=linux.git

Merge tag 'bootconfig-v6.7' of git://git./linux/kernel/git/trace/linux-trace

Pull bootconfig updates from Masami Hiramatsu:

 - Documentation update for /proc/cmdline, which includes both the
   parameters from bootloader and the embedded parameters in the kernel

 - fs/proc: Add bootloader argument as a comment line to
   /proc/bootconfig so that the user can distinguish what parameters
   were passed from bootloader even if bootconfig modified that

 - Documentation fix to add /proc/bootconfig to proc.rst

* tag 'bootconfig-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  doc: Add /proc/bootconfig to proc.rst
  fs/proc: Add boot loader arguments as comment to /proc/bootconfig
  doc: Update /proc/cmdline documentation to include boot config
---

1b10d2c8c6219bfc86d8c7d53a4f97a0a706d1ba