Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (e9011d08) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/input/event-codes.txt

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -281,6 +281,19 @@ gestures can normally be extracted from it.
	If INPUT_PROP_SEMI_MT is not set, the device is assumed to be a true MT		If INPUT_PROP_SEMI_MT is not set, the device is assumed to be a true MT
	device.		device.

			INPUT_PROP_TOPBUTTONPAD:
			-----------------------
			Some laptops, most notably the Lenovo *40 series provide a trackstick
			device but do not have physical buttons associated with the trackstick
			device. Instead, the top area of the touchpad is marked to show
			visual/haptic areas for left, middle, right buttons intended to be used
			with the trackstick.

			If INPUT_PROP_TOPBUTTONPAD is set, userspace should emulate buttons
			accordingly. This property does not affect kernel behavior.
			The kernel does not provide button emulation for such devices but treats
			them as any other INPUT_PROP_BUTTONPAD device.

	Guidelines:		Guidelines:
	==========		==========
	The guidelines below ensure proper single-touch and multi-finger functionality.		The guidelines below ensure proper single-touch and multi-finger functionality.

MAINTAINERS

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6956,6 +6956,12 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	S: Maintained		S: Maintained
	F: drivers/pinctrl/pinctrl-at91.c		F: drivers/pinctrl/pinctrl-at91.c

			PIN CONTROLLER - RENESAS
			M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
			L: linux-sh@vger.kernel.org
			S: Maintained
			F: drivers/pinctrl/sh-pfc/

	PIN CONTROLLER - SAMSUNG		PIN CONTROLLER - SAMSUNG
	M: Tomasz Figa <t.figa@samsung.com>		M: Tomasz Figa <t.figa@samsung.com>
	M: Thomas Abraham <thomas.abraham@linaro.org>		M: Thomas Abraham <thomas.abraham@linaro.org>
	@@ -8019,6 +8025,16 @@ F: drivers/ata/
	F: include/linux/ata.h		F: include/linux/ata.h
	F: include/linux/libata.h		F: include/linux/libata.h

			SERIAL ATA AHCI PLATFORM devices support
			M: Hans de Goede <hdegoede@redhat.com>
			M: Tejun Heo <tj@kernel.org>
			L: linux-ide@vger.kernel.org
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
			S: Supported
			F: drivers/ata/ahci_platform.c
			F: drivers/ata/libahci_platform.c
			F: include/linux/ahci_platform.h

	SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER		SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
	M: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>		M: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
	L: linux-scsi@vger.kernel.org		L: linux-scsi@vger.kernel.org

Makefile

+3 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 3		VERSION = 3
	PATCHLEVEL = 16		PATCHLEVEL = 16
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc6		EXTRAVERSION = -rc7
	NAME = Shuffling Zombie Juror		NAME = Shuffling Zombie Juror

	# DOCUMENTATION		# DOCUMENTATION
	@@ -688,6 +688,8 @@ KBUILD_CFLAGS += -fomit-frame-pointer
	endif		endif
	endif		endif

			KBUILD_CFLAGS += $(call cc-option, -fno-var-tracking-assignments)

	ifdef CONFIG_DEBUG_INFO		ifdef CONFIG_DEBUG_INFO
	KBUILD_CFLAGS += -g		KBUILD_CFLAGS += -g
	KBUILD_AFLAGS += -Wa,-gdwarf-2		KBUILD_AFLAGS += -Wa,-gdwarf-2

arch/arm/crypto/aesbs-glue.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -137,7 +137,7 @@ static int aesbs_cbc_encrypt(struct blkcipher_desc *desc,
	dst += AES_BLOCK_SIZE;		dst += AES_BLOCK_SIZE;
	} while (--blocks);		} while (--blocks);
	}		}
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	return err;		return err;
	}		}
	@@ -158,7 +158,7 @@ static int aesbs_cbc_decrypt(struct blkcipher_desc *desc,
	bsaes_cbc_encrypt(walk.src.virt.addr, walk.dst.virt.addr,		bsaes_cbc_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
	walk.nbytes, &ctx->dec, walk.iv);		walk.nbytes, &ctx->dec, walk.iv);
	kernel_neon_end();		kernel_neon_end();
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	while (walk.nbytes) {		while (walk.nbytes) {
	u32 blocks = walk.nbytes / AES_BLOCK_SIZE;		u32 blocks = walk.nbytes / AES_BLOCK_SIZE;
	@@ -182,7 +182,7 @@ static int aesbs_cbc_decrypt(struct blkcipher_desc *desc,
	dst += AES_BLOCK_SIZE;		dst += AES_BLOCK_SIZE;
	src += AES_BLOCK_SIZE;		src += AES_BLOCK_SIZE;
	} while (--blocks);		} while (--blocks);
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	return err;		return err;
	}		}
	@@ -268,7 +268,7 @@ static int aesbs_xts_encrypt(struct blkcipher_desc *desc,
	bsaes_xts_encrypt(walk.src.virt.addr, walk.dst.virt.addr,		bsaes_xts_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
	walk.nbytes, &ctx->enc, walk.iv);		walk.nbytes, &ctx->enc, walk.iv);
	kernel_neon_end();		kernel_neon_end();
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	return err;		return err;
	}		}
	@@ -292,7 +292,7 @@ static int aesbs_xts_decrypt(struct blkcipher_desc *desc,
	bsaes_xts_decrypt(walk.src.virt.addr, walk.dst.virt.addr,		bsaes_xts_decrypt(walk.src.virt.addr, walk.dst.virt.addr,
	walk.nbytes, &ctx->dec, walk.iv);		walk.nbytes, &ctx->dec, walk.iv);
	kernel_neon_end();		kernel_neon_end();
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	return err;		return err;
	}		}

arch/arm64/crypto/aes-glue.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -106,7 +106,7 @@ static int ecb_encrypt(struct blkcipher_desc desc, struct scatterlist dst,
	for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {		for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {
	aes_ecb_encrypt(walk.dst.virt.addr, walk.src.virt.addr,		aes_ecb_encrypt(walk.dst.virt.addr, walk.src.virt.addr,
	(u8 *)ctx->key_enc, rounds, blocks, first);		(u8 *)ctx->key_enc, rounds, blocks, first);
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	kernel_neon_end();		kernel_neon_end();
	return err;		return err;
	@@ -128,7 +128,7 @@ static int ecb_decrypt(struct blkcipher_desc desc, struct scatterlist dst,
	for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {		for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {
	aes_ecb_decrypt(walk.dst.virt.addr, walk.src.virt.addr,		aes_ecb_decrypt(walk.dst.virt.addr, walk.src.virt.addr,
	(u8 *)ctx->key_dec, rounds, blocks, first);		(u8 *)ctx->key_dec, rounds, blocks, first);
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	kernel_neon_end();		kernel_neon_end();
	return err;		return err;
	@@ -151,7 +151,7 @@ static int cbc_encrypt(struct blkcipher_desc desc, struct scatterlist dst,
	aes_cbc_encrypt(walk.dst.virt.addr, walk.src.virt.addr,		aes_cbc_encrypt(walk.dst.virt.addr, walk.src.virt.addr,
	(u8 *)ctx->key_enc, rounds, blocks, walk.iv,		(u8 *)ctx->key_enc, rounds, blocks, walk.iv,
	first);		first);
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	kernel_neon_end();		kernel_neon_end();
	return err;		return err;
	@@ -174,7 +174,7 @@ static int cbc_decrypt(struct blkcipher_desc desc, struct scatterlist dst,
	aes_cbc_decrypt(walk.dst.virt.addr, walk.src.virt.addr,		aes_cbc_decrypt(walk.dst.virt.addr, walk.src.virt.addr,
	(u8 *)ctx->key_dec, rounds, blocks, walk.iv,		(u8 *)ctx->key_dec, rounds, blocks, walk.iv,
	first);		first);
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	kernel_neon_end();		kernel_neon_end();
	return err;		return err;
	@@ -243,7 +243,7 @@ static int xts_encrypt(struct blkcipher_desc desc, struct scatterlist dst,
	aes_xts_encrypt(walk.dst.virt.addr, walk.src.virt.addr,		aes_xts_encrypt(walk.dst.virt.addr, walk.src.virt.addr,
	(u8 *)ctx->key1.key_enc, rounds, blocks,		(u8 *)ctx->key1.key_enc, rounds, blocks,
	(u8 *)ctx->key2.key_enc, walk.iv, first);		(u8 *)ctx->key2.key_enc, walk.iv, first);
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	kernel_neon_end();		kernel_neon_end();

	@@ -267,7 +267,7 @@ static int xts_decrypt(struct blkcipher_desc desc, struct scatterlist dst,
	aes_xts_decrypt(walk.dst.virt.addr, walk.src.virt.addr,		aes_xts_decrypt(walk.dst.virt.addr, walk.src.virt.addr,
	(u8 *)ctx->key1.key_dec, rounds, blocks,		(u8 *)ctx->key1.key_dec, rounds, blocks,
	(u8 *)ctx->key2.key_enc, walk.iv, first);		(u8 *)ctx->key2.key_enc, walk.iv, first);
	err = blkcipher_walk_done(desc, &walk, 0);		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
	}		}
	kernel_neon_end();		kernel_neon_end();