From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751105AbdHXBcS (ORCPT ); Wed, 23 Aug 2017 21:32:18 -0400 Received: from ozlabs.org ([103.22.144.67]:49209 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750715AbdHXBcR (ORCPT ); Wed, 23 Aug 2017 21:32:17 -0400 Date: Thu, 24 Aug 2017 11:32:14 +1000 From: Stephen Rothwell To: Kalle Valo , Wireless Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Emmanuel Grumbach , Luca Coelho Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Message-ID: <20170824113214.352b5c18@canb.auug.org.au> In-Reply-To: <20170824111753.2b1c508e@canb.auug.org.au> References: <20170824111753.2b1c508e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On Thu, 24 Aug 2017 11:17:53 +1000 Stephen Rothwell wrote: > > IWL_DEBUG_DEV(dev, IWL_DL_LAR, > - "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n", > - "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x): %s\n", > ++ "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n" Rats! I missed the comma ... I have added it back. -- Cheers, Stephen Rothwell