On Tue, Jul 15, 2014 at 2:54 PM, Måns Rullgård <mans@xxxxxxxxx> wrote: > Nicholas Krause <xerofoify@xxxxxxxxx> writes: > >> This fixes the checkpatch error I get in this file relating to a >> quoted string needed to be joined to the line above it. >> --- >> arch/alpha/boot/bootpz.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/arch/alpha/boot/bootpz.c b/arch/alpha/boot/bootpz.c >> index 6fc840d..a9e127b 100644 >> --- a/arch/alpha/boot/bootpz.c >> +++ b/arch/alpha/boot/bootpz.c >> @@ -87,8 +87,7 @@ check_range(unsigned long vstart, unsigned long vend, >> kaddr = (find_pa(vaddr) | PAGE_OFFSET); >> if (kaddr >= kstart && kaddr <= kend) { >> #ifdef DEBUG_CHECK_RANGE >> - srm_printk("OVERLAP: vaddr 0x%lx kaddr 0x%lx" >> - " [0x%lx:0x%lx]\n", >> + srm_printk("OVERLAP: vaddr 0x%lx kaddr 0x%lx" " [0x%lx:0x%lx]\n", >> vaddr, kaddr, kstart, kend); >> #endif > > If you're doing this, you should merge the strings too. > > -- > Måns Rullgård > mans@xxxxxxxxx Very well, I will merge the strings for this statement. Nick -- To unsubscribe from this list: send the line "unsubscribe linux-alpha" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html