From: Jani Nikula <jani.nikula@linux.intel.com>
To: Bjorn Helgaas <helgaas@kernel.org>,
suijingfeng <suijingfeng@loongson.cn>
Cc: "Limonciello, Mario" <Mario.Limonciello@amd.com>,
"15330273260@189.cn" <15330273260@189.cn>,
"linux-fbdev@vger.kernel.org" <linux-fbdev@vger.kernel.org>,
"Pan, Xinhui" <Xinhui.Pan@amd.com>,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
"nouveau@lists.freedesktop.org" <nouveau@lists.freedesktop.org>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>,
"Chai, Thomas" <YiPeng.Chai@amd.com>,
"Gao, Likun" <Likun.Gao@amd.com>,
David Airlie <airlied@gmail.com>,
Ville Syrjala <ville.syrjala@linux.intel.com>,
Yi Liu <yi.l.liu@intel.com>, Karol Herbst <kherbst@redhat.com>,
"amd-gfx@lists.freedesktop.org" <amd-gfx@lists.freedesktop.org>,
Jason Gunthorpe <jgg@ziepe.ca>, Ben Skeggs <bskeggs@redhat.com>,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
Kevin Tian <kevin.tian@intel.com>,
"Lazar, Lijo" <Lijo.Lazar@amd.com>,
Daniel Vetter <daniel@ffwll.ch>,
"Zhang, Bokun" <Bokun.Zhang@amd.com>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Alex Williamson <alex.williamson@redhat.com>,
Abhishek Sahu <abhsahu@nvidia.com>,
Maxime Ripard <mripard@kernel.org>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
Yishai Hadas <yishaih@nvidia.com>,
Cornelia Huck <cohuck@redhat.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
"Deucher, Alexander" <Alexander.Deucher@amd.com>,
"Koenig, Christian" <Christian.Koenig@amd.com>,
"Zhang, Hawking" <Hawking.Zhang@amd.com>
Subject: Re: [PATCH v7 6/8] PCI/VGA: Introduce is_boot_device function callback to vga_client_register
Date: Fri, 30 Jun 2023 21:32:20 +0300 [thread overview]
Message-ID: <87v8f4243v.fsf@intel.com> (raw)
In-Reply-To: <20230630174156.GA487980@bhelgaas>
On Fri, 30 Jun 2023, Bjorn Helgaas <helgaas@kernel.org> wrote:
> On Fri, Jun 30, 2023 at 10:14:11AM +0800, suijingfeng wrote:
>> On 2023/6/30 01:44, Limonciello, Mario wrote:
>> > > On 2023/6/29 23:54, Bjorn Helgaas wrote:
>> > > > On Thu, Jun 22, 2023 at 01:08:15PM +0800, Sui Jingfeng wrote:
>
>> > > > 4) Right now we're in the middle of the v6.5 merge window, so new
>> > > > content, e.g., this series, is too late for v6.5. Most
>> > > > maintainers, including me, wait to merge new content until the
>> > > > merge window closes and a new -rc1 is tagged. This merge window
>> > > > should close on July 9, and people will start merging content for
>> > > > v6.6, typically based on v6.5-rc1.
>> > >
>> > > Would you will merge all of the patches in this series (e.g. including
>> > > the patch for drm/amdgpu(7/8) and drm/radeon(8/8)) ?
>> > >
>> > > Or just part of them?
>
> The bulk of this series is drivers/pci changes, so typically I would
> merge all the patches after getting Acked-by tags from the other
> subsystems (DRM and VFIO).
For the (negligible) i915 parts,
Acked-by: Jani Nikula <jani.nikula@intel.com>
>> Is it possible to merge the PCI/VGA part as fast as possible,
>> especially the PATCH-0006 PCI/VGA: Introduce is_boot_device function
>> callback to vga_client_register
>
> We're in the middle of the v6.5 merge window, so it's too late to add
> things to v6.5-rc1. The most likely path for new material like this
> would be to queue it for v6.6, which means I would merge it after
> v6.5-rc1 is tagged (that tag will probably happen on July 9).
Perhaps the part that causes confusion here is that the drm-misc-next
and drm-intel-next branches, for example, are always open for new
patches; it's just that there's a cutoff at around rc5/rc6 after which
they start targeting the next+1 release. We basically hide the merge
window from a lot of drm developers.
> It would then be in -next until the v6.6 merge window opens (likely in
> September), when it would be merged into Linus' tree.
>
> If the series fixes a regression or other major defect, it's
> *possible* to merge things earlier, so they appear in v6.5. But this
> series doesn't seem to fall in that category, so I think v6.6 is a
> more realistic target.
>
> Merging for v6.6 would include both the PCI parts and the DRM parts at
> the same time, so hopefully that addresses your dependency concerns.
I guess the main question is whether Sui Jingfeng has follow-up work
planned in drm that depends on these being merged. This would set that
back by a full release. (But it happens.)
BR,
Jani.
>
> I suggest that you wait until v6.5-rc1, rebase your patches so they
> apply cleanly on that tag, collect all the Reviewed-by and Acked-by
> tags, include them in your commit logs, and then repost them.
>
> Bjorn
--
Jani Nikula, Intel Open Source Graphics Center
next prev parent reply other threads:[~2023-06-30 18:32 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 3:01 [PATCH v7 0/8] PCI/VGA: Introduce is_boot_device function callback to vga_client_register Sui Jingfeng
2023-06-13 3:01 ` [PATCH v7 1/8] PCI/VGA: Use unsigned type for the io_state variable Sui Jingfeng
2023-06-13 3:01 ` [PATCH v7 2/8] PCI/VGA: Deal only with VGA class devices Sui Jingfeng
2023-06-14 10:50 ` Sui Jingfeng
2023-06-15 21:11 ` Alex Deucher
2023-06-16 7:11 ` Sui Jingfeng
2023-06-16 13:41 ` Alex Deucher
2023-06-16 14:22 ` Sui Jingfeng
2023-06-16 14:34 ` Alex Deucher
2023-06-16 15:44 ` Sui Jingfeng
2023-06-18 12:11 ` Sui Jingfeng
2023-06-19 2:17 ` Sui Jingfeng
2023-06-19 2:23 ` Sui Jingfeng
2023-06-21 7:33 ` Sui Jingfeng
2023-07-03 17:18 ` Sui Jingfeng
2023-06-19 3:02 ` Maciej W. Rozycki
2023-06-19 3:45 ` Sui Jingfeng
2023-06-13 3:01 ` [PATCH v7 3/8] PCI/VGA: Tidy up the code and comment format Sui Jingfeng
2023-06-13 3:01 ` [PATCH v7 4/8] PCI/VGA: Replace full MIT license text with SPDX identifier Sui Jingfeng
2023-06-13 3:01 ` [PATCH v7 5/8] video/aperture: Add a helper to detect if an aperture contains firmware FB Sui Jingfeng
2023-06-27 14:21 ` Sui Jingfeng
2023-06-13 3:01 ` [PATCH v7 6/8] PCI/VGA: Introduce is_boot_device function callback to vga_client_register Sui Jingfeng
2023-06-22 5:08 ` Sui Jingfeng
2023-06-29 15:54 ` Bjorn Helgaas
2023-06-29 17:00 ` Sui Jingfeng
2023-06-29 17:44 ` Limonciello, Mario
2023-06-30 2:14 ` suijingfeng
2023-06-30 17:41 ` Bjorn Helgaas
2023-06-30 18:32 ` Jani Nikula [this message]
2023-06-30 4:42 ` Sui Jingfeng
2023-06-27 14:35 ` Sui Jingfeng
2023-06-29 14:41 ` Sui Jingfeng
2023-06-13 3:01 ` [PATCH v7 7/8] drm/amdgpu: Implement the is_boot_device callback function Sui Jingfeng
2023-06-15 6:51 ` Sui Jingfeng
2023-06-13 3:01 ` [PATCH v7 8/8] drm/radeon: " Sui Jingfeng
2023-06-27 14:20 ` Sui Jingfeng
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=87v8f4243v.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=15330273260@189.cn \
--cc=Alexander.Deucher@amd.com \
--cc=Bokun.Zhang@amd.com \
--cc=Christian.Koenig@amd.com \
--cc=Hawking.Zhang@amd.com \
--cc=Lijo.Lazar@amd.com \
--cc=Likun.Gao@amd.com \
--cc=Mario.Limonciello@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=YiPeng.Chai@amd.com \
--cc=abhsahu@nvidia.com \
--cc=airlied@gmail.com \
--cc=alex.williamson@redhat.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=bhelgaas@google.com \
--cc=bskeggs@redhat.com \
--cc=cohuck@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=helgaas@kernel.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jgg@ziepe.ca \
--cc=joonas.lahtinen@linux.intel.com \
--cc=kevin.tian@intel.com \
--cc=kherbst@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
--cc=suijingfeng@loongson.cn \
--cc=tvrtko.ursulin@linux.intel.com \
--cc=tzimmermann@suse.de \
--cc=ville.syrjala@linux.intel.com \
--cc=yi.l.liu@intel.com \
--cc=yishaih@nvidia.com \
/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 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).