Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / meta-phosphor / 13d5ba87fc4d73e97aa1688f6340dfb3d66b59b7
commit13d5ba87fc4d73e97aa1688f6340dfb3d66b59b7[log] [tgz]
authorEd Tanous <ed.tanous@intel.com>Sun Dec 16 17:58:15 2018 -0800
committerBrad Bishop <bradleyb@fuzziesquirrel.com>Wed Jan 09 01:19:56 2019 +0000
tree91f371c2182f5ebf743300473895dd553be28cab
parent469631bd46ba7a6cf210416491128c79d4097edf [diff]
busybox: remove upstream watchdog patch

The behavior of the watchdog has been merged in upstream, and now we
appear to have a merge conflict.  Remove, as the behavior is there, even
if the code isn't identical.

Change-Id: Iedb75a2a7c2b359f2e513a618935b209ae004f5b
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
2 files changed
tree: 91f371c2182f5ebf743300473895dd553be28cab
  1. aspeed-layer/
  2. classes/
  3. conf/
  4. nuvoton-layer/
  5. recipes-connectivity/
  6. recipes-core/
  7. recipes-devtools/
  8. recipes-extended/
  9. recipes-phosphor/
  10. recipes-protocols/
  11. recipes-support/
  12. recipes-textproc/
  13. COPYING.apache-2.0
  14. COPYING.MIT
  15. LICENSE
  16. MAINTAINERS
  17. README.md
  18. recipes.txt
README.md

OpenBMC

meta-phosphor is the OpenBMC layer. This layer should be included for all OpenBMC systems. The OpenBMC layer contains content which is shared between all OpenBMC systems.