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

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

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



Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7d4c04fc 3658f360

MAINTAINERS

+11 −10
Original line number Original line Diff line number Diff line
@@ -3242,6 +3242,12 @@ F: Documentation/firmware_class/ 
F:	drivers/base/firmware*.c

F:	drivers/base/firmware*.c

F:	include/linux/firmware.h

F:	include/linux/firmware.h





FLASHSYSTEM DRIVER (IBM FlashSystem 70/80 PCI SSD Flash Card)

M:	Joshua Morris <josh.h.morris@us.ibm.com>

M:	Philip Kelleher <pjk1939@linux.vnet.ibm.com>

S:	Maintained

F:	drivers/block/rsxx/



FLOPPY DRIVER

FLOPPY DRIVER

M:	Jiri Kosina <jkosina@suse.cz>

M:	Jiri Kosina <jkosina@suse.cz>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
@@ -5059,9 +5065,8 @@ S: Maintained 
F:	drivers/net/ethernet/marvell/sk*

F:	drivers/net/ethernet/marvell/sk*





MARVELL LIBERTAS WIRELESS DRIVER

MARVELL LIBERTAS WIRELESS DRIVER

M:	Dan Williams <dcbw@redhat.com>

L:	libertas-dev@lists.infradead.org

L:	libertas-dev@lists.infradead.org

S:	Maintained

S:	Orphan

F:	drivers/net/wireless/libertas/

F:	drivers/net/wireless/libertas/





MARVELL MV643XX ETHERNET DRIVER

MARVELL MV643XX ETHERNET DRIVER
@@ -5563,6 +5568,7 @@ F: include/uapi/linux/if_* 
F:	include/uapi/linux/netdevice.h

F:	include/uapi/linux/netdevice.h





NETXEN (1/10) GbE SUPPORT

NETXEN (1/10) GbE SUPPORT

M:	Manish Chopra <manish.chopra@qlogic.com>

M:	Sony Chacko <sony.chacko@qlogic.com>

M:	Sony Chacko <sony.chacko@qlogic.com>

M:	Rajesh Borundia <rajesh.borundia@qlogic.com>

M:	Rajesh Borundia <rajesh.borundia@qlogic.com>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org
@@ -6209,7 +6215,7 @@ F: include/linux/power_supply.h 
F:	drivers/power/

F:	drivers/power/





PNP SUPPORT

PNP SUPPORT

M:	Adam Belay <abelay@mit.edu>

M:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

M:	Bjorn Helgaas <bhelgaas@google.com>

M:	Bjorn Helgaas <bhelgaas@google.com>

S:	Maintained

S:	Maintained

F:	drivers/pnp/

F:	drivers/pnp/
@@ -6553,12 +6559,6 @@ S: Maintained 
F:	Documentation/blockdev/ramdisk.txt

F:	Documentation/blockdev/ramdisk.txt

F:	drivers/block/brd.c

F:	drivers/block/brd.c





RAMSAM DRIVER (IBM RamSan 70/80 PCI SSD Flash Card)

M:	Joshua Morris <josh.h.morris@us.ibm.com>

M:	Philip Kelleher <pjk1939@linux.vnet.ibm.com>

S:	Maintained

F:	drivers/block/rsxx/



RANDOM NUMBER DRIVER

RANDOM NUMBER DRIVER

M:	Theodore Ts'o" <tytso@mit.edu>

M:	Theodore Ts'o" <tytso@mit.edu>

S:	Maintained

S:	Maintained
@@ -7708,9 +7708,10 @@ F: include/linux/swiotlb.h 




SYNOPSYS ARC ARCHITECTURE

SYNOPSYS ARC ARCHITECTURE

M:	Vineet Gupta <vgupta@synopsys.com>

M:	Vineet Gupta <vgupta@synopsys.com>

L:	linux-snps-arc@vger.kernel.org

S:	Supported

S:	Supported

F:	arch/arc/

F:	arch/arc/

F:	Documentation/devicetree/bindings/arc/

F:	drivers/tty/serial/arc-uart.c





SYSV FILESYSTEM

SYSV FILESYSTEM

M:	Christoph Hellwig <hch@infradead.org>

M:	Christoph Hellwig <hch@infradead.org>

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
VERSION = 3

VERSION = 3

PATCHLEVEL = 9

PATCHLEVEL = 9

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Unicycling Gorilla

NAME = Unicycling Gorilla





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/arc/include/asm/dma-mapping.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, 
	int i;

	int i;





	for_each_sg(sg, s, nents, i)

	for_each_sg(sg, s, nents, i)

		sg->dma_address = dma_map_page(dev, sg_page(s), s->offset,

		s->dma_address = dma_map_page(dev, sg_page(s), s->offset,

					       s->length, dir);

					       s->length, dir);





	return nents;

	return nents;

arch/arc/include/asm/elf.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -72,7 +72,4 @@ extern int elf_check_arch(const struct elf32_hdr *); 
 */

 */

#define ELF_PLATFORM	(NULL)

#define ELF_PLATFORM	(NULL)





#define SET_PERSONALITY(ex) \

	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))



#endif
 
#endif

arch/arc/include/asm/entry.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -415,7 +415,7 @@ 
 *-------------------------------------------------------------*/

 *-------------------------------------------------------------*/

.macro SAVE_ALL_EXCEPTION   marker

.macro SAVE_ALL_EXCEPTION   marker





	st      \marker, [sp, 8]

	st      \marker, [sp, 8]	/* orig_r8 */

	st      r0, [sp, 4]    /* orig_r0, needed only for sys calls */

	st      r0, [sp, 4]    /* orig_r0, needed only for sys calls */





	/* Restore r9 used to code the early prologue */

	/* Restore r9 used to code the early prologue */