| /linux-6.14.4/Documentation/userspace-api/ioctl/ |
| D | ioctl-number.rst | 73 0x00 00-1F linux/fs.h conflict!
74 0x00 00-1F scsi/scsi_ioctl.h conflict!
75 0x00 00-1F linux/fb.h conflict!
76 0x00 00-1F linux/wavefront.h conflict!
106 '3' 00-0F drivers/s390/char/raw3270.h conflict!
107 '3' 00-1F linux/suspend_ioctls.h, conflict!
114 '@' 00-0F linux/radeonfb.h conflict!
115 '@' 00-0F drivers/video/aty/aty128fb.c conflict!
116 'A' 00-1F linux/apm_bios.h conflict!
117 'A' 00-0F linux/agpgart.h, conflict!
[all …]
|
| /linux-6.14.4/Documentation/process/ |
| D | backporting.rst | 4 Backporting and conflict resolution
19 when a merge conflict does pop up, it can be daunting. Luckily,
25 backporting and conflict resolution.
43 destination tree, as this will make git output conflict markers and let
44 you resolve conflicts with the help of git and any other conflict
91 CONFLICT (content): Merge conflict
102 conflict that needs to be resolved.
104 If your attempted cherry-pick fails with a conflict, git automatically
105 edits the files to include so-called conflict markers showing you where
106 the conflict is and how the two branches have diverged. Resolving the
[all …]
|
| /linux-6.14.4/drivers/gpio/ |
| D | gpio-winbond.c | 212 * @testbit: index of a bit to check whether an actual conflict exists
213 * @warnonly: if set then a conflict isn't fatal (just warn about it),
214 * otherwise disable the particular GPIO port if a conflict
236 * @conflict: description of a device that possibly conflicts with
248 struct winbond_gpio_port_conflict conflict; member
261 .conflict = {
278 /* special conflict handling so doesn't use conflict data */
289 .conflict = {
306 .conflict = {
323 .conflict = {
[all …]
|
| /linux-6.14.4/kernel/ |
| D | resource.c | 180 /* Return the conflict entry if you can't request it */
273 * Returns 0 for success, conflict resource on error.
277 struct resource *conflict; in request_resource_conflict() local
280 conflict = __request_resource(root, new); in request_resource_conflict()
282 return conflict; in request_resource_conflict()
294 struct resource *conflict; in request_resource() local
296 conflict = request_resource_conflict(root, new); in request_resource()
297 return conflict ? -EBUSY : 0; in request_resource()
767 struct resource *conflict; in reallocate_resource() local
791 conflict = __request_resource(root, old); in reallocate_resource()
[all …]
|
| /linux-6.14.4/tools/perf/pmu-events/arch/powerpc/power8/ |
| D | cache.json | 41 …ssor's data cache was reloaded from local core's L2 with load hit store conflict due to a demand l…
42 …ssor's data cache was reloaded from local core's L2 with load hit store conflict due to either onl…
47 … processor's data cache was reloaded from local core's L2 with dispatch conflict due to a demand l…
48 … processor's data cache was reloaded from local core's L2 with dispatch conflict due to either onl…
59 …: "The processor's data cache was reloaded from local core's L2 without conflict due to a demand l…
60 …: "The processor's data cache was reloaded from local core's L2 without conflict due to either onl…
83 … processor's data cache was reloaded from local core's L3 with dispatch conflict due to a demand l…
84 … processor's data cache was reloaded from local core's L3 with dispatch conflict due to either onl…
95 …: "The processor's data cache was reloaded from local core's L3 without conflict due to a demand l…
96 …: "The processor's data cache was reloaded from local core's L3 without conflict due to either onl…
|
| D | frontend.json | 125 …Instruction cache was reloaded from local core's L2 with load hit store conflict due to an instruc…
126 …Instruction cache was reloaded from local core's L2 with load hit store conflict due to either an …
131 …sor's Instruction cache was reloaded from local core's L2 with dispatch conflict due to an instruc…
132 …sor's Instruction cache was reloaded from local core's L2 with dispatch conflict due to either an …
143 …processor's Instruction cache was reloaded from local core's L2 without conflict due to an instruc…
144 …processor's Instruction cache was reloaded from local core's L2 without conflict due to either an …
167 …sor's Instruction cache was reloaded from local core's L3 with dispatch conflict due to an instruc…
168 …sor's Instruction cache was reloaded from local core's L3 with dispatch conflict due to either an …
179 …processor's Instruction cache was reloaded from local core's L3 without conflict due to an instruc…
180 …processor's Instruction cache was reloaded from local core's L3 without conflict due to either an …
[all …]
|
| D | marked.json | 107 …ssor's data cache was reloaded from local core's L2 with load hit store conflict due to a marked l…
113 … "Duration in cycles to reload from local core's L2 with load hit store conflict due to a marked l…
119 … processor's data cache was reloaded from local core's L2 with dispatch conflict due to a marked l…
125 …"BriefDescription": "Duration in cycles to reload from local core's L2 with dispatch conflict due …
143 …: "The processor's data cache was reloaded from local core's L2 without conflict due to a marked l…
149 …"BriefDescription": "Duration in cycles to reload from local core's L2 without conflict due to a m…
179 … processor's data cache was reloaded from local core's L3 with dispatch conflict due to a marked l…
185 …"BriefDescription": "Duration in cycles to reload from local core's L3 with dispatch conflict due …
203 …: "The processor's data cache was reloaded from local core's L3 without conflict due to a marked l…
209 …"BriefDescription": "Duration in cycles to reload from local core's L3 without conflict due to a m…
[all …]
|
| D | pipeline.json | 53 …efDescription": "Completion stall due to cache miss that resolves in the L2 or L3 with a conflict",
54 …"PublicDescription": "Completion stall due to cache miss resolving in core's L2/L3 with a conflict"
131 …"BriefDescription": "Completion Stalled due to thread conflict. Group ready to complete but it was…
132 "PublicDescription": "Completion stall due to thread conflict"
|
| /linux-6.14.4/drivers/iio/adc/ |
| D | dln2-adc.c | 185 __le16 conflict; in dln2_adc_set_port_enabled() local
186 int olen = sizeof(conflict); in dln2_adc_set_port_enabled()
193 &conflict, &olen); in dln2_adc_set_port_enabled()
197 if (conflict_out && enable && olen >= sizeof(conflict)) in dln2_adc_set_port_enabled()
198 *conflict_out = le16_to_cpu(conflict); in dln2_adc_set_port_enabled()
201 if (enable && olen < sizeof(conflict)) in dln2_adc_set_port_enabled()
235 u16 conflict; in dln2_adc_read() local
247 ret = dln2_adc_set_port_enabled(dln2, true, &conflict); in dln2_adc_read()
249 if (conflict) { in dln2_adc_read()
251 "ADC pins conflict with mask %04X\n", in dln2_adc_read()
[all …]
|
| /linux-6.14.4/drivers/pci/ |
| D | setup-res.c | 80 * disabled ROM can conflict with other BARs. in pci_std_update_resource()
94 * disable decoding so that a half-updated BAR won't conflict in pci_std_update_resource()
140 struct resource *root, *conflict; in pci_claim_resource() local
164 conflict = request_resource_conflict(root, res); in pci_claim_resource()
165 if (conflict) { in pci_claim_resource()
166 pci_info(dev, "%s %pR: can't claim; address conflict with %s %pR\n", in pci_claim_resource()
167 res_name, res, conflict->name, conflict); in pci_claim_resource()
204 struct resource *root, *conflict; in pci_revert_fw_address() local
237 conflict = request_resource_conflict(root, res); in pci_revert_fw_address()
238 if (conflict) { in pci_revert_fw_address()
[all …]
|
| D | ecam.c | 34 struct resource *conflict; in pci_ecam_create() local
69 conflict = request_resource_conflict(&iomem_resource, &cfg->res); in pci_ecam_create()
70 if (conflict) { in pci_ecam_create()
72 dev_err(dev, "can't claim ECAM area %pR: address conflict with %s %pR\n", in pci_ecam_create()
73 &cfg->res, conflict->name, conflict); in pci_ecam_create()
|
| D | vgaarb.c | 124 * In this case, I assume it will not conflict with any PCI card. If this
215 struct vga_device *conflict; in __vga_tryget() local
249 list_for_each_entry(conflict, &vga_list, list) { in __vga_tryget()
253 /* Don't conflict with myself */ in __vga_tryget()
254 if (vgadev == conflict) in __vga_tryget()
258 * We have a possible conflict. Before we go further, we must in __vga_tryget()
264 if (vgadev->pdev->bus != conflict->pdev->bus) { in __vga_tryget()
273 if (conflict->locks & lwants) in __vga_tryget()
274 return conflict; in __vga_tryget()
281 match = lwants & conflict->owns; in __vga_tryget()
[all …]
|
| /linux-6.14.4/drivers/input/keyboard/ |
| D | hpps2atkbd.h | 19 # define CONFLICT(x,y) x macro
21 # define CONFLICT(x,y) y macro
28 #define C_07 CONFLICT( KEY_F12, KEY_F1 )
29 #define C_11 CONFLICT( KEY_LEFTALT, KEY_LEFTCTRL )
30 #define C_14 CONFLICT( KEY_LEFTCTRL, KEY_CAPSLOCK )
31 #define C_58 CONFLICT( KEY_CAPSLOCK, KEY_RIGHTCTRL )
32 #define C_61 CONFLICT( KEY_102ND, KEY_LEFT )
104 #undef CONFLICT
|
| /linux-6.14.4/arch/arm/boot/dts/gemini/ |
| D | gemini-wbd111.dts | 36 /* Conflict with ICE */
46 /* Conflict with TVC and extended parallel flash */
52 /* Conflict with TVC and extended parallel flash */
58 /* Conflict with TVC and extended parallel flash */
64 /* Conflict with TVC and extended parallel flash */
|
| D | gemini-wbd222.dts | 35 /* Conflict with ICE */
45 /* Conflict with TVC and extended parallel flash */
51 /* Conflict with TVC and extended parallel flash */
57 /* Conflict with TVC and extended parallel flash */
63 /* Conflict with TVC and extended parallel flash */
|
| D | gemini-nas4220b.dts | 35 /* Conflict with TVC */
43 /* Conflict with TVC */
52 /* Conflict with TVC */
58 /* Conflict with TVC */
|
| D | gemini-rut1xx.dts | 35 /* Conflict with TVC */
45 /* Conflict with ICE */
52 /* Conflict with NAND CE0 */
|
| /linux-6.14.4/drivers/pinctrl/ |
| D | pinctrl-gemini.c | 743 /* Conflict with some GPIO groups */
749 /* Conflict with all flash usage */
782 /* Conflict only with GPIO2 */
790 /* Conflict with SSP and UART modem pins */
798 /* Conflict with TVC and ICE */
806 /* Conflict with LPC and UART modem pins */
821 * Conflict with LPC and SSP,
830 /* Conflict with character LCD and ICE */
851 /* Conflict with IDE, parallel and serial flash */
859 /* Conflict with IDE, NAND and serial flash */
[all …]
|
| /linux-6.14.4/arch/m68k/fpsp040/ |
| D | bugfix.S | 51 | (cmdreg1b[ 9: 7] != cmdreg3b[9:7])) { /* xu conflict only */
53 | xu conflict and NOT an nu conflict */
98 | (cmdreg1b[9:7] != cmdreg3b[9:7])) { /* xu conflict only */
100 | xu conflict and NOT an nu conflict */
185 | Test the register conflict aspect. If opclass0, check for
197 | Check for cu and nu register conflict. If one exists, this takes
198 | priority over a cu and xu conflict.
212 | Check for cu and xu register conflict.
246 | We have the case in which a conflict exists between the cu src or
357 | a cu and nu conflict taking priority an nu conflict. If either,
[all …]
|
| /linux-6.14.4/include/trace/events/ |
| D | filelock.h | 207 TP_PROTO(bool conflict, struct file_lease *lease, struct file_lease *breaker),
209 TP_ARGS(conflict, lease, breaker),
218 __field(bool, conflict)
228 __entry->conflict = conflict;
231 TP_printk("conflict %d: lease=%p fl_flags=%s fl_type=%s; breaker=%p fl_flags=%s fl_type=%s",
232 __entry->conflict,
|
| /linux-6.14.4/arch/loongarch/pci/ |
| D | acpi.c | 98 struct resource *conflict; in arch_pci_ecam_create() local
122 conflict = request_resource_conflict(&iomem_resource, &cfg->res); in arch_pci_ecam_create()
123 if (conflict) { in arch_pci_ecam_create()
125 dev_err(dev, "can't claim ECAM area %pR: address conflict with %s %pR\n", in arch_pci_ecam_create()
126 &cfg->res, conflict->name, conflict); in arch_pci_ecam_create()
|
| /linux-6.14.4/arch/arm/boot/dts/microchip/ |
| D | at91-sama5d27_som1_ek.dts | 120 status = "disabled"; /* Conflict with leds. */
159 status = "disabled"; /* Conflict with isc. */
178 status = "disabled"; /* Conflict with isc. */
185 status = "disabled"; /* Conflict with isc. */
197 status = "disabled"; /* Conflict with spi6 and i2c6. */
204 status = "okay"; /* Conflict with uart5 and i2c6. */
211 status = "disabled"; /* Conflict with uart5 and spi6. */
498 status = "okay"; /* Conflict with pwm0. */
|
| D | at91-sama5d2_xplained.dts | 77 status = "okay"; /* conflict with qspi0 */
86 status = "disabled"; /* conflict with sdmmc1 */
322 status = "disabled"; /* conflict with leds */
327 status = "disabled"; /* conflict with ISC_D2 & ISC_D3 data pins */
347 status = "disabled"; /* conflict with ISC_D2 & ISC_D3 data pins */
367 status = "disabled"; /* conflict with can0 */
697 status = "disabled"; /* conflict with spi0, sdmmc1 */
726 status = "okay"; /* conflict with pwm0 */
|
| /linux-6.14.4/tools/testing/selftests/net/ |
| D | netns-name.sh | 36 # Test move with a conflict
41 fail "Performed a netns move with a name conflict"
47 # Test move with a conflict and rename
|
| /linux-6.14.4/arch/s390/tools/ |
| D | gcc-thunk-extern.sh | 3 # Borrowed from gcc: gcc/testsuite/gcc.target/s390/nobp-section-type-conflict.c
4 # Checks that we don't get error: section type conflict with ‘put_page’.
|