From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@kernel.org>
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 6B5B4C43334
	for <linux-kernel@archiver.kernel.org>; Fri,  1 Jul 2022 07:42:04 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S235266AbiGAHmC (ORCPT <rfc822;linux-kernel@archiver.kernel.org>);
        Fri, 1 Jul 2022 03:42:02 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38840 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229966AbiGAHmA (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 1 Jul 2022 03:42:00 -0400
Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B88D140C2
        for <linux-kernel@vger.kernel.org>; Fri,  1 Jul 2022 00:42:00 -0700 (PDT)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
        (No client certificate requested)
        by dfw.source.kernel.org (Postfix) with ESMTPS id BB61C6248A
        for <linux-kernel@vger.kernel.org>; Fri,  1 Jul 2022 07:41:59 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC3AFC3411E;
        Fri,  1 Jul 2022 07:41:58 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org;
        s=korg; t=1656661319;
        bh=HZrNIKNTW/tWeEz+OIJTTEr2M6NHVQaxjmpqR/0N95I=;
        h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
        b=T+j4uFEMnBrHe5TMnLonc7z2KICIlGfuOKDyGOIPBQGqrpdpUfcWR/nOBnUp2DA8B
         /fkvewYwjfwkajGpVw+9XFy8t5rN2ncOq6houSKYl2Udvq9Sx0mrhVB+BcknUAfuZm
         BPrr+KSGehaLBenY4mug8dPWhkkr1pAx7t8AcD/w=
Date:   Fri, 1 Jul 2022 09:41:56 +0200
From:   Greg KH <gregkh@linuxfoundation.org>
To:     Andrew Donnellan <ajd@linux.ibm.com>
Cc:     Michael Ellerman <patch-notifications@ellerman.id.au>,
        arnd@arndb.de, fbarrat@linux.ibm.com,
        Jiang Jian <jiangjian@cdjrlc.com>,
        linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] cxl: drop unexpected word "the" in the comments
Message-ID: <Yr6lRMxtX5LVdjwZ@kroah.com>
References: <20220621125321.122280-1-jiangjian@cdjrlc.com>
 <165650492410.3004956.4938254521446368740.b4-ty@ellerman.id.au>
 <fbc5d92a4028349aea0d89232db4795fb189ced4.camel@linux.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <fbc5d92a4028349aea0d89232db4795fb189ced4.camel@linux.ibm.com>
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Jun 30, 2022 at 11:10:13AM +1000, Andrew Donnellan wrote:
> On Wed, 2022-06-29 at 22:15 +1000, Michael Ellerman wrote:
> > On Tue, 21 Jun 2022 20:53:21 +0800, Jiang Jian wrote:
> > > there is an unexpected word "the" in the comments that need to be
> > > dropped
> > > 
> > > file: drivers/misc/cxl/cxl.h
> > > line: 1107
> > > +/* check if the given pci_dev is on the the cxl vphb bus */
> > > changed to
> > > +/* check if the given pci_dev is on the cxl vphb bus */
> > > 
> > > [...]
> > 
> > Applied to powerpc/next.
> > 
> > [1/1] cxl: drop unexpected word "the" in the comments
> >      
> > https://git.kernel.org/powerpc/c/882c835b71e22ca82361dab3b60b85b557abd72f
> 
> I believe Greg's already merged this in char-misc...

git can handle merges like this without any problems :)