From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D269929410; Mon, 17 Jun 2024 19:30:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718652647; cv=none; b=INBUaiMj268zoZC/1mt4KnMYgn3OjmJZGAqMS7AHWCFgBsK1Sb1/eTNcwkzIij5iS5Sq+XXkfE8qMyzcXQ5kXzr+qnq66DGbTUb4uBwFzqwaXSt4wgTtpneiNnAmnYeWB9w9npmnWhAPpRftUjAfEFLa5kHLMjZSXucMNbuZKxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718652647; c=relaxed/simple; bh=cVX0SdYoJqBkMgOZqxZIHGybXqcAsvW36JJizcqc4bM=; h=Date:From:To:Cc:Subject:Message-Id:In-Reply-To:References: Mime-Version:Content-Type; b=tSfE3nXrvF5n2tQVNNOY5PeMbxOsdwgGgGVZaDZ8IlYfAdZkiaUZWH4af9qfPaujBnQokEEeG/895LlzuI2kLPJc91vWvXplFmUiGb56UyV1vauzP0bEsBYbhujhlONNrGBNi2ISVvhEfmtjKGPPEN3JhARm7weYuiwFW8LOsuA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=0b3hZ2ZY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="0b3hZ2ZY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1606AC2BD10; Mon, 17 Jun 2024 19:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1718652647; bh=cVX0SdYoJqBkMgOZqxZIHGybXqcAsvW36JJizcqc4bM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=0b3hZ2ZYIH6ZRlB2Aa+pX+i1RRrO3GKwRfSPT02WUVo6Bfs+tMBhw+9DAQd5ycelg jmFobRL5J4aPcRo0reLo577eHzghLNGjBa0ajqI1c6kAa56/FDzNnI7bRNduNcBQNm xkAEMjVtDgLqww7ZYQTe2uRJ9UMSEjviAN9jtgZM= Date: Mon, 17 Jun 2024 12:30:46 -0700 From: Andrew Morton To: Shuah Khan Cc: Stephen Rothwell , Brendan Higgins , Jeff Johnson , "Dr. David Alan Gilbert" , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patch in the kunit-next tree Message-Id: <20240617123046.51171b70e613606212c92b5a@linux-foundation.org> In-Reply-To: <46645216-dcb7-45d6-83c5-fdd9451362ff@linuxfoundation.org> References: <20240611152225.7264e9df@canb.auug.org.au> <46645216-dcb7-45d6-83c5-fdd9451362ff@linuxfoundation.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 17 Jun 2024 13:21:25 -0600 Shuah Khan wrote: > Hi Andrew, > > On 6/10/24 23:22, Stephen Rothwell wrote: > > Hi all, > > > > The following commit is also in the mm tree as a different commit (but > > the same patch): > > > > 425ae3ab5a1f ("list: test: add the missing MODULE_DESCRIPTION() macro") > > > This is commit > > > > 245e5db4adaf ("lib/list_test: add the missing MODULE_DESCRIPTION() macro") > > > > in the mm-nonmm-unstable branch of the mm tree. > > > > Can you drop the patch from mm tree? It will help avoid merge conflicts > in case there are other KUnit patches that depend on this end up in > kunit-next. I dropped this from mm.git on June 11.