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

Commit ae95d712 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents 03c5b534 183c948a

Documentation/devicetree/bindings/clock/qca,ath79-pll.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ Binding for Qualcomm Atheros AR7xxx/AR9XXX PLL controller 
The PPL controller provides the 3 main clocks of the SoC: CPU, DDR and AHB.

The PPL controller provides the 3 main clocks of the SoC: CPU, DDR and AHB.





Required Properties:

Required Properties:

- compatible: has to be "qca,<soctype>-cpu-intc" and one of the following

- compatible: has to be "qca,<soctype>-pll" and one of the following

  fallbacks:

  fallbacks:

  - "qca,ar7100-pll"

  - "qca,ar7100-pll"

  - "qca,ar7240-pll"

  - "qca,ar7240-pll"
@@ -21,8 +21,8 @@ Optional properties: 




Example:

Example:





	memory-controller@18050000 {

	pll-controller@18050000 {

		compatible = "qca,ar9132-ppl", "qca,ar9130-pll";

		compatible = "qca,ar9132-pll", "qca,ar9130-pll";

		reg = <0x18050000 0x20>;

		reg = <0x18050000 0x20>;





		clock-names = "ref";

		clock-names = "ref";

Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt

+6 −6
Original line number Original line Diff line number Diff line
@@ -134,12 +134,12 @@ mfio80 ddr_debug, mips_trace_data, mips_debug 
mfio81		dreq0, mips_trace_data, eth_debug

mfio81		dreq0, mips_trace_data, eth_debug

mfio82		dreq1, mips_trace_data, eth_debug

mfio82		dreq1, mips_trace_data, eth_debug

mfio83		mips_pll_lock, mips_trace_data, usb_debug

mfio83		mips_pll_lock, mips_trace_data, usb_debug

mfio84		sys_pll_lock, mips_trace_data, usb_debug

mfio84		audio_pll_lock, mips_trace_data, usb_debug

mfio85		wifi_pll_lock, mips_trace_data, sdhost_debug

mfio85		rpu_v_pll_lock, mips_trace_data, sdhost_debug

mfio86		bt_pll_lock, mips_trace_data, sdhost_debug

mfio86		rpu_l_pll_lock, mips_trace_data, sdhost_debug

mfio87		rpu_v_pll_lock, dreq2, socif_debug

mfio87		sys_pll_lock, dreq2, socif_debug

mfio88		rpu_l_pll_lock, dreq3, socif_debug

mfio88		wifi_pll_lock, dreq3, socif_debug

mfio89		audio_pll_lock, dreq4, dreq5

mfio89		bt_pll_lock, dreq4, dreq5

tck

tck

trstn

trstn

tdi

tdi

Documentation/filesystems/cramfs.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ the update lasts only as long as the inode is cached in memory, after 
which the timestamp reverts to 1970, i.e. moves backwards in time.

which the timestamp reverts to 1970, i.e. moves backwards in time.





Currently, cramfs must be written and read with architectures of the

Currently, cramfs must be written and read with architectures of the

same endianness, and can be read only by kernels with PAGE_CACHE_SIZE

same endianness, and can be read only by kernels with PAGE_SIZE

== 4096.  At least the latter of these is a bug, but it hasn't been

== 4096.  At least the latter of these is a bug, but it hasn't been

decided what the best fix is.  For the moment if you have larger pages

decided what the best fix is.  For the moment if you have larger pages

you can just change the #define in mkcramfs.c, so long as you don't

you can just change the #define in mkcramfs.c, so long as you don't

Documentation/filesystems/tmpfs.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ size: The limit of allocated bytes for this tmpfs instance. The 
           default is half of your physical RAM without swap. If you

           default is half of your physical RAM without swap. If you

           oversize your tmpfs instances the machine will deadlock

           oversize your tmpfs instances the machine will deadlock

           since the OOM handler will not be able to free that memory.

           since the OOM handler will not be able to free that memory.

nr_blocks: The same as size, but in blocks of PAGE_CACHE_SIZE.

nr_blocks: The same as size, but in blocks of PAGE_SIZE.

nr_inodes: The maximum number of inodes for this instance. The default

nr_inodes: The maximum number of inodes for this instance. The default

           is half of the number of your physical RAM pages, or (on a

           is half of the number of your physical RAM pages, or (on a

           machine with highmem) the number of lowmem RAM pages,

           machine with highmem) the number of lowmem RAM pages,

Documentation/filesystems/vfs.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -708,9 +708,9 @@ struct address_space_operations { 
	from the address space.  This generally corresponds to either a

	from the address space.  This generally corresponds to either a

	truncation, punch hole  or a complete invalidation of the address

	truncation, punch hole  or a complete invalidation of the address

	space (in the latter case 'offset' will always be 0 and 'length'

	space (in the latter case 'offset' will always be 0 and 'length'

	will be PAGE_CACHE_SIZE). Any private data associated with the page

	will be PAGE_SIZE). Any private data associated with the page

	should be updated to reflect this truncation.  If offset is 0 and

	should be updated to reflect this truncation.  If offset is 0 and

	length is PAGE_CACHE_SIZE, then the private data should be released,

	length is PAGE_SIZE, then the private data should be released,

	because the page must be able to be completely discarded.  This may

	because the page must be able to be completely discarded.  This may

	be done by calling the ->releasepage function, but in this case the

	be done by calling the ->releasepage function, but in this case the

	release MUST succeed.

	release MUST succeed.