diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-28 10:00:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-28 10:00:26 -0800 |
| commit | 228345bf98cd78f91d007478a51f9a471489e44a (patch) | |
| tree | 52b442ad7fb4f187b1e453c6ade536da6dc3361e /MAINTAINERS | |
| parent | Merge tag 'arm-soc-fixes-v5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc (diff) | |
| parent | ia64: Mark architecture as orphaned (diff) | |
| download | wireguard-linux-228345bf98cd78f91d007478a51f9a471489e44a.tar.xz wireguard-linux-228345bf98cd78f91d007478a51f9a471489e44a.zip | |
Merge tag 'asm-generic-fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull ia64 fixes from Arnd Bergmann:
"asm-generic/ia64 fixes, and mark as orphaned
Commit 2b49ddcef297 ("ia64: convert to legacy_timer_tick") from my
timer series I merged through the asm-generic tree caused a regression
on all ia64 machines, as bisected by Adrian Glaubitz.
Tony Luck is no longer really working on ia64, so instead of merging
the fix through his tree, we ended up deciding that I'd merge the fix
myself along a patch to mark the architecture as Orphaned and a
compile time warning fix I made while working on the regression"
[ HPE no longer accepts orders for new Itanium hardware, and Intel
stopped accepting orders a year ago. While intel is still officially
shipping chips until July 29, 2021, it's unlikely that any such orders
actually exist.
It's dead, Jim.
- Linus ]
* tag 'asm-generic-fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
ia64: Mark architecture as orphaned
ia64: fix xchg() warning
ia64: fix timer cleanup regression
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2b70b8d5ba45..110715230700 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8433,11 +8433,8 @@ F: drivers/i3c/ F: include/linux/i3c/ IA64 (Itanium) PLATFORM -M: Tony Luck <tony.luck@intel.com> -M: Fenghua Yu <fenghua.yu@intel.com> L: linux-ia64@vger.kernel.org -S: Odd Fixes -T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git +S: Orphan F: Documentation/ia64/ F: arch/ia64/ |