Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756084Ab3G2WQk (ORCPT ); Mon, 29 Jul 2013 18:16:40 -0400 Received: from mail-vb0-f47.google.com ([209.85.212.47]:39367 "EHLO mail-vb0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754671Ab3G2WQj (ORCPT ); Mon, 29 Jul 2013 18:16:39 -0400 MIME-Version: 1.0 In-Reply-To: <20130729192649.GA9191@kroah.com> References: <20130729150129.76a9fab4023ee22c940b7920@canb.auug.org.au> <20130729192649.GA9191@kroah.com> Date: Tue, 30 Jul 2013 01:16:38 +0300 Message-ID: Subject: Re: linux-next: manual merge of the char-misc tree with Linus' tree From: Tomas Winkler To: Greg KH Cc: Stephen Rothwell , Arnd Bergmann , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 669 Lines: 19 >> (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. Tomas PS: sorry for the previous HTML mistake. -- 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/