@@ -1268,7 +1268,7 @@ Subtrees
1268
1268
1269
1269
Several parts of the repository are subtrees of software maintained elsewhere.
1270
1270
1271
- Some of these are maintained by active developers of Bitcoin Core, in which case
1271
+ Normally, these are maintained by active developers of Bitcoin Core, in which case
1272
1272
changes should go directly upstream without being PRed directly against the project.
1273
1273
They will be merged back in the next subtree merge.
1274
1274
@@ -1280,32 +1280,20 @@ should be taken upstream.
1280
1280
There is a tool in ` test/lint/git-subtree-check.sh ` ([ instructions] ( ../test/lint#git-subtree-checksh ) )
1281
1281
to check a subtree directory for consistency with its upstream repository.
1282
1282
1283
- Current subtrees include:
1283
+ The tool instructions also include a list of the subtrees managed by Bitcoin Core.
1284
+
1285
+ The ultimate upstream of the few externally managed subtrees are:
1284
1286
1285
1287
- src/leveldb
1286
- - Subtree at https://github.com/bitcoin-core/leveldb-subtree ; maintained by Core contributors.
1287
1288
- Upstream at https://github.com/google/leveldb ; maintained by Google. Open
1288
- important PRs to the subtree to avoid delay.
1289
+ important PRs to the Bitcoin Core subtree to avoid delay.
1289
1290
- ** Note** : Follow the instructions in [ Upgrading LevelDB] ( #upgrading-leveldb ) when
1290
1291
merging upstream changes to the LevelDB subtree.
1291
1292
1292
1293
- src/crc32c
1293
1294
- Used by leveldb for hardware acceleration of CRC32C checksums for data integrity.
1294
- - Subtree at https://github.com/bitcoin-core/crc32c-subtree ; maintained by Core contributors.
1295
1295
- Upstream at https://github.com/google/crc32c ; maintained by Google.
1296
1296
1297
- - src/secp256k1
1298
- - Upstream at https://github.com/bitcoin-core/secp256k1/ ; maintained by Core contributors.
1299
-
1300
- - src/crypto/ctaes
1301
- - Upstream at https://github.com/bitcoin-core/ctaes ; maintained by Core contributors.
1302
-
1303
- - src/minisketch
1304
- - Upstream at https://github.com/bitcoin-core/minisketch ; maintained by Core contributors.
1305
-
1306
- - src/ipc/libmultiprocess
1307
- - Upstream at https://github.com/bitcoin-core/libmultiprocess ; maintained by Core contributors.
1308
-
1309
1297
Upgrading LevelDB
1310
1298
---------------------
1311
1299
0 commit comments