From owner-svn-src-stable-11@freebsd.org Sun Feb 11 21:28:09 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 576CDF19D2F; Sun, 11 Feb 2018 21:28:09 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: from mail-lf0-f48.google.com (mail-lf0-f48.google.com [209.85.215.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B78566C148; Sun, 11 Feb 2018 21:28:08 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: by mail-lf0-f48.google.com with SMTP id j193so1988593lfe.0; Sun, 11 Feb 2018 13:28:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=6fpPz9WC9lbJ1aXiyn2ZuvYXwQPfTT2Y3CjPbyW/Axk=; b=V4M8A3Zjugo7zi+WD/56Iz1N3nN/HBBQDFG6GnBxvH3uDotPz2D994ye5Y1KH1Ped5 c8ouCkmJNU/ukpZsZaTtp79fNrVI26fBLemdBMVPCT/jRRS2Bc6jVzjI0ggywtte0FO6 BQbyA074t94t2/lFYbW48f57Uk6ALQXtQnLAYByO8yiuKoRgumKI41mAM4c3mIKYBviv uKk6XxSZDj9c+becAyTwTq91gj8eYfmYiBSr1HZGaO7VCXAqs/31LL0vBncqLs0hBF6X S5CvT3lF4JWc/ssb9y6CGNwZZwD+kkj/oECRGlC0kiEfhIWxdRYFF5uHGpBfwKb9sWS3 a3ug== X-Gm-Message-State: APf1xPCxkeu9w4P8JNBAX/V3toHAxYCEB76BOtyPQn9q4/Epprcc12xL vT2oAP0baeRZSJ2bar2wob2xBgrb X-Google-Smtp-Source: AH8x226Rymw8SkM9TsWSHBiOBKhEoeN4n1qIl5hXFsWu23nD9QjJ3ys62zyyLvapcC0Pa5N1SLslmw== X-Received: by 10.25.78.79 with SMTP id c76mr5525911lfb.98.1518384083596; Sun, 11 Feb 2018 13:21:23 -0800 (PST) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com. [209.85.215.44]) by smtp.gmail.com with ESMTPSA id a197sm1408789lfe.88.2018.02.11.13.21.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Feb 2018 13:21:23 -0800 (PST) Received: by mail-lf0-f44.google.com with SMTP id i24so14796288lfc.7; Sun, 11 Feb 2018 13:21:23 -0800 (PST) X-Received: by 10.46.23.156 with SMTP id 28mr3444223ljx.29.1518384083153; Sun, 11 Feb 2018 13:21:23 -0800 (PST) MIME-Version: 1.0 Received: by 10.46.106.8 with HTTP; Sun, 11 Feb 2018 13:21:02 -0800 (PST) In-Reply-To: <201802112058.w1BKw0xv046842@repo.freebsd.org> References: <201802112058.w1BKw0xv046842@repo.freebsd.org> From: Kyle Evans Date: Sun, 11 Feb 2018 15:21:02 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r329140 - in stable/11: . share/mk sys/arm/include sys/arm64/include sys/boot sys/boot/arm/at91 sys/boot/arm/at91/boot0 sys/boot/arm/at91/boot0iic sys/boot/arm/at91/boot0spi sys/boot/ar... To: src-committers Cc: svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Feb 2018 21:28:09 -0000 On Sun, Feb 11, 2018 at 2:58 PM, Kyle Evans wrote: > Author: kevans > Date: Sun Feb 11 20:58:00 2018 > New Revision: 329140 > URL: https://svnweb.freebsd.org/changeset/base/329140 > > Log: > MFC Loader Fixes 2017q4p6: r324649,r324650,r324651,r324652,r324653,r324654, > r324700,r324702,r324709,r324717,r324719,r324841,r324842,r324843,r324845, > r324850,r324876,r324877,r324878,r324879,r324880,r324881,r324883,r324980, > r324981,r324982,r324995,r325014,r325093,r325094,r325114,r325170,r325171, > r325172,r325173,r325174,r325175,r325176,r325248,r325286,r325310,r325332, > r325338,r325339,r325376,r325377,r325379,r325380,r325382,r325478,r325479, > r325480,r325482,r325483,r325484,r325485,r325556,r325641,r325681,r325685, > r325686,r325687,r325688,r325689,r325690,r325691,r325692,r325693,r325694, > r325743,r325744,r325748,r325775,r325779,r325780 > Apologies for all of the breakage/cutting teeth in the last couple hours of this process... A lot of things got moved around, and svn's handling of merging commits that moved things isn't great considering 'svn mv' does a 'copy + delete old'. All of the cherry-picking that we've done came back to haunt us as it tried to wipe out the cherry-picked bits in the process. We can now begin our downhill descent, as the next step is to move everything from sys/boot to stand/ except for sys/boot/fdt/dts and things should be easygoing from there.