linux-kernel - linux-next: build warning after merge of the clockevents 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: <20140116150341.506a8d292d722c5878340b57@canb.auug.org.au>
Date:	Thu, 16 Jan 2014 15:03:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Daniel Lezcano <daniel.lezcano@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ingo Molnar <mingo@...nel.org>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: build warning after merge of the clockevents tree

Hi Daniel,

After merging the clockevents tree, the file
drivers/clocksource/clksrc-of.c.rej appears ... it was commited as part
of commit 55af97749f2b ("Merge branch 'clockevents/3.14' of
git://git.linaro.org/people/daniel.lezcano/linux into timers/core") which
I suspect was added to the clockevents tree when you based (or merged)
the tip tree.  That commit no longer appears in the tip tree.

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

Content of type "application/pgp-signature" skipped