linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jorrit Schippers <jorrit@ncode.nl>,
	Ralf Baechle <ralf@linux-mips.org>
Subject: linux-next: manual merge of the trivial tree with the mips tree
Date: Wed, 23 Jan 2013 14:03:48 +1100	[thread overview]
Message-ID: <20130123140348.e80088cfd9f4eacc4134051c@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2453 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/mips/cavium-octeon/executive/cvmx-helper-util.c between commit
baf783ede9dc ("MIPS: Whitespace cleanup") from the mips tree and commit
d82603c6da75 ("treewide: Replace incomming with incoming in all comments
and strings") from the trivial 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 arch/mips/cavium-octeon/executive/cvmx-helper-util.c
index b72d9fb,dfdfe8b..0000000
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
@@@ -172,11 -172,11 +172,11 @@@ int cvmx_helper_dump_packet(cvmx_wqe_t 
   *
   * @queue:  Input queue to setup RED on (0-7)
   * @pass_thresh:
 - *               Packets will begin slowly dropping when there are less than
 - *               this many packet buffers free in FPA 0.
 + *		 Packets will begin slowly dropping when there are less than
 + *		 this many packet buffers free in FPA 0.
   * @drop_thresh:
-  *		 All incomming packets will be dropped when there are less
 - *               All incoming packets will be dropped when there are less
 - *               than this many free packet buffers in FPA 0.
++ *		 All incoming packets will be dropped when there are less
 + *		 than this many free packet buffers in FPA 0.
   * Returns Zero on success. Negative on failure
   */
  int cvmx_helper_setup_red_queue(int queue, int pass_thresh, int drop_thresh)
@@@ -207,11 -207,11 +207,11 @@@
   * Setup Random Early Drop to automatically begin dropping packets.
   *
   * @pass_thresh:
 - *               Packets will begin slowly dropping when there are less than
 - *               this many packet buffers free in FPA 0.
 + *		 Packets will begin slowly dropping when there are less than
 + *		 this many packet buffers free in FPA 0.
   * @drop_thresh:
-  *		 All incomming packets will be dropped when there are less
 - *               All incoming packets will be dropped when there are less
 - *               than this many free packet buffers in FPA 0.
++ *		 All incoming packets will be dropped when there are less
 + *		 than this many free packet buffers in FPA 0.
   * Returns Zero on success. Negative on failure
   */
  int cvmx_helper_setup_red(int pass_thresh, int drop_thresh)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-01-23  3:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-23  3:03 Stephen Rothwell [this message]
2013-01-23  3:06 ` linux-next: manual merge of the trivial tree with the mips tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2012-05-22  4:50 Stephen Rothwell
2012-05-22  9:01 ` Jiri Kosina
2011-10-14  3:31 Stephen Rothwell

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=20130123140348.e80088cfd9f4eacc4134051c@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=jkosina@suse.cz \
    --cc=jorrit@ncode.nl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ralf@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).