From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755281Ab2EQFyP (ORCPT ); Thu, 17 May 2012 01:54:15 -0400 Received: from smtp.snhosting.dk ([87.238.248.203]:55306 "EHLO smtp.domainteam.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754389Ab2EQFyM (ORCPT ); Thu, 17 May 2012 01:54:12 -0400 Date: Thu, 17 May 2012 07:54:10 +0200 From: Sam Ravnborg To: Stephen Rothwell Cc: David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the net-next tree with the sparc-next tree Message-ID: <20120517055410.GA2247@merkur.ravnborg.org> References: <20120516143944.57a648287aa5cd1a5930254e@canb.auug.org.au> <20120516050245.GA407@merkur.ravnborg.org> <20120517130406.1706f944820bbe8dc5e368f2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120517130406.1706f944820bbe8dc5e368f2@canb.auug.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > So I applied this merge fixup to the merge of the net-next tree today > (and can carry it as necessary): Perfect. And please carry this as we do not plan to solve this conflict. Sam