| /linux/arch/arm/boot/dts/microchip/ |
| H A D | sama5d3_gmac.dtsi | 19 <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB0 periph A GTX0, conflicts with PWMH0 */
20 AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB1 periph A GTX1, conflicts with PWML0 */
21 AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB2 periph A GTX2, conflicts with TK1 */
22 AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB3 periph A GTX3, conflicts with TF1 */
23 AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB4 periph A GRX0, conflicts with PWMH1 */
24 AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB5 periph A GRX1, conflicts with PWML1 */
25 AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB6 periph A GRX2, conflicts with TD1 */
26 AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB7 periph A GRX3, conflicts with RK1 */
30 … <AT91_PIOB 19 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB19 periph B GTX4, conflicts with MCI1_CDA */
31 … AT91_PIOB 20 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB20 periph B GTX5, conflicts with MCI1_DA0 */
[all …]
|
| H A D | at91sam9x5_isi.dtsi | 19 <AT91_PIOC 0 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_D0, conflicts with LCDDAT0 */
20 AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_D1, conflicts with LCDDAT1 */
21 AT91_PIOC 2 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_D2, conflicts with LCDDAT2 */
22 AT91_PIOC 3 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_D3, conflicts with LCDDAT3 */
23 AT91_PIOC 4 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_D4, conflicts with LCDDAT4 */
24 AT91_PIOC 5 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_D5, conflicts with LCDDAT5 */
25 AT91_PIOC 6 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_D6, conflicts with LCDDAT6 */
26 AT91_PIOC 7 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_D7, conflicts with LCDDAT7 */
27 AT91_PIOC 12 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_PCK, conflicts with LCDDAT12 */
28 AT91_PIOC 14 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_HSYNC, conflicts with LCDDAT14 */
[all …]
|
| H A D | sama5d3.dtsi | 555 <AT91_PIOD 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD30 periph A AD10, conflicts with PCK0 */
559 <AT91_PIOD 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD31 periph A AD11, conflicts with PCK1 */
634 …<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA30 periph A TWD0 pin, conflicts with URXD1, ISI…
635 …AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA31 periph A TWCK0 pin, conflicts with UTXD1, I…
648 …<AT91_PIOC 26 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC26 periph B TWD1 pin, conflicts with SPI1_NPCS1…
649 …AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC27 periph B TWCK1 pin, conflicts with SPI1_NPC…
662 <AT91_PIOA 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* TWD2 pin, conflicts with LCDDAT18, ISI_D2 */
663 … AT91_PIOA 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* TWCK2 pin, conflicts with LCDDAT19, ISI_D3 */
676 … <AT91_PIOA 16 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA16 periph C ISI_D0, conflicts with LCDDAT16 */
677 … AT91_PIOA 17 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA17 periph C ISI_D1, conflicts with LCDDAT17 */
[all …]
|
| H A D | sama5d3_emac.dtsi | 19 <AT91_PIOC 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC0 periph A ETX0, conflicts with TIOA3 */
20 AT91_PIOC 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC1 periph A ETX1, conflicts with TIOB3 */
21 AT91_PIOC 2 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC2 periph A ERX0, conflicts with TCLK3 */
22 AT91_PIOC 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC3 periph A ERX1, conflicts with TIOA4 */
23 AT91_PIOC 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC4 periph A ETXEN, conflicts with TIOB4 */
24 AT91_PIOC 5 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC5 periph A ECRSDV,conflicts with TCLK4 */
25 AT91_PIOC 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC6 periph A ERXER, conflicts with TIOA5 */
26 AT91_PIOC 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC7 periph A EREFCK, conflicts with TIOB5 */
27 AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC8 periph A EMDC, conflicts with TCLK5 */
|
| H A D | at91-som60.dtsi | 54 /* Conflicts with USART2_SCK */
60 /* Conflicts with USB_VBUS */
66 /* Conflicts with USART3_SCK */
72 /* Conflicts with USB_OC */
83 /* Conflicts with USART1_SCK */
89 /* Conflicts with GETH_INT */
|
| H A D | sama5d3_can.dtsi | 19 …<AT91_PIOD 14 AT91_PERIPH_C AT91_PINCTRL_NONE /* PD14 periph C RX, conflicts with SCK0, SPI0_NPCS1…
20 …AT91_PIOD 15 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PD15 periph C TX, conflicts with CTS0, SPI0_NPCS…
27 <AT91_PIOB 14 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB14 periph B RX, conflicts with GCRS */
28 AT91_PIOB 15 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB15 periph B TX, conflicts with GCOL */
|
| H A D | sama5d3_mci2.dtsi | 20 … <AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC15 periph A MCI2_CK, conflicts with PCK2 */
26 …2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC12 periph A MCI2_DA1 with pullup, conflicts with TIOA1 */
27 …3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC13 periph A MCI2_DA2 with pullup, conflicts with TIOB1 */
28 …AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PC14 periph A MCI2_DA3 with pullup, conflicts with TCLK1 */
|
| H A D | at91sam9x5_can.dtsi | 41 <AT91_PIOA 9 AT91_PERIPH_B AT91_PINCTRL_NONE /* CANRX0, conflicts with DRXD */
42 AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* CANTX0, conflicts with DTXD */
49 <AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE /* CANRX1, conflicts with RXD1 */
50 AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* CANTX1, conflicts with TXD1 */
|
| H A D | sama5d3_uart.dtsi | 26 <AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* conflicts with PWMFI2, ISI_D8 */
27 AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with ISI_PCK */
34 <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with TWD0, ISI_VSYNC */
35 AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with TWCK0, ISI_HSYNC */
|
| H A D | sama5d4.dtsi | 866 <AT91_PIOE 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with USBA_VBUS */
893 <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* conflicts with D14 and TDI */
894 AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with D15 and TDO */
1022 <AT91_PIOE 29 AT91_PERIPH_C AT91_PINCTRL_NONE /* TWD1, conflicts with UART0 RX and DIBP */
1023 AT91_PIOE 30 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* TWCK1, conflicts with UART0 TX and DIBN */
1036 <AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_NONE /* TWD2, conflicts with RD0 and PWML1 */
1037 AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* TWCK2, conflicts with RF0 */
1064 <AT91_PIOC 0 AT91_PERIPH_C AT91_PINCTRL_NONE /* ISI_D8, conflicts with SPI0_MISO, PWMH2 */
1065 AT91_PIOC 1 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* ISI_D9, conflicts with SPI0_MOSI, PWML2 */
1069 <AT91_PIOC 2 AT91_PERIPH_C AT91_PINCTRL_NONE /* ISI_D10, conflicts with SPI0_SPCK, PWMH3 */
[all …]
|
| /linux/drivers/char/mwave/ |
| H A D | smapi.c | 284 …"smapi::smapi_set_DSP_cfg: Serial port A irq %x conflicts with mwave_uart_irq %x\n", usSI & 0xFF, … in smapi_set_DSP_cfg()
287 …"smapi::smapi_set_DSP_cfg: Serial port A irq %x conflicts with mwave_uart_irq %x\n", usSI & 0xFF, … in smapi_set_DSP_cfg()
305 …"smapi::smapi_set_DSP_cfg: Serial port A base I/O address %x conflicts with mwave uart I/O %x\n", … in smapi_set_DSP_cfg()
308 …"smapi::smapi_set_DSP_cfg: Serial port A base I/O address %x conflicts with mwave uart I/O %x\n", … in smapi_set_DSP_cfg()
337 …"smapi::smapi_set_DSP_cfg: Serial port B irq %x conflicts with mwave_uart_irq %x\n", usSI & 0xFF, … in smapi_set_DSP_cfg()
340 …"smapi::smapi_set_DSP_cfg: Serial port B irq %x conflicts with mwave_uart_irq %x\n", usSI & 0xFF, … in smapi_set_DSP_cfg()
358 …"smapi::smapi_set_DSP_cfg: Serial port B base I/O address %x conflicts with mwave uart I/O %x\n", … in smapi_set_DSP_cfg()
361 …"smapi::smapi_set_DSP_cfg: Serial port B base I/O address %x conflicts with mwave uart I/O %x\n", … in smapi_set_DSP_cfg()
392 …"smapi::smapi_set_DSP_cfg: IR port irq %x conflicts with mwave_uart_irq %x\n", usCX & 0xff, mwave_… in smapi_set_DSP_cfg()
395 …"smapi::smapi_set_DSP_cfg: IR port irq %x conflicts with mwave_uart_irq %x\n", usCX & 0xff, mwave_… in smapi_set_DSP_cfg()
[all …]
|
| /linux/Documentation/process/ |
| H A D | backporting.rst | 18 merging branches, or resolving conflicts in their day-to-day work, so
20 resolving conflicts is a skill like any other, and there are many useful
44 you resolve conflicts with the help of git and any other conflict
61 in silent mistakes or messy conflicts).
86 Resolving conflicts
95 In general, conflicts appear when the context of the patch (i.e., the
128 - `IntelliJ <https://www.jetbrains.com/help/idea/resolve-conflicts.html>`__
139 Most conflicts happen because the branch you are backporting to is
240 conflicts in a different file and don't want to do it again, you can
374 For particularly nasty conflicts with many conflict markers, you can use
[all …]
|
| /linux/Documentation/maintainer/ |
| H A D | rebasing-and-merging.rst | 145 sure that there are no conflicts with parallel development and generally
165 maintainer merges with the upstream in order to resolve merge conflicts
169 merge conflicts than unnecessary back merges. Seeing the conflicts lets
178 especially difficult conflicts, create and push a *separate* branch to show
182 Even in the absence of known conflicts, doing a test merge before sending a
|
| /linux/drivers/pnp/ |
| H A D | resource.c | 197 /* check for internal conflicts */ in pnp_check_port()
207 /* check for conflicts with other pnp devices */ in pnp_check_port()
260 /* check for internal conflicts */ in pnp_check_mem()
270 /* check for conflicts with other pnp devices */ in pnp_check_mem()
376 /* check for internal conflicts */ in pnp_check_irq()
397 /* check for conflicts with other pnp devices */ in pnp_check_irq()
440 /* check for internal conflicts */ in pnp_check_dma()
456 /* check for conflicts with other pnp devices */ in pnp_check_dma()
|
| /linux/tools/perf/pmu-events/arch/powerpc/power8/ |
| H A D | cache.json | 53 …sor's data cache was reloaded from local core's L2 hit without dispatch conflicts on Mepf state du…
54 …sor's data cache was reloaded from local core's L2 hit without dispatch conflicts on Mepf state du…
89 …ocessor's data cache was reloaded from local core's L3 without dispatch conflicts hit on Mepf stat…
90 …ocessor's data cache was reloaded from local core's L3 without dispatch conflicts hit on Mepf stat…
|
| H A D | marked.json | 131 …sor's data cache was reloaded from local core's L2 hit without dispatch conflicts on Mepf state. d…
137 …"Duration in cycles to reload from local core's L2 hit without dispatch conflicts on Mepf state. d…
191 …ocessor's data cache was reloaded from local core's L3 without dispatch conflicts hit on Mepf stat…
197 …n": "Duration in cycles to reload from local core's L3 without dispatch conflicts hit on Mepf stat…
401 …Entry was loaded into the TLB from local core's L2 hit without dispatch conflicts on Mepf state. d…
431 …ble Entry was loaded into the TLB from local core's L3 without dispatch conflicts hit on Mepf stat…
|
| H A D | frontend.json | 137 …nstruction cache was reloaded from local core's L2 hit without dispatch conflicts on Mepf state. d…
138 …nstruction cache was reloaded from local core's L2 hit without dispatch conflicts on Mepf state. d…
173 …'s Instruction cache was reloaded from local core's L3 without dispatch conflicts hit on Mepf stat…
174 …'s Instruction cache was reloaded from local core's L3 without dispatch conflicts hit on Mepf stat…
329 …Entry was loaded into the TLB from local core's L2 hit without dispatch conflicts on Mepf state. d…
359 …ble Entry was loaded into the TLB from local core's L3 without dispatch conflicts hit on Mepf stat…
|
| /linux/drivers/acpi/acpica/ |
| H A D | utaddress.c | 37 * address conflicts can be detected.
149 * RETURN: Count of the number of conflicts detected. Zero is always
179 /* Check entire list for all possible conflicts */ in acpi_ut_check_address_range()
205 … "%s range 0x%8.8X%8.8X-0x%8.8X%8.8X conflicts with OpRegion 0x%8.8X%8.8X-0x%8.8X%8.8X (%s)", in acpi_ut_check_address_range()
|
| /linux/tools/perf/pmu-events/arch/x86/rocketlake/ |
| H A D | memory.json | 39 … an HLE execution aborted due to various memory events (e.g., read/write capacity and conflicts).",
43 … an HLE execution aborted due to various memory events (e.g., read/write capacity and conflicts).",
75 "BriefDescription": "Number of machine clears due to memory ordering conflicts.",
305 …es an RTM execution aborted due to various memory events (e.g. read/write capacity and conflicts)",
309 …s an RTM execution aborted due to various memory events (e.g. read/write capacity and conflicts).",
|
| /linux/tools/perf/pmu-events/arch/x86/icelake/ |
| H A D | memory.json | 39 … an HLE execution aborted due to various memory events (e.g., read/write capacity and conflicts).",
43 … an HLE execution aborted due to various memory events (e.g., read/write capacity and conflicts).",
75 "BriefDescription": "Number of machine clears due to memory ordering conflicts.",
305 …es an RTM execution aborted due to various memory events (e.g. read/write capacity and conflicts)",
309 …s an RTM execution aborted due to various memory events (e.g. read/write capacity and conflicts).",
|
| /linux/arch/arm/boot/dts/allwinner/ |
| H A D | axp81x.dtsi | 137 /* Disable by default to avoid conflicts with GPIO */
142 /* Disable by default to avoid conflicts with GPIO */
|
| /linux/Documentation/networking/device_drivers/ethernet/cirrus/ |
| H A D | cs89x0.rst | 49 5.4 Resolving I/O Conflicts
185 You should only change the default configuration settings if conflicts with
430 The Interrupt test insures there are no conflicts with the assigned IRQ
453 hardware problem or due to a conflicts on the Boot PROM address
516 5.4. Resolving I/O Conflicts
538 conflicts.
543 diagnostics self-test to ensure the new configuration is free of conflicts
|
| /linux/arch/arm/boot/dts/gemini/ |
| H A D | gemini-dlink-dns-313.dts | 207 /* Used by LEDs conflicts ICE */
209 /* Used by ? conflicts ICE */
212 * Used by fan & G751, conflicts LPC,
|
| /linux/tools/perf/pmu-events/arch/x86/broadwellde/ |
| H A D | memory.json | 13 … an HLE execution aborted due to various memory events (e.g., read/write capacity and conflicts).",
76 "BriefDescription": "Counts the number of machine clears due to memory order conflicts.",
225 …es an RTM execution aborted due to various memory events (e.g. read/write capacity and conflicts)",
234 … an RTM execution aborted due to various memory events (e.g., read/write capacity and conflicts).",
|
| /linux/tools/perf/pmu-events/arch/x86/haswell/ |
| H A D | memory.json | 12 … an HLE execution aborted due to various memory events (e.g., read/write capacity and conflicts).",
70 "BriefDescription": "Counts the number of machine clears due to memory order conflicts.",
420 …es an RTM execution aborted due to various memory events (e.g. read/write capacity and conflicts)",
424 …s an RTM execution aborted due to various memory events (e.g. read/write capacity and conflicts).",
429 … an RTM execution aborted due to various memory events (e.g., read/write capacity and conflicts).",
|