From: Jakub Kicinski <kuba@kernel.org>
To: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
davem@davemloft.net, linux-bluetooth@vger.kernel.org,
netdev@vger.kernel.org
Subject: Re: pull request: bluetooth-next 2024-07-14
Date: Mon, 15 Jul 2024 07:01:33 -0700 [thread overview]
Message-ID: <20240715070133.63140316@kernel.org> (raw)
In-Reply-To: <CACMJSes7rBOWFWxOaXZt70++XwDBTNr3E4R9KTZx+HA0ZQFG9Q@mail.gmail.com>
On Mon, 15 Jul 2024 15:55:56 +0200 Bartosz Golaszewski wrote:
> Luiz pulled the immutable branch I provided (on which my PR to Linus
> is based) but I no longer see the Merge commit in the bluetooth-next
> tree[1]. Most likely a bad rebase.
>
> Luiz: please make sure to let Linus (or whomever your upstream is)
> know about this. I'm afraid there's not much we can do now, the
> commits will appear twice in mainline. :(
If Luiz does rebases, maybe he could rebase, drop the patches and
re-pull again? Or, you know, re-pull in the middle of a rebase
so that build doesn't break. Should be pretty.. doable.. ?
next prev parent reply other threads:[~2024-07-15 14:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-15 1:57 pull request: bluetooth-next 2024-07-14 Luiz Augusto von Dentz
2024-07-15 13:49 ` Jakub Kicinski
2024-07-15 13:55 ` Bartosz Golaszewski
2024-07-15 13:59 ` Bartosz Golaszewski
2024-07-15 13:59 ` Luiz Augusto von Dentz
2024-07-15 14:05 ` Jakub Kicinski
2024-07-15 14:10 ` Luiz Augusto von Dentz
2024-07-15 14:17 ` Bartosz Golaszewski
2024-07-15 14:28 ` Luiz Augusto von Dentz
2024-07-15 14:32 ` Bartosz Golaszewski
2024-07-15 14:01 ` Jakub Kicinski [this message]
2024-07-15 14:15 ` Bartosz Golaszewski
-- strict thread matches above, loose matches on Subject: below --
2024-07-15 1:51 Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240715070133.63140316@kernel.org \
--to=kuba@kernel.org \
--cc=bartosz.golaszewski@linaro.org \
--cc=davem@davemloft.net \
--cc=linux-bluetooth@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.