Home
last modified time | relevance | path

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

12345678910>>...17

/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/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
101 TEST_F(merge, mprotect_unfaulted_right) in TEST_F() argument
151 TEST_F(merge, mprotect_unfaulted_both) in TEST_F() argument
202 TEST_F(merge, mprotect_faulted_left_unfaulted_right) in TEST_F() argument
261 TEST_F(merge, mprotect_unfaulted_left_faulted_right) in TEST_F() argument
320 TEST_F(merge, forked_target_vma) in TEST_F() argument
384 TEST_F(merge, forked_source_vma) in 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->l2.mac_src[i] |= in nfp_flower_update_merge_with_actions()
[all …]
/linux/fs/btrfs/
H A Dextent_map.c345 struct extent_map *merge = NULL; in try_merge_map() local
364 merge = rb_entry_safe(rb, struct extent_map, rb_node); in try_merge_map()
366 if (rb && can_merge_extent_map(merge) && mergeable_maps(merge, em)) { in try_merge_map()
367 em->start = merge->start; in try_merge_map()
368 em->len += merge->len; in try_merge_map()
369 em->generation = max(em->generation, merge->generation); in try_merge_map()
372 merge_ondisk_extents(merge, em, em); in try_merge_map()
376 remove_em(inode, merge); in try_merge_map()
377 btrfs_free_extent_map(merge); in try_merge_map()
382 merge = rb_entry_safe(rb, struct extent_map, rb_node); 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/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/tools/perf/tests/shell/
H A Dstat.sh163 if ! perf stat --no-merge -e "$ok_grouping" true > /dev/null 2>&1
169 if perf stat --no-merge -e "$group_needs_break" true 2>&1 | grep -E -q "<not supported>"
/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/Documentation/process/
H A D2.Process.rst32 cycle, the "merge window" is said to be open. At that time, code which is
40 merge window do not come out of thin air; they have been collected, tested,
44 The merge window lasts for approximately two weeks. At the end of this
47 for example, the release which happens at the end of the merge window will
49 merge new features has passed, and that the time to stabilize the next
54 allowed, but such occasions are rare; developers who try to merge new
55 features outside of the merge window tend to get an unfriendly reception.
56 As a general rule, if you miss the merge window for a given feature, the
73 September 30 5.4-rc1, merge window closes
96 worse; the pile of changes waiting for the next merge window will grow
[all …]
/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

12345678910>>...17