Home
last modified time | relevance | path

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

12345678910>>...22

/linux-6.3-rc2/Documentation/devicetree/bindings/display/mediatek/
A Dmediatek,merge.yaml7 title: Mediatek display merge
14 Mediatek display merge, namely MERGE, is used to merge two slice-per-line
25 - const: mediatek,mt8173-disp-merge
27 - const: mediatek,mt8195-disp-merge
47 - const: merge
49 - const: merge
52 mediatek,merge-fifo-en:
62 mediatek,merge-mute:
97 merge@14017000 {
98 compatible = "mediatek,mt8173-disp-merge";
[all …]
/linux-6.3-rc2/Documentation/maintainer/
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
101 independently of the others. So naturally, at least one merge will be
122 can be recorded. The changelog for the merge should, for any kind of
123 merge, say *why* the merge is being done. For a lower-level tree, "why" is
144 type of merge is often called a "back merge". Back merges can help to make
159 merge to a well-known stable point, rather than to some random commit.
164 One of the most frequent causes of merge-related trouble is when a
190 as always, in such situations, the merge commit should explain why the
216 git merge v5.2-rc1^0
[all …]
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
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.
A 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.
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
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-6.3-rc2/fs/btrfs/
A Dextent_map.c233 struct extent_map *merge = NULL; in try_merge_map() local
252 em->start = merge->start; in try_merge_map()
254 em->len += merge->len; in try_merge_map()
258 em->mod_start = merge->mod_start; in try_merge_map()
263 RB_CLEAR_NODE(&merge->rb_node); in try_merge_map()
264 free_extent_map(merge); in try_merge_map()
272 em->len += merge->len; in try_merge_map()
273 em->block_len += merge->block_len; in try_merge_map()
275 RB_CLEAR_NODE(&merge->rb_node); in try_merge_map()
276 em->mod_len = (merge->mod_start + merge->mod_len) - em->mod_start; in try_merge_map()
[all …]
/linux-6.3-rc2/Documentation/admin-guide/device-mapper/
A Dsnapshot.rst12 - To merge a snapshot of a block device back into the snapshot's origin
24 snapshot, snapshot-origin, and snapshot-merge.
73 - snapshot-merge <origin> <COW device> <persistent> <chunksize>
124 How snapshot-merge is used by LVM2
136 lvconvert --merge volumeGroup/snap
144 volumeGroup-base: 0 2097152 snapshot-merge 254:11 254:12 P 16
154 The snapshot-merge and snapshot status lines end with:
174 # lvconvert --merge -b volumeGroup/snap
182 0 8388608 snapshot-merge 281688/2097152 1104
185 0 8388608 snapshot-merge 180480/2097152 712
[all …]
/linux-6.3-rc2/drivers/net/ethernet/netronome/nfp/flower/
A Doffload.c616 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()
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()
639 merge->l2.mac_src[i] |= in nfp_flower_update_merge_with_actions()
666 merge->ipv6.ip_ext.ttl |= in nfp_flower_update_merge_with_actions()
675 ports = (u8 *)&merge->l4.port_src; in nfp_flower_update_merge_with_actions()
717 merge->tci = meta_tci->tci; in nfp_flower_populate_merge_match()
727 memcpy(&merge->l2, mask, match_size); in nfp_flower_populate_merge_match()
[all …]
/linux-6.3-rc2/fs/notify/
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-6.3-rc2/lib/
A Dlist_sort.c16 static struct list_head *merge(void *priv, list_cmp_func_t cmp, in merge() function
225 a = merge(priv, cmp, b, a); in list_sort()
247 list = merge(priv, cmp, pending, list); in list_sort()
/linux-6.3-rc2/tools/lib/
A Dlist_sort.c15 static struct list_head *merge(void *priv, list_cmp_func_t cmp, in merge() function
224 a = merge(priv, cmp, b, a); in list_sort()
246 list = merge(priv, cmp, pending, list); in list_sort()
/linux-6.3-rc2/tools/perf/tests/shell/
A Dstat.sh79 if ! perf stat --no-merge -e "$ok_grouping" true > /dev/null 2>&1
85 if perf stat --no-merge -e "$group_needs_break" true 2>&1 | grep -E -q "<not supported>"
/linux-6.3-rc2/Documentation/block/
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-6.3-rc2/Documentation/driver-api/media/
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-6.3-rc2/arch/x86/pci/
A Dbus_numa.c96 resource_size_t end, unsigned long flags, int merge) in update_res() argument
107 if (!merge) in update_res()
A Dbus_numa.h26 resource_size_t end, unsigned long flags, int merge);
/linux-6.3-rc2/Documentation/ABI/testing/
A Dsysfs-block-dm32 reasonable merge candidate can be queued on the request
36 request-based DM's merge heuristic and associated extra
/linux-6.3-rc2/tools/testing/selftests/bpf/
A DDENYLIST3 get_stack_raw_tp # spams with kernel warnings until next bpf -> bpf-next merge
/linux-6.3-rc2/Documentation/doc-guide/
A Dmaintainer-profile.rst34 the merge window. The docs tree tends to close late before the merge
/linux-6.3-rc2/Documentation/process/
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 window will grow
[all …]
/linux-6.3-rc2/Documentation/translations/zh_CN/maintainer/
A Drebasing-and-merging.rst159 git merge v5.2-rc1^0
/linux-6.3-rc2/arch/powerpc/include/asm/
A Dkexec_ranges.h7 void sort_memory_ranges(struct crash_mem *mrngs, bool merge);
/linux-6.3-rc2/drivers/dma/
A DTODO11 4. Check other subsystems for dma drivers and merge/move to dmaengine
/linux-6.3-rc2/drivers/media/v4l2-core/
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,

Completed in 26 milliseconds

12345678910>>...22