From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marc Kleine-Budde <mkl@pengutronix•de>
Cc: Andrew Morton <akpm@linux-foundation•org>,
David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Masahiro Yamada <yamada.masahiro@socionext•com>
Subject: Re: linux-next: manual merge of the akpm tree with the net-next tree
Date: Tue, 7 Feb 2017 20:45:36 +1100 [thread overview]
Message-ID: <20170207204501.23ef9b12@canb.auug.org.au> (raw)
In-Reply-To: <4cbbbce4-1318-9a75-d918-5b209cc418e6@pengutronix.de>
Hi Marc,
On Tue, 7 Feb 2017 09:40:09 +0100 Marc Kleine-Budde <mkl@pengutronix•de> wrote:
>
> On 02/07/2017 06:23 AM, Stephen Rothwell wrote:
> > diff --cc drivers/net/can/flexcan.c
> > index ea57fed375c6,4dc71bce525c..000000000000
> > --- a/drivers/net/can/flexcan.c
> > +++ b/drivers/net/can/flexcan.c
> > @@@ -195,9 -189,7 +195,9 @@@
> > */
> > #define FLEXCAN_QUIRK_BROKEN_ERR_STATE BIT(1) /* [TR]WRN_INT not connected */
> > #define FLEXCAN_QUIRK_DISABLE_RXFG BIT(2) /* Disable RX FIFO Global mask */
> > -#define FLEXCAN_QUIRK_DISABLE_MECR BIT(3) /* Disable Memory error detection */
> > +#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS BIT(3) /* Enable EACEN and RRS bit in ctrl2 */
> > - #define FLEXCAN_QUIRK_DISABLE_MECR BIT(4) /* Disble Memory error detection */
> > ++#define FLEXCAN_QUIRK_DISABLE_MECR BIT(4) /* Disbale Memory error detection */
>
> ^^^^^^^
> Should be "Disable". I'll send David Miller a fix for the typo.
The "Disbale" typo is only in my merge resolution :-( I will fix it there.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-02-07 9:45 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-07 5:23 linux-next: manual merge of the akpm tree with the net-next tree Stephen Rothwell
2017-02-07 8:40 ` Marc Kleine-Budde
2017-02-07 9:45 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-06-02 9:30 Stephen Rothwell
2020-06-02 9:45 ` Stephen Rothwell
2019-07-03 10:49 Stephen Rothwell
2018-01-16 4:51 Stephen Rothwell
2017-03-20 5:10 Stephen Rothwell
2015-05-14 7:39 Stephen Rothwell
2015-05-14 7:38 Stephen Rothwell
2014-07-23 8:18 Stephen Rothwell
2013-11-06 9:00 Stephen Rothwell
2013-11-06 8:55 Stephen Rothwell
2013-05-21 4:32 Stephen Rothwell
2013-05-21 4:29 Stephen Rothwell
2013-05-21 20:04 ` Andrew Morton
2013-05-22 7:07 ` David Miller
2013-05-22 7:14 ` Andrew Morton
2013-05-22 7:19 ` David Miller
2013-05-22 7:48 ` Daniel Borkmann
2013-05-21 4:25 Stephen Rothwell
2013-05-21 7:44 ` Daniel Borkmann
2013-05-21 23:54 ` Stephen Rothwell
2013-05-22 9:20 ` Daniel Borkmann
2013-05-20 4:14 Stephen Rothwell
2013-05-20 4:11 Stephen Rothwell
2013-02-20 6:02 Stephen Rothwell
2013-02-20 6:43 ` Cong Wang
2013-02-15 6:56 Stephen Rothwell
2012-06-08 3:56 Stephen Rothwell
2011-11-23 3:27 Stephen Rothwell
2011-11-23 3:40 ` Neil Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170207204501.23ef9b12@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mkl@pengutronix$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
--cc=yamada.masahiro@socionext$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox