From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Vinod Koul <vinod.koul@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alan Cox <alan@linux•intel.com>,
Bryan O'Donoghue <pure.logic@nexus-software•ie>
Subject: linux-next: manual merge of the tty tree with the slave-dma tree
Date: Tue, 30 Sep 2014 17:26:32 +1000 [thread overview]
Message-ID: <20140930172632.78398c4f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1339 bytes --]
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/8250/8250_pci.c between commit 29897087d901 ("Add
new PCI IDs to cover newer Intel SoCs such as Braswell") from the
slave-dma tree and commit 1ede7dcca3c4 ("serial: 8250: Add Quark X1000
to 8250_pci.c") from the tty 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 drivers/tty/serial/8250/8250_pci.c
index 85a2eb986ffe,4f1cd296f1b1..000000000000
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@@ -1934,18 -1888,11 +1922,25 @@@ static struct pci_serial_quirk pci_seri
},
{
.vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_BSW_UART1,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .setup = byt_serial_setup,
+ },
+ {
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_BSW_UART2,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .setup = byt_serial_setup,
+ },
++ {
++ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_QRK_UART,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .setup = pci_default_setup,
+ },
/*
* ITE
*/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-09-30 7:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-30 7:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-04-07 9:28 linux-next: manual merge of the tty tree with the slave-dma tree Stephen Rothwell
2015-04-07 9:52 ` Greg KH
2015-04-07 12:27 ` Geert Uytterhoeven
2016-09-05 6:43 Stephen Rothwell
2016-09-05 11:28 ` Vinod Koul
2016-09-05 11:33 ` Greg KH
2016-09-05 12:43 ` Vinod Koul
2016-09-05 13:55 ` Greg KH
2016-09-05 15:53 ` Vinod Koul
2016-09-09 11:53 ` Vinod Koul
2016-09-09 12:20 ` Greg KH
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=20140930172632.78398c4f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alan@linux$(echo .)intel.com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pure.logic@nexus-software$(echo .)ie \
--cc=vinod.koul@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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