Merge tag 'bootconfig-fixes-v7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull bootconfig fix from Masami Hiramatsu:

 - init/bootconfig: Pass init arguments in documented order

   Parse extra_init_args before command-line init arguments in
   start_kernel(). This ensures command-line options take precedence
   over bootconfig, matching the documented order and saved command
   line.

* tag 'bootconfig-fixes-v7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  init/bootconfig: pass init arguments in documented order