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

Commit 4fbef95a authored Oct 01, 2013 by David S. Miller

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



Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/usb/qmi_wwan.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
	include/net/netfilter/nf_conntrack_synproxy.h
	include/net/secure_seq.h

The conflicts are of two varieties:

1) Conflicts with Joe Perches's 'extern' removal from header file
   function declarations.  Usually it's an argument signature change
   or a function being added/removed.  The resolutions are trivial.

2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
   a new value, another changes an existing value.  That sort of
   thing.

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 5229432f c31eeace

CREDITS

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2808,8 +2808,7 @@ S: Ottawa, Ontario
	S: Canada K2P 0X8		S: Canada K2P 0X8

	N: Mikael Pettersson		N: Mikael Pettersson
	E: mikpe@it.uu.se		E: mikpelinux@gmail.com
	W: http://user.it.uu.se/~mikpe/linux/
	D: Miscellaneous fixes		D: Miscellaneous fixes

	N: Reed H. Petty		N: Reed H. Petty

Documentation/block/00-INDEX

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,8 @@ capability.txt
	- Generic Block Device Capability (/sys/block/<device>/capability)		- Generic Block Device Capability (/sys/block/<device>/capability)
	cfq-iosched.txt		cfq-iosched.txt
	- CFQ IO scheduler tunables		- CFQ IO scheduler tunables
			cmdline-partition.txt
			- how to specify block device partitions on kernel command line
	data-integrity.txt		data-integrity.txt
	- Block data integrity		- Block data integrity
	deadline-iosched.txt		deadline-iosched.txt

Documentation/block/cmdline-partition.txt

+4 −4

Original line number	Original line	Diff line number	Diff line
	Embedded device command line partition		Embedded device command line partition parsing
	=====================================================================		=====================================================================

	Read block device partition table from command line.		Support for reading the block device partition table from the command line.
	The partition used for fixed block device (eMMC) embedded device.		It is typically used for fixed block (eMMC) embedded devices.
	It is no MBR, save storage space. Bootloader can be easily accessed		It has no MBR, so saves storage space. Bootloader can be easily accessed
	by absolute address of data on the block device.		by absolute address of data on the block device.
	Users can easily change the partition.		Users can easily change the partition.

Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

+5 −5

Original line number	Original line	Diff line number	Diff line
	* Samsung Exynos specific extensions to the Synopsis Designware Mobile		* Samsung Exynos specific extensions to the Synopsys Designware Mobile
	Storage Host Controller		Storage Host Controller

	The Synopsis designware mobile storage host controller is used to interface		The Synopsys designware mobile storage host controller is used to interface
	a SoC with storage medium such as eMMC or SD/MMC cards. This file documents		a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
	differences between the core Synopsis dw mshc controller properties described		differences between the core Synopsys dw mshc controller properties described
	by synopsis-dw-mshc.txt and the properties used by the Samsung Exynos specific		by synopsys-dw-mshc.txt and the properties used by the Samsung Exynos specific
	extensions to the Synopsis Designware Mobile Storage Host Controller.		extensions to the Synopsys Designware Mobile Storage Host Controller.

	Required Properties:		Required Properties:

Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt

+5 −5

Original line number	Original line	Diff line number	Diff line
	* Rockchip specific extensions to the Synopsis Designware Mobile		* Rockchip specific extensions to the Synopsys Designware Mobile
	Storage Host Controller		Storage Host Controller

	The Synopsis designware mobile storage host controller is used to interface		The Synopsys designware mobile storage host controller is used to interface
	a SoC with storage medium such as eMMC or SD/MMC cards. This file documents		a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
	differences between the core Synopsis dw mshc controller properties described		differences between the core Synopsys dw mshc controller properties described
	by synopsis-dw-mshc.txt and the properties used by the Rockchip specific		by synopsys-dw-mshc.txt and the properties used by the Rockchip specific
	extensions to the Synopsis Designware Mobile Storage Host Controller.		extensions to the Synopsys Designware Mobile Storage Host Controller.

	Required Properties:		Required Properties: