]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2021 15:56:51 +0000 (05:56 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2021 15:56:51 +0000 (05:56 -1000)
commitc37aee162784646b97b4672a8508adc3c3e1fb75
tree1c525ed663ff80bb8ddc3653274ff28b7ef475ac
parentb5077f1c8ce67a05269c9c15dfb06bdf86b8c0dc
parent16a520e3c6bd7a4590ea4af72b0c1e819e891aef
Merge tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

Pull nios2 fix from Dinh Nguyen:

 - Renamed CTL_STATUS to CTL_FSTATUS to fix a redefined warning

* tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  NIOS2: irqflags: rename a redefined register name