Home
last modified time | relevance | path

Searched refs:conflicts (Results 1 – 25 of 245) sorted by relevance

12345678910

/freebsd-13.1/sys/contrib/device-tree/src/arm/
H A Dsama5d3_gmac.dtsi19 <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 */
36 AT91_PIOB 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB25 periph B GRX6, conflicts with SCK1 */
41 <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB8 periph A GTXCK, conflicts with PWMH2 */
[all …]
H A Dat91sam9x5_isi.dtsi19 <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 */
34 <AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_D8, conflicts with LCDDAT8 */
[all …]
H A Dsama5d3.dtsi768 <AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GTX0 */
776 <AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GTX1 */
785 <AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GRX0 */
797 <AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GRX1 */
801 <AT91_PIOE 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with IRQ */
806 <AT91_PIOB 8 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GTXCK */
814 <AT91_PIOB 9 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GTXEN */
936 <AT91_PIOE 25 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with A25 */
937 AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts NCS0 */
950 <AT91_PIOE 18 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with A18 */
[all …]
H A Dsama5d3_emac.dtsi19 <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 Dat91sam9x5_can.dtsi41 <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 Dsama5d3_uart.dtsi25 <AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* conflicts with PWMFI2, ISI_D8 */
26 AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with ISI_PCK */
33 <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with TWD0, ISI_VSYNC */
34 AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with TWCK0, ISI_HSYNC */
H A Dsama5d3_can.dtsi19 …<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 Dsama5d3_mci2.dtsi20 … <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 Dsama5d4.dtsi869 <AT91_PIOE 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with USBA_VBUS */
896 <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* conflicts with D14 and TDI */
897 AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with D15 and TDO */
1040 AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* TWCK2, conflicts with RF0 */
1145 /* LCDDAT0 conflicts with TMS */
1153 /* LCDDAT8 conflicts with TCK */
1161 /* LCDDAT16 conflicts with NTRST */
1352 <AT91_PIOD 11 AT91_PERIPH_B AT91_PINCTRL_NONE /* SPI2_MISO conflicts with RTS0 */
1353 AT91_PIOD 13 AT91_PERIPH_B AT91_PINCTRL_NONE /* SPI2_MOSI conflicts with TXD0 */
1354 AT91_PIOD 15 AT91_PERIPH_B AT91_PINCTRL_NONE /* SPI2_SPCK conflicts with RTS1 */
[all …]
/freebsd-13.1/contrib/subversion/subversion/libsvn_wc/
H A Dinfo.c46 if (info->conflicts) in svn_wc_info_dup()
51 = apr_array_make(pool, info->conflicts->nelts, info->conflicts->elt_size); in svn_wc_info_dup()
52 for (i = 0; i < info->conflicts->nelts; i++) in svn_wc_info_dup()
56 APR_ARRAY_IDX(info->conflicts, i, in svn_wc_info_dup()
60 new_info->conflicts = new_conflicts; in svn_wc_info_dup()
292 wc_info->conflicts = NULL; in build_info_for_node()
513 const apr_array_header_t *conflicts; in svn_wc__get_info() local
534 SVN_ERR(svn_wc__read_conflicts(&conflicts, NULL, in svn_wc__get_info()
539 if (! conflicts || ! conflicts->nelts) in svn_wc__get_info()
542 tree_conflict = APR_ARRAY_IDX(conflicts, 0, in svn_wc__get_info()
[all …]
H A Dconflicts.c2373 *conflicts = cflcts; in svn_wc__read_conflicts()
2596 conflicts = NULL; in resolve_prop_conflict_on_node()
2950 svn_skel_t *conflicts; in svn_wc__mark_resolved_prop_conflicts() local
2956 if (!conflicts) in svn_wc__mark_resolved_prop_conflicts()
3027 const apr_array_header_t *conflicts; in conflict_status_walker() local
3452 svn_skel_t *conflicts; in svn_wc__conflict_prop_mark_resolved() local
3458 if (!conflicts) in svn_wc__conflict_prop_mark_resolved()
3504 const apr_array_header_t *conflicts; in svn_wc__conflict_tree_update_break_moved_away() local
3591 const apr_array_header_t *conflicts; in svn_wc__conflict_tree_update_raise_moved_away() local
3669 const apr_array_header_t *conflicts; in svn_wc__conflict_tree_update_moved_away_node() local
[all …]
H A Dworkqueue.c1101 svn_skel_t *conflicts; in run_prej_install() local
1288 svn_skel_t *conflicts; in run_set_text_conflict_markers() local
1293 if (! conflicts) in run_set_text_conflict_markers()
1296 conflicts = svn_wc__conflict_skel_create(scratch_pool); in run_set_text_conflict_markers()
1304 SVN_ERR(svn_wc__conflict_skel_add_text_conflict(conflicts, db, in run_set_text_conflict_markers()
1312 SVN_ERR(svn_wc__db_op_mark_conflict(db, local_abspath, conflicts, in run_set_text_conflict_markers()
1353 svn_skel_t *conflicts; in run_set_property_conflict_marker() local
1356 SVN_ERR(svn_wc__db_read_conflict(&conflicts, NULL, NULL, in run_set_property_conflict_marker()
1360 if (! conflicts) in run_set_property_conflict_marker()
1363 conflicts = svn_wc__conflict_skel_create(scratch_pool); in run_set_property_conflict_marker()
[all …]
H A Dquestions.c368 svn_skel_t *conflicts; in internal_conflicted_p() local
372 SVN_ERR(svn_wc__db_read_conflict(&conflicts, NULL, NULL, in internal_conflicted_p()
376 if (!conflicts) in internal_conflicted_p()
392 db, local_abspath, conflicts, in internal_conflicted_p()
412 db, local_abspath, conflicts, in internal_conflicted_p()
455 db, local_abspath, conflicts, in internal_conflicted_p()
479 conflicts, in internal_conflicted_p()
H A Dtree_conflicts.c484 const apr_array_header_t *conflicts; in svn_wc__get_tree_conflict() local
488 SVN_ERR(svn_wc__read_conflicts(&conflicts, NULL, in svn_wc__get_tree_conflict()
494 if (!conflicts || conflicts->nelts == 0) in svn_wc__get_tree_conflict()
500 for (i = 0; i < conflicts->nelts; i++) in svn_wc__get_tree_conflict()
504 desc = APR_ARRAY_IDX(conflicts, i, svn_wc_conflict_description2_t *); in svn_wc__get_tree_conflict()
/freebsd-13.1/usr.bin/getconf/
H A DMakefile15 .PHONY: conflicts
17 all: conflicts
27 conflicts: conflicting.names unique.names target
/freebsd-13.1/contrib/byacc/test/btyacc/
H A Dbtyacc_calc1.error1 YACC: 17 shift/reduce conflicts, 27 reduce/reduce conflicts.
H A Dvarsyntax_calc1.error2 YACC: 18 shift/reduce conflicts, 26 reduce/reduce conflicts.
H A Dcalc1.error2 YACC: 18 shift/reduce conflicts, 26 reduce/reduce conflicts.
H A Dcalc1.output866 State 8 contains 5 shift/reduce conflicts.
867 State 15 contains 6 reduce/reduce conflicts.
868 State 17 contains 5 shift/reduce conflicts.
869 State 32 contains 4 shift/reduce conflicts.
870 State 37 contains 2 shift/reduce conflicts, 4 reduce/reduce conflicts.
871 State 39 contains 2 shift/reduce conflicts, 4 reduce/reduce conflicts.
872 State 41 contains 6 reduce/reduce conflicts.
873 State 43 contains 6 reduce/reduce conflicts.
/freebsd-13.1/contrib/byacc/test/yacc/
H A Dcalc1.error2 YACC: 18 shift/reduce conflicts, 26 reduce/reduce conflicts.
H A Dvarsyntax_calc1.error2 YACC: 18 shift/reduce conflicts, 26 reduce/reduce conflicts.
H A Dcalc1.output866 State 8 contains 5 shift/reduce conflicts.
867 State 15 contains 6 reduce/reduce conflicts.
868 State 17 contains 5 shift/reduce conflicts.
869 State 32 contains 4 shift/reduce conflicts.
870 State 37 contains 2 shift/reduce conflicts, 4 reduce/reduce conflicts.
871 State 39 contains 2 shift/reduce conflicts, 4 reduce/reduce conflicts.
872 State 41 contains 6 reduce/reduce conflicts.
873 State 43 contains 6 reduce/reduce conflicts.
/freebsd-13.1/contrib/bmake/unit-tests/
H A Dparse.exp1 make: "parse.mk" line 7: Makefile appears to contain unresolved CVS/RCS/??? merge conflicts
2 make: "parse.mk" line 14: Makefile appears to contain unresolved CVS/RCS/??? merge conflicts
/freebsd-13.1/contrib/subversion/subversion/libsvn_client/
H A Dmerge_elements.c168 void *conflicts; in merge_elements_one_source() local
185 SVN_ERR(merge_trees(&merge_result, &conflicts, in merge_elements_one_source()
190 if (conflicts) in merge_elements_one_source()
/freebsd-13.1/contrib/byacc/
H A Doutput.c19 static Value_t *conflicts = NULL; variable
425 if (conflicts[i + j] != conflicts[cbase + j]) in find_conflict_base()
475 conflicts[nconflicts++] = -1; in token_actions()
484 if (conflicts[cbase] == -1) in token_actions()
520 conflicts[nconflicts++] = -1; in token_actions()
531 conflicts[nconflicts++] = -1; in token_actions()
540 if (conflicts[cbase] == -1) in token_actions()
1115 start_int_table("ctable", conflicts ? conflicts[0] : -1); in output_ctable()
1128 output_int((conflicts != 0 && i < nconflicts) ? conflicts[i] : -1); in output_ctable()
1131 if (conflicts) in output_ctable()
[all …]

12345678910