From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754327AbaBRIGd (ORCPT ); Tue, 18 Feb 2014 03:06:33 -0500 Received: from cassarossa.samfundet.no ([193.35.52.29]:47888 "EHLO cassarossa.samfundet.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753814AbaBRIGb (ORCPT ); Tue, 18 Feb 2014 03:06:31 -0500 Date: Tue, 18 Feb 2014 09:06:03 +0100 From: Hans-Christian Egtvedt To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chen Gang , Hans-Christian Egtvedt , Tim Chen Subject: Re: linux-next: manual merge of the tip tree with Linus' tree Message-ID: <20140218080603.GA27512@samfundet.no> References: <20140218140920.e79e5cff80dad8ecee400538@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140218140920.e79e5cff80dad8ecee400538@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Around Tue 18 Feb 2014 14:09:20 +1100 or thereabout, Stephen Rothwell wrote: Hello Stephen, > Today's linux-next merge of the tip tree got a conflict in > arch/avr32/include/asm/Kbuild between commit d7668f9d448a ("avr32: add > generic vga.h to Kbuild") from the tree and commit b119fa61d440 > ("locking/mcs: Order the header files in Kbuild of each architecture in > alphabetical order") from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thank you for handling the merge. PS! I typically don't use my Cisco address for avr32 related kernel patches, but it seems to be my own fault, my global gitconfig contained my @cisco.com address. Fixed now. -- Best regards, Hans-Christian Egtvedt