Hi Linus, please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git release This will update the files shown below. The big change to swiotlb.c is backing out a change from Jan to make his life easier with Xen, but is "more than ugly" according to Christoph (and having re-read it, I have to agree with him). Thanks! -Tony include/asm-ia64/swiotlb.h | 9 -- arch/ia64/ia32/sys_ia32.c | 10 +- arch/ia64/kernel/efi.c | 36 ++++++++ arch/ia64/kernel/perfmon.c | 11 +- arch/ia64/kernel/setup.c | 30 +++++++ arch/ia64/lib/Makefile | 3 arch/ia64/mm/contig.c | 5 - arch/ia64/mm/discontig.c | 6 - include/asm-ia64/meminit.h | 6 + include/asm-ia64/resource.h | 1 include/asm-x86_64/swiotlb.h | 1 lib/swiotlb.c | 184 ++++++++----------------------------------- 12 files changed, 121 insertions(+), 181 deletions(-) Alexandr Andreev: [IA64] sync compat getdents Horms: [IA64] point saved_max_pfn to the max_pfn of the entire system Lee Schermerhorn: [IA64] always build arch/ia64/lib/xor.o Magnus Damm: [IA64] kexec: Use EFI_LOADER_DATA for ELF core header Nick Piggin: [IA64] permon use-after-free fix schwab@xxxxxxx: [IA64] Remove stack hard limit on ia64 Tony Luck: Revert "[IA64] swiotlb abstraction (e.g. for Xen)" - To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |