* Rebasing the for-next branch
@ 2021-11-16 23:24 Bart Van Assche
2021-11-16 23:34 ` Martin K. Petersen
0 siblings, 1 reply; 2+ messages in thread
From: Bart Van Assche @ 2021-11-16 23:24 UTC (permalink / raw)
To: Martin K. Petersen; +Cc: James Bottomley, linux-scsi
Hi Martin,
Do you plan to rebase the for-next branch of
git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git on v5.16-rc1?
I just noticed that there are multiple merge conflicts between the UFS
patch series I'm working on (based on mkp-scsi/for-next) and v5.16-rc1.
Although rebasing is being frowned upon in the Linux kernel community,
Linus probably will be grateful if we do the work of reducing merge
conflicts before the v5.17-rc1 pull request is sent.
Thanks,
Bart.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Rebasing the for-next branch
2021-11-16 23:24 Rebasing the for-next branch Bart Van Assche
@ 2021-11-16 23:34 ` Martin K. Petersen
0 siblings, 0 replies; 2+ messages in thread
From: Martin K. Petersen @ 2021-11-16 23:34 UTC (permalink / raw)
To: Bart Van Assche; +Cc: Martin K. Petersen, James Bottomley, linux-scsi
Bart,
> Do you plan to rebase the for-next branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git on
> v5.16-rc1?
Yes, I'll get the branches going shortly. Been stuck in meetings all day
yesterday and today.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-16 23:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-16 23:24 Rebasing the for-next branch Bart Van Assche
2021-11-16 23:34 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).