Searched full:merge (Results 1 – 25 of 72) sorted by relevance
123
| /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.
|
| /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 …]
|
| D | dm-init.rst | 56 `snapshot-merge` constrained, userspace should verify src/dst device
|
| /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.
|
| D | biodoc.rst | 378 pre-building would be to do it whenever we fail to merge on a request.
859 elevator_merge_fn called to query requests for merge with a bio
867 involved in a merge. It is used in the deadline
874 want to stop a merge at this point if it
894 block layer to find merge possibilities.
932 The generic i/o scheduler algorithm attempts to sort/merge/batch requests for
952 ii. Merge hash
954 enables merging code to quickly look up "back merge" candidates, even when
962 merge/sort optimizations
970 the requests. This provides an opportunity to merge/sort the requests before
[all …]
|
| /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'.
|
| /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
|
| D | 6.Followthrough.rst | 112 dedicated to patches planned for the next merge window, and another for
135 only turned up during the merge window and had to be addressed in a hurry.
136 Now they can be resolved at leisure, before the merge window opens.
|
| /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
|
| D | sysfs-block | 152 merge contiguous I/Os. For known random I/O loads these
156 merge checks are disabled, but the simple one-shot merges
158 all merge tries are disabled. The default value is 0 -
159 which enables all types of merge tries.
|
| /Documentation/translations/it_IT/process/ |
| D | 7.AdvancedTopics.rst | 52 *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*
|
| /Documentation/gpu/ |
| D | introduction.rst | 87 Feature Merge Deadlines
92 merge window. All patches must have landed in the drm-next tree by latest -rc7,
96 After that point only bugfixes (like after the upstream merge window has closed
|
| /Documentation/devicetree/bindings/display/mediatek/ |
| D | mediatek,disp.txt | 36 "mediatek,<chip>-disp-merge" - merge streams from two RDMA sources
46 merge and split function blocks).
|
| /Documentation/admin-guide/mm/ |
| D | ksm.rst | 30 are swapped back in: ksmd must rediscover their identity and merge again).
57 cannot contain any pages which KSM could actually merge; even if
140 the faster KSM will merge the memory and the higher the
|
| /Documentation/translations/zh_CN/process/ |
| D | 7.AdvancedTopics.rst | 76 完全合并（merge）。合并有时是很有意义的，但是过于频繁的合并会不必要地扰乱
|
| /Documentation/translations/zh_CN/video4linux/ |
| D | v4l2-framework.txt | 912 此外，v4l2_subscribed_event 结构体内部有可供驱动设置的 merge() 和
916 kevent 结构体时，它将被调用。merge() 回调让你可以合并最早的事件净荷
923 关于 replace/merge 回调的一个不错的例子在 v4l2-event.c 中：用于
950 * merge: 将‘早期‘事件合并到‘新’事件中。
|
| /Documentation/ide/ |
| D | ChangeLog.ide-floppy.1996-2002 | 54 * Ver 0.97 Jul 22 01 Merge 0.91-0.96 onto 0.9.sv for ac series
|
| /Documentation/bpf/ |
| D | bpf_devel_QA.rst | 113 Occasionally, to prevent merge conflicts, we might send pull requests
207 Q: Are patches applied to bpf-next when the merge window is open?
209 A: For the time when the merge window is open, bpf-next will not be
213 During those two weeks of merge window, we might ask you to resend
215 a ``v*-rc1`` after the merge window, we continue processing of bpf-next.
332 then be placed into the merge commit by the BPF maintainers such that
|
| /Documentation/scsi/ |
| D | ChangeLog.ips | 66 - Merge in changes through kernel 2.4.0test1ac21
|
| /Documentation/x86/x86_64/ |
| D | boot-options.rst | 254 [,memaper[=<order>]][,merge][,fullflush][,nomerge]
284 merge
|
| /Documentation/devicetree/bindings/display/ |
| D | amlogic,meson-vpu.yaml | 43 scaler and a "post-blending" to merge with the OSD Planes.
|
| /Documentation/networking/ |
| D | netdev-FAQ.rst | 44 two week "merge window" where the main maintainers feed their new stuff
46 merge window is closed, and it is called/tagged ``-rc1``. No new
54 Relating that to netdev: At the beginning of the 2-week merge window,
|
| /Documentation/sphinx/ |
| D | kerneldoc.py | 8 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
123