The conflicts between kernel/rcutree.h and kernel/rcutree_plugin.h were due to adjacent insertions and deletions, which were resolved by simply accepting the changes on both branches. |
||
---|---|---|
.. | ||
core | ||
hw | ||
ulp | ||
Kconfig | ||
Makefile |
The conflicts between kernel/rcutree.h and kernel/rcutree_plugin.h were due to adjacent insertions and deletions, which were resolved by simply accepting the changes on both branches. |
||
---|---|---|
.. | ||
core | ||
hw | ||
ulp | ||
Kconfig | ||
Makefile |