Home
last modified time | relevance | path

Searched full:conflicts (Results 1 – 25 of 701) sorted by relevance

12345678910>>...29

/freebsd/sys/contrib/device-tree/src/arm/microchip/
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 */
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 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 */
28 AT91_PIOC 14 AT91_PERIPH_B AT91_PINCTRL_NONE /* ISI_HSYNC, conflicts with LCDDAT14 */
[all …]
H A Dsama5d3.dtsi555 <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_VSYNC */
635 AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA31 periph A TWCK0 pin, conflicts with UTXD1, ISI_HSYNC */
648 <AT91_PIOC 26 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC26 periph B TWD1 pin, conflicts with SPI1_NPCS1, ISI_D11 */
649 AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC27 periph B TWCK1 pin, conflicts with SPI1_NPCS2, ISI_D10 */
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 wit
[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 Dat91-som60.dtsi54 /* 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 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 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.dtsi26 <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 Dsama5d4.dtsi866 <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 wit
[all...]
/freebsd/share/doc/psd/15.yacc/
H A Dss537 5: Ambiguity and Conflicts
121 Note that there are never any ``Shift/shift'' conflicts.
123 When there are shift/reduce or reduce/reduce conflicts, Yacc still produces a parser.
140 in this situation, but reduce/reduce conflicts should be avoided whenever possible.
142 Conflicts may arise because of mistakes in input or logic, or because the grammar rules, while cons…
144 The use of actions within rules can also cause conflicts, if the action must
149 always reports the number of shift/reduce and reduce/reduce conflicts resolved by Rule 1 and Rule 2.
153 conflicts.
155 have considered conflicts to be fatal errors.
157 and produces slower parsers; thus, Yacc will produce parsers even in the presence of conflicts.
[all …]
H A Dss640 where the rules given above for resolving conflicts are not sufficient;
60 This creates a very ambiguous grammar, with many parsing conflicts.
64 This information is sufficient to allow Yacc to resolve the parsing conflicts
146 resolve parsing conflicts; they give rise to disambiguating rules.
160 and the conflicts are reported.
169 Conflicts resolved by precedence are not counted in the number of shift/reduce and reduce/reduce
170 conflicts reported by Yacc.
/freebsd/usr.sbin/etcupdate/
H A Detcupdate.sh48 # with unresolved conflicts after the merge are left in a tree rooted
49 # at WORKDIR/conflicts.
721 log "cat ${CONFLICTS}$1 > ${DESTDIR}$1"
722 cat ${CONFLICTS}$1 > ${DESTDIR}$1 2>&3
727 # Generate a conflict file when a "new" file conflicts with an
730 # $1 - pathname of the file that conflicts (relative to DESTDIR)
738 install_dirs $NEWTREE $CONFLICTS $1
742 ' $DESTDIR/$1 $NEWTREE/$1 > $CONFLICTS/$1
866 # conflicts, the updated file is installed. If the merge fails, the
867 # merged version with conflict markers is left in the CONFLICTS tree.
[all …]
H A Detcupdate.8121 utility will not perform a new merge until all conflicts from an earlier
194 If the merge encounters conflicts,
197 If the merge does not encounter conflicts,
325 mode is used to resolve any conflicts encountered during a merge.
328 iterates over any existing conflicts prompting the user for actions to take
365 First it lists any files for which there are unresolved conflicts.
367 If the last merge did not generate any conflicts or warnings,
393 This can be useful to avoid gratuitous conflicts in
415 trees as well as unresolved conflicts.
429 During an update this can simplify handling for harmless conflicts caused
[all …]
/freebsd/sys/contrib/openzfs/contrib/debian/
H A Dcontrol37 Conflicts: libnvpair3linux
48 Conflicts: libpam-zfs
63 Conflicts: libuutil3linux
86 Conflicts: libzfslinux-dev
104 Conflicts: libzfs6linux
118 Conflicts: libzfsbootenv1linux
132 Conflicts: libzpool6linux
148 Conflicts: python3-pyzfs
169 Conflicts: pyzfs-doc
218 Conflicts: zfs-initramfs
[all …]
/freebsd/usr.sbin/etcupdate/tests/
H A Dconflicts_test.sh36 echo "Usage: conflicts.sh [-s script] [-w workdir]"
61 CONFLICTS=$WORKDIR/conflicts
66 # These tests deal with conflicts to a single file. For each test, we
72 rm -rf $OLD $NEW $TEST $CONFLICTS
99 rm -rf $OLD $NEW $TEST $CONFLICTS
181 if ! [ -f $CONFLICTS/$1 ]; then
185 sum=`md5 -q $CONFLICTS/$1`
196 if [ -f $CONFLICTS/$1 ]; then
247 cat > $CONFLICTS/etc/login.conf <<EOF
286 cp $TEST/etc/mail/aliases $CONFLICTS/etc/mail/aliases
H A Dignore_test.sh61 CONFLICTS=$WORKDIR/conflicts
72 rm -rf $OLD $NEW $TEST $CONFLICTS
155 if ! [ -f $CONFLICTS/$1 ]; then
159 sum=`md5 -q $CONFLICTS/$1`
170 if [ -f $CONFLICTS/$1 ]; then
H A Dfbsdid_test.sh61 CONFLICTS=$WORKDIR/conflicts
80 # These tests deal with FreeBSD ID string conflicts. We run the test
86 rm -rf $OLD $NEW $TEST $CONFLICTS
260 if ! [ -f $CONFLICTS/$1 ]; then
264 sum=`md5 -q $CONFLICTS/$1`
275 if [ -f $CONFLICTS/$1 ]; then
/freebsd/usr.bin/getconf/
H A DMakefile13 .PHONY: conflicts
15 all: conflicts
25 conflicts: conflicting.names unique.names target
27 echo "Name conflicts found!" >&2; \
/freebsd/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_promote/
H A Dzfs_promote_007_neg.ksh37 # 'zfs promote' can deal with conflicts in the namespaces.
43 # 4. Verify the promote operation fail due to the name conflicts.
58 log_assert "'zfs promote' can deal with name conflicts."
76 log_pass "'zfs promote' deals with name conflicts as expected."
/freebsd/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/
H A Dzfs_promote_007_neg.ksh35 # 'zfs promote' can deal with conflicts in the namespaces.
41 # 4. Verify the promote operation fail due to the name conflicts.
66 log_assert "'zfs promote' can deal with name conflicts."
84 log_pass "'zfs promote' deals with name conflicts as expected."
/freebsd/contrib/byacc/test/yacc/
H A Dquote_calc-s.output546 State 12 contains 6 shift/reduce conflicts.
547 State 26 contains 7 shift/reduce conflicts.
548 State 27 contains 7 shift/reduce conflicts.
549 State 28 contains 7 shift/reduce conflicts.
550 State 29 contains 7 shift/reduce conflicts.
551 State 30 contains 7 shift/reduce conflicts.
552 State 31 contains 7 shift/reduce conflicts.
553 State 32 contains 6 shift/reduce conflicts.
H A Dquote_calc.output546 State 12 contains 6 shift/reduce conflicts.
547 State 26 contains 7 shift/reduce conflicts.
548 State 27 contains 7 shift/reduce conflicts.
549 State 28 contains 7 shift/reduce conflicts.
550 State 29 contains 7 shift/reduce conflicts.
551 State 30 contains 7 shift/reduce conflicts.
552 State 31 contains 7 shift/reduce conflicts.
553 State 32 contains 6 shift/reduce conflicts.
H A Dquote_calc2-s.output546 State 12 contains 6 shift/reduce conflicts.
547 State 26 contains 7 shift/reduce conflicts.
548 State 27 contains 7 shift/reduce conflicts.
549 State 28 contains 7 shift/reduce conflicts.
550 State 29 contains 7 shift/reduce conflicts.
551 State 30 contains 7 shift/reduce conflicts.
552 State 31 contains 7 shift/reduce conflicts.
553 State 32 contains 6 shift/reduce conflicts.
H A Dquote_calc2.output546 State 12 contains 6 shift/reduce conflicts.
547 State 26 contains 7 shift/reduce conflicts.
548 State 27 contains 7 shift/reduce conflicts.
549 State 28 contains 7 shift/reduce conflicts.
550 State 29 contains 7 shift/reduce conflicts.
551 State 30 contains 7 shift/reduce conflicts.
552 State 31 contains 7 shift/reduce conflicts.
553 State 32 contains 6 shift/reduce conflicts.

12345678910>>...29