linux-kernel - linux-next: manual merge of the renesas tree with the sh 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>] [day] [month] [year] [list]

Message-Id: <20130617171305.d97598f75a42dfba89b3dbd0@canb.auug.org.au>
Date:	Mon, 17 Jun 2013 17:13:05 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Simon Horman <horms@...ge.net.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ulrich Hecht <ulrich.hecht@...il.com>,
	Bastian Hecht <hechtb@...il.com>,
	Paul Mundt <lethal@...ux-sh.org>
Subject: linux-next: manual merge of the renesas tree with the sh tree

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
include/linux/serial_sci.h between commit ada80ee7fa60 ("serial: sh-sci:
Add OF support") from the sh tree and commit 24610a30600b ("serial:
sh-sci: HSCIF support") from the renesas tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/serial_sci.h
index 857eec4,d340497..0000000
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@@ -18,8 -16,7 +18,9 @@@ enum 
  	SCBRR_ALGO_3,		/* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */
  	SCBRR_ALGO_4,		/* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */
  	SCBRR_ALGO_5,		/* (((clk * 1000 / 32) / bps) - 1) */
+ 	SCBRR_ALGO_6,		/* HSCIF variable sample rate algorithm */
 +
 +	SCBRR_NR_ALGOS,
  };
  
  #define SCSCR_TIE	(1 << 7)

Content of type "application/pgp-signature" skipped