Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756157Ab3G2WZR (ORCPT ); Mon, 29 Jul 2013 18:25:17 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:42086 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754553Ab3G2WZO (ORCPT ); Mon, 29 Jul 2013 18:25:14 -0400 X-Sasl-enc: 4HdExT0NS/N9x1TkZgJPNe4CvSfp0ohbiMr+6nEsNh0p 1375136713 Date: Mon, 29 Jul 2013 15:25:12 -0700 From: Greg KH To: Tomas Winkler Cc: Stephen Rothwell , Arnd Bergmann , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the char-misc tree with Linus' tree Message-ID: <20130729222512.GA4391@kroah.com> References: <20130729150129.76a9fab4023ee22c940b7920@canb.auug.org.au> <20130729192649.GA9191@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 805 Lines: 21 On Tue, Jul 30, 2013 at 01:16:38AM +0300, Tomas Winkler wrote: > >> (Unrelated white space changes are a pest :-() > >> > >> I fixed it up (see below) and can carry the fix as necessary (no action > >> is required). > > > > Thanks, I've merged the char-misc-next branch into 3.11-rc3, so this > > merge problem should no longer be there. > > I've preferred the blank line there as these ifs became a bit dense > nevertheless thanks for taking care of it. Ah, sorry about that, feel free to change it back in the next round of patches you send :) greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/