| Message ID | 20190605194511.12127-1-leoyang.li@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL,v2] updates to soc/fsl drivers for next(v5.3) | expand |
On Wed, Jun 05, 2019 at 02:45:11PM -0500, Li Yang wrote: > Hi arm-soc maintainers, > > This is a rebase of patches that missed 5.2 merge window together with > some new patches for QE. Please help to review and merge it. We would > like this to be merged earlier because there are other patches depending > on patches in this pull request. After this is merged in arm-soc, we can > ask other sub-system maintainers to pull from this tag and apply additional > patches. Thanks. Li, You never followed up with a reply, or removed, the previous tag. So when we process the pull requests that come in, we've already merged it. So, I've merged the previous version. Can you send an incremental pull request on top of that branch/tag instead of a rebase like this was, please? Thanks! -Olof
> -----Original Message----- > From: Olof Johansson <olof@lixom.net> > Sent: Monday, June 17, 2019 6:50 AM > To: Leo Li <leoyang.li@nxp.com> > Cc: arm@kernel.org; linux-arm-kernel@lists.infradead.org; linux- > kernel@vger.kernel.org; shawnguo@kernel.org > Subject: Re: [GIT PULL v2] updates to soc/fsl drivers for next(v5.3) > > On Wed, Jun 05, 2019 at 02:45:11PM -0500, Li Yang wrote: > > Hi arm-soc maintainers, > > > > This is a rebase of patches that missed 5.2 merge window together with > > some new patches for QE. Please help to review and merge it. We > > would like this to be merged earlier because there are other patches > > depending on patches in this pull request. After this is merged in > > arm-soc, we can ask other sub-system maintainers to pull from this tag > > and apply additional patches. Thanks. > > Li, > > You never followed up with a reply, or removed, the previous tag. So when > we process the pull requests that come in, we've already merged it. Sorry about that. Will reply the previous pull request and remove the old tag if update is needed next time. > > So, I've merged the previous version. Can you send an incremental pull > request on top of that branch/tag instead of a rebase like this was, please? Actually the new pull request is based on the old pull request this time. I sent the new one as V2 hoping that you can see this first and avoid merging two times. Since you have already merged the first one, you can merge the second pull request as an incremental pull request directly. Regards, Leo > > > Thanks! > > -Olof
> -----Original Message----- > From: Leo Li > Sent: Monday, June 17, 2019 8:29 AM > To: Olof Johansson <olof@lixom.net> > Cc: arm@kernel.org; linux-arm-kernel@lists.infradead.org; linux- > kernel@vger.kernel.org; shawnguo@kernel.org > Subject: RE: [GIT PULL v2] updates to soc/fsl drivers for next(v5.3) > > > > > -----Original Message----- > > From: Olof Johansson <olof@lixom.net> > > Sent: Monday, June 17, 2019 6:50 AM > > To: Leo Li <leoyang.li@nxp.com> > > Cc: arm@kernel.org; linux-arm-kernel@lists.infradead.org; linux- > > kernel@vger.kernel.org; shawnguo@kernel.org > > Subject: Re: [GIT PULL v2] updates to soc/fsl drivers for next(v5.3) > > > > On Wed, Jun 05, 2019 at 02:45:11PM -0500, Li Yang wrote: > > > Hi arm-soc maintainers, > > > > > > This is a rebase of patches that missed 5.2 merge window together > > > with some new patches for QE. Please help to review and merge it. > > > We would like this to be merged earlier because there are other > > > patches depending on patches in this pull request. After this is > > > merged in arm-soc, we can ask other sub-system maintainers to pull > > > from this tag and apply additional patches. Thanks. > > > > Li, > > > > You never followed up with a reply, or removed, the previous tag. So > > when we process the pull requests that come in, we've already merged it. > > Sorry about that. Will reply the previous pull request and remove the old tag > if update is needed next time. > > > > > So, I've merged the previous version. Can you send an incremental pull > > request on top of that branch/tag instead of a rebase like this was, please? > > Actually the new pull request is based on the old pull request this time. I > sent the new one as V2 hoping that you can see this first and avoid merging > two times. Since you have already merged the first one, you can merge the > second pull request as an incremental pull request directly. Hi Olof, I was on vacation for the past two weeks to follow up on this. Hope this is not too late for this merge window. Like I mentioned, the new tag is on top of the previous tag (you merged) so that it should be able to be merged incrementally. The only thing is that the description of the new tag also included patches you merged with old tag. Do you want me to regenerate the tag before you can merge it? Regards, Leo
On Mon, Jul 08, 2019 at 06:48:17PM +0000, Leo Li wrote: > > > > -----Original Message----- > > From: Leo Li > > Sent: Monday, June 17, 2019 8:29 AM > > To: Olof Johansson <olof@lixom.net> > > Cc: arm@kernel.org; linux-arm-kernel@lists.infradead.org; linux- > > kernel@vger.kernel.org; shawnguo@kernel.org > > Subject: RE: [GIT PULL v2] updates to soc/fsl drivers for next(v5.3) > > > > > > > > > -----Original Message----- > > > From: Olof Johansson <olof@lixom.net> > > > Sent: Monday, June 17, 2019 6:50 AM > > > To: Leo Li <leoyang.li@nxp.com> > > > Cc: arm@kernel.org; linux-arm-kernel@lists.infradead.org; linux- > > > kernel@vger.kernel.org; shawnguo@kernel.org > > > Subject: Re: [GIT PULL v2] updates to soc/fsl drivers for next(v5.3) > > > > > > On Wed, Jun 05, 2019 at 02:45:11PM -0500, Li Yang wrote: > > > > Hi arm-soc maintainers, > > > > > > > > This is a rebase of patches that missed 5.2 merge window together > > > > with some new patches for QE. Please help to review and merge it. > > > > We would like this to be merged earlier because there are other > > > > patches depending on patches in this pull request. After this is > > > > merged in arm-soc, we can ask other sub-system maintainers to pull > > > > from this tag and apply additional patches. Thanks. > > > > > > Li, > > > > > > You never followed up with a reply, or removed, the previous tag. So > > > when we process the pull requests that come in, we've already merged it. > > > > Sorry about that. Will reply the previous pull request and remove the old tag > > if update is needed next time. > > > > > > > > So, I've merged the previous version. Can you send an incremental pull > > > request on top of that branch/tag instead of a rebase like this was, please? > > > > Actually the new pull request is based on the old pull request this time. I > > sent the new one as V2 hoping that you can see this first and avoid merging > > two times. Since you have already merged the first one, you can merge the > > second pull request as an incremental pull request directly. > > Hi Olof, > > I was on vacation for the past two weeks to follow up on this. Hope this is not too late for this merge window. Like I mentioned, the new tag is on top of the previous tag (you merged) so that it should be able to be merged incrementally. The only thing is that the description of the new tag also included patches you merged with old tag. Do you want me to regenerate the tag before you can merge it? Hi, I've now merged v2 into arm/drivers for the 5.4 merge window. If you need to add more material on top for 5.4, feel free to use it as the base that you send incremental pull requests on top of. Next time, it's probably easier if you re-generate a new pull request like I asked for -- I missed revisiting this since it seemed like a side follow up and not new material to merge. -Olof
Hi arm-soc maintainers, This is a rebase of patches that missed 5.2 merge window together with some new patches for QE. Please help to review and merge it. We would like this to be merged earlier because there are other patches depending on patches in this pull request. After this is merged in arm-soc, we can ask other sub-system maintainers to pull from this tag and apply additional patches. Thanks. Regards, Leo The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git tags/soc-fsl-next-v5.3-2 for you to fetch changes up to 21560067fb1f5e87abedc3ecec5d46f67ac0c019: soc: fsl: qe: fold qe_get_num_of_snums into qe_snums_init (2019-06-05 14:26:52 -0500) ---------------------------------------------------------------- NXP/FSL SoC driver updates for v5.3 (take 2) DPAA2 Console driver - Add driver to export two char devices to dump logs for MC and AIOP DPAA2 DPIO driver - Add support for memory backed QBMan portals - Increase the timeout period to prevent false error - Add APIs to retrieve QBMan portal probing status DPAA Qman driver - Only make liodn fixup on powerpc SoCs with PAMU iommu QUICC Engine - Add support for importing qe-snums through device tree - Some cleanups and foot print optimzation ---------------------------------------------------------------- Colin Ian King (1): soc: fsl: fix spelling mistake "Firmaware" -> "Firmware" Ioana Ciornei (2): Documentation: DT: Add entry for DPAA2 console soc: fsl: add DPAA2 console support Laurentiu Tudor (2): soc: fsl: qman: fixup liodns only on ppc targets soc: fsl: qbman_portals: add APIs to retrieve the probing status Rasmus Villemoes (6): soc: fsl: qe: drop useless static qualifier soc: fsl: qe: reduce static memory footprint by 1.7K soc: fsl: qe: introduce qe_get_device_node helper dt-bindings: soc: fsl: qe: document new fsl,qe-snums binding soc: fsl: qe: support fsl,qe-snums property soc: fsl: qe: fold qe_get_num_of_snums into qe_snums_init Roy Pledge (2): bus: mc-bus: Add support for mapping shareable portals soc: fsl: dpio: Add support for memory backed QBMan portals Vabhav Sharma (1): soc: fsl: guts: Add definition for LX2160A Youri Querry (1): soc: fsl: dpio: Increase timeout for QBMan Management Commands .../devicetree/bindings/misc/fsl,dpaa2-console.txt | 11 + .../devicetree/bindings/soc/fsl/cpm_qe/qe.txt | 13 +- MAINTAINERS | 1 + drivers/bus/fsl-mc/dprc.c | 30 +- drivers/bus/fsl-mc/fsl-mc-bus.c | 15 +- drivers/bus/fsl-mc/fsl-mc-private.h | 17 +- drivers/soc/fsl/Kconfig | 10 + drivers/soc/fsl/Makefile | 1 + drivers/soc/fsl/dpaa2-console.c | 329 +++++++++++++++++++++ drivers/soc/fsl/dpio/dpio-driver.c | 23 +- drivers/soc/fsl/dpio/qbman-portal.c | 148 +++++++-- drivers/soc/fsl/dpio/qbman-portal.h | 9 +- drivers/soc/fsl/guts.c | 6 + drivers/soc/fsl/qbman/bman_portal.c | 20 +- drivers/soc/fsl/qbman/qman_ccsr.c | 2 +- drivers/soc/fsl/qbman/qman_portal.c | 21 +- drivers/soc/fsl/qbman/qman_priv.h | 9 +- drivers/soc/fsl/qe/qe.c | 163 ++++------ include/soc/fsl/bman.h | 8 + include/soc/fsl/qman.h | 9 + 20 files changed, 695 insertions(+), 150 deletions(-) create mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt create mode 100644 drivers/soc/fsl/dpaa2-console.c