From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Cooper Subject: Re: linux-next: manual merge of the mvebu tree Date: Wed, 9 Oct 2013 10:37:27 -0400 Message-ID: <20131009143727.GD5402@titan.lakedaemon.net> References: <1381328067-1593-1-git-send-email-treding@nvidia.com> <1381328067-1593-6-git-send-email-treding@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:36310 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754051Ab3JIOh3 (ORCPT ); Wed, 9 Oct 2013 10:37:29 -0400 Content-Disposition: inline In-Reply-To: <1381328067-1593-6-git-send-email-treding@nvidia.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Thierry Reding Cc: Sebastian Hesselbarth , Ezequiel Garcia , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Thierry, On Wed, Oct 09, 2013 at 04:14:27PM +0200, Thierry Reding wrote: > Today's linux-next merge of the mvebu tree got conflicts in I looked in your scripts repo, and couldn't find the script you use to send out this email thread :( Since I can't create a patch, I'll just ask, could you include the commit id of the branch you pulled in the email? eg: Today's linux-next merge of the mvebu tree (477cdaf) got conflicts in ... I had uploaded a new for-next branch less than 30 minutes before you sent this out, so I wasn't sure which you were working with. Not a big deal, just thought I'd pass along the idea for the next time you're tweaking your scripts. thx, Jason.