From: Greg KH <gregkh@linuxfoundation.org>
To: Tom Rix <trix@redhat.com>
Cc: Moritz Fischer <mdf@kernel.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: Mon, 11 Jan 2021 17:09:38 +0100 [thread overview]
Message-ID: <X/x4QjGyP8ssYUDI@kroah.com> (raw)
In-Reply-To: <7923d9dc-c503-5318-6e4f-931f8c13c1be@redhat.com>
On Mon, Jan 11, 2021 at 07:55:24AM -0800, Tom Rix wrote:
>
> On 1/11/21 6:54 AM, Greg KH wrote:
> > On Mon, Jan 11, 2021 at 06:40:24AM -0800, Tom Rix wrote:
> >> On 1/10/21 10:57 PM, Greg KH wrote:
> >>> On Sun, Jan 10, 2021 at 11:43:54AM -0800, Tom Rix wrote:
> >>>> 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.
> >>> Ick, no! NEVER rebase a public branch. Why does it matter the speed of
> >>> my branch vs. anyone elses? Git handles merges very well.
> >>>
> >>> Just like Linus's branches move much faster than mine, and I don't
> >>> rebase my branches, you shouldn't rebase yours.
> >>>
> >>> Becides, I'm only taking _PATCHES_ for fpga changes at the moment, no
> >>> git pulls, so why does it matter at all for any of this?
> >>>
> >>> What is the problem you are trying to solve here?
> >> This 5.12 fpga patchset not making it into 5.11.
> > Ok, but isn't it the responsibility of the submitter to make sure they
> > apply properly when sending them out?
> >
> >> At some point before the 5.11 window, I tried it on next and it failed to merge.
> >>
> >> This points to needing some c/i so it does not happen again.
> > "again"? Merges and the like are a totally normal thing and happen all
> > the time, I still fail to understand what you are trying to "solve" for
> > here...
>
> What can I do to help make your merges as easy as possible ?
I have not had any problems with merges, I've only had "problems"
rejecting patches for their content.
Try helping out with patch reviews if you want, finding and fixing
things before I review them is usually a good idea :)
> Does the patchwork infra Moritz was speaking of earlier need fixing help?
No idea, I don't use it.
> Any other things ?
What problems are you trying to solve here? What's wrong with how this
subsystem is working that you are feeling needs to be addressed?
confused,
greg k-h
next prev parent reply other threads:[~2021-01-11 16:09 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
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 [this message]
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=X/x4QjGyP8ssYUDI@kroah.com \
--to=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=trix@redhat.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).