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 5BFDB154458; Tue, 9 Jul 2024 09:23:42 +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=1720517022; cv=none; b=d0tirpO4GnYhL+1G4d0bgPxv5kx7UpcLNKkWNu7sF4HWsz+I0YZsz71QyMKgFdaYlJeQSFBdQCfI5qHlQB7Sb8bTpcfgQJ9jPAaP0FrHizL777M6xbveaodeKKqVss0/vYMBHKNwqih/EpINXQYhnO2PbWeBFqtbI0XvfP12LO0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720517022; c=relaxed/simple; bh=Zv+pv+pZmKbhIWv+tnX51tCjTYginfxVgAyJhKPvWJo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=D0bvMpBIUMtKn+luUijL+7C/7xz/Fbhc8VmWedGACQLFauWq6QKALZrM8Q+n75NGBrd5QK4/l4dS/ICQ+LZypFl7r+6RoJQQ0PsbvXHhqtXbXw3sSZuz3ygNFtwGWGHPXvOjQ48pWq+Spj0ju0/pnTJ605/ZzAI0/cDPsleyo8g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=n6qdWwU4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="n6qdWwU4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89BC2C32786; Tue, 9 Jul 2024 09:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720517021; bh=Zv+pv+pZmKbhIWv+tnX51tCjTYginfxVgAyJhKPvWJo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=n6qdWwU4JiHjyIS0syIfTQXgfct+41zo7mUBgoXdQpUEjCCC85qDadJSkmL2DKJnP a6zy+v0TO7295Fp0/SRo4FZGy6/Xgjgu6ZiOfXtYGjf/VunFpWkor4kAysxLitszGd oCjMztVS+JK5lFO8cZLMe7JLRMHjpDOPh9yLoIhjmzeQVm/weC2nYyW8j5F/693/sn Hem8he9MbBqkUFeCQbKqUTS8SKZ0wgYbBuOCM/VulpEOsFno9QKq0HDDuCfsfeJj9q 20ghgVDXB3yxqLz+qQc5Tq4KrHTOUq2+dKasoEcEPF4Z/C9ZMrAxeCuivXQEtaugQl Vcx1lp802MftQ== Date: Tue, 9 Jul 2024 10:23:37 +0100 From: Lee Jones To: Stephen Rothwell Cc: Sebastian Reichel , Hans de Goede , Linux Kernel Mailing List , Linux Next Mailing List , Thomas =?iso-8859-1?Q?Wei=DFschuh?= Subject: Re: linux-next: manual merge of the battery tree with the leds-lj tree Message-ID: <20240709092337.GB501857@google.com> References: <20240709133420.55645c59@canb.auug.org.au> <20240709161729.27935749@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240709161729.27935749@canb.auug.org.au> On Tue, 09 Jul 2024, Stephen Rothwell wrote: > Hi all, > > On Tue, 9 Jul 2024 13:34:20 +1000 Stephen Rothwell wrote: > > > > Today's linux-next merge of the battery tree got a conflict in: > > > > include/linux/leds.h > > > > between commit: > > > > 6b0d3355e5a5 ("leds: class: Add flag to avoid automatic renaming of LED devices") > > This is also in the mfd tree. That's intentional. It's a shared branch. Same commit ID, right? -- Lee Jones [李琼斯]