From patchwork Tue Feb 5 09:38:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philipp Tomsich X-Patchwork-Id: 1036561 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=theobroma-systems.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43tzzN0Y4yz9s3l for ; Tue, 5 Feb 2019 20:38:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8CE0BC21EF2; Tue, 5 Feb 2019 09:38:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4C191C21E8A; Tue, 5 Feb 2019 09:38:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 47F29C21E76; Tue, 5 Feb 2019 09:38:33 +0000 (UTC) Received: from mail.theobroma-systems.com (vegas.theobroma-systems.com [144.76.126.164]) by lists.denx.de (Postfix) with ESMTPS id 0E64DC21E2C for ; Tue, 5 Feb 2019 09:38:33 +0000 (UTC) Received: from 178-18-171-174.customer.bnet.at ([178.18.171.174]:54988 helo=[192.168.2.179]) by mail.theobroma-systems.com with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1gqxBX-0002DZ-J7; Tue, 05 Feb 2019 10:38:31 +0100 From: Philipp Tomsich Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Message-Id: Date: Tue, 5 Feb 2019 10:38:30 +0100 To: Tom Rini X-Mailer: Apple Mail (2.3445.9.1) Cc: U-Boot Mailing List , Michal Simek Subject: [U-Boot] [PULL] Please pull u-boot-rockchip: tags/for-master-20190205 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Tom, A merge-artifact slipped in with the last round of merges. Here’s a PR to remove these (I didn’t throw this at Travis for obvious reasons...). Thanks, Philipp. The following changes since commit e5fd39c886485e3dec77f4438a6e364c2987cf5f: Merge tag 'for-master-20190201' of git://git.denx.de/u-boot-rockchip (2019-02-02 10:11:20 -0500) are available in the git repository at: git://git.denx.de/u-boot-rockchip tags/for-master-20190205 for you to fetch changes up to 30477f0500dac67e988498df3b6783372a31c22c: rockchip: Remove rejected files with .rej suffix (2019-02-05 10:34:04 +0100) ---------------------------------------------------------------- Removes artifacts (.rej-files) from the last merge. ---------------------------------------------------------------- Michal Simek (1): rockchip: Remove rejected files with .rej suffix configs/kylin-rk3036_defconfig.rej | 10 ---------- configs/puma-rk3399_defconfig.rej | 10 ---------- 2 files changed, 20 deletions(-) delete mode 100644 configs/kylin-rk3036_defconfig.rej delete mode 100644 configs/puma-rk3399_defconfig.rej