Home
last modified time | relevance | path

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

12345678910>>...19

/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 shoul
[all...]
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
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 int
[all...]
/linux/tools/testing/selftests/mm/
H A Dmerge.c18 FIXTURE(merge) in FIXTURE() argument
25 FIXTURE_SETUP(merge) in FIXTURE_SETUP() argument
36 FIXTURE_TEARDOWN(merge) in FIXTURE_TEARDOWN() argument
47 TEST_F(merge, mprotect_unfaulted_left) in TEST_F() argument
56 * merge failure due to lack of VM_ACCOUNT flag by mistake. in TEST_F()
85 * Now mprotect() the RW region read-only, we should merge (though for in TEST_F()
95 /* Assert that the merge succeeded using PROCMAP_QUERY. */ in TEST_F()
101 TEST_F(merge, mprotect_unfaulted_right) in TEST_F() argument
136 * Now mprotect() the RW region read-only, we should merge: in TEST_F()
145 /* Assert that the merge succeede in TEST_F()
151 TEST_F(merge,mprotect_unfaulted_both) TEST_F() argument
202 TEST_F(merge,mprotect_faulted_left_unfaulted_right) TEST_F() argument
261 TEST_F(merge,mprotect_unfaulted_left_faulted_right) TEST_F() argument
320 TEST_F(merge,forked_target_vma) TEST_F() argument
384 TEST_F(merge,forked_source_vma) TEST_F() argument
466 TEST_F(merge,handle_uprobe_upon_merged_vma) TEST_F() argument
509 TEST_F(merge,ksm_merge) TEST_F() argument
580 TEST_F(merge,mremap_unfaulted_to_faulted) TEST_F() argument
641 TEST_F(merge,mremap_unfaulted_behind_faulted) TEST_F() argument
702 TEST_F(merge,mremap_unfaulted_between_faulted) TEST_F() argument
787 TEST_F(merge,mremap_unfaulted_between_faulted_unfaulted) TEST_F() argument
868 TEST_F(merge,mremap_unfaulted_between_correctly_placed_faulted) TEST_F() argument
942 TEST_F(merge,mremap_correct_placed_faulted) TEST_F() argument
[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 in nfp_flower_update_merge_with_actions()
706 nfp_flower_populate_merge_match(struct nfp_fl_payload * flow,struct nfp_flower_merge_check * merge,bool extra_fields) nfp_flower_populate_merge_match() 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()
345 struct extent_map *merge = NULL; in try_merge_map() local
364 merge in try_merge_map()
[all...]
/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_ in mtk_ovl_adaptor_layer_config()
[all...]
/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/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 al
[all...]
/linux/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
80 * If the merge is highly unbalanced (e.g. the input is in merge_final()
148 * for each bit, when count increments to 2^k), we merge two lists of
151 * This merge happens exactly when the count reaches an odd multiple of
153 * so it's safe to merge away two lists of size 2^k.
174 * (merge and loop back to state 2)
178 * merge the
[all...]
/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/tools/perf/tests/shell/
H A Dstat.sh100 "topdown metrics group not merge into slots group"
102 "topdown metrics group not merge into slots group last"
108 "metrics group not merge into slots group"
110 "metrics group not merge into slots group last"
126 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/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,
430 * operations, such as split / merge or prefetch.
2091 struct drm_gpuva *va, bool merge) in op_unmap_cb() argument
2097 op.unmap.keep = merge; in op_unmap_cb()
2121 bool merge = !!va->gem.obj; in __drm_gpuvm_sm_map() local
2124 merge &= obj == req_obj && in __drm_gpuvm_sm_map()
2128 ret = op_unmap_cb(ops, priv, va, merge); in __drm_gpuvm_sm_map()
2135 ret = op_unmap_cb(ops, priv, va, merge); in __drm_gpuvm_sm_map()
2150 .keep = merge, in __drm_gpuvm_sm_map()
2168 merge in __drm_gpuvm_sm_map()
[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()
110 /* try to merge it with old one */ 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/testing/selftests/bpf/
H A DDENYLIST3 get_stack_raw_tp # spams with kernel warnings until next bpf -> bpf-next merge
/linux/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 windo
[all...]
/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/drivers/dma/
H A DTODO11 4. Check other subsystems for dma drivers and merge/move to dmaengine
/linux/Documentation/doc-guide/
H A Dmaintainer-profile.rst41 the merge window. The docs tree tends to close late before the merge

12345678910>>...19