From: Dan Carpenter <dan.carpenter@oracle.com>
To: Xu Yilun <yilun.xu@intel.com>
Cc: Moritz Fischer <mdf@kernel.org>,
Nava kishore Manne <nava.manne@xilinx.com>,
Wu Hao <hao.wu@intel.com>, Michal Simek <michal.simek@xilinx.com>,
linux-fpga@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] fpga: zynq: fix zynq_fpga_has_sync()
Date: Wed, 11 May 2022 12:17:18 +0300 [thread overview]
Message-ID: <20220511091718.GQ4031@kadam> (raw)
In-Reply-To: <20220511084838.GA487393@yilunxu-OptiPlex-7050>
On Wed, May 11, 2022 at 04:48:38PM +0800, Xu Yilun wrote:
> On Wed, May 11, 2022 at 11:33:29AM +0300, Dan Carpenter wrote:
> > On Tue, May 10, 2022 at 01:00:15AM +0800, Xu Yilun wrote:
> > >
> > > Hi Dan & Moritz:
> > >
> > > Thanks for the patch. But it actually reverts Nava's patch. Since Nava's
> > > patch is not pushed to linux-next yet, could we just drop it from
> > > linux-fpga?
> >
> > I don't know if you meant linux-next. It's pushed to linux-next. But
> > linux-next is rebased every day so reverting is fine as far as linux-next
> > goes.
>
> Thanks for the info. I was not aware of that and may mess up something.
> I force pushed the linux-fpga yesterday for this patchset, then linux-next
> would be conflict with linux-fpga, is it?
>
> If it is the case, how could I remedy?
No. Don't worry about linux-next. Stephen rebuilds it from scratch
every day. It's fine if you rebase. There are quite a few trees which
rebase.
regards,
dan carpenter
next prev parent reply other threads:[~2022-05-11 9:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 12:11 [PATCH] fpga: zynq: fix zynq_fpga_has_sync() Dan Carpenter
2022-05-09 12:43 ` Tom Rix
2022-05-09 15:15 ` Nava kishore Manne
2022-05-10 12:21 ` Tom Rix
2022-05-10 14:42 ` Xu Yilun
2022-05-09 16:55 ` Xu Yilun
2022-05-10 4:16 ` Nava kishore Manne
2022-05-09 17:00 ` Xu Yilun
2022-05-11 8:33 ` Dan Carpenter
2022-05-11 8:48 ` Xu Yilun
2022-05-11 9:17 ` Dan Carpenter [this message]
2022-05-11 9:15 ` Xu Yilun
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=20220511091718.GQ4031@kadam \
--to=dan.carpenter@oracle.com \
--cc=hao.wu@intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=mdf@kernel.org \
--cc=michal.simek@xilinx.com \
--cc=nava.manne@xilinx.com \
--cc=yilun.xu@intel.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