| /Linux-v5.4/fs/btrfs/ |
| D | extent_map.c | 233 struct extent_map *merge = NULL; in try_merge_map() local
239 merge = rb_entry(rb, struct extent_map, rb_node); in try_merge_map()
240 if (rb && mergable_maps(merge, em)) { in try_merge_map()
241 em->start = merge->start; in try_merge_map()
242 em->orig_start = merge->orig_start; in try_merge_map()
243 em->len += merge->len; in try_merge_map()
244 em->block_len += merge->block_len; in try_merge_map()
245 em->block_start = merge->block_start; in try_merge_map()
246 em->mod_len = (em->mod_len + em->mod_start) - merge->mod_start; in try_merge_map()
247 em->mod_start = merge->mod_start; in try_merge_map()
[all …]
|
| /Linux-v5.4/Documentation/maintainer/ |
| D | rebasing-and-merging.rst | 16 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 …]
|
| D | pull-requests.rst | 53 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.4/Documentation/admin-guide/device-mapper/ |
| D | snapshot.rst | 12 - 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.4/drivers/net/ethernet/netronome/nfp/flower/ |
| D | offload.c | 512 struct nfp_flower_merge_check *merge, in nfp_flower_update_merge_with_actions() argument
540 merge->tci = cpu_to_be16(0xffff); in nfp_flower_update_merge_with_actions()
543 merge->tci = cpu_to_be16(0); in nfp_flower_update_merge_with_actions()
547 eth_broadcast_addr(&merge->l2.mac_dst[0]); in nfp_flower_update_merge_with_actions()
548 eth_broadcast_addr(&merge->l2.mac_src[0]); in nfp_flower_update_merge_with_actions()
549 memset(&merge->l4, 0xff, in nfp_flower_update_merge_with_actions()
551 memset(&merge->ipv4, 0xff, in nfp_flower_update_merge_with_actions()
557 merge->l2.mac_dst[i] |= eth->eth_addr_mask[i]; in nfp_flower_update_merge_with_actions()
559 merge->l2.mac_src[i] |= in nfp_flower_update_merge_with_actions()
564 merge->ipv4.ipv4_src |= ipv4_add->ipv4_src_mask; in nfp_flower_update_merge_with_actions()
[all …]
|
| /Linux-v5.4/fs/notify/ |
| D | notification.c | 86 int (*merge)(struct list_head *, in fsnotify_add_event()
113 if (!list_empty(list) && merge) { in fsnotify_add_event()
114 ret = merge(list, event); in fsnotify_add_event()
|
| /Linux-v5.4/lib/ |
| D | list_sort.c | 19 static struct list_head *merge(void *priv, cmp_func cmp, in merge() function
230 a = merge(priv, (cmp_func)cmp, b, a); in list_sort()
252 list = merge(priv, (cmp_func)cmp, pending, list); in list_sort()
|
| /Linux-v5.4/Documentation/block/ |
| D | deadline-iosched.rst | 62 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.4/Documentation/media/kapi/ |
| D | v4l2-event.rst | 59 ``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.4/arch/x86/pci/ |
| D | bus_numa.c | 96 resource_size_t end, unsigned long flags, int merge) in update_res() argument
107 if (!merge) in update_res()
|
| D | bus_numa.h | 26 resource_size_t end, unsigned long flags, int merge);
|
| /Linux-v5.4/Documentation/ABI/testing/ |
| D | sysfs-block-dm | 32 reasonable merge candidate can be queued on the request
36 request-based DM's merge heuristic and associated extra
|
| /Linux-v5.4/drivers/staging/rtl8192e/ |
| D | TODO | 1 * merge into drivers/net/wireless/rtllib/rtl8192e
|
| /Linux-v5.4/kernel/gcov/ |
| D | gcc_3_4.c | 56 void (*merge)(gcov_type *, unsigned int); member
282 dup->counts[i].merge = ctr->merge; in gcov_info_dup()
|
| /Linux-v5.4/Documentation/process/ |
| D | 2.Process.rst | 37 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 February 11 4.16-rc1, merge window closes
100 worse; the pile of changes waiting for the next merge window will grow
[all …]
|
| D | 7.AdvancedTopics.rst | 65 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.4/drivers/dma/ |
| D | TODO | 11 4. Check other subsystems for dma drivers and merge/move to dmaengine
|
| /Linux-v5.4/drivers/media/v4l2-core/ |
| D | v4l2-event.c | 127 } else if (sev->ops && sev->ops->merge) { in __v4l2_event_queue_fh()
130 sev->ops->merge(&kev->event, &second_oldest->event); in __v4l2_event_queue_fh()
336 .merge = v4l2_event_src_merge,
|
| /Linux-v5.4/drivers/staging/rtl8712/ |
| D | TODO | 2 - merge Realtek's bugfixes and new features into the driver
|
| /Linux-v5.4/drivers/staging/vt6656/ |
| D | TODO | 5 - prepare for merge with vt6655 driver:
|
| /Linux-v5.4/block/ |
| D | blk-rq-qos.c | 89 if (rqos->ops->merge) in __rq_qos_merge()
90 rqos->ops->merge(rqos, rq, bio); in __rq_qos_merge()
|
| /Linux-v5.4/drivers/staging/vt6655/ |
| D | TODO | 3 - prepare for merge with vt6656 driver:
|
| /Linux-v5.4/Documentation/translations/zh_CN/process/ |
| D | 7.AdvancedTopics.rst | 76 完全合并（merge）。合并有时是很有意义的，但是过于频繁的合并会不必要地扰乱
|
| /Linux-v5.4/include/media/ |
| D | v4l2-event.h | 50 void (*merge)(const struct v4l2_event *old, struct v4l2_event *new); member
|
| /Linux-v5.4/drivers/staging/rtl8188eu/ |
| D | TODO | 9 - merge Realtek's bugfixes and new features into the driver
|
