Home
last modified time | relevance | path

Searched refs:conflict (Results 1 – 25 of 101) sorted by relevance

12345

/linux/kernel/
H A Dresource.c285 struct resource *conflict; in request_resource_conflict() local
288 conflict = __request_resource(root, new); in request_resource_conflict()
290 return conflict; in request_resource_conflict()
302 struct resource *conflict; in request_resource() local
304 conflict = request_resource_conflict(root, new); in request_resource()
305 return conflict ? -EBUSY : 0; in request_resource()
823 struct resource *conflict; in reallocate_resource() local
847 conflict = __request_resource(root, old); in reallocate_resource()
848 BUG_ON(conflict); in reallocate_resource()
991 struct resource *conflict; in insert_resource_conflict() local
[all …]
/linux/drivers/gpio/
H A Dgpio-winbond.c248 struct winbond_gpio_port_conflict conflict; member
261 .conflict = {
289 .conflict = {
306 .conflict = {
323 .conflict = {
340 .conflict = {
529 const struct winbond_gpio_port_conflict *conflict = &info->conflict; in winbond_gpio_configure_port() local
532 if (conflict->name != NULL) { in winbond_gpio_configure_port()
533 if (conflict->dev != WB_SIO_DEV_NONE) in winbond_gpio_configure_port()
534 winbond_sio_select_logical(base, conflict->dev); in winbond_gpio_configure_port()
[all …]
/linux/Documentation/process/
H A Dbackporting.rst4 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/drivers/pci/
H A Dvgaarb.c215 struct vga_device *conflict; in __vga_tryget() local
249 list_for_each_entry(conflict, &vga_list, list) { in __vga_tryget()
254 if (vgadev == conflict) 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()
297 if (!conflict->bridge_has_one_vga) { in __vga_tryget()
298 if ((match & conflict->decodes) & VGA_RSRC_LEGACY_MEM) in __vga_tryget()
300 if ((match & conflict->decodes) & VGA_RSRC_LEGACY_IO) in __vga_tryget()
[all …]
H A Decam.c34 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()
73 &cfg->res, conflict->name, conflict); in pci_ecam_create()
/linux/include/trace/events/
H A Dfilelock.h208 TP_PROTO(bool conflict, struct file_lease *lease, struct file_lease *breaker),
210 TP_ARGS(conflict, lease, breaker),
219 __field(bool, conflict)
229 __entry->conflict = conflict;
233 __entry->conflict,
/linux/arch/loongarch/pci/
H A Dacpi.c98 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()
126 &cfg->res, conflict->name, conflict); in arch_pci_ecam_create()
/linux/arch/arm/boot/dts/microchip/
H A Dat91-sama5d2_xplained.dts77 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 */
H A Dsama5d4.dtsi1061 AT91_PIOB 1 AT91_PERIPH_C AT91_PINCTRL_NONE /* ISI_PCK, conflict with G0_RXCK */
1236 <AT91_PIOC 4 AT91_PERIPH_B AT91_PINCTRL_NONE /* MCI0_CK, conflict with PCK1(ISI_MCK) */
1237 AT91_PIOC 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_CDA, conflict with NAND_D0 */
1238 AT91_PIOC 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA0, conflict with NAND_D1 */
1243 <AT91_PIOC 7 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA1, conflict with NAND_D2 */
1244 AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA2, conflict with NAND_D3 */
1245 AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA3, conflict with NAND_D4 */
1250 <AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA4, conflict with NAND_D5 */
1251 AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA5, conflict with NAND_D6 */
1252 AT91_PIOC 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA6, conflict with NAND_D7 */
[all …]
/linux/arch/m68k/fpsp040/
H A Dbugfix.S185 | 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,
368 | We have the case in which a conflict exists between the cu src or
/linux/tools/testing/selftests/
H A Drun_kselftest.sh30 -s | --summary Print summary with detailed log in output.log (conflict with -p)
31 -p | --per-test-log Print test log in /tmp with each test name (conflict with -s)
/linux/net/sctp/
H A Dbind_addr.c371 int conflict = 0; in sctp_bind_addr_conflict() local
390 conflict = sp->pf->cmp_addr(&laddr->a, addr, sp); in sctp_bind_addr_conflict()
391 if (conflict) in sctp_bind_addr_conflict()
396 return conflict; in sctp_bind_addr_conflict()
/linux/drivers/virt/coco/guest/
H A Dreport.c472 const struct tsm_report_ops *conflict; in tsm_report_register() local
475 conflict = provider.ops; in tsm_report_register()
476 if (conflict) { in tsm_report_register()
477 pr_err("\"%s\" ops already registered\n", conflict->name); in tsm_report_register()
/linux/arch/x86/pci/
H A Dmmconfig-shared.c520 struct resource *conflict; in pci_mmcfg_reserved() local
564 conflict = insert_resource_conflict(&iomem_resource, in pci_mmcfg_reserved()
566 if (conflict) in pci_mmcfg_reserved()
568 &cfg->res, conflict->name, conflict); in pci_mmcfg_reserved()
H A Dfixup.c738 struct resource *res, *conflict; in pci_amd_enable_64bit_bar() local
788 conflict = request_resource_conflict(&iomem_resource, res); in pci_amd_enable_64bit_bar()
789 if (conflict) { in pci_amd_enable_64bit_bar()
791 if (conflict->name != name) in pci_amd_enable_64bit_bar()
795 res = conflict; in pci_amd_enable_64bit_bar()
/linux/drivers/net/dsa/sja1105/
H A Dsja1105_tas.c474 bool conflict; in sja1105_gating_check_conflicts() local
494 conflict = sja1105_tas_check_conflicts(priv, port, dummy); in sja1105_gating_check_conflicts()
497 conflict = sja1105_tas_check_conflicts(priv, port, in sja1105_gating_check_conflicts()
499 if (conflict) in sja1105_gating_check_conflicts()
506 return conflict; in sja1105_gating_check_conflicts()
/linux/arch/arm/boot/dts/nxp/imx/
H A Dimx6sx-sdb-sai.dts14 /* pin conflict with sai */
H A Dimx6sx-sdb-mqs.dts23 /* pin conflict with mqs*/
/linux/include/linux/platform_data/
H A Dkeypad-omap.h39 #error Group bits in conflict with keynum bits
/linux/drivers/acpi/
H A Dpci_root.c933 struct resource *res, *conflict, *root = NULL; in pci_acpi_root_add_resources() local
951 conflict = insert_resource_conflict(root, res); in pci_acpi_root_add_resources()
952 if (conflict) { in pci_acpi_root_add_resources()
955 res, conflict->name, conflict); in pci_acpi_root_add_resources()
/linux/arch/sparc/kernel/
H A Dpci.c655 struct resource *p, *root, *conflict; in pci_claim_legacy_resources() local
677 conflict = request_resource_conflict(root, p); in pci_claim_legacy_resources()
678 if (conflict) { in pci_claim_legacy_resources()
680 p, conflict->name, conflict); in pci_claim_legacy_resources()
/linux/arch/arm64/boot/dts/ti/
H A Dk3-am62-verdin.dtsi245 /* Verdin QSPI_1_CLK as GPIO (conflict with Verdin QSPI_1 interface) */
252 /* Verdin QSPI_1_IO0 as GPIO (conflict with Verdin QSPI_1 interface) */
259 /* Verdin QSPI_1_IO1 as GPIO (conflict with Verdin QSPI_1 interface) */
266 /* Verdin QSPI_1_IO2 as GPIO (conflict with Verdin QSPI_1 interface) */
273 /* Verdin QSPI_1_IO3 as GPIO (conflict with Verdin QSPI_1 interface) */
287 /* Verdin QSPI_1_CS# as GPIO (conflict with Verdin QSPI_1 interface) */
294 /* Verdin QSPI_1_CS2# as GPIO (conflict with Verdin QSPI_1 interface) */
392 /* Verdin I2S_2_D_OUT as GPIO (conflict with Verdin I2S_2 interface) */
399 /* Verdin I2S_2_BCLK as GPIO (conflict with Verdin I2S_2 interface) */
/linux/Documentation/nvme/
H A Dfeature-and-quirk-policy.rst45 2. Does not conflict with the Linux architecture, nor the design of the
55 to be used by the Linux NVMe host driver in order to avoid conflict at a
/linux/Documentation/dev-tools/kunit/
H A Dstyle.rst10 they may break some tooling, may conflict with other tests, and may not be run
134 As tests are themselves functions, their names cannot conflict with
145 name conflict with the macro itself.
198 subdirectory to not conflict with other source files (e.g. for
/linux/drivers/gpu/drm/radeon/
H A Dradeon_connectors.c384 struct drm_connector *conflict; in radeon_connector_analog_encoder_conflict_solve() local
387 list_for_each_entry(conflict, &dev->mode_config.connector_list, head) { in radeon_connector_analog_encoder_conflict_solve()
390 if (conflict == connector) in radeon_connector_analog_encoder_conflict_solve()
393 radeon_conflict = to_radeon_connector(conflict); in radeon_connector_analog_encoder_conflict_solve()
395 drm_connector_for_each_possible_encoder(conflict, enc) { in radeon_connector_analog_encoder_conflict_solve()
398 if (conflict->status != connector_status_connected) in radeon_connector_analog_encoder_conflict_solve()
406 conflict->name); in radeon_connector_analog_encoder_conflict_solve()
409 conflict->status = connector_status_disconnected; in radeon_connector_analog_encoder_conflict_solve()
410 radeon_connector_update_scratch_regs(conflict, connector_status_disconnected); in radeon_connector_analog_encoder_conflict_solve()
415 conflict->name); in radeon_connector_analog_encoder_conflict_solve()

12345