[linux-yocto] git pull request output
Bruce Ashfield
bruce.ashfield at windriver.com
Tue Apr 14 12:21:52 PDT 2015
On 2015-04-13 06:53 AM, Abhishek Paliwal wrote:
> warn: No match for commit c6dbf6731f79c72d91f5052896540b3dc073ae9c
> found at _git at git.yoctoproject.org:linux-yocto-contrib_
> <mailto:git at git.yoctoproject.org:linux-yocto-contrib>
> warn: Are you sure you pushed 'apaliwal/octeon' there?
> The following changes since commit
> 4434aa71ff7043c570f9eae493df1ccadbda9b85:
> workqueue: fix v3.14.x merge error (2015-03-24 13:41:01 -0400)
> are available in the git repository at:
> _git at git.yoctoproject.org:linux-yocto-contrib_
> <mailto:git at git.yoctoproject.org:linux-yocto-contrib> apaliwal/octeon
> for you to fetch changes up to c6dbf6731f79c72d91f5052896540b3dc073ae9c:
> netdev: octeon-ethernet: Streamline logic to determine if hardware
> should calculate L3/L4 checksum. (2015-04-13 15:54:23 +0530)
> ----------------------------------------------------------------
> Abhishek Paliwal (54):
These commits and diffstat don't seem to be consistent with what I'm
seeing the branch.
i.e.:
----------
commit 63a63104095ded5745362980cb49df1bdaa49def
Author: Abhishek Paliwal <abhishek.paliwal at aricent.com>
Date: Fri Feb 13 14:42:59 2015 +0530
kvm tool: Add it to the tree.
From: David Daney <david.daney at cavium.com>
This is code copied from: https://github.com/penberg/linux-kvm
commit 6cb68289ec13825e4d9a58b3b4d51dcee69f956e upstream
Then patched to add mips support.
Signed-off-by: David Daney <david.daney at cavium.com>
Signed-off-by: Abhishek Paliwal <abhishek.paliwal at aricent.com>
----
Is not showing in your list, and isn't something that we want to
merge to linux-yocto.
Also, this branch doesn't seem to be fast forward with respect
to the latest standard/base in linux-yocto-3.14. The commit you
reference in the pull request: [workqueue: fix v3.14.x merge error]
is not present on your branch .. and is likely the source of that commit
being missed.
There shouldn't be major issues in merging this, but you need to double
check that branch, make sure it is rebased to standard/base and resend
the pull request.
Cheers,
Bruce
> MIPS: OCTEON: Define cpu_has_local_ebase to 0
> MIPS: OCTEON: Implement of_node_to_nid()
> netdev: Octeon3-ethernet: Don't swap packet linked pointers in
> LE mode.
> MIPS: OCTEON: Handle NULL of_node in of_node_to_nid().
> MIPS: octeon-i2c: export twsix symbols for usb modules
> gpio: gpio-octeon: Add support for multiple GPIO controllers.
> MIPS: OCTEON: Define NR_IRQS_LEGACY.
> MIPS: OCTEON: Panic if non-NUMA kernel is executed on multi-node
> system.
> MIPS: OCTEON: Fix interrupt controller code for multi-node/NUMA
> watchdog: octeon-wdt: Correct spelling and make do_countdown
> boolean.
> watchdog: octeon-wdt: Disable building as a module.
> watchdog: octeon-wdt: Fix to work on multi-node systems.
> MIPS: OCTEON: Rename csrc-octeon clocksource variables for clarity.
> MIPS: OCTEON: Add csrc-fpa-clk.
> MIPS: OCTEON: #define a bunch of topology.h symbols.
> MIPS: OCTEON: Fix octeon_ciu3_errbits_enable_intsn() for multi-node.
> MIPS: OCTEON: Fix octeon-error-tree.c for multi-node cn78XX.
> MIPS: OCTEON: Define cvmx_get_local_core_num()
> netdev: octeon3-ethernet: Fix for NUMA operation.
> netdev: octeon3-ethernet: Fix IPv6 TCP and UDP checksum generation.
> MIPS: Supply OCTEON-II specific read/write lock implementation.
> MIPS: OCTEON: Cast to unsigned int.
> netdev: octeon3-ethernet: Fix spinlock deadlock condition.
> netdev: octeon3-ethernet: Also check the skb headroom and skb
> size to determine if skb is recyclable.
> MIPS: OCTEON: Move setting of octeon_dma_bar_type to prom_init().
> MIPS: OCTEON: Initialize MSI as part of arch_init_irq().
> MIPS: OCTEON: Fix irq affinity setting for NUMA systems.
> MIPS: OCTEON: Increase NR_IRQS for CONFIG_NUMA.
> MIPS: OCTEON: Implement pcibus_to_node().
> MIPS: OCTEON: Handle MSI on multiple nodes.
> MIPS: OCTEON: Fix PCIe support to work on NUMA systems.
> MIPS: Add numa api support
> netdev: octeon3-ethernet: Provide ndo_do_ioctl.
> netdev: octeon-ethernet: Only recycles skbs that came from the fpa.
> MIPS: OCTEON: Only allow CONFIG_NUMA if CONFIG_SMP is also set.
> MIPS: paravirt: Add new clocksource based on host time (in ns)
> MIPS: OCTEON: Sync up SE files and adjust callers from previous
> SE sync-up.
> genirq: Add irq_domain-aware core IRQ handler
> MIPS: OCTEON: Use handle_domain_irq to fix suspicious RCU usage
> MIPS: Select USB_ARCH_HAS_XHCI for CAVIUM_OCTEON_SOC
> MIPS: OCTEON: Unconditionally enable
> CAVIUM_ERET_MISPREDICT_WORKAROUND
> MIPS: Call trace_hardirqs_on before irqs are re-enabled in
> syscall_exit_work
> netdev: octeon3-ethernet: Add numa support.
> ata: octeon_cf: typo in match function
> Don't bring in the mess that is cvmx-fpa.c, but rather just
> directly call cvmx_fpa1_enable().
> MIPS: OCTEON: Add smp_mb() to new reader/writer lock code
> arch_read_unlock().
> MIPS: OCTEON: Disable some cn78xx error interrupt conditions.
> MIPS: OCTEON: Print WARN() message if too few CPUs are configured.
> netdev: octeon3-ethernet: Remove warning message.
> MIPS: OCTEON: Handle CONFIG_CAVIUM_GDB for CIU3.
> MIPS: OCTEON: Updated octeon_perf to work on ebb7800.
> MIPS: OCTEON: Remove some invalid INTSNs from octeon-78xx-errors.c
> netdev: octeon-ethernet: Remove unused CONFIG_CAVIUM_RESERVE32
> definitions.
> netdev: octeon-ethernet: Streamline logic to determine if
> hardware should calculate L3/L4 checksum.
> arch/mips/Kconfig | 6 ++-
> arch/mips/cavium-octeon/Makefile | 1 +
> arch/mips/cavium-octeon/csrc-fpa-clk.c | 64 +++++++++++++++++++++++++
> arch/mips/cavium-octeon/csrc-octeon.c | 28 ++++++++---
> arch/mips/cavium-octeon/executive/cvmx-debug-uart.c | 21 +++++----
> arch/mips/cavium-octeon/executive/cvmx-debug.c | 18 +++-----
> arch/mips/cavium-octeon/executive/cvmx-fpa-resource.c | 19 +++++---
> arch/mips/cavium-octeon/executive/cvmx-helper-agl.c | 2 +-
> arch/mips/cavium-octeon/executive/cvmx-helper-bgx.c | 36 +++++++++------
> arch/mips/cavium-octeon/executive/cvmx-helper-board.c | 4 +-
> arch/mips/cavium-octeon/executive/cvmx-helper-cfg.c | 32 +++++++------
> arch/mips/cavium-octeon/executive/cvmx-helper-ilk.c | 113
> ++++++++++++++++++++++++---------------------
> arch/mips/cavium-octeon/executive/cvmx-helper-npi.c | 4 +-
> arch/mips/cavium-octeon/executive/cvmx-helper-pki.c | 32 ++++++++-----
> arch/mips/cavium-octeon/executive/cvmx-helper-pko.c | 4 +-
> arch/mips/cavium-octeon/executive/cvmx-helper-pko3.c | 21 +++++----
> arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c | 6 +--
> arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c | 8 ++--
> arch/mips/cavium-octeon/executive/cvmx-helper-srio.c | 4 +-
> arch/mips/cavium-octeon/executive/cvmx-helper-util.c | 7 ++-
> arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c | 6 +--
> arch/mips/cavium-octeon/executive/cvmx-helper.c | 62
> ++++++++++++-------------
> arch/mips/cavium-octeon/executive/cvmx-ilk.c | 315
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
> arch/mips/cavium-octeon/executive/cvmx-osm.c | 4 +-
> arch/mips/cavium-octeon/executive/cvmx-pcie.c | 19 ++++----
> arch/mips/cavium-octeon/executive/cvmx-pki-resources.c | 2 +-
> arch/mips/cavium-octeon/executive/cvmx-pki.c | 6 ++-
> arch/mips/cavium-octeon/executive/cvmx-pko3-queue.c | 70
> +++++++++++++++++-----------
> arch/mips/cavium-octeon/executive/cvmx-pko3.c | 63
> ++++++++++++++-----------
> arch/mips/cavium-octeon/executive/cvmx-qlm.c | 8 +++-
> arch/mips/cavium-octeon/octeon-78xx-errors.c | 22 ++-------
> arch/mips/cavium-octeon/octeon-error-injector.c | 2 +-
> arch/mips/cavium-octeon/octeon-error-tree.c | 15 +++---
> arch/mips/cavium-octeon/octeon-irq.c | 91
> ++++++++++++++++++++++++++++--------
> arch/mips/cavium-octeon/octeon-numa.c | 31 +++++++++++++
> arch/mips/cavium-octeon/perf_counters.c | 14 ++++--
> arch/mips/cavium-octeon/serial.c | 4 +-
> arch/mips/cavium-octeon/setup.c | 25 ++++++++++
> arch/mips/cavium-octeon/smp.c | 8 +++-
> arch/mips/include/asm/Kbuild | 1 +
> arch/mips/include/asm/irq_regs.h | 10 ++++
> arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h | 2 +
> arch/mips/include/asm/mach-cavium-octeon/irq.h | 19 ++++++--
> arch/mips/include/asm/mach-cavium-octeon/topology.h | 19 +++++---
> arch/mips/include/asm/octeon/cvmx-coremask.h | 12 ++---
> arch/mips/include/asm/octeon/cvmx-fpa.h | 8 ++--
> arch/mips/include/asm/octeon/cvmx-fpa3.h | 53 +++++++++++----------
> arch/mips/include/asm/octeon/cvmx-helper-agl.h | 2 +-
> arch/mips/include/asm/octeon/cvmx-helper-bgx.h | 40
> ++++++++--------
> arch/mips/include/asm/octeon/cvmx-helper-cfg.h | 10 ++--
> arch/mips/include/asm/octeon/cvmx-helper-ilk.h | 4 +-
> arch/mips/include/asm/octeon/cvmx-helper-npi.h | 6 +--
> arch/mips/include/asm/octeon/cvmx-helper-pki.h | 16 +++----
> arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 8 ++--
> arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 6 +--
> arch/mips/include/asm/octeon/cvmx-helper-srio.h | 8 ++--
> arch/mips/include/asm/octeon/cvmx-helper-util.h | 8 ++--
> arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 12 ++---
> arch/mips/include/asm/octeon/cvmx-helper.h | 44
> ++++++++++++------
> arch/mips/include/asm/octeon/cvmx-hwfau.h | 3 +-
> arch/mips/include/asm/octeon/cvmx-ilk.h | 4 +-
> arch/mips/include/asm/octeon/cvmx-l2c.h | 5 +-
> arch/mips/include/asm/octeon/cvmx-pcie.h | 6 +--
> arch/mips/include/asm/octeon/cvmx-pki-resources.h | 2 +-
> arch/mips/include/asm/octeon/cvmx-pki.h | 14 ++++--
> arch/mips/include/asm/octeon/cvmx-pow.h | 54 ++++++++++++----------
> arch/mips/include/asm/octeon/cvmx-qlm.h | 16 +++++--
> arch/mips/include/asm/octeon/cvmx-uart.h | 4 +-
> arch/mips/include/asm/octeon/cvmx.h | 4 ++
> arch/mips/include/asm/octeon/octeon-feature.h | 2 +-
> arch/mips/include/asm/spinlock.h | 158
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> arch/mips/kernel/entry.S | 3 +-
> arch/mips/kernel/scall64-64.S | 4 +-
> arch/mips/kernel/scall64-n32.S | 10 ++--
> arch/mips/kernel/scall64-o32.S | 8 ++--
> arch/mips/paravirt/setup.c | 14 ++++++
> arch/mips/pci/msi-octeon.c | 77 ++++++++++++++++---------------
> arch/mips/pci/pcie-octeon.c | 272
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
> drivers/ata/pata_octeon_cf.c | 2 +-
> drivers/gpio/gpio-octeon.c | 14 ++++--
> drivers/net/ethernet/octeon/ethernet-defines.h | 10 ----
> drivers/net/ethernet/octeon/ethernet-tx.c | 3 ++
> drivers/net/ethernet/octeon/ethernet-xmit.c | 5 +-
> drivers/net/ethernet/octeon/octeon-bgx-nexus.c | 10 ++--
> drivers/net/ethernet/octeon/octeon-bgx-port.c | 10 ++++
> drivers/net/ethernet/octeon/octeon-bgx.h | 1 +
> drivers/net/ethernet/octeon/octeon3-ethernet.c | 277
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
> drivers/watchdog/Kconfig | 2 +-
> drivers/watchdog/octeon-wdt-main.c | 29 ++++--------
> include/linux/irqdesc.h | 19 ++++++++
> kernel/irq/Kconfig | 3 ++
> kernel/irq/irqdesc.c | 42 +++++++++++++++++
> 92 files changed, 1705 insertions(+), 867 deletions(-)
> create mode 100644 arch/mips/cavium-octeon/csrc-fpa-clk.c
> mode change 100755 => 100644
> arch/mips/cavium-octeon/octeon-error-injector.c
> mode change 100755 => 100644 arch/mips/cavium-octeon/perf_counters.c
> "DISCLAIMER: This message is proprietary to Aricent and is intended
> solely for the use of the individual to whom it is addressed. It may
> contain privileged or confidential information and should not be
> circulated or used for any purpose other than for what it is intended.
> If you have received this message in error, please notify the
> originator immediately. If you are not the intended recipient, you are
> notified that you are strictly prohibited from using, copying,
> altering, or disclosing the contents of this message. Aricent accepts
> no responsibility for loss or damage arising from the use of the
> information transmitted by this email including damage from virus."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/linux-yocto/attachments/20150414/cf8d557a/attachment.html>
More information about the linux-yocto
mailing list