| /linux/Documentation/devicetree/bindings/display/mediatek/ |
| H A D | mediatek,merge.yaml | 4 $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
29 - const: mediatek,mt6795-disp-merge
30 - const: mediatek,mt8173-disp-merge
32 - const: mediatek,mt8188-disp-merge
[all …]
|
| /linux/Documentation/maintainer/ |
| H A D | rebasing-and-merging.rst | 16 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 D | maintainer-entry-profile.rst | 54 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 D | pull-requests.rst | 51 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.
|
| /linux/drivers/gpu/drm/ci/ |
| H A D | gitlab-ci.yml | 138 # Forked project branch / pre-merge pipeline not for Marge bot
139 …- if: &is-forked-branch-or-pre-merge-not-for-marge '$CI_PROJECT_NAMESPACE != "mesa" || ($GITLAB_US…
144 # Post-merge pipeline
145 - if: &is-post-merge '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_BRANCH'
147 # Post-merge pipeline, not for Marge Bot
148 …- if: &is-post-merge-not-for-marge '$CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marg…
150 # Pre-merge pipeline
151 - if: &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"'
153 # Pre-merge pipeline for Marge Bot
154 …- if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_…
[all …]
|
| /linux/Documentation/admin-guide/device-mapper/ |
| H A D | snapshot.rst | 12 - 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 D | list_sort.c | 11 * 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
133 * for each bit, when count increments to 2^k), we merge two lists of
136 * This merge happens exactly when the count reaches an odd multiple of
138 * so it's safe to merge away two lists of size 2^k.
159 * (merge and loop back to state 2)
163 * merge them away in the 5->2 transition. Note in particular that just
167 * When we reach the end of the input, we merge all the pending
[all …]
|
| /linux/lib/ |
| H A D | list_sort.c | 12 * 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 …]
|
| /linux/drivers/gpu/drm/mediatek/ |
| H A D | mtk_disp_merge.c | 163 * 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()
321 "failed to ioremap merge\n"); in mtk_disp_merge_probe()
326 "failed to get merge clk\n"); in mtk_disp_merge_probe()
331 "failed to get merge async clock\n"); in mtk_disp_merge_probe()
[all …]
|
| H A D | mtk_disp_ovl_adaptor.c | 77 [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/tools/testing/vma/ |
| H A D | vma.c | 95 /* Helper function which provides a wrapper around a merge new VMA operation. */
110 * Helper function which provides a wrapper around a merge existing VMA
128 * Helper function to reset merge state the associated VMA iterator to a
147 * Helper function to try to merge a new VMA.
149 * Update vmg and the iterator for it and try to merge, otherwise allocate a new
272 * performs the merge/split only. in test_simple_modify()
418 * NO merge. in test_merge_new()
431 * Merge BOTH sides. in test_merge_new()
440 /* Merge with A, delete B. */ in test_merge_new()
450 * Merge to PREVIOUS VMA. in test_merge_new()
[all …]
|
| /linux/drivers/net/ethernet/netronome/nfp/flower/ |
| H A D | offload.c | 590 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 D | conntrack.h | 127 * @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/block/ |
| H A D | blk-merge.c | 3 * 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()
514 /* only try to merge bvecs into one sg if they are from two bios */
548 * Only try to merge bvecs from two bios given we in __blk_bios_map_sg()
549 * have done bio internal merge when adding pages in __blk_bios_map_sg()
630 /* discard request merge won't add new segment */ in ll_new_hw_segment()
735 /* Merge is OK... */ in ll_merge_requests_fn()
742 * blk_rq_set_mixed_merge - mark a request as mixed merge
[all …]
|
| /linux/fs/btrfs/ |
| H A D | extent_map.c | 209 /* Don't merge compressed extents, we need to know their actual size. */ in can_merge_extent_map()
217 * We don't want to merge stuff that hasn't been written to the log yet in can_merge_extent_map()
227 /* Check to see if two extent_map structs are adjacent and safe to merge. */
249 * Handle the on-disk data extents merge for @prev and @next.
251 * @prev: left extent to merge
252 * @next: right extent to merge
253 * @merged: the extent we will not discard after the merge; updated with new values
290 * For case 2), we just merge the two data extents into one. in merge_ondisk_extents()
343 struct extent_map *merge = NULL; in try_merge_map() local
363 merge = rb_entry(rb, struct extent_map, rb_node); in try_merge_map()
[all …]
|
| /linux/Documentation/process/ |
| H A D | 2.Process.rst | 37 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/tools/perf/tests/ |
| H A D | maps.c | 141 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/mm/ |
| H A D | vma.c | 85 * Return true if we can merge this (vm_flags,anon_vma,file,vm_pgoff)
88 * We cannot merge two vmas if they have differently assigned (non-NULL)
95 * We assume the vma may be removed as part of the merge.
111 * Return true if we can merge this (vm_flags,anon_vma,file,vm_pgoff)
114 * We cannot merge two vmas if they have differently assigned (non-NULL)
117 * We assume that vma is not removed as part of the merge.
300 * In addition, if we can merge with the left VMA, ensure that left and right
314 * If we can merge with prev (left) and next (right), indicating that in can_vma_merge_right()
578 /* Actually perform the VMA merge operation. */
632 * vma_merge_existing_range - Attempt to merge VMAs based on a VMA having its
[all …]
|
| /linux/tools/testing/selftests/arm64/mte/ |
| H A D | check_ksm_options.c | 122 /* 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/arch/nios2/lib/ |
| H A D | memcpy.c | 31 #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/fs/notify/ |
| H A D | notification.c | 73 * 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 D | v4l2-event.rst | 59 ``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 D | sync_stress_merge.c | 12 * 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 D | deadline-iosched.rst | 62 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 D | fragmentation.c | 133 * 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()
|