From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4811C04E53 for ; Thu, 16 May 2019 01:53:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7605720873 for ; Thu, 16 May 2019 01:53:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726461AbfEPBxG (ORCPT ); Wed, 15 May 2019 21:53:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:36632 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725977AbfEPBxG (ORCPT ); Wed, 15 May 2019 21:53:06 -0400 Received: from oasis.local.home (50-204-120-225-static.hfc.comcastbusiness.net [50.204.120.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7C04E20862; Thu, 16 May 2019 01:53:05 +0000 (UTC) Date: Wed, 15 May 2019 21:53:05 -0400 From: Steven Rostedt To: Stephen Rothwell Cc: Linux Next Mailing List , Linux Kernel Mailing List , Josh Poimboeuf , "Peter Zijlstra (Intel)" , Linus Torvalds Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree Message-ID: <20190515215305.78e8ef4c@oasis.local.home> In-Reply-To: <20190516110548.0d22d048@canb.auug.org.au> References: <20190516110548.0d22d048@canb.auug.org.au> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 16 May 2019 11:05:48 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the ftrace tree got a conflict in: > > include/linux/compiler.h > > between commit: > > 37686b1353cf ("tracing: Improve "if" macro code generation") > > from Linus' tree and commit: > > a15fd609ad53 ("tracing: Simplify "if" macro code") > > from the ftrace tree. > > I fixed it up (I just used the latter version) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts. > Hi Stephen, I mentioned this conflict and the entry_64.S one to Linus when submitting my pull request. I fixed it up too in my ftrace/conflicts branch. Thanks! -- Steve