Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17a870be authored by Russell King's avatar Russell King
Browse files

Merge branches 'fixes' and 'misc'; commit 'kuser^{/add CPU_THUMB_CAPABLE to... 

Merge branches 'fixes' and 'misc'; commit 'kuser^{/add CPU_THUMB_CAPABLE to indicate}' into for-linus
parents 9e344048 cdcc5fa0 c466bda6

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml \ 
	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    80211.xml sh.xml regulator.xml w1.xml \

	    sh.xml regulator.xml w1.xml \

	    writing_musb_glue_layer.xml iio.xml



ifeq ($(DOCBOOKS),)

Documentation/unaligned-memory-access.txt

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ bool ether_addr_equal(const u8 *addr1, const u8 *addr2) 
#else

	const u16 *a = (const u16 *)addr1;

	const u16 *b = (const u16 *)addr2;

	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0;

	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0;

#endif

}

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 10

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Roaring Lionus



# *DOCUMENTATION*

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config ARM 
	bool

	default y

	select ARCH_CLOCKSOURCE_DATA

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

arch/arm/Kconfig-nommu

+1 −2
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ config PROCESSOR_ID 
	  used instead of the auto-probing which utilizes the register.



config REMAP_VECTORS_TO_RAM

	bool 'Install vectors to the beginning of RAM' if DRAM_BASE

	depends on DRAM_BASE

	bool 'Install vectors to the beginning of RAM'

	help

	  The kernel needs to change the hardware exception vectors.

	  In nommu mode, the hardware exception vectors are normally