Skip to content

Commit dda922c

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <[email protected]>
2 parents db3397b + c46a024 commit dda922c

File tree

256 files changed

+2503
-1406
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+2503
-1406
lines changed

‎Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Description: Discover CPUs in the same CPU frequency coordination domain
162162
What: /sys/devices/system/cpu/cpu*/cache/index3/cache_disable_{0,1}
163163
Date: August 2008
164164
KernelVersion: 2.6.27
165-
Contact: discuss@x86-64.org
165+
Contact: Linux kernel mailing list <[email protected].org>
166166
Description: Disable L3 cache indices
167167

168168
These files exist in every CPU's cache/index3 directory. Each

‎Documentation/hwmon/tmp401

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Supported chips:
2020
Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp432.html
2121
* Texas Instruments TMP435
2222
Prefix: 'tmp435'
23-
Addresses scanned: I2C 0x37, 0x48 - 0x4f
23+
Addresses scanned: I2C 0x48 - 0x4f
2424
Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp435.html
2525

2626
Authors:

‎Documentation/target/tcmu-design.txt

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ Contents:
1515
a) Discovering and configuring TCMU uio devices
1616
b) Waiting for events on the device(s)
1717
c) Managing the command ring
18-
3) Command filtering and pass_level
19-
4) A final note
18+
3) A final note
2019

2120

2221
TCM Userspace Design
@@ -324,7 +323,7 @@ int handle_device_events(int fd, void *map)
324323
/* Process events from cmd ring until we catch up with cmd_head */
325324
while (ent != (void *)mb + mb->cmdr_off + mb->cmd_head) {
326325

327-
if (tcmu_hdr_get_op(&ent->hdr) == TCMU_OP_CMD) {
326+
if (tcmu_hdr_get_op(ent->hdr.len_op) == TCMU_OP_CMD) {
328327
uint8_t *cdb = (void *)mb + ent->req.cdb_off;
329328
bool success = true;
330329

@@ -339,8 +338,12 @@ int handle_device_events(int fd, void *map)
339338
ent->rsp.scsi_status = SCSI_CHECK_CONDITION;
340339
}
341340
}
341+
else if (tcmu_hdr_get_op(ent->hdr.len_op) != TCMU_OP_PAD) {
342+
/* Tell the kernel we didn't handle unknown opcodes */
343+
ent->hdr.uflags |= TCMU_UFLAG_UNKNOWN_OP;
344+
}
342345
else {
343-
/* Do nothing for PAD entries */
346+
/* Do nothing for PAD entries except update cmd_tail */
344347
}
345348

346349
/* update cmd_tail */
@@ -360,28 +363,6 @@ int handle_device_events(int fd, void *map)
360363
}
361364

362365

363-
Command filtering and pass_level
364-
--------------------------------
365-
366-
TCMU supports a "pass_level" option with valid values of 0 or 1. When
367-
the value is 0 (the default), nearly all SCSI commands received for
368-
the device are passed through to the handler. This allows maximum
369-
flexibility but increases the amount of code required by the handler,
370-
to support all mandatory SCSI commands. If pass_level is set to 1,
371-
then only IO-related commands are presented, and the rest are handled
372-
by LIO's in-kernel command emulation. The commands presented at level
373-
1 include all versions of:
374-
375-
READ
376-
WRITE
377-
WRITE_VERIFY
378-
XDWRITEREAD
379-
WRITE_SAME
380-
COMPARE_AND_WRITE
381-
SYNCHRONIZE_CACHE
382-
UNMAP
383-
384-
385366
A final note
386367
------------
387368

‎MAINTAINERS

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,7 +2433,6 @@ L: [email protected]
24332433
S: Supported
24342434
F: include/linux/capability.h
24352435
F: include/uapi/linux/capability.h
2436-
F: security/capability.c
24372436
F: security/commoncap.c
24382437
F: kernel/capability.c
24392438

@@ -3831,10 +3830,11 @@ M: David Woodhouse <[email protected]>
38313830
L: [email protected]
38323831
S: Maintained
38333832

3834-
EMULEX LPFC FC SCSI DRIVER
3835-
M: James Smart <[email protected]>
3833+
EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER
3834+
M: James Smart <[email protected]>
3835+
M: Dick Kennedy <[email protected]>
38363836
L: [email protected]
3837-
W: http://sourceforge.net/projects/lpfcxxxx
3837+
W: http://www.avagotech.com
38383838
S: Supported
38393839
F: drivers/scsi/lpfc/
38403840

@@ -8835,9 +8835,11 @@ F: drivers/misc/phantom.c
88358835
F: include/uapi/linux/phantom.h
88368836

88378837
SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
8838-
M: Jayamohan Kallickal <[email protected]>
8838+
M: Jayamohan Kallickal <[email protected]>
8839+
M: Minh Tran <[email protected]>
8840+
M: John Soni Jose <[email protected]>
88398841
L: [email protected]
8840-
W: http://www.emulex.com
8842+
W: http://www.avagotech.com
88418843
S: Supported
88428844
F: drivers/scsi/be2iscsi/
88438845

@@ -10591,8 +10593,7 @@ F: drivers/virtio/virtio_input.c
1059110593
F: include/uapi/linux/virtio_input.h
1059210594

1059310595
VIA RHINE NETWORK DRIVER
10594-
M: Roger Luethi <[email protected]>
10595-
S: Maintained
10596+
S: Orphan
1059610597
F: drivers/net/ethernet/via/via-rhine.c
1059710598

1059810599
VIA SD/MMC CARD CONTROLLER DRIVER

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 4
22
PATCHLEVEL = 1
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc4
4+
EXTRAVERSION = -rc6
55
NAME = Hurr durr I'ma sheep
66

77
# *DOCUMENTATION*

‎arch/alpha/boot/Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ targets := vmlinux.gz vmlinux \
1414
tools/bootpzh bootloader bootpheader bootpzheader
1515
OBJSTRIP := $(obj)/tools/objstrip
1616

17+
HOSTCFLAGS := -Wall -I$(objtree)/usr/include
18+
BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)
19+
1720
# SRM bootable image. Copy to offset 512 of a partition.
1821
$(obj)/bootimage: $(addprefix $(obj)/tools/,mkbb lxboot bootlx) $(obj)/vmlinux.nh
1922
( cat $(obj)/tools/lxboot $(obj)/tools/bootlx $(obj)/vmlinux.nh ) > $@
@@ -96,13 +99,14 @@ $(obj)/tools/bootph: $(obj)/bootpheader $(OBJSTRIP) FORCE
9699
$(obj)/tools/bootpzh: $(obj)/bootpzheader $(OBJSTRIP) FORCE
97100
$(call if_changed,objstrip)
98101

99-
LDFLAGS_bootloader := -static -uvsprintf -T #-N -relax
100-
LDFLAGS_bootpheader := -static -uvsprintf -T #-N -relax
101-
LDFLAGS_bootpzheader := -static -uvsprintf -T #-N -relax
102+
LDFLAGS_bootloader := -static -T # -N -relax
103+
LDFLAGS_bootloader := -static -T # -N -relax
104+
LDFLAGS_bootpheader := -static -T # -N -relax
105+
LDFLAGS_bootpzheader := -static -T # -N -relax
102106

103-
OBJ_bootlx := $(obj)/head.o $(obj)/main.o
104-
OBJ_bootph := $(obj)/head.o $(obj)/bootp.o
105-
OBJ_bootpzh := $(obj)/head.o $(obj)/bootpz.o $(obj)/misc.o
107+
OBJ_bootlx := $(obj)/head.o $(obj)/stdio.o $(obj)/main.o
108+
OBJ_bootph := $(obj)/head.o $(obj)/stdio.o $(obj)/bootp.o
109+
OBJ_bootpzh := $(obj)/head.o $(obj)/stdio.o $(obj)/bootpz.o $(obj)/misc.o
106110

107111
$(obj)/bootloader: $(obj)/bootloader.lds $(OBJ_bootlx) $(LIBS_Y) FORCE
108112
$(call if_changed,ld)

‎arch/alpha/boot/main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include "ksize.h"
2121

22-
extern int vsprintf(char *, const char *, va_list);
2322
extern unsigned long switch_to_osf_pal(unsigned long nr,
2423
struct pcb_struct * pcb_va, struct pcb_struct * pcb_pa,
2524
unsigned long *vptb);

0 commit comments

Comments
 (0)