From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 53546 invoked by alias); 15 Mar 2015 22:38:21 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Received: (qmail 53516 invoked by uid 89); 15 Mar 2015 22:38:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: OARmail.OARCORP.com Received: from oarmail.oarcorp.com (HELO OARmail.OARCORP.com) (67.63.146.244) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 15 Mar 2015 22:38:19 +0000 Received: from [192.168.0.4] (24.96.88.41) by OARmail.OARCORP.com (192.168.2.2) with Microsoft SMTP Server (TLS) id 8.3.342.0; Sun, 15 Mar 2015 17:38:15 -0500 Message-ID: <550609D6.2020003@oarcorp.com> Date: Sun, 15 Mar 2015 22:38:00 -0000 From: Joel Sherrill User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.24) Gecko/20111108 Fedora/3.1.16-1.fc14 Lightning/1.0b2 Thunderbird/3.1.16 MIME-Version: 1.0 To: , Chris Johns Subject: Cherry Picking git Patches and ChangeLog Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2015-03/txt/msg00043.txt.bz2 Hi We (RTEMS) have a series of patches from Jiri Gaisler that we want to provide against the latest release. They were committed to the git head. Ideally we should just be able to apply them to the 7.9 release tarball, but the presence of ChangeLog entries results in them not applying cleanly by patch as part of our automated tool build process. We want to pull the patches directly from upstream without adjusting them manually. I know that this is really a git/ChangeLog/patch question but since it comes up in context of gdb, I am asking here. How does one deal with patches that would apply cleanly except for ChangeLog? FWIW If there is a 7.9.1, we would appreciate Jiri's sim/erc32 patches to be in it. Thanks. --joel sherrill RTEMS