Home
last modified time | relevance | path

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

12345678910>>...16

/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
H A Dmodifying-patches.rst7 modify patches you receive in order to merge them, because the code is not
24 want at the same time to credit the author, track changes, merge the fix,
/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/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 …]
/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...]
/linux/fs/btrfs/
H A Dextent_map.c212 /* Don't merge compressed extents, we need to know their actual size. */ in can_merge_extent_map()
220 * We don't want to merge stuff that hasn't been written to the log yet in can_merge_extent_map()
230 /* Check to see if two extent_map structs are adjacent and safe to merge. */
252 * Handle the on-disk data extents merge for @prev and @next.
254 * @prev: left extent to merge
255 * @next: right extent to merge
256 * @merged: the extent we will not discard after the merge; updated with new values
293 * For case 2), we just merge the two data extents into one. in merge_ondisk_extents()
357 struct extent_map *merge = NULL; in try_merge_map() local
376 merge in try_merge_map()
[all...]
/linux/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/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/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/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/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/drivers/gpu/drm/
H A Ddrm_gpuvm.c8 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
497 * operations, such as split / merge or prefetch.
2395 struct drm_gpuva *va, bool merge, bool madvise) in op_unmap_cb()
2404 op.unmap.keep = merge; in __drm_gpuvm_sm_map()
2433 bool merge = !!va->gem.obj; in __drm_gpuvm_sm_map()
2439 merge &= obj == req_obj && in __drm_gpuvm_sm_map()
2443 ret = op_unmap_cb(ops, priv, va, merge, madvise); in __drm_gpuvm_sm_map()
2450 ret = op_unmap_cb(ops, priv, va, merge, madvise); in __drm_gpuvm_sm_map()
2465 .keep = merge, in __drm_gpuvm_sm_map()
2486 merge in __drm_gpuvm_sm_map()
2389 op_unmap_cb(const struct drm_gpuvm_ops * fn,void * priv,struct drm_gpuva * va,bool merge,bool madvise) op_unmap_cb() argument
2427 bool merge = !!va->gem.obj; __drm_gpuvm_sm_map() local
[all...]
/linux/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/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/tools/crypto/tcrypt/
H A Dtcrypt_speed_compare.py113 def merge(base, new): function
182 merged = merge(base, new)
/linux/tools/testing/selftests/bpf/
H A DDENYLIST3 get_stack_raw_tp # spams with kernel warnings until next bpf -> bpf-next merge
/linux/arch/powerpc/include/asm/
H A Dkexec_ranges.h7 void sort_memory_ranges(struct crash_mem *mrngs, bool merge);
/linux/Documentation/translations/zh_CN/maintainer/
H A Drebasing-and-merging.rst159 git merge v5.2-rc1^0
/linux/Documentation/doc-guide/
H A Dmaintainer-profile.rst41 the merge window. The docs tree tends to close late before the merge
/linux/drivers/media/v4l2-core/
H A Dv4l2-event.c130 } else if (sev->ops && sev->ops->merge) { in __v4l2_event_queue_fh()
133 sev->ops->merge(&kev->event, &second_oldest->event); in __v4l2_event_queue_fh()
356 .merge = v4l2_event_src_merge,
/linux/drivers/dma/
H A DTODO11 4. Check other subsystems for dma drivers and merge/move to dmaengine
/linux/drivers/gpu/drm/amd/display/dc/dml/dcn32/
H A Ddcn32_fpu.c8 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
184 bool *repopulate_pipes, int *split, bool *merge);
1207 bool merge[MAX_PIPES]) in update_pipe_slice_table_with_split_flags()
1212 * merge to an append or remove operation. in update_pipe_slice_table_with_split_flags()
1240 if (merge[dc_pipe_idx]) { in update_pipe_slice_table_with_split_flags()
1291 bool merge[MAX_PIPES]) in update_pipes_with_split_flags()
1299 split, merge);
1306 bool *merge) in should_apply_odm_power_optimization()
1366 split, merge); in should_apply_odm_power_optimization()
1402 bool *merge, in try_odm_power_optimization_and_revalidate()
1302 should_apply_odm_power_optimization(struct dc * dc,struct dc_state * context,struct vba_vars_st * v,int * split,bool * merge) should_apply_odm_power_optimization() argument
1398 try_odm_power_optimization_and_revalidate(struct dc * dc,struct dc_state * context,display_e2e_pipe_params_st * pipes,int * split,bool * merge,unsigned int * vlevel,int pipe_cnt) try_odm_power_optimization_and_revalidate() argument
1442 dcn32_full_validate_bw_helper(struct dc * dc,struct dc_state * context,display_e2e_pipe_params_st * pipes,int * vlevel,int * split,bool * merge,int * pipe_cnt,bool * repopulate_pipes) dcn32_full_validate_bw_helper() argument
1905 dcn32_apply_merge_split_flags_helper(struct dc * dc,struct dc_state * context,bool * repopulate_pipes,int * split,bool * merge) dcn32_apply_merge_split_flags_helper() argument
2111 bool merge[MAX_PIPES] = { false }; dcn32_internal_validate_bw() local
[all...]

12345678910>>...16