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

Commit dbd1a2d2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19-q.90 (e7f7ced0) into msm-4.19"

parents 6c58ab83 e6ff8969

Documentation/admin-guide/kernel-parameters.txt

+12 −10
Original line number Diff line number Diff line
@@ -4954,13 +4954,13 @@ 
			Flags is a set of characters, each corresponding

			to a common usb-storage quirk flag as follows:

				a = SANE_SENSE (collect more than 18 bytes

					of sense data);

					of sense data, not on uas);

				b = BAD_SENSE (don't collect more than 18

					bytes of sense data);

					bytes of sense data, not on uas);

				c = FIX_CAPACITY (decrease the reported

					device capacity by one sector);

				d = NO_READ_DISC_INFO (don't use

					READ_DISC_INFO command);

					READ_DISC_INFO command, not on uas);

				e = NO_READ_CAPACITY_16 (don't use

					READ_CAPACITY_16 command);

				f = NO_REPORT_OPCODES (don't use report opcodes
@@ -4975,17 +4975,18 @@ 
				j = NO_REPORT_LUNS (don't use report luns

					command, uas only);

				l = NOT_LOCKABLE (don't try to lock and

					unlock ejectable media);

					unlock ejectable media, not on uas);

				m = MAX_SECTORS_64 (don't transfer more

					than 64 sectors = 32 KB at a time);

					than 64 sectors = 32 KB at a time,

					not on uas);

				n = INITIAL_READ10 (force a retry of the

					initial READ(10) command);

					initial READ(10) command, not on uas);

				o = CAPACITY_OK (accept the capacity

					reported by the device);

					reported by the device, not on uas);

				p = WRITE_CACHE (the device cache is ON

					by default);

					by default, not on uas);

				r = IGNORE_RESIDUE (the device reports

					bogus residue values);

					bogus residue values, not on uas);

				s = SINGLE_LUN (the device has only one

					Logical Unit);

				t = NO_ATA_1X (don't allow ATA(12) and ATA(16)
@@ -4994,7 +4995,8 @@ 
				w = NO_WP_DETECT (don't test whether the

					medium is write-protected).

				y = ALWAYS_SYNC (issue a SYNCHRONIZE_CACHE

					even if the device claims no cache)

					even if the device claims no cache,

					not on uas)

			Example: quirks=0419:aaf5:rl,0421:0433:rc



	user_debug=	[KNL,ARM]

Documentation/filesystems/proc.txt

+3 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ SwapPss: 0 kB 
KernelPageSize:        4 kB

MMUPageSize:           4 kB

Locked:                0 kB

THPeligible:           0

VmFlags: rd ex mr mw me dw

Name:           name from userspace
@@ -466,6 +467,8 @@ replaced by copy-on-write) part of the underlying shmem object out on swap. 
"SwapPss" shows proportional swap share of this mapping. Unlike "Swap", this

does not take into account swapped out page of underlying shmem objects.

"Locked" indicates whether the mapping is locked in memory or not.

"THPeligible" indicates whether the mapping is eligible for THP pages - 1 if

true, 0 otherwise.



"VmFlags" field deserves a separate description. This member represents the kernel

flags associated with the particular virtual memory area in two letter encoded

Documentation/hid/uhid.txt

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ them but you should handle them according to your needs. 
  UHID_OUTPUT:

  This is sent if the HID device driver wants to send raw data to the I/O

  device on the interrupt channel. You should read the payload and forward it to

  the device. The payload is of type "struct uhid_data_req".

  the device. The payload is of type "struct uhid_output_req".

  This may be received even though you haven't received UHID_OPEN, yet.



  UHID_GET_REPORT:

Makefile

+4 −9
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 87

SUBLEVEL = 90

EXTRAVERSION =

NAME = "People's Front"
@@ -1606,9 +1606,6 @@ else # KBUILD_EXTMOD 


# We are always building modules

KBUILD_MODULES := 1

PHONY += crmodverdir

crmodverdir:

	$(cmd_crmodverdir)



PHONY += $(objtree)/Module.symvers

$(objtree)/Module.symvers:
@@ -1620,7 +1617,7 @@ $(objtree)/Module.symvers: 


module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD))

PHONY += $(module-dirs) modules

$(module-dirs): crmodverdir $(objtree)/Module.symvers

$(module-dirs): prepare $(objtree)/Module.symvers

	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)



modules: $(module-dirs)
@@ -1661,7 +1658,8 @@ help: 


# Dummies...

PHONY += prepare scripts

prepare: ;

prepare:

	$(cmd_crmodverdir)

scripts: ;

endif # KBUILD_EXTMOD
@@ -1789,17 +1787,14 @@ endif 


# Modules

/: prepare scripts FORCE

	$(cmd_crmodverdir)

	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \

	$(build)=$(build-dir)

# Make sure the latest headers are built for Documentation

Documentation/ samples/: headers_install

%/: prepare scripts FORCE

	$(cmd_crmodverdir)

	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \

	$(build)=$(build-dir)

%.ko: prepare scripts FORCE

	$(cmd_crmodverdir)

	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \

	$(build)=$(build-dir) $(@:.ko=.o)

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost

arch/arc/include/asm/cache.h

+2 −0
Original line number Diff line number Diff line
@@ -124,7 +124,9 @@ extern unsigned long perip_base, perip_end; 


/* IO coherency related Auxiliary registers */

#define ARC_REG_IO_COH_ENABLE	0x500

#define ARC_IO_COH_ENABLE_BIT	BIT(0)

#define ARC_REG_IO_COH_PARTIAL	0x501

#define ARC_IO_COH_PARTIAL_BIT	BIT(0)

#define ARC_REG_IO_COH_AP0_BASE	0x508

#define ARC_REG_IO_COH_AP0_SIZE	0x509