From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Feb 2022 14:45:34 +0000 (-0800)
Subject: Merge tag 'mips-fixes-5.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips... 
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=d394bb77dd0bd20b125459da25fdac00a853be28;p=kernel.git

Merge tag 'mips-fixes-5.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fixes from Thomas Bogendoerfer:

 - fix missed change for PTR->PTR_WD conversion

 - kernel-doc fixes

* tag 'mips-fixes-5.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: KVM: fix vz.c kernel-doc notation
  MIPS: octeon: Fix missed PTR->PTR_WD conversion
---

d394bb77dd0bd20b125459da25fdac00a853be28