From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Apr 2024 02:42:45 +0000 (-0700)
Subject: Merge tag 'bootconfig-fixes-v6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.9-rc4-pxa1908~60
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=03a55b63919f4b52b9c323d9a43ccccdc1cdb33b;p=linux.git

Merge tag 'bootconfig-fixes-v6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull bootconfig fixes from Masami Hiramatsu:

 - show the original cmdline only once, and only if it was modeified by
   bootconfig

* tag 'bootconfig-fixes-v6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  fs/proc: Skip bootloader comment if no embedded kernel parameters
  fs/proc: remove redundant comments from /proc/bootconfig
---

03a55b63919f4b52b9c323d9a43ccccdc1cdb33b