Home
last modified time | relevance | path

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

12345678910>>...135

/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
27 - mediatek,mt8195-mdp3-merge
30 - mediatek,mt8188-mdp3-merge
31 - const: mediatek,mt8195-mdp3-merge
33 - const: mediatek,mt6795-disp-merge
[all …]
/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
63 New feature submissions targeting the next merge window should have
66 the NEXT+1 merge window, or should come with sufficient justification
71 - Last -rc to merge features: Deadline for merge decisions
74 set will need to wait for the NEXT+1 merge window. Of course there is no
77 resubmit for the following 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/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 …]
/linux/tools/lib/
H A Dlist_sort.c9 * to chaining of merge() calls: null-terminated, no reserved or
13 static struct list_head *merge(void *priv, list_cmp_func_t cmp, in merge() function
42 * Combine final list merge with restoration of standard doubly-linked
43 * list structure. This approach duplicates code from merge(), but
131 * for each bit, when count increments to 2^k), we merge two lists of
134 * This merge happens exactly when the count reaches an odd multiple of
136 * so it's safe to merge away two lists of size 2^k.
157 * (merge and loop back to state 2)
161 * merge them away in the 5->2 transition. Note in particular that just
165 * When we reach the end of the input, we merge all the pending
[all …]
/linux/net/ethtool/
H A Dmm.c248 /* Returns whether a given device supports the MAC merge layer
309 * ethtool_mmsv_verify_timer - Timer for MAC Merge verification
312 * Verify the MAC Merge capability in the local TX direction, by
381 * ethtool_mmsv_stop() - Stop MAC Merge Software Verification
382 * @mmsv: MAC Merge Software Verification state
386 * MAC Merge features would be superfluous. Otherwise, prefer
396 * ethtool_mmsv_link_state_handle() - Inform MAC Merge Software Verification
398 * @mmsv: MAC Merge Software Verification state
432 * ethtool_mmsv_event_handle() - Inform MAC Merge Software Verification
434 * @mmsv: MAC Merge Software Verification state
[all …]
/linux/tools/testing/vma/tests/
H A Dmerge.c3 /* Helper function which provides a wrapper around a merge new VMA operation. */
32 * Helper function to reset merge state the associated VMA iterator to a
67 * Helper function to try to merge a new VMA.
69 * Update vmg and the iterator for it and try to merge, otherwise allocate a new
143 * performs the merge/split only. in test_simple_modify()
301 * NO merge. in __test_merge_new()
314 * Merge BOTH sides. in __test_merge_new()
323 /* Merge with A, delete B. */ in __test_merge_new()
335 * Merge to PREVIOUS VMA. in __test_merge_new()
354 * Merge t in __test_merge_new()
[all...]
/linux/drivers/net/ethernet/netronome/nfp/flower/
H A Doffload.c590 struct nfp_flower_merge_check *merge, in nfp_flower_update_merge_with_actions() argument
620 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()
627 eth_broadcast_addr(&merge->l2.mac_dst[0]); in nfp_flower_update_merge_with_actions()
628 eth_broadcast_addr(&merge->l2.mac_src[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()
641 merge->l2.mac_dst[i] |= eth->eth_addr_mask[i]; in nfp_flower_update_merge_with_actions()
643 merge->l2.mac_src[i] |= in nfp_flower_update_merge_with_actions()
[all …]
H A Dconntrack.h127 * @flags: Used to indicate flow flag like NAT which used by merge.
148 * struct nfp_fl_ct_tc_merge - Merge of two flows from tc
170 * struct nfp_fl_nft_tc_merge - Merge of tc_merge flows with nft flow
221 * merge with other +trk+est entries and offload if possible.
238 * merge with other -trk entries and offload if possible.
252 * to the next relevant zone table. Try to merge with other +trk+est
/linux/tools/testing/selftests/mm/
H A Dmerge.c18 FIXTURE(merge) in FIXTURE() argument
64 FIXTURE_SETUP(merge) in FIXTURE_TEARDOWN()
74 FIXTURE_TEARDOWN(merge) in FIXTURE()
124 TEST_F(merge, mprotect_unfaulted_left) in TEST_F()
133 * merge failure due to lack of VM_ACCOUNT flag by mistake. in TEST_F()
162 * Now mprotect() the RW region read-only, we should merge (though for in TEST_F()
172 /* Assert that the merge succeeded using PROCMAP_QUERY. */ in TEST_F()
178 TEST_F(merge, mprotect_unfaulted_right) in TEST_F()
213 * Now mprotect() the RW region read-only, we should merge: in TEST_F()
222 /* Assert that the merge succeede in TEST_F()
51 FIXTURE_SETUP(merge) FIXTURE_SETUP() argument
61 FIXTURE_TEARDOWN(merge) FIXTURE_TEARDOWN() argument
111 TEST_F(merge,mprotect_unfaulted_left) TEST_F() argument
165 TEST_F(merge,mprotect_unfaulted_right) TEST_F() argument
215 TEST_F(merge,mprotect_unfaulted_both) TEST_F() argument
266 TEST_F(merge,mprotect_faulted_left_unfaulted_right) TEST_F() argument
325 TEST_F(merge,mprotect_unfaulted_left_faulted_right) TEST_F() argument
384 TEST_F(merge,forked_target_vma) TEST_F() argument
439 TEST_F(merge,forked_source_vma) TEST_F() argument
512 TEST_F(merge,handle_uprobe_upon_merged_vma) TEST_F() argument
555 TEST_F(merge,ksm_merge) TEST_F() argument
626 TEST_F(merge,mremap_unfaulted_to_faulted) TEST_F() argument
687 TEST_F(merge,mremap_unfaulted_behind_faulted) TEST_F() argument
748 TEST_F(merge,mremap_unfaulted_between_faulted) TEST_F() argument
833 TEST_F(merge,mremap_unfaulted_between_faulted_unfaulted) TEST_F() argument
914 TEST_F(merge,mremap_unfaulted_between_correctly_placed_faulted) TEST_F() argument
988 TEST_F(merge,mremap_correct_placed_faulted) TEST_F() argument
[all...]
H A Dsoft-dirty.c198 * v merge v in test_merge()
240 * Now remap it immediately adjacent to map, if the merge correctly in test_merge()
244 * merge in test_merge()
255 "Test %s-anon soft-dirty after remap merge 1st pg\n", in test_merge()
258 "Test %s-anon soft-dirty after remap merge 2nd pg\n", in test_merge()
294 * merge in test_merge()
304 "Test %s-anon soft-dirty after mprotect merge 1st pg\n", in test_merge()
307 "Test %s-anon soft-dirty after mprotect merge 2nd pg\n", in test_merge()
/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()
/linux/drivers/gpu/drm/mediatek/
H A Dmtk_disp_ovl_adaptor.c77 [OVL_ADAPTOR_TYPE_MERGE] = "merge",
88 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()
[all …]
/linux/mm/
H A Dvma.c109 struct vm_area_struct *src = vmg->middle; /* existing merge case. */ in is_mergeable_anon_vma()
142 * @vmg: The merge state that will be used to determine adjustment and VMA
186 * Return true if we can merge this (vma_flags,anon_vma,file,vm_pgoff)
189 * We cannot merge two vmas if they have differently assigned (non-NULL)
196 * We assume the vma may be removed as part of the merge.
212 * Return true if we can merge this (vma_flags,anon_vma,file,vm_pgoff)
215 * We cannot merge two vmas if they have differently assigned (non-NULL)
218 * We assume that vma is not removed as part of the merge.
436 * In addition, if we can merge with the left VMA, ensure that left and right
452 * If we can merge with prev (left) and next (right), indicating that in can_vma_merge_right()
[all …]
/linux/arch/nios2/lib/
H A Dmemcpy.c31 #define MERGE(w0, sh_1, w1, sh_2) (((w0) >> (sh_1)) | ((w1) << (sh_2))) macro
137 ((op_t *) dstp)[0] = MERGE(ap, sh_1, a0, sh_2); in _wordcopy_fwd_dest_aligned()
138 ((op_t *) dstp)[1] = MERGE(a0, sh_1, a1, sh_2); in _wordcopy_fwd_dest_aligned()
139 ((op_t *) dstp)[2] = MERGE(a1, sh_1, a2, sh_2); in _wordcopy_fwd_dest_aligned()
140 ((op_t *) dstp)[3] = MERGE(a2, sh_1, a3, sh_2); in _wordcopy_fwd_dest_aligned()
151 ((op_t *) dstp)[0] = MERGE(ap, sh_1, a0, sh_2); in _wordcopy_fwd_dest_aligned()
/linux/tools/perf/tests/
H A Dmaps.c141 TEST_ASSERT_VAL("failed to merge map", !ret); in test__maps__merge_in()
144 TEST_ASSERT_VAL("merge check failed", !ret); in test__maps__merge_in()
147 TEST_ASSERT_VAL("failed to merge map", !ret); in test__maps__merge_in()
150 TEST_ASSERT_VAL("merge check failed", !ret); in test__maps__merge_in()
153 TEST_ASSERT_VAL("failed to merge map", !ret); in test__maps__merge_in()
156 TEST_ASSERT_VAL("merge check failed", !ret); in test__maps__merge_in()
/linux/fs/notify/
H A Dnotification.c73 * The group can use the @merge hook to merge the event with a queued event.
83 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/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/tools/testing/selftests/sync/
H A Dsync_stress_merge.c12 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
60 * and merge them together in test_merge_stress_random_merge()
74 /* Merge */ in test_merge_stress_random_merge()
76 merged = sync_merge("merge", tmpfence, fence); in test_merge_stress_random_merge()
/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.
/linux/net/batman-adv/
H A Dfragmentation.c133 * fragments needed to merge the packet, the chain is moved to the passed head
149 * the later merge. Non-linear merge should be added to remove this in batadv_frag_insert_packet()
238 * batadv_frag_merge_packets() - merge a chain of fragments
297 * batadv_frag_skb_buffer() - buffer fragment for later merge
301 * Add fragment to buffer and merge fragments if possible.
317 /* Add packet to buffer and table entry if merge is possible. */ in batadv_frag_skb_buffer()
321 /* Leave if more fragments are needed to merge. */ in batadv_frag_skb_buffer()
447 /* To avoid merge and refragmentation at next-hops we never send in batadv_frag_send_packet()
/linux/arch/sparc/include/asm/
H A Destate.h17 * fetches 3) atomic operations. Such events _cannot_ occur for: 1) merge
29 * 3) As the result of store merge completion, writeback, or copyout will
43 * during store merge, writeback, and copyout operations.
/linux/security/apparmor/
H A Dlabel.c265 * @vec: list of profiles to sort and merge
866 /* requires sort and merge done first */
951 * @a: label to merge
952 * @b: label to merge
990 * @a: label to merge then compare (NOT NULL)
991 * @b: label to merge then compare (NOT NULL)
992 * @z: label to compare merge against (NOT NULL)
1029 * @new: preallocated label to merge into (NOT NULL)
1030 * @a: label to merge with @b (NOT NULL)
1031 * @b: label to merge with @a (NOT NULL)
[all …]
/linux/scripts/kconfig/
H A Dmerge_config.sh26 echo " -m only merge the fragments, do not execute the make command"
135 # Merge files, printing warnings on overridden values
139 echo "The merge file '$ORIG_MERGE_FILE' does not exist. Exit." >&2
197 # First pass: read merge file, store all lines and index
214 # Not a config or not in merge file - keep it
253 # Append merge file, skipping lines marked for builtin preservation

12345678910>>...135