linux-kernel - linux-next: manual merge of the clockevents tree with the tip 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]

Date:	Mon, 21 Dec 2015 14:08:24 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Daniel Lezcano <daniel.lezcano@...aro.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Yoshinori Sato <ysato@...rs.sourceforge.jp>
Subject: linux-next: manual merge of the clockevents tree with the tip tree

Hi Daniel,

Today's linux-next merge of the clockevents tree got a conflict in:

  drivers/clocksource/h8300_timer16.c

between commit:

  d33f250af4e6 ("clocksource/drivers/h8300: Use ioread / iowrite")

from the tip tree and commit:

  1ddca16cc5b3 ("clocksource/drivers/h8300: Use ioread / iowrite")

from the clockevents tree.

The former is just a fixed version of the latter, so I used that.

It looks like the clockevents tree needs to be cleaned up.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/