From: Linus Torvalds Date: Wed, 20 Oct 2021 15:56:51 +0000 (-1000) Subject: Merge tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.15-rc7~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e59977463e9894e3d579d4e1e2a1dc81f456633;p=thirdparty%2Flinux.git 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 --- 1e59977463e9894e3d579d4e1e2a1dc81f456633