Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758913Ab3FMXmp (ORCPT ); Thu, 13 Jun 2013 19:42:45 -0400 Received: from mail-ie0-f176.google.com ([209.85.223.176]:36456 "EHLO mail-ie0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752314Ab3FMXmo (ORCPT ); Thu, 13 Jun 2013 19:42:44 -0400 MIME-Version: 1.0 In-Reply-To: <1371163963.5555.25.camel@pasglop> References: <1371163963.5555.25.camel@pasglop> From: Grant Likely Date: Fri, 14 Jun 2013 00:42:23 +0100 X-Google-Sender-Auth: 7zC14HlPK_Ay6HGxFKVXmZg-0Oc Message-ID: Subject: Re: [GIT PULL] devicetree bugfixes for v3.10 To: Benjamin Herrenschmidt Cc: Linus Torvalds , Rob Herring , Linux Kernel Mailing List , devicetree-discuss , Stephen Warren Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 723 Lines: 18 On Thu, Jun 13, 2013 at 11:52 PM, Benjamin Herrenschmidt wrote: > On Thu, 2013-06-13 at 23:22 +0100, Grant Likely wrote: >> Grant Likely (2): >> dtc: Update generated files to output from Bison 2.5 >> dtc: ensure #line directives don't consume data from the next > > Question. Are those fixes also in the upstream dtc from jdl ? Or have we > effectively forked it ? cherry picked from dtc. In v3.11 we'll need a full resync from jdl. g. -- 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/