Hi! On Mon, 19 Oct 2015 17:54:46 +0200, I wrote: > I have recently merged trunk r228776 (2015-10-13) into gomp-4_0-branch, > which is the trunk revision before Jakub's big "Merge from > gomp-4_1-branch to trunk", > <http://news.gmane.org/find-root.php?message_id=%3C20151013191214.GL478%40tucnak.redhat.com%3E>. > Instead of attempting to merge that one in one go -- that is, to avoid > having to deal with a ton of merge conflicts at once, and to allow for > easier understanding of individual changes/regressions -- in the > following I'll gradually merge individual "blocks" of all the > gomp-4_1-branch changes into gomp-4_0-branch. Committed to > gomp-4_0-branch in r228972: > > commit 3931662876141de5c18d0c5e02c156eef5286bee > Merge: fdc2c87 2b9f218 > Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4> > Date: Mon Oct 19 15:38:31 2015 +0000 > > svn merge -r 222404:224607 > svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_1-branch > > > git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@228972 > 138bc75d-0d04-0410-961f-82ee72b054a4
Yesterday, I merged gomp-4_1-branch r224838 in gomp-4_0-branch r229178, <http://news.gmane.org/find-root.php?message_id=%3C87io5y7o7y.fsf%40schwinge.name%3E>. Now committed to gomp-4_0-branch in r229214: commit ae006d29a544a280a4ab4eb32f431c5ec7527823 Merge: cbef8ef 85aa63a Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Fri Oct 23 07:48:08 2015 +0000 svn merge -r 224838:225300 svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_1-branch git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@229214 138bc75d-0d04-0410-961f-82ee72b054a4 Grüße Thomas
signature.asc
Description: PGP signature
