linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the trivial tree with the mips tree
@ 2011-10-14  3:31 Stephen Rothwell
  0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2011-10-14  3:31 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: linux-next, linux-kernel, Paul Bolle, Manuel Lauss, Ralf Baechle

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/ide/Kconfig between commit a60891de4357 ("MIPS: Alchemy: remove
all CONFIG_SOC_AU1??? defines") from the mips tree and commit
6af677ea59fb ("Kconfig: remove redundant CONFIG_ prefix on two symbols")
from the trivial tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/ide/Kconfig
index ff7c6bb,76b6d98..0000000
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@@ -681,8 -681,8 +681,8 @@@ config BLK_DEV_IDE_AU1XX
         select IDE_XFER_MODE
  choice
         prompt "IDE Mode for AMD Alchemy Au1200"
-        default CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA
+        default BLK_DEV_IDE_AU1XXX_PIO_DBDMA
 -       depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX
 +       depends on BLK_DEV_IDE_AU1XXX
  
  config BLK_DEV_IDE_AU1XXX_PIO_DBDMA
         bool "PIO+DbDMA IDE for AMD Alchemy Au1200"

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* linux-next: manual merge of the trivial tree with the mips tree
@ 2012-05-22  4:50 Stephen Rothwell
  2012-05-22  9:01 ` Jiri Kosina
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2012-05-22  4:50 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: linux-next, linux-kernel, John Crispin, Ralf Baechle, Masanari Iida

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/mips/pci/pci-lantiq.c between commit 57c8cb8f2429 ("MIPS: pci:
convert lantiq driver to OF") from the mips tree and commit 6997991ab0db
("mips: Fix printk typos in arc/mips") from the trivial tree.

The former did the fix from the latter as a side effect so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* linux-next: manual merge of the trivial tree with the mips tree
@ 2013-01-23  3:03 Stephen Rothwell
  2013-01-23  3:06 ` Stephen Rothwell
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2013-01-23  3:03 UTC (permalink / raw)
  To: Jiri Kosina; +Cc: linux-next, linux-kernel, Jorrit Schippers, Ralf Baechle

[-- 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 --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-01-23  3:06 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-14  3:31 linux-next: manual merge of the trivial tree with the mips tree Stephen Rothwell
2012-05-22  4:50 Stephen Rothwell
2012-05-22  9:01 ` Jiri Kosina
2013-01-23  3:03 Stephen Rothwell
2013-01-23  3:06 ` Stephen Rothwell

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).