linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Amit Shah <amit.shah@redhat.com>
Subject: linux-next: manual merge of the tty tree with Linus' tree
Date: Thu, 24 Feb 2011 16:34:39 +1100	[thread overview]
Message-ID: <20110224163439.05352f9b.sfr@canb.auug.org.au> (raw)

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/char/Makefile between commit
51df0acc3d76cf41d5496ef044cc5717ab5c7f71 ("virtio: console: Move file
back to drivers/char/") from Linus' tree and commit
a6afd9f3e819de4795fcd356e5bfad446e4323f2 ("tty: move a number of tty
drivers from drivers/char/ to drivers/tty/") (and later ones) from the tty
tree.

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

diff --cc drivers/char/Makefile
index 8238f89,3ca1f62..0000000
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -5,32 -5,7 +5,8 @@@
  obj-y				+= mem.o random.o
  obj-$(CONFIG_TTY_PRINTK)	+= ttyprintk.o
  obj-y				+= misc.o
- obj-$(CONFIG_BFIN_JTAG_COMM)	+= bfin_jtag_comm.o
- obj-$(CONFIG_MVME147_SCC)	+= generic_serial.o vme_scc.o
- obj-$(CONFIG_MVME162_SCC)	+= generic_serial.o vme_scc.o
- obj-$(CONFIG_BVME6000_SCC)	+= generic_serial.o vme_scc.o
- obj-$(CONFIG_ROCKETPORT)	+= rocket.o
- obj-$(CONFIG_SERIAL167)		+= serial167.o
- obj-$(CONFIG_CYCLADES)		+= cyclades.o
- obj-$(CONFIG_STALLION)		+= stallion.o
- obj-$(CONFIG_ISTALLION)		+= istallion.o
- obj-$(CONFIG_NOZOMI)		+= nozomi.o
- obj-$(CONFIG_DIGIEPCA)		+= epca.o
- obj-$(CONFIG_SPECIALIX)		+= specialix.o
- obj-$(CONFIG_MOXA_INTELLIO)	+= moxa.o
- obj-$(CONFIG_A2232)		+= ser_a2232.o generic_serial.o
  obj-$(CONFIG_ATARI_DSP56K)	+= dsp56k.o
- obj-$(CONFIG_MOXA_SMARTIO)	+= mxser.o
- obj-$(CONFIG_COMPUTONE)		+= ip2/
- obj-$(CONFIG_RISCOM8)		+= riscom8.o
- obj-$(CONFIG_ISI)		+= isicom.o
- obj-$(CONFIG_SYNCLINK)		+= synclink.o
- obj-$(CONFIG_SYNCLINKMP)	+= synclinkmp.o
- obj-$(CONFIG_SYNCLINK_GT)	+= synclink_gt.o
- obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
- obj-$(CONFIG_SX)		+= sx.o generic_serial.o
- obj-$(CONFIG_RIO)		+= rio/ generic_serial.o
 +obj-$(CONFIG_VIRTIO_CONSOLE)	+= virtio_console.o
  obj-$(CONFIG_RAW_DRIVER)	+= raw.o
  obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o
  obj-$(CONFIG_MSPEC)		+= mspec.o

             reply	other threads:[~2011-02-24  5:34 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-24  5:34 Stephen Rothwell [this message]
2011-02-24 19:39 ` linux-next: manual merge of the tty tree with Linus' tree Greg KH
2011-02-25  5:11   ` Stephen Rothwell
2011-02-25  5:48     ` Greg KH
2011-10-25  8:12 Stephen Rothwell
2011-10-25 12:02 ` Greg KH
2011-10-25  8:18 Stephen Rothwell
2011-10-25 10:03 ` Nicolas Ferre
2013-01-17  2:04 Stephen Rothwell
2013-01-18  0:41 ` Greg KH
2013-01-21  3:46 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:57 ` Greg KH
2014-05-05  5:41 Stephen Rothwell
2014-05-05 21:02 ` Greg KH
2016-05-20  2:31 Stephen Rothwell
2016-05-21  3:26 ` Greg KH
2020-03-10  3:40 Stephen Rothwell
2020-03-10  9:04 ` Greg KH
2020-03-10 10:52   ` Jiri Slaby
2020-03-16  6:38   ` Jiri Slaby
2020-03-16  7:46     ` Greg KH
2020-03-16  6:34 ` Jiri Slaby

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=20110224163439.05352f9b.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=amit.shah@redhat.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).