Received-SPF: pass (google.com: domain of linux-kernel+bounces-3322-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Feedback-ID: i787e41f1:Fastmail
Date: Mon, 18 Dec 2023 11:26:08 +0100
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patch in the driver-core tree
Message-ID: <2023121857-myself-contact-8ca8@gregkh>
References: <20231218154034.56bf4c68@canb.auug.org.au>
 <20231217215429.944b318dc38a3646e734a807@linux-foundation.org>
 <20231218173506.2165eef6@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231218173506.2165eef6@canb.auug.org.au>

On Mon, Dec 18, 2023 at 05:35:06PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
> 
> On Sun, 17 Dec 2023 21:54:29 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > On Mon, 18 Dec 2023 15:40:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > The following commit is also in the mm tree as a different commit (but
> > > the same patch):
> > > 
> > >   2678fd2fe9ee ("initramfs: Expose retained initrd as sysfs file")
> > > 
> > > This is commit
> > > 
> > >   426081603f6c ("initramfs: expose retained initrd as sysfs file")
> > > 
> > > in the mm tree.  
> > 
> > I'm suspecting that something went wrong here?
> 
> Like what?  You and Greg have applied the same patch.  It happens.

Yeah, sorry about that, git should be able to handle this fine.

greg k-h