]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4443d1 eec8768)
Merge tag 'ia64_for_5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Oct 2020 23:20:31 +0000 (16:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Oct 2020 23:20:31 +0000 (16:20 -0700)
Pull ia64 updates from Tony Luck:
 "Cleanups by Christoph:

   - Switch to libata instead of legacy ide driver

   - Drop ia64 perfmon (it's been broken for a while)"

* tag 'ia64_for_5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: Use libata instead of the legacy ide driver in defconfigs
  ia64: Remove perfmon

1  2 
arch/ia64/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/ia64/Kconfig
Simple merge
Linux Kernel Source Tree.