linux-kernel - Re: [PATCH 6/6] alpha: Join lines 90 and 91

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <yw1xzjgaa1vg.fsf@unicorn.mansr.com>
Date:	Tue, 15 Jul 2014 19:54:59 +0100
From:	Måns Rullgård <mans@...sr.com>
To:	Nicholas Krause <xerofoify@...il.com>
Cc:	rth@...ddle.net, ink@...assic.park.msu.ru, mattst88@...il.com,
	linux-alpha@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 6/6] alpha: Join lines 90 and 91

Nicholas Krause <xerofoify@...il.com> 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@...sr.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/