Home
last modified time | relevance | path

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

12345678910>>...43

/openbmc/linux/Documentation/devicetree/bindings/display/mediatek/
H A Dmediatek,merge.yaml7 title: Mediatek display merge
14 Mediatek display merge, namely MERGE, is used to merge two slice-per-line
25 - mediatek,mt8173-disp-merge
26 - mediatek,mt8195-disp-merge
28 - const: mediatek,mt6795-disp-merge
49 - const: merge
51 - const: merge
54 mediatek,merge-fifo-en:
64 mediatek,merge-mute:
99 merge@14017000 {
[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/drivers/gpu/drm/ci/
H A Dgitlab-ci.yml131 # Forked project branch / pre-merge pipeline not for Marge bot
137 # Post-merge pipeline
140 # Post-merge pipeline, not for Marge Bot
143 # Pre-merge pipeline
146 # Pre-merge pipeline for Marge Bot
194 - if: *is-post-merge
200 - if: *is-pre-merge-for-marge
204 - if: *is-post-merge-not-for-marge
241 - if: *is-pre-merge
248 - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
[all …]
/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
101 independently of the others. So naturally, at least one merge will be
122 can be recorded. The changelog for the merge should, for any kind of
123 merge, say *why* the merge is being done. For a lower-level tree, "why" is
144 type of merge is often called a "back merge". Back merges can help to make
159 merge to a well-known stable point, rather than to some random commit.
164 One of the most frequent causes of merge-related trouble is when a
190 as always, in such situations, the merge commit should explain why the
211 in the tree. As always, such a merge should pick a well-known release
[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/openbmc/poky/meta/recipes-devtools/quilt/quilt/
H A D0001-test-Fix-a-race-condition-in-merge.test.patch5 Subject: [PATCH] test: Fix a race condition in merge.test
17 test/merge.test | 6 ++++--
20 diff --git a/test/merge.test b/test/merge.test
22 --- a/test/merge.test
23 +++ b/test/merge.test
/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
24 snapshot, snapshot-origin, and snapshot-merge.
73 - snapshot-merge <origin> <COW device> <persistent> <chunksize>
124 How snapshot-merge is used by LVM2
136 lvconvert --merge volumeGroup/snap
144 volumeGroup-base: 0 2097152 snapshot-merge 254:11 254:12 P 16
154 The snapshot-merge and snapshot status lines end with:
174 # lvconvert --merge -b volumeGroup/snap
182 0 8388608 snapshot-merge 281688/2097152 1104
185 0 8388608 snapshot-merge 180480/2097152 712
[all …]
/openbmc/linux/fs/btrfs/
H A Dextent_map.c233 struct extent_map *merge = NULL; in try_merge_map() local
252 em->start = merge->start; in try_merge_map()
254 em->len += merge->len; in try_merge_map()
258 em->mod_start = merge->mod_start; in try_merge_map()
263 RB_CLEAR_NODE(&merge->rb_node); in try_merge_map()
264 free_extent_map(merge); in try_merge_map()
272 em->len += merge->len; in try_merge_map()
273 em->block_len += merge->block_len; in try_merge_map()
275 RB_CLEAR_NODE(&merge->rb_node); in try_merge_map()
276 em->mod_len = (merge->mod_start + merge->mod_len) - em->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/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/net/ethernet/netronome/nfp/flower/
H A Doffload.c616 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()
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()
639 merge->l2.mac_src[i] |= in nfp_flower_update_merge_with_actions()
666 merge->ipv6.ip_ext.ttl |= in nfp_flower_update_merge_with_actions()
675 ports = (u8 *)&merge->l4.port_src; in nfp_flower_update_merge_with_actions()
717 merge->tci = meta_tci->tci; in nfp_flower_populate_merge_match()
727 memcpy(&merge->l2, mask, match_size); in nfp_flower_populate_merge_match()
[all …]
/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/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/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/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/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/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/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/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/poky/scripts/
H A Dresulttool40 import resulttool.merge
58 resulttool.merge.register_commands(subparsers)
/openbmc/openbmc/poky/scripts/lib/resulttool/
H A Dmerge.py13 def merge(args, logger): function
38 parser_build.set_defaults(func=merge)
/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>>...43