From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Jan 2022 07:37:31 +0000 (+0200)
Subject: Merge tag 'for-5.17/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v6.1-rc5~2152
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc5341f41dc81bd497828e562da135bcff9c876c;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-5.17/parisc-2' of git://git./linux/kernel/git/deller/parisc-linux

Pull more parisc architecture updates from Helge Deller:
 "Fixes and enhancements:

   - a memory leak fix in an error path in pdc_stable (Miaoqian Lin)

   - two compiler warning fixes in the TOC code

   - added autodetection for currently used console type (serial or
     graphics) which inserts console=<type> if it's missing"

* tag 'for-5.17/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: pdc_stable: Fix memory leak in pdcs_register_pathentries
  parisc: Fix missing prototype for 'toc_intr' warning in toc.c
  parisc: Autodetect default output device and set console= kernel parameter
  parisc: Use safer strscpy() in setup_cmdline()
  parisc: Add visible flag to toc_stack variable
---

dc5341f41dc81bd497828e562da135bcff9c876c