Home
last modified time | relevance | path

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

12345678910>>...22

/linux-6.6.21/Documentation/devicetree/bindings/display/mediatek/
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
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
54 mediatek,merge-fifo-en:
[all …]
/linux-6.6.21/drivers/gpu/drm/ci/
Dgitlab-ci.yml118 # Forked project branch / pre-merge pipeline not for Marge bot
119 …- if: &is-forked-branch-or-pre-merge-not-for-marge '$CI_PROJECT_NAMESPACE != "mesa" || ($GITLAB_US…
124 # Post-merge pipeline
125 - if: &is-post-merge '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_BRANCH'
127 # Post-merge pipeline, not for Marge Bot
128 …- if: &is-post-merge-not-for-marge '$CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marg…
130 # Pre-merge pipeline
131 - if: &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"'
133 # Pre-merge pipeline for Marge Bot
134 …- if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_…
[all …]
/linux-6.6.21/Documentation/maintainer/
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 …]
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.
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.
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.6.21/Documentation/admin-guide/device-mapper/
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 …]
/linux-6.6.21/fs/btrfs/
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 …]
/linux-6.6.21/drivers/net/ethernet/netronome/nfp/flower/
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 …]
/linux-6.6.21/drivers/gpu/drm/
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 …]
/linux-6.6.21/fs/notify/
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.6.21/tools/lib/
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()
/linux-6.6.21/lib/
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()
/linux-6.6.21/Documentation/block/
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.6.21/tools/perf/tests/shell/
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>"
/linux-6.6.21/Documentation/driver-api/media/
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.6.21/drivers/gpu/drm/mediatek/
Dmtk_disp_ovl_adaptor.c95 struct device *merge; in mtk_ovl_adaptor_layer_config() local
111 merge = ovl_adaptor->ovl_adaptor_comp[OVL_ADAPTOR_MERGE0 + idx]; in mtk_ovl_adaptor_layer_config()
115 mtk_merge_stop_cmdq(merge, cmdq_pkt); in mtk_ovl_adaptor_layer_config()
134 mtk_merge_advance_config(merge, l_w, r_w, pending->height, 0, 0, cmdq_pkt); in mtk_ovl_adaptor_layer_config()
152 mtk_merge_start_cmdq(merge, cmdq_pkt); in mtk_ovl_adaptor_layer_config()
/linux-6.6.21/arch/x86/pci/
Dbus_numa.c96 resource_size_t end, unsigned long flags, int merge) in update_res() argument
107 if (!merge) in update_res()
Dbus_numa.h26 resource_size_t end, unsigned long flags, int merge);
/linux-6.6.21/Documentation/ABI/testing/
Dsysfs-block-dm32 reasonable merge candidate can be queued on the request
36 request-based DM's merge heuristic and associated extra
/linux-6.6.21/tools/testing/selftests/bpf/
DDENYLIST3 get_stack_raw_tp # spams with kernel warnings until next bpf -> bpf-next merge
/linux-6.6.21/Documentation/doc-guide/
Dmaintainer-profile.rst34 the merge window. The docs tree tends to close late before the merge
/linux-6.6.21/Documentation/process/
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.6.21/Documentation/translations/zh_CN/maintainer/
Drebasing-and-merging.rst159 git merge v5.2-rc1^0
/linux-6.6.21/arch/powerpc/include/asm/
Dkexec_ranges.h7 void sort_memory_ranges(struct crash_mem *mrngs, bool merge);

12345678910>>...22