Skip to content

Commit e2a553d

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: include/net/ipip.h The changes made to ipip.h in 'net' were already included in 'net-next' before that header was moved to another location. Signed-off-by: David S. Miller <[email protected]>
2 parents 7559d97 + a8c4528 commit e2a553d

File tree

238 files changed

+2886
-1270
lines changed

Some content is hidden

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

238 files changed

+2886
-1270
lines changed

‎Documentation/i2c/busses/i2c-diolan-u2c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Supported adapters:
55
Documentation:
66
http://www.diolan.com/i2c/u2c12.html
77

8-
Author: Guenter Roeck <[email protected]>
8+
Author: Guenter Roeck <[email protected]>
99

1010
Description
1111
-----------

‎Documentation/sound/alsa/ALSA-Configuration.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
912912
models depending on the codec chip. The list of available models
913913
is found in HD-Audio-Models.txt
914914

915-
The model name "genric" is treated as a special case. When this
915+
The model name "generic" is treated as a special case. When this
916916
model is given, the driver uses the generic codec parser without
917917
"codec-patch". It's sometimes good for testing and debugging.
918918

‎Documentation/sound/alsa/seq_oss.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ <H4>
285285
<H4>
286286
7.2.4 Close Callback</H4>
287287
The <TT>close</TT> callback is called when this device is closed by the
288-
applicaion. If any private data was allocated in open callback, it must
288+
application. If any private data was allocated in open callback, it must
289289
be released in the close callback. The deletion of ALSA port should be
290290
done here, too. This callback must not be NULL.
291291
<H4>

‎MAINTAINERS

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,6 +1461,12 @@ F: drivers/dma/at_hdmac.c
14611461
F: drivers/dma/at_hdmac_regs.h
14621462
F: include/linux/platform_data/dma-atmel.h
14631463

1464+
ATMEL I2C DRIVER
1465+
M: Ludovic Desroches <[email protected]>
1466+
L: [email protected]
1467+
S: Supported
1468+
F: drivers/i2c/busses/i2c-at91.c
1469+
14641470
ATMEL ISI DRIVER
14651471
M: Josh Wu <[email protected]>
14661472
L: [email protected]
@@ -2623,7 +2629,7 @@ F: include/uapi/drm/
26232629

26242630
INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
26252631
M: Daniel Vetter <[email protected]>
2626-
L: [email protected] (subscribers-only)
2632+
L: [email protected]
26272633
L: [email protected]
26282634
T: git git://people.freedesktop.org/~danvet/drm-intel
26292635
S: Supported
@@ -5641,6 +5647,14 @@ S: Maintained
56415647
F: drivers/video/riva/
56425648
F: drivers/video/nvidia/
56435649

5650+
NVM EXPRESS DRIVER
5651+
M: Matthew Wilcox <[email protected]>
5652+
L: [email protected]
5653+
T: git git://git.infradead.org/users/willy/linux-nvme.git
5654+
S: Supported
5655+
F: drivers/block/nvme.c
5656+
F: include/linux/nvme.h
5657+
56445658
OMAP SUPPORT
56455659
M: Tony Lindgren <[email protected]>
56465660
L: [email protected]
@@ -5669,7 +5683,7 @@ S: Maintained
56695683
F: arch/arm/*omap*/*clock*
56705684

56715685
OMAP POWER MANAGEMENT SUPPORT
5672-
M: Kevin Hilman <khilman@ti.com>
5686+
M: Kevin Hilman <khilman@deeprootsystems.com>
56735687
L: [email protected]
56745688
S: Maintained
56755689
F: arch/arm/*omap*/*pm*
@@ -5763,7 +5777,7 @@ F: arch/arm/*omap*/usb*
57635777

57645778
OMAP GPIO DRIVER
57655779
M: Santosh Shilimkar <[email protected]>
5766-
M: Kevin Hilman <khilman@ti.com>
5780+
M: Kevin Hilman <khilman@deeprootsystems.com>
57675781
L: [email protected]
57685782
S: Maintained
57695783
F: drivers/gpio/gpio-omap.c
@@ -7161,7 +7175,7 @@ F: arch/arm/mach-s3c2410/bast-irq.c
71617175

71627176
TI DAVINCI MACHINE SUPPORT
71637177
M: Sekhar Nori <[email protected]>
7164-
M: Kevin Hilman <khilman@ti.com>
7178+
M: Kevin Hilman <khilman@deeprootsystems.com>
71657179
L: [email protected] (moderated for non-subscribers)
71667180
T: git git://gitorious.org/linux-davinci/linux-davinci.git
71677181
Q: http://patchwork.kernel.org/project/linux-davinci/list/

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 9
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc3
4+
EXTRAVERSION = -rc4
55
NAME = Unicycling Gorilla
66

77
# *DOCUMENTATION*

‎arch/arm/Kconfig.debug

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@ config DEBUG_IMX_UART_PORT
495495
DEBUG_IMX53_UART || \
496496
DEBUG_IMX6Q_UART
497497
default 1
498+
depends on ARCH_MXC
498499
help
499500
Choose UART port on which kernel low-level debug messages
500501
should be output.

‎arch/arm/boot/dts/tegra20.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@
385385

386386
spi@7000d800 {
387387
compatible = "nvidia,tegra20-slink";
388-
reg = <0x7000d480 0x200>;
388+
reg = <0x7000d800 0x200>;
389389
interrupts = <0 83 0x04>;
390390
nvidia,dma-request-selector = <&apbdma 17>;
391391
#address-cells = <1>;

‎arch/arm/boot/dts/tegra30.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372

373373
spi@7000d800 {
374374
compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink";
375-
reg = <0x7000d480 0x200>;
375+
reg = <0x7000d800 0x200>;
376376
interrupts = <0 83 0x04>;
377377
nvidia,dma-request-selector = <&apbdma 17>;
378378
#address-cells = <1>;

‎arch/arm/mach-mxs/mach-mxs.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ static struct fb_videomode mx23evk_video_modes[] = {
4141
.lower_margin = 4,
4242
.hsync_len = 1,
4343
.vsync_len = 1,
44-
.sync = FB_SYNC_DATA_ENABLE_HIGH_ACT |
45-
FB_SYNC_DOTCLK_FAILING_ACT,
4644
},
4745
};
4846

@@ -59,8 +57,6 @@ static struct fb_videomode mx28evk_video_modes[] = {
5957
.lower_margin = 10,
6058
.hsync_len = 10,
6159
.vsync_len = 10,
62-
.sync = FB_SYNC_DATA_ENABLE_HIGH_ACT |
63-
FB_SYNC_DOTCLK_FAILING_ACT,
6460
},
6561
};
6662

@@ -77,7 +73,6 @@ static struct fb_videomode m28evk_video_modes[] = {
7773
.lower_margin = 45,
7874
.hsync_len = 1,
7975
.vsync_len = 1,
80-
.sync = FB_SYNC_DATA_ENABLE_HIGH_ACT,
8176
},
8277
};
8378

@@ -94,9 +89,7 @@ static struct fb_videomode apx4devkit_video_modes[] = {
9489
.lower_margin = 13,
9590
.hsync_len = 48,
9691
.vsync_len = 3,
97-
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT |
98-
FB_SYNC_DATA_ENABLE_HIGH_ACT |
99-
FB_SYNC_DOTCLK_FAILING_ACT,
92+
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
10093
},
10194
};
10295

@@ -113,9 +106,7 @@ static struct fb_videomode apf28dev_video_modes[] = {
113106
.lower_margin = 0x15,
114107
.hsync_len = 64,
115108
.vsync_len = 4,
116-
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT |
117-
FB_SYNC_DATA_ENABLE_HIGH_ACT |
118-
FB_SYNC_DOTCLK_FAILING_ACT,
109+
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
119110
},
120111
};
121112

@@ -132,7 +123,6 @@ static struct fb_videomode cfa10049_video_modes[] = {
132123
.lower_margin = 2,
133124
.hsync_len = 15,
134125
.vsync_len = 15,
135-
.sync = FB_SYNC_DATA_ENABLE_HIGH_ACT
136126
},
137127
};
138128

@@ -259,6 +249,8 @@ static void __init imx23_evk_init(void)
259249
mxsfb_pdata.mode_count = ARRAY_SIZE(mx23evk_video_modes);
260250
mxsfb_pdata.default_bpp = 32;
261251
mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
252+
mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |
253+
MXSFB_SYNC_DOTCLK_FAILING_ACT;
262254
}
263255

264256
static inline void enable_clk_enet_out(void)
@@ -278,6 +270,8 @@ static void __init imx28_evk_init(void)
278270
mxsfb_pdata.mode_count = ARRAY_SIZE(mx28evk_video_modes);
279271
mxsfb_pdata.default_bpp = 32;
280272
mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
273+
mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |
274+
MXSFB_SYNC_DOTCLK_FAILING_ACT;
281275

282276
mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
283277
}
@@ -297,6 +291,7 @@ static void __init m28evk_init(void)
297291
mxsfb_pdata.mode_count = ARRAY_SIZE(m28evk_video_modes);
298292
mxsfb_pdata.default_bpp = 16;
299293
mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT;
294+
mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
300295
}
301296

302297
static void __init sc_sps1_init(void)
@@ -322,6 +317,8 @@ static void __init apx4devkit_init(void)
322317
mxsfb_pdata.mode_count = ARRAY_SIZE(apx4devkit_video_modes);
323318
mxsfb_pdata.default_bpp = 32;
324319
mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
320+
mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |
321+
MXSFB_SYNC_DOTCLK_FAILING_ACT;
325322
}
326323

327324
#define ENET0_MDC__GPIO_4_0 MXS_GPIO_NR(4, 0)
@@ -407,6 +404,7 @@ static void __init cfa10049_init(void)
407404
mxsfb_pdata.mode_count = ARRAY_SIZE(cfa10049_video_modes);
408405
mxsfb_pdata.default_bpp = 32;
409406
mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT;
407+
mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
410408
}
411409

412410
static void __init cfa10037_init(void)
@@ -423,6 +421,8 @@ static void __init apf28_init(void)
423421
mxsfb_pdata.mode_count = ARRAY_SIZE(apf28dev_video_modes);
424422
mxsfb_pdata.default_bpp = 16;
425423
mxsfb_pdata.ld_intf_width = STMLCDIF_16BIT;
424+
mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |
425+
MXSFB_SYNC_DOTCLK_FAILING_ACT;
426426
}
427427

428428
static void __init mxs_machine_init(void)

‎arch/powerpc/perf/power7-pmu.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,20 @@ static struct attribute_group power7_pmu_events_group = {
420420
.attrs = power7_events_attr,
421421
};
422422

423+
PMU_FORMAT_ATTR(event, "config:0-19");
424+
425+
static struct attribute *power7_pmu_format_attr[] = {
426+
&format_attr_event.attr,
427+
NULL,
428+
};
429+
430+
struct attribute_group power7_pmu_format_group = {
431+
.name = "format",
432+
.attrs = power7_pmu_format_attr,
433+
};
434+
423435
static const struct attribute_group *power7_pmu_attr_groups[] = {
436+
&power7_pmu_format_group,
424437
&power7_pmu_events_group,
425438
NULL,
426439
};

‎arch/tile/configs/tilegx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ CONFIG_MD_RAID0=m
330330
CONFIG_MD_RAID1=m
331331
CONFIG_MD_RAID10=m
332332
CONFIG_MD_RAID456=m
333-
CONFIG_MULTICORE_RAID456=y
334333
CONFIG_MD_FAULTY=m
335334
CONFIG_BLK_DEV_DM=m
336335
CONFIG_DM_DEBUG=y

‎arch/tile/configs/tilepro_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ CONFIG_MD_RAID0=m
324324
CONFIG_MD_RAID1=m
325325
CONFIG_MD_RAID10=m
326326
CONFIG_MD_RAID456=m
327-
CONFIG_MULTICORE_RAID456=y
328327
CONFIG_MD_FAULTY=m
329328
CONFIG_BLK_DEV_DM=m
330329
CONFIG_DM_DEBUG=y

‎arch/x86/include/asm/kprobes.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ struct arch_specific_insn {
7777
* a post_handler or break_handler).
7878
*/
7979
int boostable;
80+
bool if_modifier;
8081
};
8182

8283
struct arch_optimized_insn {

‎arch/x86/include/asm/kvm_host.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,8 @@ struct kvm_vcpu_arch {
414414
gpa_t time;
415415
struct pvclock_vcpu_time_info hv_clock;
416416
unsigned int hw_tsc_khz;
417-
unsigned int time_offset;
418-
struct page *time_page;
417+
struct gfn_to_hva_cache pv_time;
418+
bool pv_time_enabled;
419419
/* set guest stopped flag in pvclock flags field */
420420
bool pvclock_set_guest_stopped_request;
421421

‎arch/x86/kernel/cpu/perf_event_intel.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ static struct event_constraint intel_snb_event_constraints[] __read_mostly =
101101
FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
102102
FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
103103
FIXED_EVENT_CONSTRAINT(0x0300, 2), /* CPU_CLK_UNHALTED.REF */
104+
INTEL_UEVENT_CONSTRAINT(0x04a3, 0xf), /* CYCLE_ACTIVITY.CYCLES_NO_DISPATCH */
105+
INTEL_UEVENT_CONSTRAINT(0x05a3, 0xf), /* CYCLE_ACTIVITY.STALLS_L2_PENDING */
106+
INTEL_UEVENT_CONSTRAINT(0x02a3, 0x4), /* CYCLE_ACTIVITY.CYCLES_L1D_PENDING */
107+
INTEL_UEVENT_CONSTRAINT(0x06a3, 0x4), /* CYCLE_ACTIVITY.STALLS_L1D_PENDING */
104108
INTEL_EVENT_CONSTRAINT(0x48, 0x4), /* L1D_PEND_MISS.PENDING */
105109
INTEL_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PREC_DIST */
106110
INTEL_EVENT_CONSTRAINT(0xcd, 0x8), /* MEM_TRANS_RETIRED.LOAD_LATENCY */

‎arch/x86/kernel/kprobes/core.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,9 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
375375
else
376376
p->ainsn.boostable = -1;
377377

378+
/* Check whether the instruction modifies Interrupt Flag or not */
379+
p->ainsn.if_modifier = is_IF_modifier(p->ainsn.insn);
380+
378381
/* Also, displacement change doesn't affect the first byte */
379382
p->opcode = p->ainsn.insn[0];
380383
}
@@ -434,7 +437,7 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
434437
__this_cpu_write(current_kprobe, p);
435438
kcb->kprobe_saved_flags = kcb->kprobe_old_flags
436439
= (regs->flags & (X86_EFLAGS_TF | X86_EFLAGS_IF));
437-
if (is_IF_modifier(p->ainsn.insn))
440+
if (p->ainsn.if_modifier)
438441
kcb->kprobe_saved_flags &= ~X86_EFLAGS_IF;
439442
}
440443

0 commit comments

Comments
 (0)