Home
last modified time | relevance | path

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

12345678910>>...23

/linux-6.15/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
27 - mediatek,mt8195-mdp3-merge
53 - const: merge
55 - const: merge
58 mediatek,merge-fifo-en:
68 mediatek,merge-mute:
126 merge@14017000 {
[all …]
/linux-6.15/drivers/gpu/drm/ci/
H A Dgitlab-ci.yml139 # merge pipeline
141 # post-merge pipeline
143 # Pre-merge pipeline
160 .never-post-merge-rules:
162 - if: *is-post-merge
175 - if: *is-merge-attempt
180 - if: *is-pre-merge
184 # Skip everything for pre-merge and merge pipelines which don't change
186 - if: *is-merge-attempt
188 - if: *is-pre-merge
[all …]
/linux-6.15/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.
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.
H A Dmessy-diffstat.rst70 branch or performing another merge with the linus branch, then recreating
76 situation is to indeed to do a merge with the branch you intend your work
78 shame. Create a new, throwaway branch and do the merge there::
86 The merge operation resolves all of the complications resulting from the
/linux-6.15/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 …]
/linux-6.15/drivers/net/ethernet/netronome/nfp/flower/
H A Doffload.c620 merge->tci = cpu_to_be16(0xffff); in nfp_flower_update_merge_with_actions()
623 merge->tci = cpu_to_be16(0); in nfp_flower_update_merge_with_actions()
629 memset(&merge->l4, 0xff, in nfp_flower_update_merge_with_actions()
632 memset(&merge->ipv6, 0xff, in nfp_flower_update_merge_with_actions()
635 memset(&merge->ipv4, 0xff, in nfp_flower_update_merge_with_actions()
643 merge->l2.mac_src[i] |= in nfp_flower_update_merge_with_actions()
670 merge->ipv6.ip_ext.ttl |= in nfp_flower_update_merge_with_actions()
679 ports = (u8 *)&merge->l4.port_src; in nfp_flower_update_merge_with_actions()
721 merge->tci = meta_tci->tci; in nfp_flower_populate_merge_match()
731 memcpy(&merge->l2, mask, match_size); in nfp_flower_populate_merge_match()
[all …]
/linux-6.15/fs/btrfs/
H A Dextent_map.c345 struct extent_map *merge = NULL; in try_merge_map() local
366 if (rb && can_merge_extent_map(merge) && mergeable_maps(merge, em)) { in try_merge_map()
367 em->start = merge->start; in try_merge_map()
368 em->len += merge->len; in try_merge_map()
376 remove_em(inode, merge); in try_merge_map()
377 free_extent_map(merge); in try_merge_map()
384 if (rb && can_merge_extent_map(merge) && mergeable_maps(em, merge)) { in try_merge_map()
385 em->len += merge->len; in try_merge_map()
387 merge_ondisk_extents(em, merge, em); in try_merge_map()
391 remove_em(inode, merge); in try_merge_map()
[all …]
/linux-6.15/drivers/gpu/drm/mediatek/
H A Dmtk_disp_ovl_adaptor.c88 static const struct mtk_ddp_comp_funcs merge = { variable
118 [OVL_ADAPTOR_MERGE0] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE1, 1, &merge },
119 [OVL_ADAPTOR_MERGE1] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE2, 2, &merge },
120 [OVL_ADAPTOR_MERGE2] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE3, 3, &merge },
121 [OVL_ADAPTOR_MERGE3] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE4, 4, &merge },
141 struct device *merge; in mtk_ovl_adaptor_layer_config() local
157 merge = ovl_adaptor->ovl_adaptor_comp[OVL_ADAPTOR_MERGE0 + idx]; in mtk_ovl_adaptor_layer_config()
161 mtk_merge_stop_cmdq(merge, cmdq_pkt); in mtk_ovl_adaptor_layer_config()
180 mtk_merge_advance_config(merge, l_w, r_w, pending->height, 0, 0, cmdq_pkt); in mtk_ovl_adaptor_layer_config()
198 mtk_merge_start_cmdq(merge, cmdq_pkt); in mtk_ovl_adaptor_layer_config()
/linux-6.15/tools/lib/
H A Dlist_sort.c13 static struct list_head *merge(void *priv, list_cmp_func_t cmp, in merge() function
212 a = merge(priv, cmp, b, a); in list_sort()
234 list = merge(priv, cmp, pending, list); in list_sort()
/linux-6.15/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()
/linux-6.15/lib/
H A Dlist_sort.c13 static struct list_head *merge(void *priv, list_cmp_func_t cmp, in merge() function
229 a = merge(priv, cmp, b, a); in list_sort()
251 list = merge(priv, cmp, pending, list); in list_sort()
/linux-6.15/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.
/linux-6.15/drivers/gpu/drm/
H A Ddrm_gpuvm.c2090 struct drm_gpuva *va, bool merge) in op_unmap_cb() argument
2096 op.unmap.keep = merge; in op_unmap_cb()
2120 bool merge = !!va->gem.obj; in __drm_gpuvm_sm_map() local
2123 merge &= obj == req_obj && in __drm_gpuvm_sm_map()
2127 ret = op_unmap_cb(ops, priv, va, merge); in __drm_gpuvm_sm_map()
2134 ret = op_unmap_cb(ops, priv, va, merge); in __drm_gpuvm_sm_map()
2149 .keep = merge, in __drm_gpuvm_sm_map()
2167 merge &= obj == req_obj && in __drm_gpuvm_sm_map()
2169 u.keep = merge; in __drm_gpuvm_sm_map()
2200 merge &= obj == req_obj && in __drm_gpuvm_sm_map()
[all …]
/linux-6.15/tools/perf/tests/shell/
H A Dstat.sh126 if ! perf stat --no-merge -e "$ok_grouping" true > /dev/null 2>&1
132 if perf stat --no-merge -e "$group_needs_break" true 2>&1 | grep -E -q "<not supported>"
/linux-6.15/Documentation/driver-api/media/
H A Dv4l2-event.rst59 ``merge()`` and ``replace()`` callbacks which drivers can set. These
68 The ``merge()`` callback allows you to merge the oldest event payload into
75 A good example of these ``replace``/``merge`` callbacks is in v4l2-event.c:
121 merge merge event 'old' into event 'new'.
/linux-6.15/arch/x86/pci/
H A Dbus_numa.c96 resource_size_t end, unsigned long flags, int merge) in update_res() argument
107 if (!merge) in update_res()
H A Dbus_numa.h26 resource_size_t end, unsigned long flags, int merge);
/linux-6.15/Documentation/ABI/testing/
H A Dsysfs-block-dm32 reasonable merge candidate can be queued on the request
36 request-based DM's merge heuristic and associated extra
/linux-6.15/tools/testing/selftests/bpf/
H A DDENYLIST3 get_stack_raw_tp # spams with kernel warnings until next bpf -> bpf-next merge
/linux-6.15/tools/crypto/tcrypt/
H A Dtcrypt_speed_compare.py113 def merge(base, new): function
182 merged = merge(base, new)
/linux-6.15/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 …]
/linux-6.15/arch/powerpc/include/asm/
H A Dkexec_ranges.h7 void sort_memory_ranges(struct crash_mem *mrngs, bool merge);
/linux-6.15/arch/arm64/boot/dts/mediatek/
H A Dmt8188.dtsi2780 compatible = "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merge";
3017 merge1: merge@1c10c000 {
3018 compatible = "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merge";
3027 mediatek,merge-mute;
3031 compatible = "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merge";
3040 mediatek,merge-mute;
3044 compatible = "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merge";
3053 mediatek,merge-mute;
3057 compatible = "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merge";
3066 mediatek,merge-mute;
[all …]

12345678910>>...23