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 Schwab <schwab at linux-m68k dot org>
To: Andreas Jaeger <aj at suse dot com>
Cc: David Miller <davem at davemloft dot net>, libc-alpha at sourceware dot org, aj at suse dot de
Date: Wed, 28 Mar 2012 10:47:32 +0200
Subject: Re: elf move merge botched
References: <20120327.235422.964358988177481575.davem@davemloft.net><4F72B8F2.7060900@suse.com>

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).

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Follow-Ups:
- Re: elf move merge botched
  - From: Andreas Jaeger

References:
- elf move merge botched
  - From: David Miller
- 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]