From: Tom Rix <trix@redhat.com>
To: Moritz Fischer <mdf@kernel.org>
Cc: gregkh@linuxfoundation.org,
"linux-fpga@vger.kernel.org" <linux-fpga@vger.kernel.org>,
linux-kernel@vger.kernel.org, moritzf@google.com,
Rikard Falkeborn <rikard.falkeborn@gmail.com>,
Zheng Yongjun <zhengyongjun3@huawei.com>,
Russ Weight <russell.h.weight@intel.com>,
"Gerlach, Matthew" <matthew.gerlach@intel.com>,
Sonal Santan <sonal.santan@xilinx.com>,
Xu Yilun <yilun.xu@intel.com>,
Richard Gong <richard.gong@intel.com>
Subject: Re: [PATCH 0/8] FPGA DFL Changes for 5.12
Date: Sun, 10 Jan 2021 11:43:54 -0800 [thread overview]
Message-ID: <95af46d6-d123-f610-2f21-6d6de6f248e9@redhat.com> (raw)
In-Reply-To: <X/sz6lDq8WFzrRUJ@archbook>
On 1/10/21 9:05 AM, Moritz Fischer wrote:
> Tom,
>
> On Sun, Jan 10, 2021 at 07:46:29AM -0800, Tom Rix wrote:
>> On 1/7/21 8:09 AM, Tom Rix wrote:
>>> On 1/6/21 8:37 PM, Moritz Fischer wrote:
>>>> This is a resend of the previous (unfortunately late) patchset of
>>>> changes for FPGA DFL.
>>> Is there something I can do to help ?
>>>
>>> I am paid to look after linux-fpga, so i have plenty of time.
>>>
>>> Some ideas of what i am doing now privately i can do publicly.
>>>
>>> 1. keep linux-fpga sync-ed to greg's branch so linux-fpga is normally in a pullable state.
> Is it not? It currently points to v5.11-rc1. If I start applying patches
> that require the changes that went into Greg's branch I can merge.
I mean the window between when we have staged patches and when they go into Greg's branch.
We don't have any now, maybe those two trival ones.
Since Greg's branch moves much faster than ours, our staging branch needs to be rebased regularly until its merge.
There are no outstanding fixes so all changes would go to -next.
>>> 2. an in-flight dev branch for the outstanding patches
>> I have setup these branches based on Greg's char-misc-next
>>
>> fpga-next, which is char-misc-next base for fpga-testing
>>
>> fpga-testing, all the in-flight patches that would apply with automatic merge conflict resolution
>>
>> These are respectively
>>
>> https://github.com/trixirt/linux-fpga/tree/fpga-next
>>
>> https://github.com/trixirt/linux-fpga/tree/fpga-testing
> Feel free to have your own repos/branches etc, but I'd like to keep the
> offical trees on kernel.org.
Is there a way for me to move these to kernel.org ?
>
> Tbh I'd much rather see the patchwork instance be cleaned up if you want
> to do stuff.
Please point me at the wreckage and I will clean it up.
>>
>> There are two trivial changes, that could go to 5.12 now.
>>
>> fpga: dfl: fme: Constify static attribute_group structs
>>
>> fpga: Use DEFINE_SPINLOCK() for spinlock
>>
>> respectively
>>
>> https://lore.kernel.org/linux-fpga/20210108235414.48017-1-rikard.falkeborn@gmail.com/
>>
>> https://lore.kernel.org/linux-fpga/20201228135135.28788-1-zhengyongjun3@huawei.com/
> I was going to pick them up monday ...
>>
>> There are a couple of patchsets that conflict
>>
>> https://lore.kernel.org/linux-fpga/20210105230855.15019-7-russell.h.weight@intel.com/
>>
>> https://lore.kernel.org/linux-fpga/20201203171548.1538178-3-matthew.gerlach@linux.intel.com/
> Conflict between what and what?
There are basic git am ... applying problems.
By having a -testing branch it is easier to see where the conficts with all the outstanding patchsets.
>
>> And the xilinx patchset
>>
>> https://lore.kernel.org/linux-fpga/20201217075046.28553-1-sonals@xilinx.com/
>>
>> Which is being split/worked on offline.
> I'm not sure what that means.
Don't worry about this until a new patchset lands.
Tom
>>
>> If I have missed any patchset, poke me.
>>
>> Tom
> - Moritz
>
next prev parent reply other threads:[~2021-01-10 19:45 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 4:37 [PATCH 0/8] FPGA DFL Changes for 5.12 Moritz Fischer
2021-01-07 4:37 ` [PATCH 1/8] fpga: dfl: refactor cci_enumerate_feature_devs() Moritz Fischer
2021-01-07 4:37 ` [PATCH 2/8] fpga: dfl-pci: locate DFLs by PCIe vendor specific capability Moritz Fischer
2021-01-07 4:37 ` [PATCH 3/8] fpga: dfl: fix the definitions of type & feature_id for dfl devices Moritz Fischer
2021-01-07 4:37 ` [PATCH 4/8] fpga: dfl: move dfl_device_id to mod_devicetable.h Moritz Fischer
2021-01-07 4:37 ` [PATCH 5/8] fpga: dfl: add dfl bus support to MODULE_DEVICE_TABLE() Moritz Fischer
2021-01-07 4:37 ` [PATCH 6/8] fpga: dfl: move dfl bus related APIs to include/linux/dfl.h Moritz Fischer
2021-01-07 4:37 ` [PATCH 7/8] fpga: dfl: add support for N3000 Nios private feature Moritz Fischer
2021-01-07 4:37 ` [PATCH 8/8] memory: dfl-emif: add the DFL EMIF private feature driver Moritz Fischer
2021-01-07 16:09 ` [PATCH 0/8] FPGA DFL Changes for 5.12 Tom Rix
2021-01-07 16:14 ` Greg KH
2021-01-07 17:01 ` Tom Rix
2021-01-10 15:46 ` Tom Rix
2021-01-10 17:05 ` Moritz Fischer
2021-01-10 19:43 ` Tom Rix [this message]
2021-01-11 6:57 ` Greg KH
2021-01-11 14:40 ` Tom Rix
2021-01-11 14:54 ` Greg KH
2021-01-11 15:55 ` Tom Rix
2021-01-11 16:09 ` Greg KH
2021-01-11 16:43 ` Tom Rix
2021-01-11 18:21 ` Greg KH
2021-01-11 19:46 ` Tom Rix
2021-01-11 20:03 ` Greg KH
2021-01-11 20:28 ` Moritz Fischer
2021-01-11 22:39 ` Tom Rix
2021-01-14 16:48 ` Moritz Fischer
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=95af46d6-d123-f610-2f21-6d6de6f248e9@redhat.com \
--to=trix@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.gerlach@intel.com \
--cc=mdf@kernel.org \
--cc=moritzf@google.com \
--cc=richard.gong@intel.com \
--cc=rikard.falkeborn@gmail.com \
--cc=russell.h.weight@intel.com \
--cc=sonal.santan@xilinx.com \
--cc=yilun.xu@intel.com \
--cc=zhengyongjun3@huawei.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).