From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id DE158605F3 for ; Wed, 24 Jul 2013 04:32:36 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.3) with ESMTP id r6O4WbNq010076 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Tue, 23 Jul 2013 21:32:37 -0700 (PDT) Received: from yow-bashfiel-d3.corp.ad.wrs.com (128.224.130.143) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.2.342.3; Tue, 23 Jul 2013 21:32:37 -0700 From: Bruce Ashfield To: Date: Wed, 24 Jul 2013 00:32:32 -0400 Message-ID: X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Subject: [PATCH 0/1] linux-yocto/3.8: fix tree patching X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jul 2013 04:32:37 -0000 Content-Type: text/plain The xilinx guys noticed that my recent commit to the kernel's meta branch to ensure that modified files were tracked was a bit premature and caused a mismatch in the .gitignore between the meta branch and the BSP branches. Which meant that a dirty file was present in the BSP branches, breaking git application of patches to the tree. I'm reverting the change for now, and will fix it properly with the new yocto 1.5 kernel and tools. Cheers, Bruce The following changes since commit 31e6eee860b5f9f4ac9ef0889bcff5648de6e3f9: poky-tiny.conf: blacklist core-image-weston option (2013-07-18 21:26:58 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (1): linux-yocto/3.8: revert .gitignore: do not ignore meta directory meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 1.7.10.4