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

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

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



Synchronize with 'net' in order to sort out some l2tp, wireless, and
ipv6 GRE fixes that will be built on top of in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8b9a4d56 836dc9e3

Documentation/hid/hid-sensor.txt

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

Documentation/kernel-parameters.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2438,7 +2438,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			real-time workloads.  It can also improve energy

			real-time workloads.  It can also improve energy

			efficiency for asymmetric multiprocessors.

			efficiency for asymmetric multiprocessors.





	rcu_nocbs_poll	[KNL,BOOT]

	rcu_nocb_poll	[KNL,BOOT]

			Rather than requiring that offloaded CPUs

			Rather than requiring that offloaded CPUs

			(specified by rcu_nocbs= above) explicitly

			(specified by rcu_nocbs= above) explicitly

			awaken the corresponding "rcuoN" kthreads,

			awaken the corresponding "rcuoN" kthreads,

Documentation/x86/boot.txt

+26 −1
Original line number Original line Diff line number Diff line
@@ -57,6 +57,10 @@ Protocol 2.10: (Kernel 2.6.31) Added a protocol for relaxed alignment 
Protocol 2.11:	(Kernel 3.6) Added a field for offset of EFI handover

Protocol 2.11:	(Kernel 3.6) Added a field for offset of EFI handover

		protocol entry point.

		protocol entry point.





Protocol 2.12:	(Kernel 3.8) Added the xloadflags field and extension fields

	 	to struct boot_params for for loading bzImage and ramdisk

		above 4G in 64bit.



**** MEMORY LAYOUT

**** MEMORY LAYOUT





The traditional memory map for the kernel loader, used for Image or

The traditional memory map for the kernel loader, used for Image or
@@ -182,7 +186,7 @@ Offset Proto Name Meaning 
0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel

0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel

0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not

0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not

0235/1	2.10+	min_alignment	Minimum alignment, as a power of two

0235/1	2.10+	min_alignment	Minimum alignment, as a power of two

0236/2	N/A	pad3		Unused

0236/2	2.12+	xloadflags	Boot protocol option flags

0238/4	2.06+	cmdline_size	Maximum size of the kernel command line

0238/4	2.06+	cmdline_size	Maximum size of the kernel command line

023C/4	2.07+	hardware_subarch Hardware subarchitecture

023C/4	2.07+	hardware_subarch Hardware subarchitecture

0240/8	2.07+	hardware_subarch_data Subarchitecture-specific data

0240/8	2.07+	hardware_subarch_data Subarchitecture-specific data
@@ -582,6 +586,27 @@ Protocol: 2.10+ 
  misaligned kernel.  Therefore, a loader should typically try each

  misaligned kernel.  Therefore, a loader should typically try each

  power-of-two alignment from kernel_alignment down to this alignment.

  power-of-two alignment from kernel_alignment down to this alignment.





Field name:     xloadflags

Type:           read

Offset/size:    0x236/2

Protocol:       2.12+



  This field is a bitmask.



  Bit 0 (read):	XLF_KERNEL_64

	- If 1, this kernel has the legacy 64-bit entry point at 0x200.



  Bit 1 (read): XLF_CAN_BE_LOADED_ABOVE_4G

        - If 1, kernel/boot_params/cmdline/ramdisk can be above 4G.



  Bit 2 (read):	XLF_EFI_HANDOVER_32

	- If 1, the kernel supports the 32-bit EFI handoff entry point

          given at handover_offset.



  Bit 3 (read): XLF_EFI_HANDOVER_64

	- If 1, the kernel supports the 64-bit EFI handoff entry point

          given at handover_offset + 0x200.



Field name:	cmdline_size

Field name:	cmdline_size

Type:		read

Type:		read

Offset/size:	0x238/4

Offset/size:	0x238/4

Documentation/x86/zero-page.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,9 @@ Offset Proto Name Meaning 
090/010	ALL	hd1_info	hd1 disk parameter, OBSOLETE!!

090/010	ALL	hd1_info	hd1 disk parameter, OBSOLETE!!

0A0/010	ALL	sys_desc_table	System description table (struct sys_desc_table)

0A0/010	ALL	sys_desc_table	System description table (struct sys_desc_table)

0B0/010	ALL	olpc_ofw_header	OLPC's OpenFirmware CIF and friends

0B0/010	ALL	olpc_ofw_header	OLPC's OpenFirmware CIF and friends

0C0/004	ALL	ext_ramdisk_image ramdisk_image high 32bits

0C4/004	ALL	ext_ramdisk_size  ramdisk_size high 32bits

0C8/004	ALL	ext_cmd_line_ptr  cmd_line_ptr high 32bits

140/080	ALL	edid_info	Video mode setup (struct edid_info)

140/080	ALL	edid_info	Video mode setup (struct edid_info)

1C0/020	ALL	efi_info	EFI 32 information (struct efi_info)

1C0/020	ALL	efi_info	EFI 32 information (struct efi_info)

1E0/004	ALL	alk_mem_k	Alternative mem check, in KB

1E0/004	ALL	alk_mem_k	Alternative mem check, in KB
@@ -27,6 +30,7 @@ Offset Proto Name Meaning 
1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)

1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)

1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer

1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer

				(below)

				(below)

1EF/001	ALL	sentinel	Used to detect broken bootloaders

290/040	ALL	edd_mbr_sig_buffer EDD MBR signatures

290/040	ALL	edd_mbr_sig_buffer EDD MBR signatures

2D0/A00	ALL	e820_map	E820 memory map table

2D0/A00	ALL	e820_map	E820 memory map table

				(array of struct e820entry)

				(array of struct e820entry)

MAINTAINERS

+2 −2
Original line number Original line Diff line number Diff line
@@ -1489,7 +1489,7 @@ AVR32 ARCHITECTURE 
M:	Haavard Skinnemoen <hskinnemoen@gmail.com>

M:	Haavard Skinnemoen <hskinnemoen@gmail.com>

M:	Hans-Christian Egtvedt <egtvedt@samfundet.no>

M:	Hans-Christian Egtvedt <egtvedt@samfundet.no>

W:	http://www.atmel.com/products/AVR32/

W:	http://www.atmel.com/products/AVR32/

W:	http://avr32linux.org/

W:	http://mirror.egtvedt.no/avr32linux.org/

W:	http://avrfreaks.net/

W:	http://avrfreaks.net/

S:	Maintained

S:	Maintained

F:	arch/avr32/

F:	arch/avr32/
@@ -7076,7 +7076,7 @@ F: include/uapi/sound/ 
F:	sound/

F:	sound/





SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

M:	Liam Girdwood <lrg@ti.com>

M:	Liam Girdwood <lgirdwood@gmail.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)