diff for duplicates of <20150328010532.GA15897@ravnborg.org> diff --git a/a/1.txt b/N1/1.txt index d2a0891..14b6e6f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,6 @@ > > Index: linux-2.6/arch/alpha/Kconfig -> =================================================================== -> --- linux-2.6.orig/arch/alpha/Kconfig +> =================================> --- linux-2.6.orig/arch/alpha/Kconfig > +++ linux-2.6/arch/alpha/Kconfig > @@ -66,6 +66,9 @@ config ZONE_DMA > config ARCH_DMA_ADDR_T_64BIT @@ -16,8 +15,7 @@ For alpha you define a new symbol with a default value. > def_bool y > > Index: linux-2.6/arch/arm/Kconfig -> =================================================================== -> --- linux-2.6.orig/arch/arm/Kconfig +> =================================> --- linux-2.6.orig/arch/arm/Kconfig > +++ linux-2.6/arch/arm/Kconfig > @@ -1779,6 +1779,7 @@ config XEN > depends on !GENERIC_ATOMIC64 @@ -33,8 +31,7 @@ As the actual definition of the Kconfig symbol is already present in mm/Kconfig please use select in all cases. > Index: linux-2.6/arch/arm/mm/Kconfig -> =================================================================== -> --- linux-2.6.orig/arch/arm/mm/Kconfig +> =================================> --- linux-2.6.orig/arch/arm/mm/Kconfig > +++ linux-2.6/arch/arm/mm/Kconfig > @@ -630,6 +630,9 @@ config ARCH_PHYS_ADDR_T_64BIT > config ARCH_DMA_ADDR_T_64BIT @@ -49,8 +46,7 @@ Here it would have been nice with a comment that explains the use of ths symbol. > bool "Support Thumb user binaries" if !CPU_THUMBONLY > depends on CPU_ARM720T || CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || \ > Index: linux-2.6/arch/arm64/Kconfig -> =================================================================== -> --- linux-2.6.orig/arch/arm64/Kconfig +> =================================> --- linux-2.6.orig/arch/arm64/Kconfig > +++ linux-2.6/arch/arm64/Kconfig > @@ -125,6 +125,9 @@ config HAVE_GENERIC_RCU_GUP > config ARCH_DMA_ADDR_T_64BIT @@ -65,8 +61,7 @@ Use select > def_bool y > > Index: linux-2.6/arch/ia64/Kconfig -> =================================================================== -> --- linux-2.6.orig/arch/ia64/Kconfig +> =================================> --- linux-2.6.orig/arch/ia64/Kconfig > +++ linux-2.6/arch/ia64/Kconfig > @@ -74,6 +74,9 @@ config MMU > config ARCH_DMA_ADDR_T_64BIT @@ -81,8 +76,7 @@ Use select > def_bool y > > Index: linux-2.6/arch/mips/Kconfig -> =================================================================== -> --- linux-2.6.orig/arch/mips/Kconfig +> =================================> --- linux-2.6.orig/arch/mips/Kconfig > +++ linux-2.6/arch/mips/Kconfig > @@ -984,6 +984,9 @@ config FW_CFE > config ARCH_DMA_ADDR_T_64BIT @@ -93,8 +87,7 @@ Use select Use select ... if -> =================================================================== -> --- linux-2.6.orig/arch/powerpc/Kconfig +> =================================> --- linux-2.6.orig/arch/powerpc/Kconfig > +++ linux-2.6/arch/powerpc/Kconfig > @@ -23,6 +23,9 @@ config ARCH_PHYS_ADDR_T_64BIT > config ARCH_DMA_ADDR_T_64BIT @@ -106,8 +99,7 @@ Use select ... if Use select > Index: linux-2.6/arch/sparc/Kconfig -> =================================================================== -> --- linux-2.6.orig/arch/sparc/Kconfig +> =================================> --- linux-2.6.orig/arch/sparc/Kconfig > +++ linux-2.6/arch/sparc/Kconfig > @@ -143,6 +143,9 @@ config GENERIC_ISA_DMA > bool @@ -122,8 +114,7 @@ Use select ... > def_bool y if SPARC64 > > Index: linux-2.6/arch/tile/Kconfig -> =================================================================== -> --- linux-2.6.orig/arch/tile/Kconfig +> =================================> --- linux-2.6.orig/arch/tile/Kconfig > +++ linux-2.6/arch/tile/Kconfig > @@ -86,6 +86,9 @@ config ARCH_PHYS_ADDR_T_64BIT > config ARCH_DMA_ADDR_T_64BIT @@ -135,8 +126,7 @@ Use select ... Use select ... > Index: linux-2.6/arch/x86/Kconfig -> =================================================================== -> --- linux-2.6.orig/arch/x86/Kconfig +> =================================> --- linux-2.6.orig/arch/x86/Kconfig > +++ linux-2.6/arch/x86/Kconfig > @@ -1295,6 +1295,10 @@ config ARCH_DMA_ADDR_T_64BIT > def_bool y @@ -153,8 +143,7 @@ Use select ... > depends on X86_64 && !DEBUG_PAGEALLOC && !KMEMCHECK > Index: linux-2.6/include/linux/types.h -> =================================================================== -> --- linux-2.6.orig/include/linux/types.h +> =================================> --- linux-2.6.orig/include/linux/types.h > +++ linux-2.6/include/linux/types.h > @@ -146,6 +146,13 @@ typedef u64 dma_addr_t; > typedef u32 dma_addr_t; diff --git a/a/content_digest b/N1/content_digest index eec84c9..1b6a5c2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,7 @@ "ref\0CAE9FiQWwU4gsq4y0+BTMtisBGQDxF1m_pxAT62PmP-Ct+O1c5A@mail.gmail.com\0" "From\0Sam Ravnborg <sam@ravnborg.org>\0" "Subject\0Re: d63e2e1f3df breaks sparc/T5-8\0" - "Date\0Sat, 28 Mar 2015 02:05:32 +0100\0" + "Date\0Sat, 28 Mar 2015 01:05:32 +0000\0" "To\0Yinghai Lu <yinghai@kernel.org>\0" "Cc\0David Ahern <david.ahern@oracle.com>" Bjorn Helgaas <bhelgaas@google.com> @@ -16,8 +16,7 @@ "b\0" "> \n" "> Index: linux-2.6/arch/alpha/Kconfig\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/arch/alpha/Kconfig\n" + "> =================================> --- linux-2.6.orig/arch/alpha/Kconfig\n" "> +++ linux-2.6/arch/alpha/Kconfig\n" "> @@ -66,6 +66,9 @@ config ZONE_DMA\n" "> config ARCH_DMA_ADDR_T_64BIT\n" @@ -32,8 +31,7 @@ "> def_bool y\n" "> \n" "> Index: linux-2.6/arch/arm/Kconfig\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/arch/arm/Kconfig\n" + "> =================================> --- linux-2.6.orig/arch/arm/Kconfig\n" "> +++ linux-2.6/arch/arm/Kconfig\n" "> @@ -1779,6 +1779,7 @@ config XEN\n" "> \tdepends on !GENERIC_ATOMIC64\n" @@ -49,8 +47,7 @@ "present in mm/Kconfig please use select in all cases.\n" "\n" "> Index: linux-2.6/arch/arm/mm/Kconfig\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/arch/arm/mm/Kconfig\n" + "> =================================> --- linux-2.6.orig/arch/arm/mm/Kconfig\n" "> +++ linux-2.6/arch/arm/mm/Kconfig\n" "> @@ -630,6 +630,9 @@ config ARCH_PHYS_ADDR_T_64BIT\n" "> config ARCH_DMA_ADDR_T_64BIT\n" @@ -65,8 +62,7 @@ "> \tbool \"Support Thumb user binaries\" if !CPU_THUMBONLY\n" "> \tdepends on CPU_ARM720T || CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || \\\n" "> Index: linux-2.6/arch/arm64/Kconfig\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/arch/arm64/Kconfig\n" + "> =================================> --- linux-2.6.orig/arch/arm64/Kconfig\n" "> +++ linux-2.6/arch/arm64/Kconfig\n" "> @@ -125,6 +125,9 @@ config HAVE_GENERIC_RCU_GUP\n" "> config ARCH_DMA_ADDR_T_64BIT\n" @@ -81,8 +77,7 @@ "> \tdef_bool y\n" "> \n" "> Index: linux-2.6/arch/ia64/Kconfig\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/arch/ia64/Kconfig\n" + "> =================================> --- linux-2.6.orig/arch/ia64/Kconfig\n" "> +++ linux-2.6/arch/ia64/Kconfig\n" "> @@ -74,6 +74,9 @@ config MMU\n" "> config ARCH_DMA_ADDR_T_64BIT\n" @@ -97,8 +92,7 @@ "> \tdef_bool y\n" "> \n" "> Index: linux-2.6/arch/mips/Kconfig\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/arch/mips/Kconfig\n" + "> =================================> --- linux-2.6.orig/arch/mips/Kconfig\n" "> +++ linux-2.6/arch/mips/Kconfig\n" "> @@ -984,6 +984,9 @@ config FW_CFE\n" "> config ARCH_DMA_ADDR_T_64BIT\n" @@ -109,8 +103,7 @@ "\n" "Use select ... if\n" "\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/arch/powerpc/Kconfig\n" + "> =================================> --- linux-2.6.orig/arch/powerpc/Kconfig\n" "> +++ linux-2.6/arch/powerpc/Kconfig\n" "> @@ -23,6 +23,9 @@ config ARCH_PHYS_ADDR_T_64BIT\n" "> config ARCH_DMA_ADDR_T_64BIT\n" @@ -122,8 +115,7 @@ "Use select\n" "\n" "> Index: linux-2.6/arch/sparc/Kconfig\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/arch/sparc/Kconfig\n" + "> =================================> --- linux-2.6.orig/arch/sparc/Kconfig\n" "> +++ linux-2.6/arch/sparc/Kconfig\n" "> @@ -143,6 +143,9 @@ config GENERIC_ISA_DMA\n" "> \tbool\n" @@ -138,8 +130,7 @@ "> \tdef_bool y if SPARC64\n" "> \n" "> Index: linux-2.6/arch/tile/Kconfig\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/arch/tile/Kconfig\n" + "> =================================> --- linux-2.6.orig/arch/tile/Kconfig\n" "> +++ linux-2.6/arch/tile/Kconfig\n" "> @@ -86,6 +86,9 @@ config ARCH_PHYS_ADDR_T_64BIT\n" "> config ARCH_DMA_ADDR_T_64BIT\n" @@ -151,8 +142,7 @@ "Use select ...\n" "\n" "> Index: linux-2.6/arch/x86/Kconfig\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/arch/x86/Kconfig\n" + "> =================================> --- linux-2.6.orig/arch/x86/Kconfig\n" "> +++ linux-2.6/arch/x86/Kconfig\n" "> @@ -1295,6 +1295,10 @@ config ARCH_DMA_ADDR_T_64BIT\n" "> \tdef_bool y\n" @@ -169,8 +159,7 @@ "> \tdepends on X86_64 && !DEBUG_PAGEALLOC && !KMEMCHECK\n" "\n" "> Index: linux-2.6/include/linux/types.h\n" - "> ===================================================================\n" - "> --- linux-2.6.orig/include/linux/types.h\n" + "> =================================> --- linux-2.6.orig/include/linux/types.h\n" "> +++ linux-2.6/include/linux/types.h\n" "> @@ -146,6 +146,13 @@ typedef u64 dma_addr_t;\n" "> typedef u32 dma_addr_t;\n" @@ -190,4 +179,4 @@ "\n" "\tSam" -3f1bfbb4707f1bb2df80c8607f5cb713ff3636e1a87cb6311e9f04dd4a7a80c9 +4e33dc4d9feba6812ddf20b84c462c48910225fb26006c75d19431564c3da1b5
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.