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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E801ECDB483 for ; Wed, 18 Oct 2023 17:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231686AbjJRRzD (ORCPT ); Wed, 18 Oct 2023 13:55:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231378AbjJRRzB (ORCPT ); Wed, 18 Oct 2023 13:55:01 -0400 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27290112 for ; Wed, 18 Oct 2023 10:55:00 -0700 (PDT) Received: by mail-il1-x129.google.com with SMTP id e9e14a558f8ab-357658775dbso1505325ab.0 for ; Wed, 18 Oct 2023 10:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1697651699; x=1698256499; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=EZzGCsO7OcpY3g5B092DIlTlbmYfwK3hp6HeyMWhbCk=; b=Xg6Pv4Gsyuuip/HNKaYfZsPW8vrgkvi/uRQZhg5ugrTq8S6ckJtBKC2dI21Ft9FDuG jMQH9jOPxK62hKnKaMkFgVW3iCkyDZcVM0g5lZaD1wYRBKIuOcr0R7P50SADhbC1817N tOg8zqusxzpRu54fc/q5IKYW+sWYJypaqRwLo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697651699; x=1698256499; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EZzGCsO7OcpY3g5B092DIlTlbmYfwK3hp6HeyMWhbCk=; b=bAmuwo1V+OoxO3+1jwGOWyYJF2Yf0MqNeglAHZ9Pm1DQ1/e4lvt8RmXcX5e8k/VeP0 g5gf3YhczX8RPfYksIPb/RVr2uyGkkannSE98hCLAuyfCfjMUVyML0MQRMyKbENu4c9k S1D3IYaSYKaWNlbmyYO8dNOG/NUwk7zpOOMr3ll2Ti9K6zw4SsbDEDcMXHDLPV4Ry7ub /myLmu7C9Y94hAKV2uZm8JsHFwMLOef0uxEWirgGKEkkFexSLn7dBWoJH/5SMCEkbmrI MnaOQe/Zyk4D79HIK0JEpiKIBcoDIOjFAUsWD1L5mjbcnE6Mqh/X5E0mq8iVUdWqAlll DL9Q== X-Gm-Message-State: AOJu0YxFVr/hdzHlJ/OCEZnmXRrF+Uc7atfH58NAy85/GeP9/Dqx89i4 plc54mL1T+J5AYJRkzNyjB5Yrg== X-Google-Smtp-Source: AGHT+IGiNyp4BDf3d9yPRBOHGSfQnZoXoW25bC8vSfd0VcYXPTxmTM0MW3X00u/oXRn/zjy4xB//nA== X-Received: by 2002:a92:d28e:0:b0:345:e438:7381 with SMTP id p14-20020a92d28e000000b00345e4387381mr60861ilp.2.1697651699484; Wed, 18 Oct 2023 10:54:59 -0700 (PDT) Received: from [192.168.1.128] ([38.15.45.1]) by smtp.gmail.com with ESMTPSA id v37-20020a05663835a500b0043978165d54sm1355214jal.104.2023.10.18.10.54.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Oct 2023 10:54:58 -0700 (PDT) Message-ID: <82594142-0ffa-4965-b37e-bef66cc08bfd@linuxfoundation.org> Date: Wed, 18 Oct 2023 11:54:57 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the ftrace tree with the kselftest-fixes tree Content-Language: en-US To: Steven Rostedt Cc: Stephen Rothwell , Masami Hiramatsu , Shuah Khan , Beau Belgrave , Linux Kernel Mailing List , Linux Next Mailing List , Shuah Khan References: <20231018123014.65073211@canb.auug.org.au> <8482e2c8-9ee9-4207-9ad5-b2e66dd38b4a@linuxfoundation.org> <20231018120744.1f17950c@gandalf.local.home> From: Shuah Khan In-Reply-To: <20231018120744.1f17950c@gandalf.local.home> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/18/23 10:07, Steven Rostedt wrote: > On Wed, 18 Oct 2023 10:01:04 -0600 > Shuah Khan wrote: > >>> I fixed it up (see below) 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. >>> >> >> Thank you Stephen. >> >> Steve, how would you like to handle this one. I am planning >> to send fix to Linus this week to be included in Linux 6.6 >> in a fixes update. > > Feel free to send it as you expected to. I do a merge of Linus's tree before > sending a pull request for the merge window, and report all conflicts that > occur. > > Linus is good at merge conflict resolution, so this should not be a problem. > > -- Steve Thank you. I will cc you when I send the pull request later on this week. thanks, -- Shuah