Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754473Ab1FVGhs (ORCPT ); Wed, 22 Jun 2011 02:37:48 -0400 Received: from sncsmrelay2.nai.com ([67.97.80.206]:30496 "EHLO sncsmrelay2.nai.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753372Ab1FVGhU (ORCPT ); Wed, 22 Jun 2011 02:37:20 -0400 Message-ID: <4E018CE3.7070101@snapgear.com> Date: Wed, 22 Jun 2011 16:34:11 +1000 From: Greg Ungerer User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10 MIME-Version: 1.0 To: Stephen Rothwell CC: , , Geert Uytterhoeven Subject: Re: linux-next: manual merge of the m68knommu tree with the m68k tree References: <20110622111256.3857df1e.sfr@canb.auug.org.au> In-Reply-To: <20110622111256.3857df1e.sfr@canb.auug.org.au> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1310 Lines: 33 Hi Stephen, On 22/06/11 11:12, Stephen Rothwell wrote: > Today's linux-next merge of the m68knommu tree got a conflict in > arch/m68k/include/asm/bitops_mm.h between commit 17c74432b88e > ("m68k/bitops: Make bitmap data pointer of atomic ops volatile") from the > m68k tree and commit 2cb0d89e66b1 ("m68k: merge mmu and non-mmu > bitops.h") from the m68knommu tree. > > The latter effectively deletes in the file and in doing the merge, > removes the funtions that were modified by the former commit. So I just > removed the file. That would be right. The changes that Geert's patch makes are in my merge patch. Geert: do you want me to hold of on merging the bitops.h files? Regards Greg -- ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close FAX: +61 7 3217 5323 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com -- 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/