Home
last modified time | relevance | path

Searched full:merge (Results 1 – 25 of 4838) sorted by relevance

12345678910>>...194

/openbmc/linux/Documentation/devicetree/bindings/display/mediatek/
H A Dmediatek,merge.yaml4 $id: http://devicetree.org/schemas/display/mediatek/mediatek,merge.yaml#
7 title: Mediatek display merge
14 Mediatek display merge, namely MERGE, is used to merge two slice-per-line
16 MERGE device node must be siblings to the central MMSYS_CONFIG node.
25 - mediatek,mt8173-disp-merge
26 - mediatek,mt8195-disp-merge
28 - const: mediatek,mt6795-disp-merge
29 - const: mediatek,mt8173-disp-merge
49 - const: merge
51 - const: merge
[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
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.
H A Dpull-requests.rst51 itself, and then in the merge commit that the maintainer makes if/when they
52 merge the pull request. So write it up well, as it will be in the kernel
59 want to use that message as the message for the merge, so it should
67 suspicious. And when you send me new stuff after the merge window
70 happened that this didn't go through the merge window..
83 it right now), but may not make sense in the context of a merge
95 Here is the big char/misc patch set for the 4.15-rc1 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/drivers/gpu/drm/ci/
H A Dgitlab-ci.yml131 # Forked project branch / pre-merge pipeline not for Marge bot
132 …- if: &is-forked-branch-or-pre-merge-not-for-marge '$CI_PROJECT_NAMESPACE != "mesa" || ($GITLAB_US…
137 # Post-merge pipeline
138 - if: &is-post-merge '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_BRANCH'
140 # Post-merge pipeline, not for Marge Bot
141 …- if: &is-post-merge-not-for-marge '$CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marg…
143 # Pre-merge pipeline
144 - if: &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"'
146 # Pre-merge pipeline for Marge Bot
147 …- if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_…
[all …]
/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/linux/drivers/gpu/drm/mediatek/
H A Dmtk_disp_merge.c163 * DISP_REG_MERGE_CFG_24 is merge SRAM0 w/h in mtk_merge_advance_config()
164 * DISP_REG_MERGE_CFG_25 is merge SRAM1 w/h. in mtk_merge_advance_config()
165 * If r_w > 0, the merge is in merge mode (input0 and input1 merge together), in mtk_merge_advance_config()
167 * If r_w = 0, the merge is in buffer mode, the input goes through SRAM0 and in mtk_merge_advance_config()
180 * DISP_REG_MERGE_CFG_26 and DISP_REG_MERGE_CFG_27 is only used in LR merge. in mtk_merge_advance_config()
181 * Only take effect when the merge is setting to merge mode. in mtk_merge_advance_config()
201 dev_err(dev, "merge clk prepare enable failed\n"); in mtk_merge_clk_enable()
255 dev_err(dev, "failed to ioremap merge\n"); in mtk_disp_merge_probe()
261 dev_err(dev, "failed to get merge clk\n"); in mtk_disp_merge_probe()
267 dev_err(dev, "failed to get merge async clock\n"); in mtk_disp_merge_probe()
[all …]
/openbmc/linux/tools/lib/
H A Dlist_sort.c11 * to chaining of merge() calls: null-terminated, no reserved or
15 static struct list_head *merge(void *priv, list_cmp_func_t cmp, in merge() function
44 * Combine final list merge with restoration of standard doubly-linked
45 * list structure. This approach duplicates code from merge(), but
82 * If the merge is highly unbalanced (e.g. the input is in merge_final()
143 * for each bit, when count increments to 2^k), we merge two lists of
146 * This merge happens exactly when the count reaches an odd multiple of
148 * so it's safe to merge away two lists of size 2^k.
169 * (merge and loop back to state 2)
173 * merge them away in the 5->2 transition. Note in particular that just
[all …]
/openbmc/linux/lib/
H A Dlist_sort.c12 * to chaining of merge() calls: null-terminated, no reserved or
16 static struct list_head *merge(void *priv, list_cmp_func_t cmp, in merge() function
45 * Combine final list merge with restoration of standard doubly-linked
46 * list structure. This approach duplicates code from merge(), but
83 * If the merge is highly unbalanced (e.g. the input is in merge_final()
144 * for each bit, when count increments to 2^k), we merge two lists of
147 * This merge happens exactly when the count reaches an odd multiple of
149 * so it's safe to merge away two lists of size 2^k.
170 * (merge and loop back to state 2)
174 * merge them away in the 5->2 transition. Note in particular that just
[all …]
/openbmc/openbmc/poky/scripts/lib/resulttool/
H A Dmerge.py1 # 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 Dutils.py21 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 D0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch24 # 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/linux/fs/btrfs/
H A Dextent_map.c185 /* Check to see if two extent_map structs are adjacent and safe to merge. */
192 * don't merge compressed extents, we need to know their in mergable_maps()
203 * We don't want to merge stuff that hasn't been written to the log yet in mergable_maps()
233 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()
[all …]
/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/scripts/
H A Dresulttool4 # (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/linux/tools/perf/tests/
H A Dmaps.c126 TEST_ASSERT_VAL("failed to merge map", !ret); in test__maps__merge_in()
129 TEST_ASSERT_VAL("merge check failed", !ret); in test__maps__merge_in()
132 TEST_ASSERT_VAL("failed to merge map", !ret); in test__maps__merge_in()
135 TEST_ASSERT_VAL("merge check failed", !ret); in test__maps__merge_in()
138 TEST_ASSERT_VAL("failed to merge map", !ret); in test__maps__merge_in()
141 TEST_ASSERT_VAL("merge check failed", !ret); in test__maps__merge_in()
/openbmc/linux/block/
H A Dblk-merge.c3 * Functions related to segment and merge handling
61 * Don't merge if the 1st bio starts with non-zero offset, otherwise it in bio_will_gap()
63 * merge a huge number of small single bios in case of mkfs. in bio_will_gap()
79 * merge with 'pb' in bio_will_gap()
386 /* there isn't chance to merge the split bio */ in __bio_split_to_limits()
513 /* only try to merge bvecs into one sg if they are from two bios */
547 * Only try to merge bvecs from two bios given we in __blk_bios_map_sg()
548 * have done bio internal merge when adding pages in __blk_bios_map_sg()
625 /* discard request merge won't add new segment */ in ll_new_hw_segment()
727 /* Merge is OK... */ in ll_merge_requests_fn()
[all …]
/openbmc/qemu/tests/qemu-iotests/tests/
H A Dqemu-img-bitmaps94 # 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 \
/openbmc/linux/Documentation/process/
H A D2.Process.rst37 cycle, the "merge window" is said to be open. At that time, code which is
45 merge window do not come out of thin air; they have been collected, tested,
49 The merge window lasts for approximately two weeks. At the end of this
52 for example, the release which happens at the end of the merge window will
54 merge new features has passed, and that the time to stabilize the next
59 allowed, but such occasions are rare; developers who try to merge new
60 features outside of the merge window tend to get an unfriendly reception.
61 As a general rule, if you miss the merge window for a given feature, the
78 September 30 5.4-rc1, merge window closes
101 worse; the pile of changes waiting for the next merge window will grow
[all …]
/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 "
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 Dtest_create_new_project.py22 - Merge Toaster settings: False
38 - Merge Toaster settings: True
54 - Merge Toaster settings: True
70 - Merge Toaster settings: True
/openbmc/linux/tools/testing/selftests/arm64/mte/
H A Dcheck_ksm_options.c122 /* Tagged pages should not merge */ in check_madvise_options()
154 "Check KSM mte page merge for private mapping, sync mode and mmap memory\n"); in main()
156 "Check KSM mte page merge for private mapping, async mode and mmap memory\n"); in main()
158 "Check KSM mte page merge for shared mapping, sync mode and mmap memory\n"); in main()
160 "Check KSM mte page merge for shared mapping, async mode and mmap memory\n"); in main()
/openbmc/u-boot/lib/
H A Dlist_sort.c17 * 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()

12345678910>>...194