Home
last modified time | relevance | path

Searched refs:merge (Results 1 – 8 of 8) sorted by relevance

/lib/mbedtls/external/mbedtls/tests/suites/
A Dtest_suite_memory_buffer_alloc.data10 Memory buffer alloc - free in middle, merge, realloc
13 Memory buffer alloc - free at end, merge, realloc
/lib/lwip/lwip/doc/
A Dsavannah.txt68 Merging is a straightforward process in Git. How to merge all changes in a
69 development branch since our last merge from main:
75 git merge your-development-branch
79 Commit the merge result.
/lib/
A Dlist_sort.c22 static struct list_head *merge(void *priv, in merge() function
129 cur = merge(priv, cmp, part[lev], cur); in list_sort()
146 list = merge(priv, cmp, part[lev], list); in list_sort()
/lib/mbedtls/external/mbedtls/docs/architecture/psa-migration/
A Doutcome-analysis.sh54 git checkout $(git merge-base HEAD development)
/lib/mbedtls/external/mbedtls/library/
A Dx509.c819 unsigned char c, merge = 0; in mbedtls_x509_dn_gets() local
839 ret = mbedtls_snprintf(p, n, merge ? " + " : ", "); in mbedtls_x509_dn_gets()
934 merge = name->next_merged; in mbedtls_x509_dn_gets()
/lib/lwip/lwip/src/netif/ppp/
A DPPPD_FOLLOWUP6 is happening on their side and merge what is relevant for lwIP.
370 We didn't merge 08ef47ca ;-)
/lib/mbedtls/external/mbedtls/
A DCONTRIBUTING.md28 …ature or topic. The larger the contribution is, the longer it would take to review it and merge it.
/lib/mbedtls/external/mbedtls/docs/architecture/
A Dmbed-crypto-storage-specification.md6 This document contains historical information both from before and after this merge.

Completed in 22 milliseconds