Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755168Ab3EFQPX (ORCPT ); Mon, 6 May 2013 12:15:23 -0400 Received: from casper.infradead.org ([85.118.1.10]:50394 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754582Ab3EFQPV (ORCPT ); Mon, 6 May 2013 12:15:21 -0400 Message-ID: <5187D6F1.9070103@infradead.org> Date: Mon, 06 May 2013 09:14:41 -0700 From: Randy Dunlap User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: Stephen Rothwell CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, James Smart , linux-scsi Subject: Re: linux-next: Tree for May 6 (lpfc) References: <20130506144207.c812a0227d7763d26e5fec80@canb.auug.org.au> In-Reply-To: <20130506144207.c812a0227d7763d26e5fec80@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 843 Lines: 31 On 05/05/13 21:42, Stephen Rothwell wrote: > Hi all, > > Please do not add any v3.11 destined work to your linux-next included > branches until after v3.10-rc1 is released. > > I am receiving a (un)reasonable number of conflicts from there being > multiple copies of some commits in various trees. Please clean this up > and resist the temptataion to rebase your trees on the way to your > upstream ... > > Changes since 20130506: > on i386: # CONFIG_CRC_T10DIF is not set drivers/built-in.o: In function `lpfc_bg_crc': (.text+0x3cb3c9): undefined reference to `crc_t10dif' -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/