Searched full:merge (Results 1 – 25 of 118) sorted by relevance
12345
| /Documentation/devicetree/bindings/display/mediatek/ |
| D | mediatek,merge.yaml | 4 $id: http://devicetree.org/schemas/display/mediatek/mediatek,merge.yaml#
7 title: Mediatek display merge
14 Mediatek display merge, namely MERGE, is used to merge two slice-per-line
16 MERGE device node must be siblings to the central MMSYS_CONFIG node.
25 - mediatek,mt8173-disp-merge
26 - mediatek,mt8195-disp-merge
27 - mediatek,mt8195-mdp3-merge
29 - const: mediatek,mt6795-disp-merge
30 - const: mediatek,mt8173-disp-merge
32 - const: mediatek,mt8188-disp-merge
[all …]
|
| /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 | maintainer-entry-profile.rst | 54 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.
|
| D | pull-requests.rst | 51 itself, and then in the merge commit that the maintainer makes if/when they
52 merge the pull request. So write it up well, as it will be in the kernel
59 want to use that message as the message for the merge, so it should
67 suspicious. And when you send me new stuff after the merge window
70 happened that this didn't go through the merge window..
83 it right now), but may not make sense in the context of a merge
95 Here is the big char/misc patch set for the 4.15-rc1 merge window.
|
| D | messy-diffstat.rst | 70 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
|
| D | modifying-patches.rst | 7 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,
|
| /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 …]
|
| /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 | blk-mq.rst | 53 layer or if we want to try to merge requests. In both cases, requests will be
73 The staging queue can be used to merge requests for adjacent sectors. For
92 happens only between requests in the same queue, so it is not possible to merge
|
| /Documentation/gpu/rfc/ |
| D | i915_gem_lmem.rst | 10 * Merge basic HW enabling of DG1(still without pciid)
11 * Merge the uAPI bits behind special CONFIG_BROKEN(or so) flag
|
| /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 September 30 5.4-rc1, merge window closes
101 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 | backporting.rst | 19 when a merge conflict does pop up, it can be daunting. Luckily,
91 CONFLICT (content): Merge conflict
118 We will not cover using dedicated merge tools here beyond providing some
126 - `P4Merge <https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge>`__
311 because they are part of the merge conflict or the patch being
314 Merge styles and diff3
317 The default conflict marker style shown above is known as the ``merge``
338 git config merge.conflictStyle diff3
|
| /Documentation/driver-api/media/ |
| 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/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
|
| /Documentation/doc-guide/ |
| D | maintainer-profile.rst | 41 the merge window. The docs tree tends to close late before the merge
|
| /Documentation/nvdimm/ |
| D | maintainer-entry-profile.rst | 10 patch acceptance and upstream merge. Patches are merged to either the
49 next merge window they should be sent before -rc4, and ideally
|
| /Documentation/filesystems/xfs/ |
| D | xfs-maintainer-entry-profile.rst | 114 proceed with a merge.
170 defer a patch when the next merge window is close.
172 Code submissions targeting the next merge window should be sent between
178 next merge window should be sent between -rc1 and -rc4.
|
| /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/devicetree/bindings/riscv/ |
| D | extensions.yaml | 128 changes to interrupts as frozen at commit ccbddab ("Merge pull
142 ("Merge pull request #42 from riscv/jhauser-2023-RC4") of riscv-aia.
191 ratified in commit 98918c844281 ("Merge pull request #1217 from
197 acceleration instructions as ratified at commit 6d33919 ("Merge pull
204 as ratified at commit 6d33919 ("Merge pull request #158 from
210 multiplication as ratified at commit 6d33919 ("Merge pull request
234 instructions as ratified at commit 6d33919 ("Merge pull request #158
|
| /Documentation/gpu/amdgpu/display/ |
| D | index.rst | 40 * Finally, developers wait a few days for community feedback before we merge
44 seriously, and we never merge anything that fails our validation. Follows an
|
| /Documentation/translations/zh_TW/process/ |
| D | 7.AdvancedTopics.rst | 88 合併（merge）。合併有時是很有意義的，但是過於頻繁的合併會不必要地擾亂歷史。
|
| /Documentation/translations/zh_CN/maintainer/ |
| D | rebasing-and-merging.rst | 159 git merge v5.2-rc1^0
|
| /Documentation/translations/zh_CN/process/ |
| D | 7.AdvancedTopics.rst | 85 合并（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
|
12345