From owner-freebsd-stable@FreeBSD.ORG Mon Jan 28 12:59:36 2013 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D6ACDA12 for ; Mon, 28 Jan 2013 12:59:36 +0000 (UTC) (envelope-from demelier.david@gmail.com) Received: from mail-pb0-f51.google.com (mail-pb0-f51.google.com [209.85.160.51]) by mx1.freebsd.org (Postfix) with ESMTP id A1F638CB for ; Mon, 28 Jan 2013 12:59:36 +0000 (UTC) Received: by mail-pb0-f51.google.com with SMTP id un15so481515pbc.24 for ; Mon, 28 Jan 2013 04:59:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=izjCuXJ2lxY2/iEk5Kvx0zC0JkY1/NuAiDsW0TYlRfo=; b=T5wImY/HQphP45db/2p2ISSJWI7yFr/7wnE+2Pwg4D6bhA4k9f7chdoA77mitayxVo 7bobxv3gbzUPgf5INCIAm8ZAXQhaMHeFLo8n00ZOgevGKURQm66Fsa1hP4XUAmdFRS72 33OOx14FwkAq0G89fdSJG8tPerGdhqbGUTcf8r31iItIbm3uwNkr9KFwtWztDjM0ccui JYgm8TDvpziZop/bn7kgWRAX4pqoKpc2pJMsI1bVNn9yzXLE7FO1dzvVOQETP3f7REIa LW4pSEM6Ry6p5DW++SbRoKAXrgevo0sTaAneuODe6AMryXxEy6UFoZ29RfzdlhNJ+xTb s9vA== MIME-Version: 1.0 X-Received: by 10.68.243.33 with SMTP id wv1mr37338012pbc.143.1359377970778; Mon, 28 Jan 2013 04:59:30 -0800 (PST) Received: by 10.66.218.134 with HTTP; Mon, 28 Jan 2013 04:59:30 -0800 (PST) In-Reply-To: <51062FBF.10507@xs4all.nl> References: <51057DA1.2090408@xs4all.nl> <51062FBF.10507@xs4all.nl> Date: Mon, 28 Jan 2013 13:59:30 +0100 Message-ID: Subject: Re: mergemaster -p / installkernel problem From: David Demelier To: Michiel Boland Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: FreeBSD Stable X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 12:59:36 -0000 What did you have in your mergemaster.rc ? To help next people who may have the same problem :) 2013/1/28 Michiel Boland > On 01/28/2013 02:10, Kevin Oberman wrote: > >> You don't by any chance have a mergemaster.rc in /etc or >> .mergemasterrc in $HOME? >> >> > Duh... I'll go stand in the corner for the next 37 years. > > Cheers > Michiel > > > ______________________________**_________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/**mailman/listinfo/freebsd-**stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@**freebsd.org > " > -- Demelier David