mirror of
https://github.com/torvalds/linux.git
synced 2026-05-15 06:03:19 -04:00
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.