Home
last modified time | relevance | path

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

12345678910>>...151

/Linux-v5.15/Documentation/maintainer/
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 …]
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
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.
Dpull-requests.rst53 itself, and then in the merge commit that the maintainer makes if/when they
54 merge the pull request. So write it up well, as it will be in the kernel
61 want to use that message as the message for the merge, so it should
69 suspicious. And when you send me new stuff after the merge window
72 happened that this didn't go through the merge window..
85 it right now), but may not make sense in the context of a merge
97 Here is the big char/misc patch set for the 4.15-rc1 merge window.
/Linux-v5.15/Documentation/admin-guide/device-mapper/
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-v5.15/fs/btrfs/
Dextent_map.c189 /* check to see if two extent_map structs are adjacent and safe to merge */
196 * don't merge compressed extents, we need to know their in mergable_maps()
207 * We don't want to merge stuff that hasn't been written to the log yet in mergable_maps()
237 struct extent_map *merge = NULL; in try_merge_map() local
254 merge = rb_entry(rb, struct extent_map, rb_node); in try_merge_map()
255 if (rb && mergable_maps(merge, em)) { in try_merge_map()
256 em->start = merge->start; in try_merge_map()
257 em->orig_start = merge->orig_start; in try_merge_map()
258 em->len += merge->len; in try_merge_map()
259 em->block_len += merge->block_len; in try_merge_map()
[all …]
/Linux-v5.15/lib/
Dlist_sort.c12 * 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-v5.15/drivers/net/ethernet/netronome/nfp/flower/
Doffload.c586 struct nfp_flower_merge_check *merge, in nfp_flower_update_merge_with_actions() argument
616 merge->tci = cpu_to_be16(0xffff); in nfp_flower_update_merge_with_actions()
619 merge->tci = cpu_to_be16(0); in nfp_flower_update_merge_with_actions()
623 eth_broadcast_addr(&merge->l2.mac_dst[0]); in nfp_flower_update_merge_with_actions()
624 eth_broadcast_addr(&merge->l2.mac_src[0]); in nfp_flower_update_merge_with_actions()
625 memset(&merge->l4, 0xff, in nfp_flower_update_merge_with_actions()
628 memset(&merge->ipv6, 0xff, in nfp_flower_update_merge_with_actions()
631 memset(&merge->ipv4, 0xff, in nfp_flower_update_merge_with_actions()
637 merge->l2.mac_dst[i] |= eth->eth_addr_mask[i]; in nfp_flower_update_merge_with_actions()
639 merge->l2.mac_src[i] |= in nfp_flower_update_merge_with_actions()
[all …]
Dmain.h346 /* A link contains a pointer to a merge flow and an associated sub_flow.
347 * Each merge flow will feature in 2 links to its underlying sub_flows.
348 * A sub_flow will have at least 1 link to a merge flow or more if it
349 * has been used to create multiple merge flows.
351 * For a merge flow, 'linked_flows' in its nfp_fl_payload struct lists
352 * all links to sub_flows (sub_flow.flow) via merge.list.
353 * For a sub_flow, 'linked_flows' gives all links to merge flows it has
/Linux-v5.15/block/
Dblk-merge.c3 * Functions related to segment and merge handling
25 * Don't merge if the 1st bio starts with non-zero offset, otherwise it in bio_will_gap()
27 * merge a huge number of small single bios in case of mkfs. in bio_will_gap()
43 * merge with 'pb' in bio_will_gap()
344 /* there isn't chance to merge the splitted bio */ in __blk_queue_split()
467 /* only try to merge bvecs into one sg if they are from two bios */
501 * Only try to merge bvecs from two bios given we in __blk_bios_map_sg()
502 * have done bio internal merge when adding pages in __blk_bios_map_sg()
567 /* discard request merge won't add new segment */ in ll_new_hw_segment()
666 /* Merge is OK... */ in ll_merge_requests_fn()
[all …]
/Linux-v5.15/tools/perf/tests/
Dmaps.c103 TEST_ASSERT_VAL("failed to merge map", !ret); in test__maps__merge_in()
106 TEST_ASSERT_VAL("merge check failed", !ret); in test__maps__merge_in()
109 TEST_ASSERT_VAL("failed to merge map", !ret); in test__maps__merge_in()
112 TEST_ASSERT_VAL("merge check failed", !ret); in test__maps__merge_in()
115 TEST_ASSERT_VAL("failed to merge map", !ret); in test__maps__merge_in()
118 TEST_ASSERT_VAL("merge check failed", !ret); in test__maps__merge_in()
/Linux-v5.15/tools/testing/selftests/arm64/mte/
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-v5.15/Documentation/process/
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 window will grow
[all …]
D7.AdvancedTopics.rst65 Publicly-available branches should be created with care; merge in patches
92 you try to push changes which do not result in a fast-forward merge
102 advances, it is tempting to merge with that tree to stay on the leading
105 world. Once that happens, a full merge must be done. Merging occasionally
107 needlessly. Suggested technique in this case is to merge infrequently, and
111 useful in such situations; it remembers how merge conflicts were resolved
/Linux-v5.15/arch/nios2/lib/
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-v5.15/fs/notify/
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_add_event()
112 if (!list_empty(list) && merge) { in fsnotify_add_event()
113 ret = merge(group, event); in fsnotify_add_event()
/Linux-v5.15/tools/testing/selftests/sync/
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-v5.15/Documentation/block/
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-v5.15/Documentation/driver-api/media/
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-v5.15/arch/sparc/include/asm/
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-v5.15/net/batman-adv/
Dfragmentation.c134 * fragments needed to merge the packet, the chain is moved to the passed head
150 * the later merge. Non-linear merge should be added to remove this in batadv_frag_insert_packet()
239 * batadv_frag_merge_packets() - merge a chain of fragments
298 * batadv_frag_skb_buffer() - buffer fragment for later merge
302 * Add fragment to buffer and merge fragments if possible.
318 /* Add packet to buffer and table entry if merge is possible. */ in batadv_frag_skb_buffer()
322 /* Leave if more fragments are needed to merge. */ in batadv_frag_skb_buffer()
453 /* To avoid merge and refragmentation at next-hops we never send in batadv_frag_send_packet()
/Linux-v5.15/security/apparmor/
Dlabel.c255 * @vec: list of profiles to sort and merge
852 /* requires sort and merge done first */
954 * @a: label to merge
955 * @b: label to merge
993 * @a: label to merge then compare (NOT NULL)
994 * @b: label to merge then compare (NOT NULL)
995 * @z: label to compare merge against (NOT NULL)
1032 * @new: preallocated label to merge into (NOT NULL)
1033 * @a: label to merge with @b (NOT NULL)
1034 * @b: label to merge with @a (NOT NULL)
[all …]
/Linux-v5.15/drivers/media/
DMakefile23 # There are both core and drivers at RC subtree - merge before drivers
29 # Finally, merge the drivers that require the core
/Linux-v5.15/arch/x86/pci/
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()
/Linux-v5.15/Documentation/gpu/rfc/
Di915_gem_lmem.rst10 * Merge basic HW enabling of DG1(still without pciid)
11 * Merge the uAPI bits behind special CONFIG_BROKEN(or so) flag
/Linux-v5.15/Documentation/translations/it_IT/process/
D7.AdvancedTopics.rst52 *index*, *fast-forward merge*, *push* e *pull*, *detached head*, eccetera.
115 *Merge* occasionali possono essere considerati di buon senso, ma quando
117 suggerita in questi casi è quella di fare *merge* raramente, e più in generale
120 dei *merge* di test in un ramo privato. In queste situazioni git "rerere"
121 può essere utile; questo strumento si ricorda come i conflitti di *merge*

12345678910>>...151