Home
last modified time | relevance | path

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

12345678910>>...22

/kernel/linux/config/
D.gitattributes1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
/kernel/linux/patches/
D.gitattributes1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
/kernel/linux/linux-5.10/fs/btrfs/
Dextent_map.c237 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()
260 em->block_start = merge->block_start; in try_merge_map()
261 em->mod_len = (em->mod_len + em->mod_start) - merge->mod_start; in try_merge_map()
262 em->mod_start = merge->mod_start; in try_merge_map()
[all …]
/kernel/linux/linux-5.10/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.
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,
/kernel/linux/linux-5.10/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 …]
/kernel/linux/linux-5.10/drivers/net/ethernet/netronome/nfp/flower/
Doffload.c588 struct nfp_flower_merge_check *merge, in nfp_flower_update_merge_with_actions() argument
618 merge->tci = cpu_to_be16(0xffff); in nfp_flower_update_merge_with_actions()
621 merge->tci = cpu_to_be16(0); in nfp_flower_update_merge_with_actions()
625 eth_broadcast_addr(&merge->l2.mac_dst[0]); in nfp_flower_update_merge_with_actions()
626 eth_broadcast_addr(&merge->l2.mac_src[0]); in nfp_flower_update_merge_with_actions()
627 memset(&merge->l4, 0xff, in nfp_flower_update_merge_with_actions()
630 memset(&merge->ipv6, 0xff, in nfp_flower_update_merge_with_actions()
633 memset(&merge->ipv4, 0xff, in nfp_flower_update_merge_with_actions()
639 merge->l2.mac_dst[i] |= eth->eth_addr_mask[i]; in nfp_flower_update_merge_with_actions()
641 merge->l2.mac_src[i] |= in nfp_flower_update_merge_with_actions()
[all …]
/kernel/linux/linux-5.10/fs/notify/
Dnotification.c86 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()
/kernel/linux/linux-5.10/lib/
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()
/kernel/linux/linux-5.10/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.
/kernel/linux/linux-5.10/fs/hmdfs/
DKconfig6 realized. Device view and merge view are provided. In the device view,
8 different device directories; in the merge view, acollection of shared
/kernel/linux/linux-5.10/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'.
/kernel/linux/linux-5.10/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()
Dbus_numa.h26 resource_size_t end, unsigned long flags, int merge);
/kernel/linux/linux-5.10/Documentation/ABI/testing/
Dsysfs-block-dm32 reasonable merge candidate can be queued on the request
36 request-based DM's merge heuristic and associated extra
/kernel/linux/linux-5.10/drivers/staging/rtl8192e/
DTODO1 * merge into drivers/net/wireless/rtllib/rtl8192e
/kernel/linux/linux-5.10/Documentation/doc-guide/
Dmaintainer-profile.rst34 the merge window. The docs tree tends to close late before the merge
/kernel/linux/linux-5.10/arch/powerpc/include/asm/
Dkexec_ranges.h7 void sort_memory_ranges(struct crash_mem *mrngs, bool merge);
/kernel/linux/linux-5.10/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 …]
/kernel/linux/linux-5.10/drivers/dma/
DTODO11 4. Check other subsystems for dma drivers and merge/move to dmaengine
/kernel/linux/linux-5.10/drivers/staging/rtl8712/
DTODO2 - merge Realtek's bugfixes and new features into the driver
/kernel/linux/linux-5.10/drivers/media/v4l2-core/
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()
339 .merge = v4l2_event_src_merge,
/kernel/linux/linux-5.10/drivers/staging/vt6656/
DTODO5 - prepare for merge with vt6655 driver:

12345678910>>...22