linux-kernel - linux-next: manual merge of the tty tree with the mips tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20111118142245.5f4156be67f6048f58595b0d@canb.auug.org.au>
Date:	Fri, 18 Nov 2011 14:22:45 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Gabor Juhos <juhosg@...nwrt.org>,
	Ralf Baechle <ralf@...ux-mips.org>,
	Rong Wang <Rong.Wang@....com>
Subject: linux-next: manual merge of the tty tree with the mips tree

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/Makefile between commit 58235d376b15 ("SERIAL: AR933X:
Add driver for the built-in UART of the SoC") from the mips tree and
commit 161e773cbd0c ("UART: add CSR SiRFprimaII SoC on-chip uart
drivers") from the tty tree.

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

diff --cc drivers/tty/serial/Makefile
index 62f7d28,af57089..0000000
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@@ -89,4 -94,4 +89,5 @@@ obj-$(CONFIG_SERIAL_MSM_SMD)	+= msm_smd
  obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
  obj-$(CONFIG_SERIAL_LANTIQ)	+= lantiq.o
  obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o
 +obj-$(CONFIG_SERIAL_AR933X)   += ar933x_uart.o
+ obj-$(CONFIG_SERIAL_SIRFSOC) += sirfsoc_uart.o

Content of type "application/pgp-signature" skipped