Messages in this thread | | | Date | Mon, 22 Sep 2014 11:52:40 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the net tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in drivers/net/can/flexcan.c between commit fc05b884a31d ("can: flexcan: correctly initialize mailboxes") from the net tree and commit cdce844865be ("can: flexcan: add vf610 support for FlexCAN") from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/can/flexcan.c index 6586309329e6,2700865efcad..000000000000 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@@ -824,8 -859,7 +883,8 @@@ static int flexcan_chip_start(struct ne struct flexcan_priv *priv = netdev_priv(dev); struct flexcan_regs __iomem *regs = priv->base; int err; - u32 reg_mcr, reg_ctrl; + u32 reg_mcr, reg_ctrl, reg_crl2, reg_mecr; + int i; /* enable module */ err = flexcan_chip_enable(priv); [unhandled content-type:application/pgp-signature] | |