From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 727C315ADB4 for ; Wed, 19 Jun 2024 19:33:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718825642; cv=none; b=Kyahhx9VT/zFrrbUldwbBNT1tcHKuFp45Bhm6TK7ia9Z+X4o9gQYxwPR2rRjt5g/nXBxh7102uN8JavDABjN/fPd2A4ZPhMUBZQk4yIoAP7G3djR6Xl9tIflctAzxi8Gec7LjU0JSvF6cpqaRQYTBzS6tFUf+Fn/XkK8jSngWx4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718825642; c=relaxed/simple; bh=nJhUYmrgF8khp038rH7E0vBosSYGyEPbRCtSDy5hfRk=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=FVD/0GgxY4hpNkIRXng4p/MpDrzu8ShUIhgi1stHTYDpAZDBGqAmeWokHiMD2S/72Lvwe0TIb13OwYHEn+zmfjh+gI3N5MIQs1m7TOYUfIlV/PMC/FBQvpq8iv3dzmAonbkrPY32aWQs88r4NggkHOfIVnTDrM4Ek5oIDuNsvTg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=inQXRDYO; arc=none smtp.client-ip=209.85.167.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="inQXRDYO" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-52c32d934c2so145439e87.2 for ; Wed, 19 Jun 2024 12:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1718825638; x=1719430438; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=2rGUjDMYzm7lFpUwAY5iZvI8fijhYwMrH7RYSZjeZEU=; b=inQXRDYOFIhYsrTKtCMzRobUh+zh/GvRqecGnewBpBFbeXmF3OXBvXKXCvSxQ62wHX 7JKQKoGfW33UrMopeFE4oia2NC4F0hyGnjxqbV+6ev+rr05GEr6TSkaH805CgQaI1J+V m5P+TBDbMkJV9gps3Um/4iX/obTU+oFDmnBlFNLZk+goHrNy/KbLkZ13IFp5t08v4ZBf jjkNmn2Tdb+ekmcD0cBjqybQe0RwpMJagA5Kwog/hV9OquKiZx5SbXGKCaICmI0sA4eW DEA2lLPTr3VARUFENgRVXF1GYZWREZnJ+AE9csuw0KOTOAzBBN/DKXQ1bnkF4QSWir6x YCrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718825638; x=1719430438; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2rGUjDMYzm7lFpUwAY5iZvI8fijhYwMrH7RYSZjeZEU=; b=Weie3VKjhBwMfjOMyD5bjz0/qXfmRfF9xIB+Yz84rejtjECa7d7wEFFdTs2pFB+g8U F87YUBU87D/O1g7zJ7zucbkshTLZpQzQ9RZUOwdEiM+oDt/xOujqV+Jk1LzeToCO2UA5 O7AwAXDr8QNFRaqPt74S0OTTvxoaAqekM6PUQS3VFu93XKG8Xnu4MWyqRqpjQq97YG/k tEpIqNAa0v8/lMzJJCedRsKRwN4jNAdH5M4lhLzqjxpPZ430EhSLv0Qg86v0iwe86iKV BsSIw9d+/blyCfuev0j/FtLrYcqXUzUX4Qp1BJxqBqTmaceDZwnCDUh/x6hOKUbEPrFr 88IQ== X-Forwarded-Encrypted: i=1; AJvYcCUk74eltdtRa1vVmu969GmeNRXx9bO6e0Uz9VxtqEoAIO+3Oou3ohi4z2nu+rFYlx0/CfbtvnkXu3hDRPqYYsUIXPFWiyau2bodKA== X-Gm-Message-State: AOJu0YzAdT/4AXkK5H9eLmXfD+Q395pH3EbmsZz1bESB0d9xoGaGIm2t MpUBoeuqaAlAhRUJqiZGXH1vG+qqtkTNO1Fs1qGTbA2zmJmdSOcojvmkPQQ9hVpp3JPbr8H6Sdi OFthqhC0jf64c5i8J93bm8Qf8vwAqGc+1oZwUHQ== X-Google-Smtp-Source: AGHT+IE91ezuO/TQwQfm8V42ORY0PMsANSYBITfPybm0WqpQNZwrx4Oib/yIen6E1DuqgRrLDQH+dcE2vHWlSPILDjI= X-Received: by 2002:a05:6512:489a:b0:52c:c9b6:8f4e with SMTP id 2adb3069b0e04-52ccaa5a0a0mr2136538e87.59.1718825637613; Wed, 19 Jun 2024 12:33:57 -0700 (PDT) Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240612075829.18241-1-brgl@bgdev.pl> In-Reply-To: From: Bartosz Golaszewski Date: Wed, 19 Jun 2024 21:33:46 +0200 Message-ID: Subject: Re: [GIT PULL] Immutable tag between the Bluetooth and pwrseq branches for v6.11-rc1 To: Luiz Augusto von Dentz Cc: Marcel Holtmann , Krzysztof Kozlowski , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jun 19, 2024 at 8:59=E2=80=AFPM Luiz Augusto von Dentz wrote: > > Hi Bartosz, > > On Wed, Jun 19, 2024 at 3:35=E2=80=AFAM Bartosz Golaszewski wrote: > > > > On Wed, Jun 12, 2024 at 5:00=E2=80=AFPM Bartosz Golaszewski wrote: > > > > > > On Wed, Jun 12, 2024 at 4:54=E2=80=AFPM Luiz Augusto von Dentz > > > wrote: > > > > > > > > Hi Bartosz, > > > > > > > > On Wed, Jun 12, 2024 at 10:45=E2=80=AFAM Bartosz Golaszewski wrote: > > > > > > > > > > On Wed, Jun 12, 2024 at 4:43=E2=80=AFPM Luiz Augusto von Dentz > > > > > wrote: > > > > > > > > > > > > Hi Bartosz, > > > > > > > > > > > > On Wed, Jun 12, 2024 at 3:59=E2=80=AFAM Bartosz Golaszewski wrote: > > > > > > > > > > > > > > From: Bartosz Golaszewski > > > > > > > > > > > > > > Hi Marcel, Luiz, > > > > > > > > > > > > > > Please pull the following power sequencing changes into the B= luetooth tree > > > > > > > before applying the hci_qca patches I sent separately. > > > > > > > > > > > > > > Link: https://lore.kernel.org/linux-kernel/20240605174713.GA7= 67261@bhelgaas/T/ > > > > > > > > > > > > > > The following changes since commit 83a7eefedc9b56fe7bfeff13b6= c7356688ffa670: > > > > > > > > > > > > > > Linux 6.10-rc3 (2024-06-09 14:19:43 -0700) > > > > > > > > > > > > > > are available in the Git repository at: > > > > > > > > > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.gi= t tags/pwrseq-initial-for-v6.11 > > > > > > > > > > > > > > for you to fetch changes up to 2f1630f437dff20d02e4b3f07e836f= 42869128dd: > > > > > > > > > > > > > > power: pwrseq: add a driver for the PMU module on the QCom = WCN chipsets (2024-06-12 09:20:13 +0200) > > > > > > > > > > > > > > -------------------------------------------------------------= --- > > > > > > > Initial implementation of the power sequencing subsystem for = linux v6.11 > > > > > > > > > > > > > > -------------------------------------------------------------= --- > > > > > > > Bartosz Golaszewski (2): > > > > > > > power: sequencing: implement the pwrseq core > > > > > > > power: pwrseq: add a driver for the PMU module on the Q= Com WCN chipsets > > > > > > > > > > > > Is this intended to go via bluetooth-next or it is just because= it is > > > > > > a dependency of another set? You could perhaps send another set > > > > > > including these changes to avoid having CI failing to compile. > > > > > > > > > > > > > > > > No, the pwrseq stuff is intended to go through its own pwrseq tre= e > > > > > hence the PR. We cannot have these commits in next twice. > > > > > > > > Not following you here, why can't we have these commits on differen= t > > > > next trees? If that is the case how can we apply the bluetooth > > > > specific ones without causing build regressions? > > > > > > > > > > We can't have the same commits twice with different hashes in next > > > because Stephen Rothwell will yell at us both. > > > > > > Just pull the tag I provided and then apply the Bluetooth specific > > > changes I sent on top of it. When sending to Linus Torvalds/David > > > Miller (not sure how your tree gets upstream) mention that you pulled > > > in the pwrseq changes in your PR cover letter. > > By pull the tag you mean using merge commits to merge the trees and > not rebase, doesn't that lock us down to only doing merge commits > rather than rebases later on? I have never used merge commits before. > There is some documentation around it that suggests not to use merges: > > 'While merges from downstream are common and unremarkable, merges from > other trees tend to be a red flag when it comes time to push a branch > upstream. Such merges need to be carefully thought about and well > justified, or there=E2=80=99s a good chance that a subsequent pull reques= t > will be rejected.' > https://docs.kernel.org/maintainer/rebasing-and-merging.html#merging-from= -sibling-or-upstream-trees > > But then looking forward in that documentation it says: > > 'Another reason for doing merges of upstream or another subsystem tree > is to resolve dependencies. These dependency issues do happen at > times, and sometimes a cross-merge with another tree is the best way > to resolve them; as always, in such situations, the merge commit > should explain why the merge has been done. Take a moment to do it > right; people will read those changelogs.' > > So I guess that is the reason we want to merge the trees, but what I'm > really looking forward to is for the 'proper' commands and commit > message to use to make sure we don't have problems in the future. > You shouldn't really need to rebase your branch very often anyway. This is really for special cases. But even then you can always use: `git rebase --rebase-merges` to keep the merge commits. The commands you want to run are: git pull git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git tags/pwrseq-initial-for-v6.11 git am or b4 shazam on the patches targeting the Bluetooth subsystem git push That's really it, there's not much else to it. Bart > > > Bart > > > > Gentle ping. > > > > Bart > > > > -- > Luiz Augusto von Dentz