Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
Date:   Wed, 18 Oct 2023 12:07:44 -0400
From:   Steven Rostedt <rostedt@goodmis.org>
To:     Shuah Khan <skhan@linuxfoundation.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Shuah Khan <shuah@kernel.org>,
        Beau Belgrave <beaub@linux.microsoft.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the ftrace tree with the
 kselftest-fixes tree
Message-ID: <20231018120744.1f17950c@gandalf.local.home>
In-Reply-To: <8482e2c8-9ee9-4207-9ad5-b2e66dd38b4a@linuxfoundation.org>
References: <20231018123014.65073211@canb.auug.org.au>
        <8482e2c8-9ee9-4207-9ad5-b2e66dd38b4a@linuxfoundation.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Wed, 18 Oct 2023 10:01:04 -0600
Shuah Khan <skhan@linuxfoundation.org> 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