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,
Paul Bolle <pebolle@tiscali.nl>,
Manuel Lauss <manuel.lauss@googlemail.com>,
Ralf Baechle <ralf@linux-mips.org>
Subject: linux-next: manual merge of the trivial tree with the mips tree
Date: Fri, 14 Oct 2011 14:31:42 +1100 [thread overview]
Message-ID: <20111014143142.392df4f9634efc30febfcfaa@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2011-10-14 3:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 3:31 Stephen Rothwell [this message]
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
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=20111014143142.392df4f9634efc30febfcfaa@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=manuel.lauss@googlemail.com \
--cc=pebolle@tiscali.nl \
--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
all inboxes | Powered by JetHome®