Stephen Rothwell 6a328f3fe0 sparc64: merge fix ... After merging the final tree, today's linux-next build (sparc64 defconfig) failed like this: arch/sparc/mm/init_64.c: In function 'pte_alloc_one': arch/sparc/mm/init_64.c:2568:9: error: unused variable 'pte' [-Werror=unused-variable] Caused by the merge between commit 37b3a8ff3e ("sparc64: Move from 4MB to 8MB huge pages") and commit 1ae9ae5f7d ("sparc: handle pgtable_page_ctor() fail") (I had the following merge fix in linux-next, but it didn't seem to propagate upstream - may have forgotten to point it out :-(). Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-18 15:08:52 -08:00
..
boot	sparc: Fix piggyback with newer binutils.	2012-12-03 11:24:25 -08:00
configs	perf: Remove PERF_COUNTERS config option	2012-04-26 13:52:52 +02:00
crypto	sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.	2012-12-19 15:44:31 -08:00
include	sparc64: fix build regession	2013-11-18 15:07:35 -08:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
lib	sparc64: Make PAGE_OFFSET variable.	2013-11-12 15:22:34 -08:00
math-emu	sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.	2012-10-26 15:18:37 -07:00
mm	sparc64: merge fix	2013-11-18 15:08:52 -08:00
net	net: fix unsafe set_memory_rw from softirq	2013-10-07 15:16:45 -04:00
oprofile
power	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00
prom	arch: sparc: prom: looping issue, need additional length check in the outside looping	2013-06-19 02:10:29 -07:00
Kbuild	sparc64: Add SHA1 driver making use of the 'sha1' instruction.	2012-08-20 15:08:49 -07:00
Kconfig	Kconfig cleanups for v3.13	2013-11-15 14:05:15 -08:00
Kconfig.debug
Makefile	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00