WireGuard for the Linux kernel https://git.zx2c4.com/wireguard-linux/atom/include/asm-frv?h=stable 2009-04-10T00:48:06Z 2009-04-10T00:48:06Z David Howells dhowells@redhat.com 2009-04-10T00:48:06Z urn:sha1:e69cc9278831139660cb99bde52908f145338d77 Move arch headers from include/asm-frv/ to arch/frv/include/asm/. Signed-off-by: David Howells <dhowells@redhat.com> 2009-04-10T00:48:01Z David Howells dhowells@redhat.com 2009-04-10T00:48:01Z urn:sha1:187934655fa0637d4ef3967d4543c6dcccf33058 Fix indentation errors to keep git-am happy when moving arch header files. Signed-off-by: David Howells <dhowells@redhat.com> 2009-04-09T17:46:05Z David Howells dhowells@redhat.com 2009-04-09T16:32:55Z urn:sha1:6fde836b54f1f0ca3d3c8b7aaf44165a08fe0f9f asm-frv/pgtable.h could just #include <asm-generic/pgtable.h> in NOMMU mode rather than #defining macros for lazy MMU and CPU stuff. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2009-04-01T22:49:02Z Ingo Molnar mingo@elte.hu 2009-04-01T19:54:19Z urn:sha1:8302294f43250dc337108c51882a6007f2b1e2e0 Conflicts: include/linux/slub_def.h lib/Kconfig.debug mm/slob.c mm/slub.c 2009-04-01T15:59:14Z Akinobu Mita akinobu.mita@gmail.com 2009-03-31T22:23:25Z urn:sha1:7ca43e7564679604d86e9ed834e7bbcffd8a4a3f Use debug_kmap_atomic in kmap_atomic, kmap_atomic_pfn, and iomap_atomic_prot_pfn. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2009-03-26T23:11:41Z Linus Torvalds torvalds@linux-foundation.org 2009-03-26T23:11:41Z urn:sha1:ba1eb95cf3cc666769afe42eaa15a3a34ae82f94 * 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits) x86: headers cleanup - setup.h emu101k1.h: fix duplicate include of <linux/types.h> compiler-gcc4: conditionalize #error on __KERNEL__ remove __KERNEL_STRICT_NAMES make netfilter use strict integer types make drm headers use strict integer types make MTD headers use strict integer types make most exported headers use strict integer types make exported headers use strict posix types unconditionally include asm/types.h from linux/types.h make linux/types.h as assembly safe Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h headers_check fix cleanup: linux/reiserfs_fs.h headers_check fix cleanup: linux/nubus.h headers_check fix cleanup: linux/coda_psdev.h headers_check fix: x86, setup.h headers_check fix: x86, prctl.h headers_check fix: linux/reinserfs_fs.h headers_check fix: linux/socket.h headers_check fix: linux/nubus.h ... Manually fix trivial conflicts in: include/linux/netfilter/xt_limit.h include/linux/netfilter/xt_statistic.h 2009-03-26T22:23:24Z David S. Miller davem@davemloft.net 2009-03-26T22:23:24Z urn:sha1:08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 Conflicts: drivers/net/wimax/i2400m/usb-notif.c 2009-03-26T17:29:40Z Ingo Molnar mingo@elte.hu 2009-03-26T17:29:40Z urn:sha1:5a54bd1307471c1cd0521402fe65e2057edcab2f 2009-03-24T22:22:54Z Bartlomiej Zolnierkiewicz bzolnier@gmail.com 2009-03-24T22:22:54Z urn:sha1:662641d98b4396b48f513726d141c5f646c08259 * Remove superfluous <asm/{setup,io,irq}.h> includes. * Remove <asm/ide.h>. Cc: David Howells <dhowells@redhat.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 2009-03-06T15:45:01Z Ingo Molnar mingo@elte.hu 2009-03-06T15:44:14Z urn:sha1:f0ef03985130287c6c84ebe69416cf790e6cc00e Conflicts: arch/x86/Kconfig block/blktrace.c kernel/irq/handle.c Semantic conflict: kernel/trace/blktrace.c Signed-off-by: Ingo Molnar <mingo@elte.hu>