From: Guenter Roeck <linux@roeck-us.net>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Mark Salter <msalter@redhat.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the h8300-remove tree
Date: Fri, 25 Oct 2013 08:09:01 -0700 [thread overview]
Message-ID: <20131025150901.GA6012@roeck-us.net> (raw)
In-Reply-To: <1382706224-8859-2-git-send-email-treding@nvidia.com>
On Fri, Oct 25, 2013 at 03:03:40PM +0200, Thierry Reding wrote:
> Today's linux-next tree of the h8300-remove tree got a conflict in
>
> drivers/parport/Kconfig
>
> caused by commits e9783b0 (Revert "drivers: parport: Kconfig: exclude h8300
> for PARPORT_PC") and d90c3eb (Kconfig cleanup (PARPORT_PC dependencies)).
>
> I fixed it up (see below). Please verify that the resolution looks good.
>
> Thanks,
> Thierry
> ---
> diff --cc drivers/parport/Kconfig
> index f536685,dc82ef0..2225237
> --- a/drivers/parport/Kconfig
> +++ b/drivers/parport/Kconfig
> @@@ -41,8 -35,10 +41,7 @@@ if PARPOR
>
> config PARPORT_PC
> tristate "PC-style hardware"
> - depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \
> - (!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \
> - !XTENSA && !CRIS
> -
> + depends on ARCH_MIGHT_HAVE_PC_PARPORT
> -
> ---help---
> You should say Y here if you have a PC-style parallel port. All
> IBM PC compatible computers and some Alphas have PC-style
>
I dropped the patch (revert) causing the conflict.
Guenter
next prev parent reply other threads:[~2013-10-25 15:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding
2013-10-24 20:02 ` linux-next: Tree for Oct 24 (xilinx_uartps) Randy Dunlap
2013-10-25 5:02 ` linux-next: Tree for Oct 24 Guenter Roeck
2013-10-25 8:35 ` Thierry Reding
2013-10-25 13:16 ` Olof Johansson
2013-10-25 13:24 ` Mark Brown
2013-10-25 13:33 ` Olof Johansson
2013-10-25 15:45 ` Mark Brown
2013-10-25 13:35 ` Thierry Reding
2013-10-25 13:43 ` Olof Johansson
2013-10-25 14:17 ` Thierry Reding
2013-10-25 15:02 ` Guenter Roeck
2013-10-25 15:17 ` Thierry Reding
2013-10-25 17:17 ` Guenter Roeck
2013-10-25 18:04 ` Geert Uytterhoeven
2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the h8300-remove tree Thierry Reding
2013-10-25 13:35 ` Mark Salter
2013-10-25 15:09 ` Guenter Roeck [this message]
2013-10-25 13:03 ` linux-next: manual merge of the mfd-lj tree Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the tip tree Thierry Reding
2013-10-25 13:25 ` Will Deacon
2013-10-26 8:40 ` Ingo Molnar
2013-10-26 14:01 ` Will Deacon
2013-10-27 7:12 ` Ingo Molnar
2013-10-27 10:00 ` Russell King - ARM Linux
2013-10-28 7:47 ` Thierry Reding
2013-10-28 8:45 ` Russell King - ARM Linux
2013-10-25 13:03 ` linux-next: manual merge of the kvm-arm tree Thierry Reding
2013-10-25 13:07 ` Marc Zyngier
2013-10-25 13:03 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-25 13:22 ` linux-next: manual merge of the c6x tree Mark Salter
2013-10-25 13:36 ` Thierry Reding
2013-10-26 13:19 ` Russell King - ARM Linux
2013-10-28 7:34 ` Thierry Reding
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=20131025150901.GA6012@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=msalter@redhat.com \
--cc=thierry.reding@gmail.com \
/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).