]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'mips-fixes-5.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Feb 2022 14:45:34 +0000 (06:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Feb 2022 14:45:34 +0000 (06:45 -0800)
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


Trivial merge