]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge tag 'bootconfig-fixes-v6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Apr 2024 02:42:45 +0000 (19:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Apr 2024 02:42:45 +0000 (19:42 -0700)
commit03a55b63919f4b52b9c323d9a43ccccdc1cdb33b
tree706e446ce39c2db9d7b88eaf09938fb222b67791
parent9875c0beb8adaab602572b983fb59dbd761d5882
parentc722cea208789d9e2660992bcd05fb9fac3adb56
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