Home
last modified time | relevance | path

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

12345678910>>...44

/openbmc/linux/
H A Dopengrok1.0.log1 2024-12-28 20:07:11.902-0600 FINER t583 IndexDatabase.createAnnotationCache: failed to create annotation: repository {dir='/opengrok/src/openbmc/linux',type=git,historyCache=on,renamed=false,merge=true,annotationCache=off} does not allow to create annotation cache for '/opengrok/src/openbmc/linux/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c'
3 2024-12-28 20:07:11.899-0600 FINER t593 IndexDatabase.createAnnotationCache: failed to create annotation: repository {dir='/opengrok/src/openbmc/linux',type=git,historyCache=on,renamed=false,merge=true,annotationCache=off} does not allow to create annotation cache for '/opengrok/src/openbmc/linux/tools/testing/selftests/powerpc/tm/tm-signal-pagefault.c'
6 2024-12-28 20:07:11.896-0600 FINER t586 IndexDatabase.createAnnotationCache: failed to create annotation: repository {dir='/opengrok/src/openbmc/linux',type=git,historyCache=on,renamed=false,merge=true,annotationCache=off} does not allow to create annotation cache for '/opengrok/src/openbmc/linux/arch/powerpc/platforms/pasemi/idle.c'
8 2024-12-28 20:07:11.895-0600 FINER t584 IndexDatabase.createAnnotationCache: failed to create annotation: repository {dir='/opengrok/src/openbmc/openbmc',type=git,historyCache=on,renamed=false,merge=true,annotationCache=off} does not allow to create annotation cache for '/opengrok/src/openbmc/openbmc/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb'
9 2024-12-28 20:07:11.894-0600 FINER t582 IndexDatabase.createAnnotationCache: failed to create annotation: repository {dir='/opengrok/src/openbmc/linux',type=git,historyCache=on,renamed=false,merge=true,annotationCache=off} does not allow to create annotation cache for '/opengrok/src/openbmc/linux/tools/perf/pmu-events/arch/powerpc/power8/cache.json'
11 2024-12-28 20:07:11.893-0600 FINER t589 IndexDatabase.createAnnotationCache: failed to create annotation: repository {dir='/opengrok/src/openbmc/qemu',type=git,historyCache=on,renamed=false,merge=true,annotationCache=off} does not allow to create annotation cache for '/opengrok/src/openbmc/qemu/include/qom/qom-qobject.h'
25 2024-12-28 20:07:11.915-0600 FINER t586 HistoryGuru.storeHistory: repository {dir='/opengrok/src/openbmc/u-boot',type=git,historyCache=on,renamed=false,merge=true,annotationCache=off} supports history for directories, skipping '/opengrok/src/openbmc/u-boot/drivers/net/lan91c96.h'
30 2024-12-28 20:07:11.916-0600 FINER t582 HistoryGuru.storeHistory: repository {dir='/opengrok/src/openbmc/libcper',type=git,historyCache=on,renamed=false,merge=true,annotationCache=off} supports history for directories, skipping '/opengrok/src/openbmc/libcper/sections/cper-section-firmware.c'
31 2024-12-28 20:07:11.916-0600 FINER t590 HistoryGuru.storeHistory: repository {dir='/opengrok/src/openbmc/linux',type=git,historyCache=on,renamed=false,merge=true,annotationCache=off} supports history for directories, skipping '/opengrok/src/openbmc/linux/drivers/phy/tegra/Kconfig'
32 2024-12-28 20:07:11.916-0600 FINER t584 HistoryGuru.storeHistory: repository {dir='/opengrok/src/openbmc/linux',type=git,historyCache=on,renamed=false,merge
[all...]
H A Dopengrok0.0.log[all...]
/openbmc/qemu/scripts/codeconverter/codeconverter/
H A Dutils.py21 def merge(a: T, b: T) -> T: function
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
/openbmc/linux/Documentation/maintainer/
H A Drebasing-and-merging.rst16 the kernel community is not scared by seeing merge commits in its
68 newer base or avoiding a merge with an upstream repository is not
84 A frequent cause of merge-window trouble is when Linus is presented with a
98 development cycle included 1,126 merge commits - nearly 9% of the total.
101 independently of the others. So naturally, at least one merge will be
105 current trunk so that no merge commits appear in the history. The kernel
118 on such a pull request will almost certainly generate a merge commit; that
120 the --no-ff flag to force the addition of a merge commit in the rare cases
121 where one would not normally be created so that the reasons for the merge
122 can be recorded. The changelog for the merge should, for any kind of
[all …]
H A Dmaintainer-entry-profile.rst54 sent at any time before the merge window closes and can still be
56 be settled in soaking in linux-next in advance of the merge window
62 New feature submissions targeting the next merge window should have
65 the NEXT+1 merge window, or should come with sufficient justification
70 - Last -rc to merge features: Deadline for merge decisions
72 set will need to wait for the NEXT+1 merge window. Of course there is no
75 resubmit for the following merge window.
/openbmc/linux/Documentation/admin-guide/device-mapper/
H A Dsnapshot.rst12 - To merge a snapshot of a block device back into the snapshot's origin
19 For snapshot merge the contents of the COW storage are merged back into
24 snapshot, snapshot-origin, and snapshot-merge.
55 snapshot-origin or snapshot-merge target must be suspended. A failure to
73 - snapshot-merge <origin> <COW device> <persistent> <chunksize>
84 has started (in the background) the <origin> may be opened and the merge
124 How snapshot-merge is used by LVM2
128 "snapshot-merge". The "-real" device is not changed and the "-cow"
131 COW device to the "snapshot-merge" is deactivated (unless using lvchange
134 A snapshot will merge into its origin with the following command::
[all …]
/openbmc/linux/fs/btrfs/
H A Dextent_map.c233 struct extent_map *merge = NULL; in try_merge_map() local
250 merge = rb_entry(rb, struct extent_map, rb_node); in try_merge_map()
251 if (rb && mergable_maps(merge, em)) { in try_merge_map()
252 em->start = merge->start; in try_merge_map()
253 em->orig_start = merge->orig_start; in try_merge_map()
254 em->len += merge->len; in try_merge_map()
255 em->block_len += merge->block_len; in try_merge_map()
256 em->block_start = merge->block_start; in try_merge_map()
257 em->mod_len = (em->mod_len + em->mod_start) - merge->mod_start; in try_merge_map()
258 em->mod_start = merge->mod_start; in try_merge_map()
[all …]
/openbmc/openbmc/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test/
H A D0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch35 @@ -55,11 +55,11 @@ def merge(gcls1, gcls2):
36 gcl1.merge(gcl2)
47 merge(gcls_base, gcls)
81 @@ -47,11 +47,11 @@ def merge(gcls1, gcls2):
82 gcl1.merge(gcl2)
93 merge(gcls_base, gcls)
/openbmc/u-boot/cmd/
H A Defi.c91 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/linux/drivers/net/ethernet/netronome/nfp/flower/
H A Doffload.c586 struct nfp_flower_merge_check *merge, in nfp_flower_update_merge_with_actions() argument
616 merge->tci = cpu_to_be16(0xffff); in nfp_flower_update_merge_with_actions()
619 merge->tci = cpu_to_be16(0); in nfp_flower_update_merge_with_actions()
623 eth_broadcast_addr(&merge->l2.mac_dst[0]); in nfp_flower_update_merge_with_actions()
624 eth_broadcast_addr(&merge->l2.mac_src[0]); in nfp_flower_update_merge_with_actions()
625 memset(&merge->l4, 0xff, in nfp_flower_update_merge_with_actions()
628 memset(&merge->ipv6, 0xff, in nfp_flower_update_merge_with_actions()
631 memset(&merge->ipv4, 0xff, in nfp_flower_update_merge_with_actions()
637 merge->l2.mac_dst[i] |= eth->eth_addr_mask[i]; in nfp_flower_update_merge_with_actions()
639 merge->l2.mac_src[i] |= in nfp_flower_update_merge_with_actions()
[all …]
/openbmc/openbmc/poky/meta/recipes-devtools/intltool/intltool/
H A Dintltool-nowarn.patch13 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/linux/drivers/gpu/drm/
H A Ddrm_gpuva_mgr.c1062 struct drm_gpuva *va, bool merge) in op_unmap_cb() argument
1068 op.unmap.keep = merge; in op_unmap_cb()
1092 bool merge = !!va->gem.obj; in __drm_gpuva_sm_map() local
1095 merge &= obj == req_obj && in __drm_gpuva_sm_map()
1099 ret = op_unmap_cb(ops, priv, va, merge); in __drm_gpuva_sm_map()
1106 ret = op_unmap_cb(ops, priv, va, merge); in __drm_gpuva_sm_map()
1121 .keep = merge, in __drm_gpuva_sm_map()
1139 merge &= obj == req_obj && in __drm_gpuva_sm_map()
1141 u.keep = merge; in __drm_gpuva_sm_map()
1172 merge &= obj == req_obj && in __drm_gpuva_sm_map()
[all …]
/openbmc/qemu/tests/qemu-iotests/
H A D254.out37 "type": "block-dirty-bitmap-merge"
58 "type": "block-dirty-bitmap-merge"
79 "type": "block-dirty-bitmap-merge"
/openbmc/linux/fs/notify/
H A Dnotification.c83 int (*merge)(struct fsnotify_group *, in fsnotify_insert_event()
112 if (!list_empty(list) && merge) { in fsnotify_insert_event()
113 ret = merge(group, event); in fsnotify_insert_event()
/openbmc/linux/tools/lib/
H A Dlist_sort.c15 static struct list_head *merge(void *priv, list_cmp_func_t cmp, in merge() function
224 a = merge(priv, cmp, b, a); in list_sort()
246 list = merge(priv, cmp, pending, list); in list_sort()
/openbmc/linux/lib/
H A Dlist_sort.c16 static struct list_head *merge(void *priv, list_cmp_func_t cmp, in merge() function
225 a = merge(priv, cmp, b, a); in list_sort()
247 list = merge(priv, cmp, pending, list); in list_sort()
/openbmc/openbmc/poky/meta/recipes-graphics/menu-cache/files/
H A D0001-Support-gcc10-compilation.patch8 /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/qemu/tests/qtest/libqos/
H A Dlibqos-malloc.c90 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()
/openbmc/linux/Documentation/block/
H A Ddeadline-iosched.rst62 request, or it fits at the front. That is called either a back merge candidate
63 or a front merge candidate. Due to the way files are typically laid out,
66 front merge requests. Setting front_merges to 0 disables this functionality.
69 rbtree front sector lookup when the io scheduler merge function is called.
/openbmc/openbmc/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/
H A Dxf86-input-tslib_1.1.1.bb9 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/u-boot/tools/patman/
H A Dgitutil.py129 merge = command.OutputOneLine('git', '--git-dir', git_dir, 'config',
136 return merge, None
137 elif remote and merge:
138 leaf = merge.split('/')[-1]
142 "'%s' remote='%s', merge='%s'" % (branch, remote, merge))
/openbmc/linux/tools/perf/tests/shell/
H A Dstat.sh91 if ! perf stat --no-merge -e "$ok_grouping" true > /dev/null 2>&1
97 if perf stat --no-merge -e "$group_needs_break" true 2>&1 | grep -E -q "<not supported>"
/openbmc/qemu/backends/
H A Dhostmem.c166 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()
/openbmc/openbmc/meta-phosphor/recipes-phosphor/ipmi/
H A Dphosphor-ipmi-fru-merge-config-native.bb1 SUMMARY = "To merge the Host and BMC config files generated from MRW "
9 PROVIDES += "virtual/phosphor-ipmi-fru-merge-config"
/openbmc/qemu/tests/qemu-iotests/tests/
H A Dqemu-img-bitmaps98 $QEMU_IMG bitmap --add --merge b0 -b "$TEST_IMG.base" -F $IMGFMT \
100 $QEMU_IMG bitmap --merge tmp -f $IMGFMT "$TEST_IMG" b0
110 $QEMU_IMG bitmap --add --merge b2 -b "$TEST_IMG" -F $IMGFMT \

12345678910>>...44