On Sun, Apr 19, 2020 at 11:22:19PM -0400, Bruce Ashfield wrote: > On Sun, Apr 19, 2020 at 9:49 PM Kevin Hao <[email protected]> wrote: > > > > On Sun, Apr 19, 2020 at 09:20:47PM -0400, Bruce Ashfield wrote: > > > On Sat, Apr 18, 2020 at 6:09 AM Kevin Hao <[email protected]> wrote: > > > > > > > > Hi Bruce, > > > > > > > > Did you miss this pull request? > > > > > > > > > > I'm seeing all the commits you listed below in the branches (and my > > > terminal history tells me that I did merge and push it). > > > > > > An attempted fetch and re-merge shows duplicate changes, as expected. > > > > The latest commit [1] on linux-yocto-dev/standard/cn96xx was merged 14 days > > ago and the pull request of this was send on Apr 07, so it seems that these > > patches don't show on the git server indeed. Did I miss something? > > > > I was talking about 5.4: > > the tip of this branch: git://github.com/haokexin/linux > v5.4/standard/cn96xx, is already in my tree:
Yes, I also got a explicitly merge reply from you for v5.4. > > From git://github.com/haokexin/linux > * [new branch] v5.4/standard/cn96xx -> > v5.4/standard/cn96xx-merge > build [/home/bruc...-yocto.git]> git checkout v5.4/standard/cn96xx > Switched to branch 'v5.4/standard/cn96xx' > build [/home/bruc...-yocto.git]> git merge v5.4/standard/cn96xx-merge > Already up to date. > > gmail has absolutely HORRIBLE threading and hid your -dev pull request > underneath the v5.4 one, so yes, I missed it in the thread. Hmm, maybe it is because the subject of these two pull request are the same except for the [...] tag. Next time I would also put the git repo and kernel version in the subject besides the [...] tag. Hope it can avoid such kind of confusion to gmail. Thanks, Kevin > > I've now fetched and merged the changes. > > Bruce > > > [1] > > http://git.yoctoproject.org/cgit.cgi/linux-yocto-dev/commit/?h=standard/cn96xx&id=86e6c879a08ac4e5661eb63dc2aceada3ad1293a > > > > Thanks, > > Kevin > > > > > > > > Bruce > > > > > > > > > > Thanks, > > > > Kevin > > > > > > > > On Tue, Apr 07, 2020 at 05:01:01PM +0800, Kevin Hao wrote: > > > > > Hi Bruce, > > > > > > > > > > Here is another patch series for the Marvell cn96xx SoC support. The > > > > > main > > > > > changes include: > > > > > - Add tuning support for HS400 mode for octeontx2 mmc > > > > > - Misc Ethernet bug fixes > > > > > - A new driver to to handle GPINT0 interrupt on Loki SoC > > > > > - RAS error-injection for octeontx2 > > > > > - Add debug interface for octeontx2 serdes > > > > > > > > > > Please merge them into the following branch: > > > > > standard/cn96xx > > > > > > > > > > The following changes since commit > > > > > 86e6c879a08ac4e5661eb63dc2aceada3ad1293a: > > > > > > > > > > Merge branch 'standard/base' into standard/cn96xx (2020-04-05 > > > > > 22:11:29 -0400) > > > > > > > > > > are available in the Git repository at: > > > > > > > > > > git://github.com/haokexin/linux standard/cn96xx > > > > > > > > > > for you to fetch changes up to > > > > > d63b95006f6a8f7d3ec216fb0bc2359348e6dbb2: > > > > > > > > > > octeontx2-af: Disable SMQ sticky mode to avoid NIX PSE deadlock > > > > > (2020-04-07 14:19:18 +0800) > > > > > > > > > > ---------------------------------------------------------------- > > > > > Aaron Williams (3): > > > > > octeontx2: mmc: Add tuning support for HS400 mode > > > > > mmc: octeontx2: Use flags for hardware differences > > > > > mmc: octeontx2: fix handling calibration glitch > > > > > > > > > > Chandrakala Chavva (2): > > > > > driver: mmc: octeontx2: Fix tuning for T96 C0 > > > > > driver: mmc: Configure flags for T96 pass B0 > > > > > > > > > > Geetha sowjanya (2): > > > > > octeontx2-af: Update NIX_TXSCHQ_CONFIG mbox to handle read > > > > > request > > > > > octeontx2-af: Disable SMQ sticky mode to avoid NIX PSE deadlock > > > > > > > > > > Hariprasad Kelam (5): > > > > > octeontx2-af: Reset HW config done to parse switch headers in > > > > > FLR > > > > > octeontx2-af: Simplify npc_set_pkind mbox handler > > > > > octeontx2-pf: Remove unnecessary mbox request in unbind > > > > > octeontx2-af: Update dmac field in vf vlan rule > > > > > octeontx2-af: Do not allow VFs to overwrite PKIND config > > > > > > > > > > Kevin Hao (1): > > > > > misc: mrvl-loki: Drop the unused variable in mrvl_loki_probe() > > > > > > > > > > Linu Cherian (1): > > > > > coresight: tmc: Force 64b DBA access when 32b pair not supported > > > > > > > > > > Michal Mazur (3): > > > > > gpio: thunderx: Configure pin function at probe > > > > > Documentation/devicetree: Describe pin-cfg option > > > > > octeontx2-af: Setup edge used for GPIO timing > > > > > > > > > > Radha Mohan Chintakuntla (1): > > > > > misc: mrvl-loki: Add driver to handle GPINT0 interrupt > > > > > > > > > > Rick Farrington (1): > > > > > edac: octeontx2: RAS error-injection > > > > > > > > > > SrujanaChalla (1): > > > > > octeontx2-af: modify default cpt limits > > > > > > > > > > Subbaraya Sundeep (1): > > > > > octeontx2-pf: Fix memory double free in otx2_aura_pool_free > > > > > > > > > > Suneel Garapati (1): > > > > > drivers: spi: octeontx2: Add fix for hw issue > > > > > > > > > > Tomasz Michalec (5): > > > > > octeontx2-serdes: Add serdes diagnostic commands > > > > > octeontx2-serdes: Implement PRBS command > > > > > octeontx2-serdes: Check SVC UUID on module init > > > > > octeontx2-serdes: Add CONFIG_OCTEONTX_SERDES > > > > > octeontx2-serdes: Add gserr and gserc eye display > > > > > > > > > > Documentation/devicetree/bindings/gpio/gpio-thunderx.txt | 4 + > > > > > drivers/gpio/gpio-thunderx.c | 29 > > > > > +++++ > > > > > drivers/hwtracing/coresight/coresight-priv.h | 1 + > > > > > drivers/hwtracing/coresight/coresight-quirks.c | 4 +- > > > > > drivers/hwtracing/coresight/coresight-tmc.c | 17 ++- > > > > > drivers/hwtracing/coresight/coresight-tmc.h | 11 ++ > > > > > drivers/misc/Kconfig | 7 ++ > > > > > drivers/misc/Makefile | 1 + > > > > > drivers/misc/mrvl-loki.c | 123 > > > > > ++++++++++++++++++++ > > > > > drivers/mmc/host/cavium-octeon.c | 1 + > > > > > drivers/mmc/host/cavium-thunderx.c | 47 > > > > > +++++++- > > > > > drivers/mmc/host/cavium.c | 421 > > > > > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- > > > > > drivers/mmc/host/cavium.h | 55 > > > > > ++++----- > > > > > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 12 ++ > > > > > drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 + > > > > > drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 9 +- > > > > > drivers/net/ethernet/marvell/octeontx2/af/npc.h | 1 + > > > > > drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 6 + > > > > > drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 36 > > > > > ++++++ > > > > > drivers/net/ethernet/marvell/octeontx2/af/rvu_fixes.c | 12 +- > > > > > drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 54 > > > > > ++++++++- > > > > > drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 43 > > > > > ++++--- > > > > > drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 48 > > > > > +++++++- > > > > > drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h | 1 + > > > > > drivers/net/ethernet/marvell/octeontx2/af/rvu_tim.c | 31 > > > > > ++++-- > > > > > drivers/net/ethernet/marvell/octeontx2/af/rvu_validation.c | 14 ++- > > > > > drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 1 + > > > > > drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h | 3 + > > > > > drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 29 > > > > > +++-- > > > > > drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 32 > > > > > +----- > > > > > drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 5 +- > > > > > drivers/soc/marvell/Kconfig | 20 ++++ > > > > > drivers/soc/marvell/Makefile | 1 + > > > > > drivers/soc/marvell/octeontx2-ghes/Makefile | 3 +- > > > > > drivers/soc/marvell/octeontx2-ghes/otx2-einj.c | 166 > > > > > +++++++++++++++++++++++++++ > > > > > drivers/soc/marvell/octeontx2-serdes/Makefile | 7 ++ > > > > > drivers/soc/marvell/octeontx2-serdes/serdes_debugfs.c | 752 > > > > > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > > > > drivers/spi/spi-octeontx2.c | 19 +++- > > > > > drivers/spi/spi-octeontx2.h | 2 + > > > > > 39 files changed, 1880 insertions(+), 149 deletions(-) > > > > > create mode 100644 drivers/misc/mrvl-loki.c > > > > > create mode 100644 drivers/soc/marvell/octeontx2-ghes/otx2-einj.c > > > > > create mode 100644 drivers/soc/marvell/octeontx2-serdes/Makefile > > > > > create mode 100644 > > > > > drivers/soc/marvell/octeontx2-serdes/serdes_debugfs.c > > > > > > > > > > Thanks, > > > > > Kevin > > > > > > > > > > > > > > > > > -- > > > - Thou shalt not follow the NULL pointer, for chaos and madness await > > > thee at its end > > > - "Use the force Harry" - Gandalf, Star Trek II > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8612): https://lists.yoctoproject.org/g/linux-yocto/message/8612 Mute This Topic: https://lists.yoctoproject.org/mt/72846577/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
