linux-kernel - Re: linux-next: manual merge of the trivial tree with the mips tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 23 Jan 2013 14:06:02 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jorrit Schippers <jorrit@...de.nl>,
	Ralf Baechle <ralf@...ux-mips.org>
Subject: Re: linux-next: manual merge of the trivial tree with the mips tree

Hi Jiri,

On Wed, 23 Jan 2013 14:03:48 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> 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).

It also affects arch/mips/include/asm/octeon/cvmx-helper-util.h

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/mips/include/asm/octeon/cvmx-helper-util.h
index e217aba,01c8ddd..0000000
--- a/arch/mips/include/asm/octeon/cvmx-helper-util.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h
@@@ -57,11 -57,11 +57,11 @@@ extern int cvmx_helper_dump_packet(cvmx
   *
   * @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
   */
  extern int cvmx_helper_setup_red_queue(int queue, int pass_thresh,
@@@ -71,11 -71,11 +71,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
   */
  extern int cvmx_helper_setup_red(int pass_thresh, int drop_thresh);

Content of type "application/pgp-signature" skipped