| /openbmc/openbmc/poky/scripts/lib/resulttool/ | 
| H A D | merge.py | 1 # resulttool - merge multiple testresults.json files into a file or directory 13 def merge(args, logger):  function 35     parser_build = subparsers.add_parser('merge', help='merge test result files/directories/URLs', 36 …description='merge the results from multiple files/directories/URLs into the target file or direct… 38     parser_build.set_defaults(func=merge) 42                               help='the target file or directory to merge the base_results with')
  | 
| /openbmc/qemu/scripts/codeconverter/codeconverter/ | 
| H A D | utils.py | 21 def merge(a: T, b: T) -> T:  function 22     """Merge two values if they matched using opt_compare()""" 35     assert merge(None, None) is None 36     assert merge(None, 10) == 10 37     assert merge(10, None) == 10 38     assert merge(10, 10) == 10 72 __all__ = ['not_optional', 'opt_compare', 'merge', 'line_col', 'LineAndColumn']
  | 
| /openbmc/openbmc/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test/ | 
| H A D | 0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch | 24  # Merge gcov graph from several test cases. This can be used to check 35 @@ -55,11 +55,11 @@ def merge(gcls1, gcls2): 36          gcl1.merge(gcl2) 47          merge(gcls_base, gcls) 70  # Merge mce serverity coverage file from several test cases. This can 81 @@ -47,11 +47,11 @@ def merge(gcls1, gcls2): 82          gcl1.merge(gcl2) 93          merge(gcls_base, gcls)
  | 
| /openbmc/openbmc/poky/scripts/ | 
| H A D | resulttool | 4 # (merge results, summarise results, regression analysis, generate manual test results file) 12 # To merge test results, execute the below 13 #    $ resulttool merge <base_result_file> <target_result_file> 43 import resulttool.merge 62     resulttool.merge.register_commands(subparsers)
  | 
| /openbmc/openbmc/meta-phosphor/recipes-phosphor/ipmi/ | 
| H A D | phosphor-ipmi-fru-merge-config-native.bb | 1 SUMMARY = "To merge the Host and BMC config files generated from MRW " 2 DESCRIPTION = "Merge host provided FRU info config file, fru info config, \ 9 PROVIDES += "virtual/phosphor-ipmi-fru-merge-config"
  | 
| /openbmc/openbmc/poky/bitbake/lib/toaster/tests/functional/ | 
| H A D | test_create_new_project.py | 22           - Merge Toaster settings: False 38           - Merge Toaster settings: True 54           - Merge Toaster settings: True 70           - Merge Toaster settings: True
  | 
| /openbmc/qemu/tests/qemu-iotests/tests/ | 
| H A D | qemu-img-bitmaps | 94 # But we can also merge in bitmaps from other layers.  This test is a bit 95 # contrived to cover more code paths, in reality, you could merge directly 98 $QEMU_IMG bitmap --add --merge b0 -b "$TEST_IMG.base" -F $IMGFMT \ 100 $QEMU_IMG bitmap --merge tmp -f $IMGFMT "$TEST_IMG" b0 106 echo "=== Merge from top layer into backing image ===" 110 $QEMU_IMG bitmap --add --merge b2 -b "$TEST_IMG" -F $IMGFMT \
  | 
| H A D | qemu-img-close-errors.out | 12 qemu-img bitmap --merge exit code:  1 22 qemu-img bitmap --merge exit code:  0
  | 
| /openbmc/qemu/tests/qemu-iotests/ | 
| H A D | 254.out | 37         "type": "block-dirty-bitmap-merge" 58         "type": "block-dirty-bitmap-merge" 79         "type": "block-dirty-bitmap-merge"
  | 
| H A D | 236 | 117     log('\n--- Submitting & Aborting Merge Transaction ---\n') 122         { "type": "block-dirty-bitmap-merge", 129     log('\n--- Creating D as a merge of B & C ---\n') 130     # Good hygiene: create a disabled bitmap as a merge target. 135         { "type": "block-dirty-bitmap-merge",
  | 
| H A D | 254 | 52     {'type': 'block-dirty-bitmap-merge', 59     {'type': 'block-dirty-bitmap-merge', 67     {'type': 'block-dirty-bitmap-merge',
  | 
| H A D | 236.out | 218 --- Submitting & Aborting Merge Transaction --- 242         "type": "block-dirty-bitmap-merge" 288 --- Creating D as a merge of B & C --- 312         "type": "block-dirty-bitmap-merge"
  | 
| /openbmc/u-boot/lib/ | 
| H A D | list_sort.c | 17  * to chaining of merge() calls: null-terminated, no reserved or 20 static struct list_head *merge(void *priv,  in merge()  function 43  * Combine final list merge with restoration of standard doubly-linked 44  * list structure.  This approach duplicates code from merge(), but 95  * This function implements "merge sort", which has O(nlog(n)) 127 			cur = merge(priv, cmp, part[lev], cur);  in list_sort() 144 			list = merge(priv, cmp, part[lev], list);  in list_sort()
  | 
| /openbmc/openbmc/poky/meta/recipes-graphics/menu-cache/files/ | 
| H A D | 0001-Support-gcc10-compilation.patch | 8 /bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:167: multiple definition of `DirDirs'; main.o:menu… 9 /bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:164: multiple definition of `AppDirs'; main.o:menu… 10 /bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:52: multiple definition of `menuTag_Layout'; main.… 98  /* parse and merge menu files */
  | 
| /openbmc/u-boot/cmd/ | 
| H A D | efi.c | 91 		bool merge = true;  in efi_build_mem_table()  local 100 			merge = false;  in efi_build_mem_table() 102 			merge = false;  in efi_build_mem_table() 104 			merge = false;  in efi_build_mem_table() 106 			merge = false;  in efi_build_mem_table() 108 		if (merge) {  in efi_build_mem_table()
  | 
| /openbmc/openbmc-build-scripts/tools/ | 
| H A D | config-clang-tidy | 25         "merge", help="Merge a reference clang-tidy config" 78         if key_class and hasattr(key_class, "merge"): 79             result[key] = key_class.merge(repo_value, ref_value) 124     def merge(repo: str, ref: str) -> str:  member in Key_Checks 184     def merge(  member in Key_CheckOptions
  | 
| /openbmc/openbmc/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/ | 
| H A D | xf86-input-tslib_1.1.1.bb | 9 SRC_URI = "https://github.com/merge/xf86-input-tslib/releases/download/${PV}/xf86-input-tslib-${PV}… 12 UPSTREAM_CHECK_URI = "https://github.com/merge/xf86-input-tslib/tags"
  | 
| /openbmc/openbmc/meta-quanta/meta-q71l/conf/machine/ | 
| H A D | quanta-q71l.conf | 34 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-merge-config = "q71l-ipmi-fru-merge-config-native"
  | 
| /openbmc/openbmc/poky/meta/recipes-devtools/intltool/intltool/ | 
| H A D | intltool-nowarn.patch | 13 Index: intltool-0.50.0/intltool-merge.in 15 --- intltool-0.50.0.orig/intltool-merge.in	2011-10-08 17:52:01.000000000 +0300 16 +++ intltool-0.50.0/intltool-merge.in	2011-12-07 16:05:55.000000000 +0200
  | 
| /openbmc/ipmitool/contrib/ | 
| H A D | oem_ibm_sel_map | 32 …SB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Merge cable missing" 36 …)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Nodes could not merge" 59 …SB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Merge cable missing" 63 …)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Nodes could not merge" 200 "0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x07","R","R","0x00","Merge Failure - BIOS… 201 "0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x08","R","R","0x00","Merge Failure - BIOS… 202 "0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x09","R","R","0x00","Merge Failure - Prim… 203 "0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x0A","R","R","0x00","Merge Failure - Comm… 204 "0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x0B","R","R","0x00","Merge Failure - Time… 205 "0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x10","R","R","0x00","Merge Failure - No p… [all …] 
 | 
| /openbmc/openbmc-build-scripts/config/ | 
| H A D | .gitlint | 16 # By default gitlint will ignore merge, revert, fixup and squash commits. 17 # ignore-merge-commits=true 74 # Whether to ignore this rule on merge commits (which typically only have a title) 75 ignore-merge-commits=false
  | 
| /openbmc/u-boot/fs/jffs2/ | 
| H A D | mergesort.c | 29 			/* two lists, merge them. */  in sort_list() 31 				/* merge the next element */  in sort_list()
  | 
| /openbmc/webui-vue/src/env/locales/ | 
| H A D | README.md | 27 ## Merge order at runtime 64 These verify vendor root → variant merge behavior and locale alias handling.
  | 
| /openbmc/qemu/backends/ | 
| H A D | hostmem.c | 166     return backend->merge;  in host_memory_backend_get_merge() 177         assert(!backend->merge);  in host_memory_backend_set_merge() 182         value != backend->merge) {  in host_memory_backend_set_merge() 190     backend->merge = value;  in host_memory_backend_set_merge() 289     backend->merge = machine_mem_merge(machine);  in host_memory_backend_init() 360     if (backend->merge) {  in host_memory_backend_memory_complete() 511     object_class_property_add_bool(oc, "merge",  in host_memory_backend_class_init() 514     object_class_property_set_description(oc, "merge",  in host_memory_backend_class_init()
  | 
| /openbmc/qemu/tests/qtest/libqos/ | 
| H A D | libqos-malloc.c | 90     char merge;  in mlist_coalesce()  local 93         merge = 0;  in mlist_coalesce() 100             merge = 1;  in mlist_coalesce() 106             merge = 1;  in mlist_coalesce() 109     } while (merge);  in mlist_coalesce()
  |