* linux-next: manual merge of the tty.current tree with the net-current tree
@ 2009-09-17 0:54 Stephen Rothwell
2009-09-17 2:12 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2009-09-17 0:54 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Wolfram Sang, Ken Kawasaki,
David S. Miller
Hi Greg,
Today's linux-next merge of the tty.current tree got a conflict in
drivers/serial/serial_cs.c between commit
531afd64d027e3d798c416b2b37b3cfb1de417d9 ("pcnet_cs: add cis of Linksys
multifunction pcmcia card") from the net-current tree and commit
5cea4a4e15a918f19d32fd3dc9a5056f333847c3 ("tty: serial/pcmcia: add ID for
Advantech card") from the tty.current tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/serial/serial_cs.c
index ed4648b,6ecb51b..0000000
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@@ -883,10 -883,11 +883,11 @@@ static struct pcmcia_device_id serial_i
PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0x0710, "SW_7xx_SER.cis"), /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */
PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
- PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "MT5634ZLX.cis"),
+ PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "cis/MT5634ZLX.cis"),
+ PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "COMpad2.cis"),
PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),
PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
- PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "RS-COM-2P.cis"),
+ PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"),
PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100 1.00.",0x19ca78af,0xf964f42b),
PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83),
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the tty.current tree with the net-current tree
2009-09-17 0:54 linux-next: manual merge of the tty.current tree with the net-current tree Stephen Rothwell
@ 2009-09-17 2:12 ` Greg KH
2009-09-17 2:44 ` Stephen Rothwell
2009-09-18 17:27 ` Greg KH
0 siblings, 2 replies; 4+ messages in thread
From: Greg KH @ 2009-09-17 2:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Wolfram Sang, Ken Kawasaki,
David S. Miller
On Thu, Sep 17, 2009 at 10:54:42AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty.current tree got a conflict in
> drivers/serial/serial_cs.c between commit
> 531afd64d027e3d798c416b2b37b3cfb1de417d9 ("pcnet_cs: add cis of Linksys
> multifunction pcmcia card") from the net-current tree and commit
> 5cea4a4e15a918f19d32fd3dc9a5056f333847c3 ("tty: serial/pcmcia: add ID for
> Advantech card") from the tty.current tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix
> for a while.
Thanks, I'll handle this when I sync back up with Linus's tree tomorrow.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the tty.current tree with the net-current tree
2009-09-17 2:12 ` Greg KH
@ 2009-09-17 2:44 ` Stephen Rothwell
2009-09-18 17:27 ` Greg KH
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2009-09-17 2:44 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Wolfram Sang, Ken Kawasaki,
David S. Miller
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
Hi Greg,
On Wed, 16 Sep 2009 19:12:02 -0700 Greg KH <greg@kroah.com> wrote:
>
> Thanks, I'll handle this when I sync back up with Linus's tree tomorrow.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the tty.current tree with the net-current tree
2009-09-17 2:12 ` Greg KH
2009-09-17 2:44 ` Stephen Rothwell
@ 2009-09-18 17:27 ` Greg KH
1 sibling, 0 replies; 4+ messages in thread
From: Greg KH @ 2009-09-18 17:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Wolfram Sang, Ken Kawasaki,
David S. Miller
On Wed, Sep 16, 2009 at 07:12:02PM -0700, Greg KH wrote:
> On Thu, Sep 17, 2009 at 10:54:42AM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the tty.current tree got a conflict in
> > drivers/serial/serial_cs.c between commit
> > 531afd64d027e3d798c416b2b37b3cfb1de417d9 ("pcnet_cs: add cis of Linksys
> > multifunction pcmcia card") from the net-current tree and commit
> > 5cea4a4e15a918f19d32fd3dc9a5056f333847c3 ("tty: serial/pcmcia: add ID for
> > Advantech card") from the tty.current tree.
> >
> > Just context changes. I fixed it up (see below) and can carry the fix
> > for a while.
>
> Thanks, I'll handle this when I sync back up with Linus's tree tomorrow.
Now fixed up.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-09-18 17:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-17 0:54 linux-next: manual merge of the tty.current tree with the net-current tree Stephen Rothwell
2009-09-17 2:12 ` Greg KH
2009-09-17 2:44 ` Stephen Rothwell
2009-09-18 17:27 ` Greg KH
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).