From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751963Ab3FZILE (ORCPT ); Wed, 26 Jun 2013 04:11:04 -0400 Received: from gate.crashing.org ([63.228.1.57]:56948 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751269Ab3FZIK7 (ORCPT ); Wed, 26 Jun 2013 04:10:59 -0400 Message-ID: <1372234231.18612.6.camel@pasglop> Subject: Re: linux-next: manual merge of the akpm tree with the powerpc tree From: Benjamin Herrenschmidt To: Stephen Rothwell Cc: Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Neuling , linuxppc-dev@lists.ozlabs.org, Oleg Nesterov Date: Wed, 26 Jun 2013 18:10:31 +1000 In-Reply-To: <20130626165642.8740ecb6d5d5882b06f173c8@canb.auug.org.au> References: <20130626165642.8740ecb6d5d5882b06f173c8@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.6.4-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2013-06-26 at 16:56 +1000, Stephen Rothwell wrote: > Today's linux-next merge of the akpm tree got a conflict in > arch/powerpc/kernel/ptrace.c between commit b0b0aa9c7faf > ("powerpc/hw_brk: Fix setting of length for exact mode breakpoints") from > the powerpc tree and commit "ptrace/powerpc: revert "hw_breakpoints: Fix > racy access to ptrace breakpoints"" from the akpm tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Where does the latter come from ? Why didn't it go through the powerpc tree ? Cheers, Ben.