This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: elf move merge botched

From: Andreas Jaeger <aj at suse dot com>
To: Andreas Schwab <schwab at linux-m68k dot org>
Cc: libc-alpha at sourceware dot org
Date: Wed, 28 Mar 2012 10:56:06 +0200
Subject: Re: elf move merge botched
References: <20120327.235422.964358988177481575.davem@davemloft.net> <4F72B8F2.7060900@suse.com> <m2obrht8m3.fsf@igel.home> <4F72D146.9050801@suse.com>

On 03/28/2012 10:52 AM, Andreas Jaeger wrote:

On 03/28/2012 10:47 AM, Andreas Schwab wrote:
Andreas Jaeger<aj@suse.com> writes:
Sorry for the screwup, seems the final git merge did not work out as
intented ;-(
Looks like you merged the wrong branch (and you shouldn't have done the
extra merge of master).
That's what indeed happened ;-( What a mess. Sorry.
I'll compare now the right branch with what I committed and cleanup any
issues.

A git diff of the my branch against master shows no further differences, so I hope we can close for good.

Andreas - wearing a brown paper bag today ;-(
--
 Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
  SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

References:
- elf move merge botched
  - From: David Miller
- Re: elf move merge botched
  - From: Andreas Jaeger
- Re: elf move merge botched
  - From: Andreas Schwab
- Re: elf move merge botched
  - From: Andreas Jaeger

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]