From patchwork Sat May 11 15:27:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sonic Zhang X-Patchwork-Id: 243140 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 015702C00D3 for ; Sun, 12 May 2013 01:27:55 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F38194A02C; Sat, 11 May 2013 17:27:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5OF6QxRAjBGJ; Sat, 11 May 2013 17:27:53 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1BE874A02D; Sat, 11 May 2013 17:27:52 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C96BB4A02D for ; Sat, 11 May 2013 17:27:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9FeelVGP9Cvl for ; Sat, 11 May 2013 17:27:43 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=SKIP(-1.5) (only DNSBL check requested) Received: from mail-oa0-f42.google.com (mail-oa0-f42.google.com [209.85.219.42]) by theia.denx.de (Postfix) with ESMTPS id 603264A02C for ; Sat, 11 May 2013 17:27:42 +0200 (CEST) Received: by mail-oa0-f42.google.com with SMTP id i10so6135617oag.29 for ; Sat, 11 May 2013 08:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=ZHaPNAHJq4G/wJrs+wIqQK1emlur0dA08GJ7wtFibTg=; b=dcgKzVURVsET/fDrdC507RE4Sa5znRLhxmUSTdzFp2STd/5KUU0zXPA6OCSHws9pco g+yhqY72E3cH/hZkYZDmwFM5KzjpjMKQ5AyTsrCReAOjMaVupne+NCLiQXKh8ioACd/A NOdmKr+YAHUd5ktdHs53h0Td81QWlr6k2JWRWBM2+vnDvnadwzx++9nXvRthlD5pnrrX T0yLtoDuBsZwoUaFDOaohdQfc+kS9uW5ht7lMJVRbJlTVqRFXsP5vs5R+aGjxGxFhk4o 7As48kC7N9/NY6y0m0RgDnSHIHfHiEnnDcoiRKk6+AxhRCqF4JSsqRV/9ui5BU75Wt9I Yj/A== MIME-Version: 1.0 X-Received: by 10.60.94.244 with SMTP id df20mr9679978oeb.122.1368286061084; Sat, 11 May 2013 08:27:41 -0700 (PDT) Received: by 10.182.116.161 with HTTP; Sat, 11 May 2013 08:27:41 -0700 (PDT) In-Reply-To: <20130509120938.GM6931@bill-the-cat> References: <20130509120938.GM6931@bill-the-cat> Date: Sat, 11 May 2013 23:27:41 +0800 Message-ID: From: Sonic Zhang To: Tom Rini Cc: u-boot-devel@blackfin.uclinux.org, U-Boot Subject: Re: [U-Boot] Pull request: u-boot-blackfin X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Hi Tom, On Thu, May 9, 2013 at 8:09 PM, Tom Rini wrote: > > Some number of these changes haven't been posted to the list for review > yet. I'm pretty sure. I don't recall seeing the CONFIG_CMD_SOFTSWITCH > stuff go past, and you didn't document that new flag in the top-level I just forward the former softswtich command patch to you which include the definition of CONFIG_CMD_SOFTSWITCH. What else do you think are missing? > README. Also, you did a merge of your patman branch which means there's > extra stuff in your commit messages. Because this command is only implemented for blackfin by now. Should I explan this limitation in the README as well? > > Please submit the new patches to the mailing list, and re-submit the > pull request with everything else you do have ready. Thanks! > Yes, I just figured out my patman subfolder isn't equal to the upstream master, but I didn't add any stuff except for doing rebase. It looks some upstream patches may be lost during rebase. I will try to redo rebase and re-submit the pull request. The difference are as following: Regards, Sonic diff -urN u-boot-blackfin/tools/patman/patman u-boot.up/tools/patman/patman --- u-boot-blackfin/tools/patman/patman 2013-05-11 23:11:43.158054437 +0800 +++ u-boot.up/tools/patman/patman 2013-05-11 23:00:34.050736519 +0800 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2011 The Chromium OS Authors. # diff -urN u-boot-blackfin/tools/patman/patman.py u-boot.up/tools/patman/patman.py --- u-boot-blackfin/tools/patman/patman.py 2013-05-11 23:11:43.158054437 +0800 +++ u-boot.up/tools/patman/patman.py 2013-05-11 23:00:34.050736519 +0800 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2011 The Chromium OS Authors. # diff -urN u-boot-blackfin/tools/patman/series.py u-boot.up/tools/patman/series.py --- u-boot-blackfin/tools/patman/series.py 2013-05-11 23:11:43.158054437 +0800 +++ u-boot.up/tools/patman/series.py 2013-05-11 23:00:34.050736519 +0800 @@ -40,6 +40,7 @@ notes: List of lines in the notes changes: (dict) List of changes for each version, The key is the integer version number + allow_overwrite: Allow tags to overwrite an existing tag """ def __init__(self): self.cc = [] @@ -49,6 +50,7 @@ self.cover = None self.notes = [] self.changes = {} + self.allow_overwrite = False # Written in MakeCcFile() # key: name of patch file @@ -72,7 +74,7 @@ """ # If we already have it, then add to our list name = name.replace('-', '_') - if name in self: + if name in self and not self.allow_overwrite: values = value.split(',') values = [str.strip() for str in values] if type(self[name]) != type([]):