2 Mon, 02 Nov 2015 09:00:19 +1100
5 $ git reset --hard stable
6 HEAD is now at 523e13455ec9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
7 Merging origin/master (ca04d396a322 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
8 $ git merge origin/master
9 Updating 523e13455ec9..ca04d396a322
11 arch/arm/boot/dts/emev2-kzm9d.dts | 8 +++----
12 arch/arm/boot/dts/ste-snowball.dts | 10 ++++-----
13 arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 12 +++++-----
14 arch/x86/kernel/apic/io_apic.c | 4 +++-
15 arch/x86/kernel/pci-dma.c | 5 +++--
16 arch/x86/kernel/process.c | 3 +++
17 drivers/clocksource/arm_global_timer.c | 9 ++++++--
18 drivers/clocksource/fsl_ftm_timer.c | 2 +-
19 drivers/clocksource/samsung_pwm_timer.c | 2 +-
20 drivers/clocksource/sh_mtu2.c | 4 +++-
21 drivers/clocksource/time-pistachio.c | 3 ++-
22 drivers/clocksource/timer-digicolor.c | 2 +-
23 drivers/clocksource/timer-prima2.c | 2 +-
24 drivers/clocksource/vf_pit_timer.c | 2 +-
25 drivers/gpu/drm/drm_crtc.c | 4 ++--
26 drivers/gpu/drm/radeon/atombios_encoders.c | 19 ++++++++++++----
27 drivers/gpu/drm/radeon/radeon_encoders.c | 1 -
28 drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 +
29 drivers/irqchip/irq-armada-370-xp.c | 1 +
30 drivers/irqchip/irq-tegra.c | 1 +
31 drivers/md/md.c | 3 +--
32 drivers/md/raid5.c | 6 +++--
33 drivers/scsi/mvsas/mv_sas.c | 2 ++
34 drivers/scsi/scsi_dh.c | 8 +++++--
35 drivers/scsi/scsi_priv.h | 2 ++
36 drivers/scsi/scsi_sysfs.c | 2 ++
37 drivers/usb/musb/omap2430.c | 29 ++++++++++++++++++++-----
38 include/linux/omap-dma.h | 2 +-
39 tools/testing/selftests/x86/entry_from_vm86.c | 4 ++++
40 29 files changed, 106 insertions(+), 47 deletions(-)
41 Merging fixes/master (25cb62b76430 Linux 4.3-rc5)
42 $ git merge fixes/master
44 Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
45 $ git merge kbuild-current/rc-fixes
47 Merging arc-current/for-curr (049e6dde7e57 Linux 4.3-rc4)
48 $ git merge arc-current/for-curr
50 Merging arm-current/fixes (38850d786a79 ARM: 8449/1: fix bug in vdsomunge swab32 macro)
51 $ git merge arm-current/fixes
52 Merge made by the 'recursive' strategy.
53 arch/arm/vdso/vdsomunge.c | 2 +-
54 1 file changed, 1 insertion(+), 1 deletion(-)
55 Merging m68k-current/for-linus (95bc06ef049b m68k/defconfig: Update defconfigs for v4.3-rc1)
56 $ git merge m68k-current/for-linus
58 Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
59 $ git merge metag-fixes/fixes
61 Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
62 $ git merge mips-fixes/mips-fixes
64 Merging powerpc-fixes/fixes (977bf062bba3 powerpc/dma: dma_set_coherent_mask() should not be GPL only)
65 $ git merge powerpc-fixes/fixes
67 Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
68 $ git merge powerpc-merge-mpe/fixes
70 Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
71 $ git merge sparc/master
72 Merge made by the 'recursive' strategy.
73 arch/sparc/include/uapi/asm/asi.h | 2 +-
74 arch/sparc/lib/VISsave.S | 10 +++++-----
75 2 files changed, 6 insertions(+), 6 deletions(-)
76 Merging net/master (5dbebbb44a6a net: bcmgenet: Software reset EPHY after power on)
77 $ git merge net/master
78 Merge made by the 'recursive' strategy.
79 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +++-
80 drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 +
81 drivers/net/ethernet/broadcom/genet/bcmmii.c | 18 ++++++++++++++++++
82 drivers/net/ethernet/freescale/fec_main.c | 2 +-
83 drivers/net/ethernet/smsc/smsc911x.c | 1 +
84 net/tipc/udp_media.c | 5 +++++
85 6 files changed, 29 insertions(+), 2 deletions(-)
86 Merging ipsec/master (ca064bd89363 xfrm: Fix pmtu discovery for local generated packets.)
87 $ git merge ipsec/master
89 Merging ipvs/master (6ece90f9a13e netfilter: fix Kconfig dependencies for nf_dup_ipv{4,6})
90 $ git merge ipvs/master
92 Merging sound-current/for-linus (cadd16ea33a9 ALSA: hda - Disable 64bit address for Creative HDA controllers)
93 $ git merge sound-current/for-linus
94 Merge made by the 'recursive' strategy.
95 sound/pci/hda/hda_intel.c | 3 +++
96 sound/pci/hda/patch_realtek.c | 13 +++++++++++++
97 2 files changed, 16 insertions(+)
98 Merging pci-current/for-linus (1266963170f5 PCI: Prevent out of bounds access in numa_node override)
99 $ git merge pci-current/for-linus
101 Merging wireless-drivers/master (de28a05ee28e Merge tag 'iwlwifi-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
102 $ git merge wireless-drivers/master
104 Merging driver-core.current/driver-core-linus (9ffecb102835 Linux 4.3-rc3)
105 $ git merge driver-core.current/driver-core-linus
107 Merging tty.current/tty-linus (f235f664a8af fbcon: initialize blink interval before calling fb_set_par)
108 $ git merge tty.current/tty-linus
110 Merging usb.current/usb-linus (32b88194f71d Linux 4.3-rc7)
111 $ git merge usb.current/usb-linus
113 Merging usb-gadget-fixes/fixes (25cb62b76430 Linux 4.3-rc5)
114 $ git merge usb-gadget-fixes/fixes
116 Merging usb-serial-fixes/usb-linus (32b88194f71d Linux 4.3-rc7)
117 $ git merge usb-serial-fixes/usb-linus
119 Merging usb-chipidea-fixes/ci-for-usb-stable (f256896afdb6 usb: chipidea: otg: gadget module load and unload support)
120 $ git merge usb-chipidea-fixes/ci-for-usb-stable
121 Merge made by the 'recursive' strategy.
122 arch/arm/boot/dts/imx27.dtsi | 16 +++--
123 drivers/usb/chipidea/ci_hdrc_imx.c | 131 ++++++++++++++++++++++++++++++++-----
124 drivers/usb/chipidea/debug.c | 2 +
125 drivers/usb/chipidea/udc.c | 17 +++++
126 4 files changed, 144 insertions(+), 22 deletions(-)
127 Merging staging.current/staging-linus (32b88194f71d Linux 4.3-rc7)
128 $ git merge staging.current/staging-linus
130 Merging char-misc.current/char-misc-linus (25cb62b76430 Linux 4.3-rc5)
131 $ git merge char-misc.current/char-misc-linus
133 Merging input-current/for-linus (195562194aad Input: alps - only the Dell Latitude D420/430/620/630 have separate stick button bits)
134 $ git merge input-current/for-linus
136 Merging crypto-current/master (3fc89adb9fa4 crypto: api - Only abort operations on fatal signal)
137 $ git merge crypto-current/master
139 Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
140 $ git merge ide/master
142 Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
143 $ git merge devicetree-current/devicetree/merge
145 Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
146 $ git merge rr-fixes/fixes
148 Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue)
149 $ git merge vfio-fixes/for-linus
151 Merging kselftest-fixes/fixes (ae7858180510 selftests: exec: revert to default emit rule)
152 $ git merge kselftest-fixes/fixes
154 Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
155 $ git merge backlight-fixes/for-backlight-fixes
157 Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
158 $ git merge ftrace-fixes/for-next-urgent
160 Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
161 $ git merge mfd-fixes/for-mfd-fixes
163 Merging drm-intel-fixes/for-linux-next-fixes (1d337b286098 drm/i915/skl: Prevent unclaimed register writes on skylake.)
164 $ git merge drm-intel-fixes/for-linux-next-fixes
165 Merge made by the 'recursive' strategy.
166 drivers/gpu/drm/i915/intel_pm.c | 5 +++++
167 1 file changed, 5 insertions(+)
168 Merging asm-generic/master (4008cb3ad223 asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h)
169 $ git merge asm-generic/master
170 Auto-merging include/linux/count_zeros.h
171 Auto-merging drivers/block/nvme-core.c
172 Merge made by the 'recursive' strategy.
173 drivers/acpi/nfit.c | 2 +-
174 drivers/acpi/osl.c | 2 +-
175 drivers/block/drbd/drbd_bitmap.c | 2 +-
176 drivers/block/nvme-core.c | 2 +-
177 drivers/crypto/hifn_795x.c | 2 --
178 drivers/edac/i3200_edac.c | 2 +-
179 drivers/edac/ie31200_edac.c | 2 +-
180 drivers/edac/x38_edac.c | 2 +-
181 drivers/gpio/gpio-mxc.c | 2 +-
182 drivers/i2c/busses/i2c-ismt.c | 2 +-
183 drivers/infiniband/hw/mlx5/main.c | 2 +-
184 drivers/net/ethernet/intel/i40e/i40e_osdep.h | 2 +-
185 drivers/net/ethernet/intel/i40evf/i40e_osdep.h | 2 +-
186 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +-
187 drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +-
188 .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +-
189 drivers/net/ethernet/rocker/rocker.c | 2 +-
190 drivers/platform/x86/ibm_rtl.c | 2 +-
191 drivers/platform/x86/intel_ips.c | 2 +-
192 drivers/scsi/qla4xxx/ql4_nx.c | 2 +-
193 drivers/tty/n_tracerouter.c | 2 +-
194 drivers/tty/n_tracesink.c | 2 +-
195 include/asm-generic/cmpxchg.h | 11 ++++---
196 include/asm-generic/io-64-nonatomic-hi-lo.h | 34 ++--------------------
197 include/asm-generic/io-64-nonatomic-lo-hi.h | 34 ++--------------------
198 .../{asm-generic/bitops => linux}/count_zeros.h | 6 ++--
199 include/linux/io-64-nonatomic-hi-lo.h | 32 ++++++++++++++++++++
200 include/linux/io-64-nonatomic-lo-hi.h | 32 ++++++++++++++++++++
201 lib/mpi/longlong.h | 2 +-
202 lib/mpi/mpicoder.c | 2 +-
203 30 files changed, 101 insertions(+), 96 deletions(-)
204 rename include/{asm-generic/bitops => linux}/count_zeros.h (92%)
205 create mode 100644 include/linux/io-64-nonatomic-hi-lo.h
206 create mode 100644 include/linux/io-64-nonatomic-lo-hi.h
207 Merging arc/for-next (5a364c2a1762 ARC: mm: PAE40 support)
208 $ git merge arc/for-next
209 Auto-merging mm/huge_memory.c
210 Auto-merging MAINTAINERS
211 Merge made by the 'recursive' strategy.
212 Documentation/features/vm/THP/arch-support.txt | 2 +-
213 .../features/vm/pte_special/arch-support.txt | 2 +-
215 arch/arc/Kconfig | 40 ++++
216 arch/arc/boot/dts/axc001.dtsi | 2 +-
217 arch/arc/boot/dts/axc003.dtsi | 2 +-
218 arch/arc/boot/dts/axc003_idu.dtsi | 2 +-
219 arch/arc/boot/dts/nsim_hs.dts | 12 +-
220 arch/arc/boot/dts/skeleton.dtsi | 2 +-
221 arch/arc/boot/dts/vdk_axc003.dtsi | 2 +-
222 arch/arc/boot/dts/vdk_axc003_idu.dtsi | 2 +-
223 arch/arc/include/asm/arcregs.h | 6 +-
224 arch/arc/include/asm/cache.h | 2 +
225 arch/arc/include/asm/cacheflush.h | 8 +-
226 arch/arc/include/asm/entry-compact.h | 13 +-
227 arch/arc/include/asm/highmem.h | 61 ++++++
228 arch/arc/include/asm/hugepage.h | 81 +++++++
229 arch/arc/include/asm/irq.h | 1 +
230 arch/arc/include/asm/irqflags-compact.h | 16 +-
231 arch/arc/include/asm/kmap_types.h | 18 ++
232 arch/arc/include/asm/mach_desc.h | 10 +-
233 arch/arc/include/asm/mcip.h | 3 -
234 arch/arc/include/asm/mmu.h | 7 +
235 arch/arc/include/asm/page.h | 9 +-
236 arch/arc/include/asm/pgalloc.h | 12 +-
237 arch/arc/include/asm/pgtable.h | 88 ++++----
238 arch/arc/include/asm/processor.h | 7 +-
239 arch/arc/include/asm/setup.h | 7 +
240 arch/arc/include/asm/smp.h | 7 +
241 arch/arc/include/asm/tlbflush.h | 5 +
242 arch/arc/include/uapi/asm/page.h | 11 +-
243 arch/arc/kernel/entry-arcv2.S | 2 +-
244 arch/arc/kernel/entry-compact.S | 43 ++--
245 arch/arc/kernel/head.S | 49 +++--
246 arch/arc/kernel/intc-compact.c | 90 ++------
247 arch/arc/kernel/irq.c | 20 +-
248 arch/arc/kernel/mcip.c | 46 +---
249 arch/arc/kernel/setup.c | 7 +-
250 arch/arc/kernel/smp.c | 66 +++---
251 arch/arc/kernel/time.c | 3 -
252 arch/arc/kernel/vmlinux.lds.S | 2 +-
253 arch/arc/mm/Makefile | 1 +
254 arch/arc/mm/cache.c | 91 +++++---
255 arch/arc/mm/fault.c | 13 +-
256 arch/arc/mm/highmem.c | 140 ++++++++++++
257 arch/arc/mm/init.c | 104 ++++++---
258 arch/arc/mm/tlb.c | 234 +++++++++++++++++----
259 arch/arc/mm/tlbex.S | 51 +++--
260 arch/arc/plat-axs10x/axs10x.c | 8 -
261 arch/arc/plat-sim/platform.c | 4 -
262 include/asm-generic/pgtable.h | 37 +++-
263 mm/huge_memory.c | 2 +-
264 mm/pgtable-generic.c | 100 +++++----
265 53 files changed, 1075 insertions(+), 479 deletions(-)
266 create mode 100644 arch/arc/include/asm/highmem.h
267 create mode 100644 arch/arc/include/asm/hugepage.h
268 create mode 100644 arch/arc/include/asm/kmap_types.h
269 create mode 100644 arch/arc/mm/highmem.c
270 Merging arm/for-next (4f96dfc97367 Merge branches 'drm-dwhdmi-devel', 'drm-tda998x-devel2' and 'drm-armada-devel' into for-next)
271 $ git merge arm/for-next
272 Removing drivers/gpu/drm/armada/armada_slave.h
273 Removing drivers/gpu/drm/armada/armada_slave.c
274 Removing drivers/gpu/drm/armada/armada_output.h
275 Removing drivers/gpu/drm/armada/armada_output.c
276 Removing Documentation/arm/SA1100/Victor
277 Merge made by the 'recursive' strategy.
278 Documentation/arm/SA1100/Victor | 16 -
279 Documentation/arm/memory.txt | 2 +-
280 Documentation/devicetree/bindings/arm/twd.txt | 5 +
281 arch/arm/Kconfig | 7 +-
282 arch/arm/include/asm/cmpxchg.h | 12 +
283 arch/arm/include/asm/irqflags.h | 10 +
284 arch/arm/include/asm/mach/arch.h | 2 +-
285 arch/arm/include/asm/memory.h | 2 +
286 arch/arm/include/asm/pgtable.h | 2 +-
287 arch/arm/include/asm/smp.h | 4 +-
288 arch/arm/include/asm/unistd.h | 7 -
289 arch/arm/kernel/devtree.c | 12 +-
290 arch/arm/kernel/entry-armv.S | 33 +-
291 arch/arm/kernel/hw_breakpoint.c | 1 -
292 arch/arm/kernel/kgdb.c | 31 +-
293 arch/arm/kernel/smp.c | 12 +-
294 arch/arm/kernel/smp_twd.c | 11 +-
295 arch/arm/kernel/traps.c | 52 --
296 arch/arm/lib/clear_user.S | 4 +
297 arch/arm/mm/Kconfig | 12 -
298 arch/arm/mm/dma-mapping.c | 7 +
299 arch/arm/mm/fault.c | 22 +
300 arch/arm/mm/fault.h | 1 +
301 arch/arm/mm/mmu.c | 4 +
302 drivers/gpu/drm/armada/Kconfig | 9 -
303 drivers/gpu/drm/armada/Makefile | 3 +-
304 drivers/gpu/drm/armada/armada_crtc.c | 258 +++++++---
305 drivers/gpu/drm/armada/armada_crtc.h | 34 +-
306 drivers/gpu/drm/armada/armada_drm.h | 16 -
307 drivers/gpu/drm/armada/armada_drv.c | 148 +-----
308 drivers/gpu/drm/armada/armada_output.c | 142 ------
309 drivers/gpu/drm/armada/armada_output.h | 33 --
310 drivers/gpu/drm/armada/armada_overlay.c | 147 +++---
311 drivers/gpu/drm/armada/armada_slave.c | 139 ------
312 drivers/gpu/drm/armada/armada_slave.h | 26 -
313 drivers/gpu/drm/bridge/Kconfig | 12 +
314 drivers/gpu/drm/bridge/Makefile | 1 +
315 drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.c | 653 ++++++++++++++++++++++++++
316 drivers/gpu/drm/bridge/dw_hdmi-audio.h | 14 +
317 drivers/gpu/drm/bridge/dw_hdmi.c | 391 +++++++++------
318 drivers/gpu/drm/bridge/dw_hdmi.h | 3 +
319 drivers/gpu/drm/i2c/tda998x_drv.c | 487 ++++++++-----------
320 drivers/gpu/ipu-v3/ipu-dc.c | 15 +-
321 drivers/gpu/ipu-v3/ipu-di.c | 129 ++---
322 include/linux/amba/bus.h | 2 -
323 lib/nmi_backtrace.c | 11 +-
324 46 files changed, 1609 insertions(+), 1335 deletions(-)
325 delete mode 100644 Documentation/arm/SA1100/Victor
326 delete mode 100644 drivers/gpu/drm/armada/armada_output.c
327 delete mode 100644 drivers/gpu/drm/armada/armada_output.h
328 delete mode 100644 drivers/gpu/drm/armada/armada_slave.c
329 delete mode 100644 drivers/gpu/drm/armada/armada_slave.h
330 create mode 100644 drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.c
331 create mode 100644 drivers/gpu/drm/bridge/dw_hdmi-audio.h
332 Merging arm-perf/for-next/perf (6ff33f3902c3 Linux 4.3-rc1)
333 $ git merge arm-perf/for-next/perf
335 Merging arm-soc/for-next (cd676572bf18 ARM: SoC: document merges)
336 $ git merge arm-soc/for-next
337 Removing drivers/clk/clk-bcm2835.c
338 Removing arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi
339 Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts
340 Auto-merging arch/arm/mm/Kconfig
341 Removing arch/arm/mach-shmobile/sh-gpio.h
342 Removing arch/arm/mach-shmobile/r8a7778.h
343 Removing arch/arm/mach-shmobile/intc.h
344 Removing arch/arm/mach-shmobile/console.c
345 Removing arch/arm/mach-shmobile/clock.h
346 Removing arch/arm/mach-shmobile/clock.c
347 Removing arch/arm/mach-shmobile/clock-r8a7778.c
348 Removing arch/arm/mach-shmobile/board-bockw.c
349 Removing arch/arm/mach-shmobile/board-bockw-reference.c
350 Removing arch/arm/mach-shmobile/Makefile.boot
351 Removing arch/arm/mach-omap2/sram34xx.S
352 Removing arch/arm/mach-omap2/devices.h
353 Removing arch/arm/mach-omap2/clkt34xx_dpll3m2.c
354 Removing arch/arm/mach-omap1/include/mach/board-voiceblue.h
355 Removing arch/arm/mach-omap1/board-voiceblue.c
356 Removing arch/arm/configs/bockw_defconfig
357 Removing arch/arm/boot/dts/r8a7778-bockw-reference.dts
358 Auto-merging arch/arm/Kconfig
359 Auto-merging MAINTAINERS
360 Auto-merging Documentation/devicetree/bindings/power/pd-samsung.txt
361 Auto-merging Documentation/devicetree/bindings/board/fsl-board.txt
362 Removing Documentation/devicetree/bindings/arm/samsung-boards.txt
363 Merge made by the 'recursive' strategy.
364 Documentation/arm/Samsung/Bootloader-interface.txt | 5 +-
365 Documentation/arm/keystone/knav-qmss.txt | 56 +
366 Documentation/arm/sunxi/README | 2 +-
367 Documentation/devicetree/bindings/arm/amlogic.txt | 10 +-
368 Documentation/devicetree/bindings/arm/apm/scu.txt | 17 +
369 Documentation/devicetree/bindings/arm/arm,scpi.txt | 188 +++
370 .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 162 +-
371 .../devicetree/bindings/arm/bcm/brcm,nsp.txt | 34 +
372 .../devicetree/bindings/arm/coherency-fabric.txt | 5 +
373 Documentation/devicetree/bindings/arm/cpus.txt | 2 +
374 Documentation/devicetree/bindings/arm/fsl.txt | 16 +-
375 .../bindings/arm/hisilicon/hisilicon.txt | 4 +
376 .../devicetree/bindings/arm/keystone/keystone.txt | 20 +-
377 .../devicetree/bindings/arm/mvebu-cpu-config.txt | 20 +
378 Documentation/devicetree/bindings/arm/pmu.txt | 1 +
379 Documentation/devicetree/bindings/arm/psci.txt | 6 +
380 Documentation/devicetree/bindings/arm/rockchip.txt | 11 +
381 .../devicetree/bindings/arm/samsung-boards.txt | 27 -
382 .../bindings/arm/samsung/samsung-boards.txt | 69 +
383 Documentation/devicetree/bindings/arm/shmobile.txt | 10 +-
384 Documentation/devicetree/bindings/arm/sunxi.txt | 1 +
385 .../bindings/arm/uniphier/cache-uniphier.txt | 60 +
386 .../{powerpc/fsl/board.txt => board/fsl-board.txt} | 14 +-
387 .../devicetree/bindings/bus/sunxi-rsb.txt | 47 +
388 .../bindings/clock/brcm,bcm2835-cprman.txt | 45 +
389 .../devicetree/bindings/clock/qcom,gcc.txt | 4 +
390 .../devicetree/bindings/clock/qcom,mmcc.txt | 4 +
391 .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 4 +-
392 .../devicetree/bindings/hwmon/pwm-fan.txt | 29 +-
393 .../devicetree/bindings/iommu/samsung,sysmmu.txt | 2 +-
394 .../bindings/memory-controllers/arm,pl172.txt | 8 +-
395 .../renesas-memory-controllers.txt | 6 +-
396 Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +
397 .../devicetree/bindings/pci/arm,juno-r1-pcie.txt | 10 +
398 .../bindings/pci/plda,xpressrich3-axi.txt | 12 +
399 .../power_domain.txt => power/pd-samsung.txt} | 5 +-
400 .../devicetree/bindings/power_supply/qcom_smbb.txt | 131 ++
401 .../devicetree/bindings/soc/mediatek/scpsys.txt | 10 +-
402 .../devicetree/bindings/soc/qcom/qcom,smem.txt | 57 +
403 .../bindings/soc/rockchip/power_domain.txt | 46 +
404 .../bindings/soc/ti/keystone-navigator-qmss.txt | 1 -
405 .../bindings/timer/mediatek,mtk-timer.txt | 8 +-
406 Documentation/devicetree/bindings/usb/dwc3.txt | 3 +-
407 .../devicetree/bindings/vendor-prefixes.txt | 3 +
408 Documentation/hwmon/scpi-hwmon | 33 +
409 Documentation/spi/pxa2xx | 6 -
411 arch/arm/Kconfig | 26 +-
412 arch/arm/Kconfig.debug | 44 +-
413 arch/arm/arm-soc-for-next-contents.txt | 287 ++++
414 arch/arm/boot/dts/Makefile | 57 +-
415 arch/arm/boot/dts/am335x-base0033.dts | 48 +-
416 arch/arm/boot/dts/am335x-bone-common.dtsi | 3 +-
417 arch/arm/boot/dts/am335x-bonegreen.dts | 53 +
418 arch/arm/boot/dts/am335x-evm.dts | 2 +-
419 arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
420 arch/arm/boot/dts/am335x-igep0033.dtsi | 40 +-
421 arch/arm/boot/dts/am335x-phycore-som.dtsi | 36 +-
422 arch/arm/boot/dts/am335x-wega.dtsi | 13 +-
423 arch/arm/boot/dts/am437x-gp-evm.dts | 31 +-
424 arch/arm/boot/dts/am437x-idk-evm.dts | 2 +-
425 arch/arm/boot/dts/am437x-sk-evm.dts | 2 +-
426 arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
427 arch/arm/boot/dts/am57xx-beagle-x15.dts | 117 +-
428 arch/arm/boot/dts/armada-370-db.dts | 3 +-
429 arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 3 +-
430 arch/arm/boot/dts/armada-370-mirabox.dts | 7 +-
431 arch/arm/boot/dts/armada-370-netgear-rn102.dts | 9 +-
432 arch/arm/boot/dts/armada-370-netgear-rn104.dts | 9 +-
433 arch/arm/boot/dts/armada-370-rd.dts | 3 +-
434 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts | 36 +
435 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts | 133 ++
436 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 231 +++
437 .../dts/armada-370-seagate-personal-cloud-2bay.dts | 51 +
438 .../boot/dts/armada-370-seagate-personal-cloud.dts | 37 +
439 .../dts/armada-370-seagate-personal-cloud.dtsi | 178 +++
440 arch/arm/boot/dts/armada-370-synology-ds213j.dts | 3 +-
441 arch/arm/boot/dts/armada-370.dtsi | 37 +
442 arch/arm/boot/dts/armada-375-db.dts | 4 +-
443 arch/arm/boot/dts/armada-375.dtsi | 33 +
444 arch/arm/boot/dts/armada-385-db-ap.dts | 4 +-
445 arch/arm/boot/dts/armada-385-linksys.dtsi | 4 +-
446 arch/arm/boot/dts/armada-388-db.dts | 4 +-
447 arch/arm/boot/dts/armada-388-gp.dts | 19 +-
448 arch/arm/boot/dts/armada-388-rd.dts | 4 +-
449 arch/arm/boot/dts/armada-38x.dtsi | 33 +
450 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 4 +-
451 arch/arm/boot/dts/armada-xp-db.dts | 4 +-
452 arch/arm/boot/dts/armada-xp-gp.dts | 4 +-
453 arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 4 +-
454 arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 +-
455 arch/arm/boot/dts/armada-xp-matrix.dts | 4 +-
456 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 90 +-
457 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 +-
458 arch/arm/boot/dts/armada-xp-synology-ds414.dts | 4 +-
459 arch/arm/boot/dts/armada-xp.dtsi | 35 +
460 arch/arm/boot/dts/at91-sama5d2_xplained.dts | 118 ++
461 arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +-
462 arch/arm/boot/dts/at91-sama5d4_xplained.dts | 2 +-
463 arch/arm/boot/dts/at91-sama5d4ek.dts | 27 +
464 arch/arm/boot/dts/at91rm9200.dtsi | 8 +-
465 arch/arm/boot/dts/at91sam9260.dtsi | 2 +-
466 arch/arm/boot/dts/at91sam9261.dtsi | 2 +-
467 arch/arm/boot/dts/at91sam9263.dtsi | 2 +-
468 arch/arm/boot/dts/at91sam9g45.dtsi | 2 +-
469 arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +
470 arch/arm/boot/dts/at91sam9n12.dtsi | 2 +-
471 arch/arm/boot/dts/at91sam9n12ek.dts | 8 +-
472 arch/arm/boot/dts/at91sam9rl.dtsi | 2 +-
473 arch/arm/boot/dts/at91sam9x5.dtsi | 5 +-
474 arch/arm/boot/dts/at91sam9x5ek.dtsi | 8 +
475 arch/arm/boot/dts/axp209.dtsi | 5 +
476 arch/arm/boot/dts/axp22x.dtsi | 143 ++
477 arch/arm/boot/dts/bcm-cygnus.dtsi | 334 +++--
478 arch/arm/boot/dts/bcm-nsp.dtsi | 119 ++
479 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 30 +
480 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 23 +
481 arch/arm/boot/dts/bcm2835-rpi-b.dts | 8 +-
482 arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 +
483 arch/arm/boot/dts/bcm2835.dtsi | 64 +-
484 arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 11 +
485 arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 1 +
486 arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 106 ++
487 arch/arm/boot/dts/bcm7445.dtsi | 84 ++
488 arch/arm/boot/dts/bcm911360_entphn.dts | 28 +-
489 arch/arm/boot/dts/bcm911360k.dts | 9 +-
490 arch/arm/boot/dts/bcm958300k.dts | 44 +-
491 arch/arm/boot/dts/bcm958305k.dts | 40 +-
492 arch/arm/boot/dts/bcm958625k.dts | 57 +
493 arch/arm/boot/dts/bcm9hmidc.dtsi | 42 +
494 arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 3 +-
495 arch/arm/boot/dts/berlin2.dtsi | 23 +
496 arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 3 +-
497 arch/arm/boot/dts/berlin2cd.dtsi | 20 +
498 arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 3 +-
499 arch/arm/boot/dts/berlin2q.dtsi | 23 +
500 arch/arm/boot/dts/cx92755.dtsi | 7 +
501 arch/arm/boot/dts/cx92755_equinox.dts | 9 +
502 arch/arm/boot/dts/dove.dtsi | 17 +-
503 arch/arm/boot/dts/dra7-evm.dts | 222 ++-
504 arch/arm/boot/dts/dra7.dtsi | 60 +
505 arch/arm/boot/dts/dra72-evm.dts | 162 +-
506 arch/arm/boot/dts/dra72x.dtsi | 21 +
507 arch/arm/boot/dts/dra74x.dtsi | 51 +
508 arch/arm/boot/dts/efm32gg-dk3750.dts | 8 +-
509 arch/arm/boot/dts/efm32gg.dtsi | 32 +-
510 arch/arm/boot/dts/exynos3250-monk.dts | 9 +-
511 arch/arm/boot/dts/exynos3250-rinato.dts | 11 +-
512 arch/arm/boot/dts/exynos3250.dtsi | 4 +-
513 arch/arm/boot/dts/exynos4.dtsi | 8 +
514 arch/arm/boot/dts/exynos4210-origen.dts | 15 +-
515 arch/arm/boot/dts/exynos4210-smdkv310.dts | 3 +-
516 arch/arm/boot/dts/exynos4210-trats.dts | 31 +-
517 arch/arm/boot/dts/exynos4210-universal_c210.dts | 44 +-
518 arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 27 +-
519 arch/arm/boot/dts/exynos4412-odroidu3.dts | 45 +-
520 arch/arm/boot/dts/exynos4412-odroidx.dts | 8 +-
521 arch/arm/boot/dts/exynos4412-origen.dts | 15 +-
522 arch/arm/boot/dts/exynos4412-tiny4412.dts | 9 +-
523 arch/arm/boot/dts/exynos4412-trats2.dts | 140 +-
524 arch/arm/boot/dts/exynos5250-arndale.dts | 8 +-
525 arch/arm/boot/dts/exynos5250-smdk5250.dts | 16 +-
526 arch/arm/boot/dts/exynos5250-snow-common.dtsi | 684 +++++++++
527 arch/arm/boot/dts/exynos5250-snow-rev5.dts | 47 +
528 arch/arm/boot/dts/exynos5250-snow.dts | 671 +--------
529 arch/arm/boot/dts/exynos5250.dtsi | 4 +
530 arch/arm/boot/dts/exynos5420-arndale-octa.dts | 3 +-
531 arch/arm/boot/dts/exynos5420-peach-pit.dts | 9 +-
532 arch/arm/boot/dts/exynos5420-smdk5420.dts | 14 +-
533 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 61 +
534 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 102 +-
535 arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 51 +
536 arch/arm/boot/dts/exynos5422-odroidxu3.dts | 51 +
537 arch/arm/boot/dts/exynos5422-odroidxu4.dts | 48 +
538 arch/arm/boot/dts/exynos5440-ssdk5440.dts | 5 +-
539 arch/arm/boot/dts/exynos5800-peach-pi.dts | 9 +-
540 arch/arm/boot/dts/hi3620-hi4511.dts | 3 +-
541 arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 2 +-
542 arch/arm/boot/dts/imx23.dtsi | 6 +-
543 arch/arm/boot/dts/imx28-evk.dts | 2 +-
544 arch/arm/boot/dts/imx28-m28evk.dts | 2 +-
545 arch/arm/boot/dts/imx28.dtsi | 6 +-
546 arch/arm/boot/dts/imx31.dtsi | 2 +-
547 arch/arm/boot/dts/imx35.dtsi | 2 +-
548 arch/arm/boot/dts/imx50-evk.dts | 2 +-
549 arch/arm/boot/dts/imx53-smd.dts | 2 +-
550 arch/arm/boot/dts/imx6dl-nit6xlite.dts | 49 +
551 arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 44 +-
552 arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +-
553 arch/arm/boot/dts/imx6dl-sabrelite.dts | 40 +-
554 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +-
555 arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +-
556 arch/arm/boot/dts/imx6q-nitrogen6_max.dts | 53 +
557 arch/arm/boot/dts/imx6q-nitrogen6x.dts | 44 +-
558 arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +-
559 arch/arm/boot/dts/imx6q-sabrelite.dts | 40 +-
560 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +-
561 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 2 +-
562 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +-
563 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 630 ++++++++
564 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 873 +++++++++++
565 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 189 ++-
566 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 6 +-
567 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +-
568 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 118 +-
569 arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +-
570 arch/arm/boot/dts/imx6qdl.dtsi | 12 +-
571 arch/arm/boot/dts/imx6sl-evk.dts | 2 +-
572 arch/arm/boot/dts/imx6sl.dtsi | 21 +-
573 arch/arm/boot/dts/imx6sx-sdb-reva.dts | 4 +-
574 arch/arm/boot/dts/imx6sx-sdb.dts | 4 +-
575 arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 +-
576 arch/arm/boot/dts/imx6sx.dtsi | 2 +-
577 arch/arm/boot/dts/imx6ul-14x14-evk.dts | 22 +
578 arch/arm/boot/dts/imx6ul.dtsi | 29 +
579 arch/arm/boot/dts/imx7d-pinfunc.h | 122 +-
580 arch/arm/boot/dts/imx7d-sdb.dts | 100 +-
581 arch/arm/boot/dts/imx7d.dtsi | 165 ++
582 arch/arm/boot/dts/k2e-evm.dts | 2 +-
583 arch/arm/boot/dts/k2e-netcp.dtsi | 23 +
584 arch/arm/boot/dts/k2e.dtsi | 3 +
585 arch/arm/boot/dts/k2hk-evm.dts | 2 +-
586 arch/arm/boot/dts/k2hk-netcp.dtsi | 24 +
587 arch/arm/boot/dts/k2hk.dtsi | 3 +
588 arch/arm/boot/dts/k2l-evm.dts | 2 +-
589 arch/arm/boot/dts/k2l-netcp.dtsi | 23 +
590 arch/arm/boot/dts/k2l.dtsi | 3 +
591 arch/arm/boot/dts/keystone.dtsi | 7 +-
592 arch/arm/boot/dts/kirkwood.dtsi | 29 +-
593 arch/arm/boot/dts/lpc18xx.dtsi | 134 ++
594 arch/arm/boot/dts/lpc4350-hitex-eval.dts | 175 +++
595 arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 95 ++
596 arch/arm/boot/dts/ls1021a-twr.dts | 13 +
597 arch/arm/boot/dts/ls1021a.dtsi | 44 +
598 arch/arm/boot/dts/meson8b-mxq.dts | 67 +
599 arch/arm/boot/dts/meson8b-odroidc1.dts | 67 +
600 arch/arm/boot/dts/meson8b.dtsi | 186 +++
601 arch/arm/boot/dts/mt8127.dtsi | 27 +
602 arch/arm/boot/dts/mt8135-evbp1.dts | 23 -
603 arch/arm/boot/dts/mt8135.dtsi | 27 +
604 arch/arm/boot/dts/nspire.dtsi | 2 +-
605 arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 6 +-
606 arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
607 arch/arm/boot/dts/omap3-beagle.dts | 2 +-
608 arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +-
609 arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 2 +-
610 arch/arm/boot/dts/omap3-evm-common.dtsi | 4 +-
611 arch/arm/boot/dts/omap3-gta04.dtsi | 10 +-
612 arch/arm/boot/dts/omap3-gta04a5.dts | 2 +-
613 arch/arm/boot/dts/omap3-igep.dtsi | 70 +-
614 arch/arm/boot/dts/omap3-igep0020-common.dtsi | 60 +-
615 arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 2 +-
616 arch/arm/boot/dts/omap3-igep0020.dts | 11 +-
617 arch/arm/boot/dts/omap3-igep0030-common.dtsi | 2 +-
618 arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 2 +-
619 arch/arm/boot/dts/omap3-igep0030.dts | 2 +-
620 arch/arm/boot/dts/omap3-ldp.dts | 2 +-
621 arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 4 +-
622 arch/arm/boot/dts/omap3-lilly-dbb056.dts | 4 +-
623 arch/arm/boot/dts/omap3-n950-n9.dtsi | 2 +-
624 arch/arm/boot/dts/omap3-overo-base.dtsi | 2 +-
625 arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +-
626 arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 2 +-
627 arch/arm/boot/dts/omap3-pandora-common.dtsi | 4 +-
628 arch/arm/boot/dts/omap3-tao3530.dtsi | 4 +-
629 arch/arm/boot/dts/omap3-zoom3.dts | 2 +-
630 arch/arm/boot/dts/omap4-panda-common.dtsi | 4 +-
631 arch/arm/boot/dts/omap4-sdp.dts | 6 +-
632 arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 2 +-
633 arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 +-
634 arch/arm/boot/dts/omap4460.dtsi | 2 +-
635 arch/arm/boot/dts/omap5-board-common.dtsi | 655 ++++++++
636 arch/arm/boot/dts/omap5-cm-t54.dts | 2 +-
637 arch/arm/boot/dts/omap5-igep0050.dts | 54 +
638 arch/arm/boot/dts/omap5-uevm.dts | 618 +-------
639 arch/arm/boot/dts/orion5x.dtsi | 22 +-
640 arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 48 +-
641 arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 60 +-
642 arch/arm/boot/dts/qcom-apq8064.dtsi | 43 +-
643 arch/arm/boot/dts/qcom-apq8084.dtsi | 1 +
644 arch/arm/boot/dts/qcom-msm8974.dtsi | 95 +-
645 arch/arm/boot/dts/qcom-pm8941.dtsi | 24 +-
646 arch/arm/boot/dts/r8a7778-bockw-reference.dts | 139 --
647 arch/arm/boot/dts/r8a7778.dtsi | 2 +-
648 arch/arm/boot/dts/r8a7779-marzen.dts | 6 +-
649 arch/arm/boot/dts/r8a7790-lager.dts | 16 +-
650 arch/arm/boot/dts/r8a7790.dtsi | 2 +-
651 arch/arm/boot/dts/r8a7791-koelsch.dts | 9 +-
652 arch/arm/boot/dts/r8a7791-porter.dts | 282 ++++
653 arch/arm/boot/dts/r8a7791.dtsi | 2 +-
654 arch/arm/boot/dts/r8a7794-silk.dts | 114 ++
655 arch/arm/boot/dts/r8a7794.dtsi | 326 +++-
656 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi | 41 +
657 arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 +
658 arch/arm/boot/dts/rk3066a-marsboard.dts | 8 +
659 arch/arm/boot/dts/rk3066a-rayeager.dts | 2 +
660 arch/arm/boot/dts/rk3188-radxarock.dts | 21 +
661 arch/arm/boot/dts/rk3188.dtsi | 20 +
662 arch/arm/boot/dts/rk3288-firefly.dtsi | 55 +-
663 arch/arm/boot/dts/rk3288-popmetal.dts | 85 +-
664 arch/arm/boot/dts/rk3288-rock2-som.dtsi | 277 ++++
665 arch/arm/boot/dts/rk3288-rock2-square.dts | 167 +++
666 arch/arm/boot/dts/rk3288-veyron-jaq.dts | 176 +++
667 arch/arm/boot/dts/rk3288-veyron.dtsi | 12 -
668 arch/arm/boot/dts/rk3288.dtsi | 134 +-
669 arch/arm/boot/dts/s3c2416.dtsi | 2 +-
670 arch/arm/boot/dts/s5pv210-aquila.dts | 2 +-
671 arch/arm/boot/dts/s5pv210-goni.dts | 4 +-
672 arch/arm/boot/dts/sama5d2-pinfunc.h | 880 +++++++++++
673 arch/arm/boot/dts/sama5d2.dtsi | 154 +-
674 arch/arm/boot/dts/sama5d3.dtsi | 5 +-
675 arch/arm/boot/dts/sama5d3_mci2.dtsi | 6 +-
676 arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +
677 arch/arm/boot/dts/sama5d4.dtsi | 49 +-
678 arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
679 arch/arm/boot/dts/socfpga.dtsi | 135 +-
680 arch/arm/boot/dts/socfpga_arria10.dtsi | 8 +
681 arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 27 +
682 arch/arm/boot/dts/stih407-b2120.dts | 1 +
683 arch/arm/boot/dts/stih407-family.dtsi | 74 +-
684 arch/arm/boot/dts/stih407-pinctrl.dtsi | 390 ++++-
685 arch/arm/boot/dts/stih407.dtsi | 13 -
686 arch/arm/boot/dts/stih410-b2120.dts | 25 +
687 arch/arm/boot/dts/stih410.dtsi | 23 +-
688 arch/arm/boot/dts/stih418-b2199.dts | 8 +
689 arch/arm/boot/dts/stih418-clock.dtsi | 2 +-
690 arch/arm/boot/dts/stih418.dtsi | 6 +
691 arch/arm/boot/dts/stihxxx-b2120.dtsi | 14 +
692 arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 +
693 arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 12 +
694 arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 4 +
695 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 11 +-
696 arch/arm/boot/dts/sun4i-a10-inet1.dts | 226 +++
697 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 117 +-
698 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 227 +++
699 arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 15 +
700 arch/arm/boot/dts/sun4i-a10-marsboard.dts | 23 +
701 arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 12 +
702 arch/arm/boot/dts/sun4i-a10-pcduino.dts | 58 +-
703 arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 78 +
704 arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 199 +++
705 arch/arm/boot/dts/sun4i-a10.dtsi | 31 +
706 arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 159 ++
707 arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +-
708 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 224 +++
709 arch/arm/boot/dts/sun5i-a10s.dtsi | 35 +-
710 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts | 227 +++
711 arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 60 +
712 arch/arm/boot/dts/sun5i-a13.dtsi | 10 +
713 arch/arm/boot/dts/sun5i-q8-common.dtsi | 180 +++
714 arch/arm/boot/dts/sun5i-r8-chip.dts | 218 +++
715 arch/arm/boot/dts/sun5i-r8.dtsi | 59 +
716 arch/arm/boot/dts/sun5i.dtsi | 52 +
717 arch/arm/boot/dts/sun6i-a31-colombus.dts | 36 +
718 arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 132 +-
719 arch/arm/boot/dts/sun6i-a31.dtsi | 31 +-
720 arch/arm/boot/dts/sun6i-a31s-primo81.dts | 255 ++++
721 arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 140 ++
722 arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 153 ++
723 arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 194 +++
724 .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 134 ++
725 arch/arm/boot/dts/sun7i-a20-bananapi.dts | 74 +-
726 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 23 +
727 arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 4 +
728 arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 198 +++
729 arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 12 +
730 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 47 +
731 arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 6 +
732 arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 29 +
733 arch/arm/boot/dts/sun7i-a20-orangepi.dts | 29 +
734 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 65 +-
735 arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 54 +-
736 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 33 +-
737 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 226 +++
738 arch/arm/boot/dts/sun7i-a20.dtsi | 39 +
739 arch/arm/boot/dts/sun8i-a23-a33.dtsi | 70 +-
740 arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts | 145 ++
741 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts | 55 +-
742 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 137 +-
743 arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 65 +
744 arch/arm/boot/dts/sun8i-a23.dtsi | 25 +
745 arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts | 89 +-
746 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts | 134 +-
747 arch/arm/boot/dts/sun8i-a33-q8-tablet.dts | 65 +
748 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 4 +
749 arch/arm/boot/dts/sun8i-a33.dtsi | 45 +
750 arch/arm/boot/dts/sun8i-q8-common.dtsi | 101 ++
751 arch/arm/boot/dts/sun9i-a80.dtsi | 2 +-
752 arch/arm/boot/dts/sunxi-q8-common.dtsi | 83 ++
753 arch/arm/boot/dts/tegra124-nyan.dtsi | 15 +-
754 arch/arm/boot/dts/tegra124.dtsi | 20 +-
755 arch/arm/boot/dts/tegra20.dtsi | 4 +-
756 arch/arm/boot/dts/tegra30-apalis-eval.dts | 13 +-
757 arch/arm/boot/dts/tegra30-apalis.dtsi | 214 +--
758 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 9 +-
759 arch/arm/boot/dts/tegra30-colibri.dtsi | 196 ++-
760 arch/arm/boot/dts/tegra30.dtsi | 10 +-
761 arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 8 +-
762 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 20 +-
763 arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts | 8 +-
764 arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 8 +-
765 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 21 +-
766 arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 34 +-
767 arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 8 +-
768 arch/arm/boot/dts/uniphier-ph1-sld3.dtsi | 21 +-
769 arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 8 +-
770 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 20 +-
771 arch/arm/boot/dts/uniphier-proxstream2-gentil.dts | 78 +
772 arch/arm/boot/dts/uniphier-proxstream2-vodka.dts | 78 +
773 arch/arm/boot/dts/uniphier-proxstream2.dtsi | 23 +-
774 arch/arm/boot/dts/vf-colibri.dtsi | 39 +
775 arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 5 +
776 arch/arm/boot/dts/vf500-colibri.dtsi | 47 +
777 arch/arm/boot/dts/vf610-twr.dts | 47 +
778 arch/arm/boot/dts/vfxxx.dtsi | 11 +
779 arch/arm/boot/dts/wm8750.dtsi | 2 +-
780 arch/arm/configs/at91_dt_defconfig | 15 -
781 arch/arm/configs/bockw_defconfig | 133 --
782 arch/arm/configs/exynos_defconfig | 18 +-
783 arch/arm/configs/imx_v6_v7_defconfig | 2 +-
784 arch/arm/configs/keystone_defconfig | 54 +-
785 arch/arm/configs/lpc18xx_defconfig | 26 +-
786 arch/arm/configs/multi_v7_defconfig | 48 +-
787 arch/arm/configs/mvebu_v7_defconfig | 9 +-
788 arch/arm/configs/qcom_defconfig | 8 +-
789 arch/arm/configs/sama5_defconfig | 16 +-
790 arch/arm/configs/shmobile_defconfig | 4 +-
791 arch/arm/configs/socfpga_defconfig | 2 +
792 arch/arm/configs/sunxi_defconfig | 4 +
793 arch/arm/configs/tegra_defconfig | 10 +-
794 arch/arm/include/asm/hardware/cache-uniphier.h | 46 +
795 arch/arm/include/debug/at91.S | 18 +-
796 arch/arm/kernel/irq.c | 3 +
797 arch/arm/kernel/psci_smp.c | 4 +-
798 arch/arm/mach-at91/pm_suspend.S | 2 +
799 arch/arm/mach-bcm/Kconfig | 15 +
800 arch/arm/mach-bcm/Makefile | 5 +-
801 arch/arm/mach-bcm/bcm_nsp.c | 25 +
802 arch/arm/mach-bcm/brcmstb.c | 9 +
803 arch/arm/mach-berlin/berlin.c | 6 +
804 arch/arm/mach-berlin/platsmp.c | 38 +-
805 arch/arm/mach-cns3xxx/pcie.c | 71 +-
806 arch/arm/mach-davinci/board-dm644x-evm.c | 4 +-
807 arch/arm/mach-davinci/clock.c | 16 +-
808 arch/arm/mach-digicolor/Kconfig | 3 +
809 arch/arm/mach-exynos/suspend.c | 3 +-
810 arch/arm/mach-imx/common.h | 1 +
811 arch/arm/mach-imx/gpc.c | 8 +-
812 arch/arm/mach-imx/mach-imx6ul.c | 9 +
813 arch/arm/mach-imx/mach-imx7d.c | 74 +
814 arch/arm/mach-imx/pm-imx6.c | 46 +-
815 arch/arm/mach-imx/suspend-imx6.S | 3 +
816 arch/arm/mach-keystone/keystone.c | 3 +
817 arch/arm/mach-mediatek/Makefile | 3 +
818 arch/arm/mach-mediatek/mediatek.c | 27 +
819 arch/arm/mach-mediatek/platsmp.c | 141 ++
820 arch/arm/mach-meson/Kconfig | 5 +
821 arch/arm/mach-meson/meson.c | 1 +
822 arch/arm/mach-mvebu/board-v7.c | 35 -
823 arch/arm/mach-mvebu/coherency.c | 60 +
824 arch/arm/mach-mvebu/pmsu.c | 33 +-
825 arch/arm/mach-omap1/Kconfig | 7 -
826 arch/arm/mach-omap1/Makefile | 1 -
827 arch/arm/mach-omap1/board-voiceblue.c | 296 ----
828 arch/arm/mach-omap1/include/mach/board-voiceblue.h | 19 -
829 arch/arm/mach-omap2/Kconfig | 1 +
830 arch/arm/mach-omap2/Makefile | 3 -
831 arch/arm/mach-omap2/board-generic.c | 12 +-
832 arch/arm/mach-omap2/board-ldp.c | 2 +-
833 arch/arm/mach-omap2/board-rx51.c | 2 +-
834 arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 122 --
835 arch/arm/mach-omap2/common.h | 3 +-
836 arch/arm/mach-omap2/devices.c | 53 -
837 arch/arm/mach-omap2/devices.h | 19 -
838 arch/arm/mach-omap2/id.c | 30 +-
839 arch/arm/mach-omap2/omap-hotplug.c | 2 +-
840 arch/arm/mach-omap2/omap-wakeupgen.c | 10 +-
841 .../omap_hwmod_33xx_43xx_interconnect_data.c | 20 -
842 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 29 -
843 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 -
844 arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 3 +-
845 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 30 -
846 arch/arm/mach-omap2/pm44xx.c | 2 +-
847 arch/arm/mach-omap2/powerdomains3xxx_data.c | 2 +-
848 arch/arm/mach-omap2/soc.h | 195 +--
849 arch/arm/mach-omap2/sram.c | 25 -
850 arch/arm/mach-omap2/sram.h | 14 -
851 arch/arm/mach-omap2/sram34xx.S | 346 -----
852 arch/arm/mach-omap2/timer.c | 162 +-
853 arch/arm/mach-omap2/vc.c | 4 -
854 arch/arm/mach-orion5x/Kconfig | 3 +
855 arch/arm/mach-orion5x/dns323-setup.c | 53 +-
856 arch/arm/mach-orion5x/tsx09-common.c | 49 +-
857 arch/arm/mach-prima2/hotplug.c | 2 +-
858 arch/arm/mach-pxa/cm-x300.c | 9 +-
859 arch/arm/mach-pxa/colibri-pxa270-income.c | 9 +-
860 arch/arm/mach-pxa/devices.c | 20 +
861 arch/arm/mach-pxa/ezx.c | 9 +-
862 arch/arm/mach-pxa/hx4700.c | 3 -
863 arch/arm/mach-pxa/icontrol.c | 2 -
864 arch/arm/mach-pxa/include/mach/magician.h | 70 +-
865 arch/arm/mach-pxa/include/mach/pxa27x.h | 2 +-
866 arch/arm/mach-pxa/lpd270.c | 9 +-
867 arch/arm/mach-pxa/magician.c | 680 +++++----
868 arch/arm/mach-pxa/mainstone.c | 19 +-
869 arch/arm/mach-pxa/mioa701.c | 11 +-
870 arch/arm/mach-pxa/palm27x.c | 9 +-
871 arch/arm/mach-pxa/palmtc.c | 9 +-
872 arch/arm/mach-pxa/palmte2.c | 9 +-
873 arch/arm/mach-pxa/pcm990-baseboard.c | 9 +-
874 arch/arm/mach-pxa/pxa27x.c | 2 +-
875 arch/arm/mach-pxa/raumfeld.c | 21 +-
876 arch/arm/mach-pxa/tavorevb.c | 13 +-
877 arch/arm/mach-pxa/viper.c | 9 +-
878 arch/arm/mach-pxa/z2.c | 15 +-
879 arch/arm/mach-pxa/zylonite.c | 9 +-
880 arch/arm/mach-qcom/platsmp.c | 2 +-
881 arch/arm/mach-realview/hotplug.c | 2 +-
882 arch/arm/mach-s3c24xx/mach-h1940.c | 10 +-
883 arch/arm/mach-s3c24xx/mach-rx1950.c | 8 +-
884 arch/arm/mach-s3c64xx/dev-backlight.c | 4 -
885 arch/arm/mach-s3c64xx/mach-crag6410.c | 9 +-
886 arch/arm/mach-s3c64xx/mach-hmt.c | 9 +-
887 arch/arm/mach-s3c64xx/mach-smartq.c | 9 +-
888 arch/arm/mach-s3c64xx/mach-smdk6410.c | 8 +-
889 arch/arm/mach-shmobile/Kconfig | 73 -
890 arch/arm/mach-shmobile/Makefile | 14 +-
891 arch/arm/mach-shmobile/Makefile.boot | 12 -
892 arch/arm/mach-shmobile/board-bockw-reference.c | 86 --
893 arch/arm/mach-shmobile/board-bockw.c | 737 ---------
894 arch/arm/mach-shmobile/clock-r8a7778.c | 342 -----
895 arch/arm/mach-shmobile/clock.c | 47 -
896 arch/arm/mach-shmobile/clock.h | 42 -
897 arch/arm/mach-shmobile/common.h | 5 -
898 arch/arm/mach-shmobile/console.c | 27 -
899 arch/arm/mach-shmobile/intc.h | 295 ----
900 arch/arm/mach-shmobile/platsmp-apmu.c | 4 +-
901 arch/arm/mach-shmobile/pm-r8a7779.c | 99 --
902 arch/arm/mach-shmobile/pm-rmobile.c | 39 +-
903 arch/arm/mach-shmobile/pm-rmobile.h | 9 -
904 arch/arm/mach-shmobile/r8a7778.h | 78 -
905 arch/arm/mach-shmobile/r8a7779.h | 8 -
906 arch/arm/mach-shmobile/setup-r8a7778.c | 563 +------
907 arch/arm/mach-shmobile/sh-gpio.h | 29 -
908 arch/arm/mach-shmobile/timer.c | 21 -
909 arch/arm/mach-spear/hotplug.c | 2 +-
910 arch/arm/mach-sunxi/sunxi.c | 3 +-
911 arch/arm/mach-tegra/board-paz00.c | 4 +-
912 arch/arm/mach-tegra/hotplug.c | 2 +-
913 arch/arm/mach-uniphier/Makefile | 2 +-
914 arch/arm/mach-uniphier/headsmp.S | 43 +
915 arch/arm/mach-uniphier/platsmp.c | 185 ++-
916 arch/arm/mach-ux500/hotplug.c | 2 +-
917 arch/arm/mach-vexpress/hotplug.c | 2 +-
918 arch/arm/mm/Kconfig | 10 +
919 arch/arm/mm/Makefile | 1 +
920 arch/arm/mm/cache-uniphier.c | 555 +++++++
921 arch/arm64/Kconfig.platforms | 12 +-
922 arch/arm64/boot/dts/Makefile | 1 +
923 arch/arm64/boot/dts/altera/Makefile | 5 +
924 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 358 +++++
925 .../boot/dts/altera/socfpga_stratix10_socdk.dts | 39 +
926 arch/arm64/boot/dts/apm/Makefile | 1 +
927 arch/arm64/boot/dts/apm/apm-merlin.dts | 72 +
928 arch/arm64/boot/dts/apm/apm-mustang.dts | 12 +
929 arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 271 ++++
930 arch/arm64/boot/dts/apm/apm-storm.dtsi | 17 +
931 arch/arm64/boot/dts/arm/juno-base.dtsi | 59 +
932 arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 15 +
933 arch/arm64/boot/dts/arm/juno-r1.dts | 52 +
934 arch/arm64/boot/dts/arm/juno.dts | 32 +
935 .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 2 +-
936 arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi | 1 +
937 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 103 ++
938 arch/arm64/boot/dts/exynos/exynos7.dtsi | 7 +
939 arch/arm64/boot/dts/freescale/Makefile | 4 +-
940 arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 204 +++
941 arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 166 +++
942 .../{fsl-ls2085a-simu.dts => fsl-ls2080a-simu.dts} | 25 +-
943 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 515 +++++++
944 arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi | 163 --
945 arch/arm64/boot/dts/hisilicon/Makefile | 2 +-
946 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 7 +-
947 arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 43 +-
948 arch/arm64/boot/dts/hisilicon/hip05-d02.dts | 36 +
949 arch/arm64/boot/dts/hisilicon/hip05.dtsi | 271 ++++
950 arch/arm64/boot/dts/marvell/Makefile | 1 +
951 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts | 66 +
952 arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 120 ++
953 arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 18 +
954 arch/arm64/boot/dts/mediatek/mt8173.dtsi | 62 +-
955 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 30 +
956 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 76 +-
957 arch/arm64/boot/dts/qcom/msm8916.dtsi | 47 +
958 arch/arm64/configs/defconfig | 14 +-
959 arch/arm64/kernel/psci.c | 14 -
960 drivers/base/power/clock_ops.c | 6 +-
961 drivers/bus/Kconfig | 11 +
962 drivers/bus/Makefile | 1 +
963 drivers/bus/sunxi-rsb.c | 783 ++++++++++
964 drivers/clk/Kconfig | 10 +
965 drivers/clk/Makefile | 3 +-
966 drivers/clk/bcm/Makefile | 1 +
967 drivers/clk/bcm/clk-bcm2835.c | 1575 ++++++++++++++++++++
968 drivers/clk/berlin/bg2q.c | 14 +-
969 drivers/clk/clk-bcm2835.c | 55 -
970 drivers/clk/clk-multiplier.c | 181 +++
971 drivers/clk/clk-scpi.c | 325 ++++
972 drivers/clk/imx/clk-imx25.c | 12 +
973 drivers/clk/imx/clk-imx27.c | 13 +
974 drivers/clk/imx/clk-imx31.c | 35 +-
975 drivers/clk/imx/clk-imx35.c | 59 +-
976 drivers/clk/imx/clk-imx51-imx53.c | 16 +
977 drivers/clk/imx/clk-imx6q.c | 12 +-
978 drivers/clk/imx/clk-imx6sl.c | 12 +-
979 drivers/clk/imx/clk-imx6sx.c | 9 +
980 drivers/clk/imx/clk-imx6ul.c | 18 +
981 drivers/clk/imx/clk-imx7d.c | 14 +
982 drivers/clk/imx/clk-vf610.c | 1 +
983 drivers/clk/imx/clk.c | 38 +
984 drivers/clk/imx/clk.h | 1 +
985 drivers/clk/samsung/clk-exynos5250.c | 14 +-
986 drivers/clk/shmobile/clk-mstp.c | 4 +
987 drivers/clk/sunxi/Makefile | 3 +
988 drivers/clk/sunxi/clk-a10-codec.c | 44 +
989 drivers/clk/sunxi/clk-a10-mod1.c | 81 +
990 drivers/clk/sunxi/clk-a10-pll2.c | 216 +++
991 drivers/clk/sunxi/clk-simple-gates.c | 2 +
992 drivers/clk/sunxi/clk-sunxi.c | 1 +
993 drivers/clocksource/Kconfig | 8 +
994 drivers/clocksource/Makefile | 1 +
995 drivers/clocksource/tcb_clksrc.c | 12 +-
996 drivers/clocksource/timer-atmel-st.c | 31 +-
997 drivers/clocksource/timer-ti-32k.c | 126 ++
998 drivers/cpufreq/Kconfig.arm | 10 +
999 drivers/cpufreq/Makefile | 1 +
1000 drivers/cpufreq/scpi-cpufreq.c | 124 ++
1001 drivers/firmware/Kconfig | 26 +
1002 drivers/firmware/Makefile | 4 +-
1003 drivers/firmware/arm_scpi.c | 771 ++++++++++
1004 drivers/firmware/psci.c | 108 +-
1005 drivers/firmware/qcom_scm-32.c | 6 +-
1006 drivers/firmware/raspberrypi.c | 260 ++++
1007 drivers/hwmon/Kconfig | 8 +
1008 drivers/hwmon/Makefile | 1 +
1009 drivers/hwmon/scpi-hwmon.c | 288 ++++
1010 drivers/memory/pl172.c | 26 +-
1011 drivers/misc/atmel_tclib.c | 4 +
1012 drivers/pwm/pwm-atmel-tcb.c | 26 +-
1013 drivers/soc/Kconfig | 2 +
1014 drivers/soc/Makefile | 2 +
1015 drivers/soc/brcmstb/Kconfig | 9 +
1016 drivers/soc/brcmstb/Makefile | 1 +
1017 drivers/soc/brcmstb/biuctrl.c | 116 ++
1018 drivers/soc/brcmstb/common.c | 33 +
1019 drivers/soc/mediatek/mtk-pmic-wrap.c | 10 +-
1020 drivers/soc/mediatek/mtk-scpsys.c | 83 +-
1021 drivers/soc/qcom/Kconfig | 17 +-
1022 drivers/soc/qcom/smd-rpm.c | 68 +-
1023 drivers/soc/qcom/smd.c | 296 ++--
1024 drivers/soc/qcom/smem.c | 368 ++---
1025 drivers/soc/rockchip/Kconfig | 18 +
1026 drivers/soc/rockchip/Makefile | 4 +
1027 drivers/soc/rockchip/pm_domains.c | 490 ++++++
1028 drivers/soc/ti/knav_qmss.h | 3 +-
1029 drivers/soc/ti/knav_qmss_acc.c | 14 +-
1030 drivers/soc/ti/knav_qmss_queue.c | 67 +-
1031 include/dt-bindings/clock/bcm2835.h | 47 +
1032 include/dt-bindings/clock/berlin2q.h | 1 +
1033 include/dt-bindings/clock/exynos5250.h | 4 +-
1034 include/dt-bindings/clock/imx6qdl-clock.h | 3 +-
1035 include/dt-bindings/clock/imx6sl-clock.h | 3 +-
1036 include/dt-bindings/clock/imx6sx-clock.h | 3 +-
1037 include/dt-bindings/clock/imx7d-clock.h | 3 +-
1038 include/dt-bindings/clock/sun4i-a10-pll2.h | 53 +
1039 include/dt-bindings/clock/vf610-clock.h | 3 +-
1040 include/dt-bindings/power/rk3288-power.h | 31 +
1041 include/linux/atmel_tc.h | 1 +
1042 include/linux/clk-provider.h | 42 +
1043 include/linux/mfd/syscon/imx7-iomuxc-gpr.h | 47 +
1044 include/linux/platform_data/atmel.h | 8 -
1045 include/linux/psci.h | 2 +
1046 include/linux/qcom_scm.h | 2 +
1047 include/linux/scpi_protocol.h | 78 +
1048 include/linux/soc/brcmstb/brcmstb.h | 10 +
1049 include/linux/soc/qcom/smd.h | 11 +
1050 include/linux/soc/qcom/smem.h | 2 +-
1051 include/linux/spi/pxa2xx_spi.h | 1 -
1052 include/linux/sunxi-rsb.h | 105 ++
1053 include/soc/bcm2835/raspberrypi-firmware.h | 120 ++
1054 include/soc/brcmstb/common.h | 15 +
1055 include/uapi/linux/psci.h | 18 +
1056 692 files changed, 31260 insertions(+), 8762 deletions(-)
1057 create mode 100644 Documentation/arm/keystone/knav-qmss.txt
1058 create mode 100644 Documentation/devicetree/bindings/arm/apm/scu.txt
1059 create mode 100644 Documentation/devicetree/bindings/arm/arm,scpi.txt
1060 create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt
1061 create mode 100644 Documentation/devicetree/bindings/arm/mvebu-cpu-config.txt
1062 delete mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt
1063 create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
1064 create mode 100644 Documentation/devicetree/bindings/arm/uniphier/cache-uniphier.txt
1065 rename Documentation/devicetree/bindings/{powerpc/fsl/board.txt => board/fsl-board.txt} (90%)
1066 create mode 100644 Documentation/devicetree/bindings/bus/sunxi-rsb.txt
1067 create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt
1068 create mode 100644 Documentation/devicetree/bindings/pci/arm,juno-r1-pcie.txt
1069 create mode 100644 Documentation/devicetree/bindings/pci/plda,xpressrich3-axi.txt
1070 rename Documentation/devicetree/bindings/{arm/exynos/power_domain.txt => power/pd-samsung.txt} (93%)
1071 create mode 100644 Documentation/devicetree/bindings/power_supply/qcom_smbb.txt
1072 create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt
1073 create mode 100644 Documentation/devicetree/bindings/soc/rockchip/power_domain.txt
1074 create mode 100644 Documentation/hwmon/scpi-hwmon
1075 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
1076 create mode 100644 arch/arm/boot/dts/am335x-bonegreen.dts
1077 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts
1078 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
1079 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
1080 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud-2bay.dts
1081 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud.dts
1082 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
1083 create mode 100644 arch/arm/boot/dts/axp22x.dtsi
1084 create mode 100644 arch/arm/boot/dts/bcm-nsp.dtsi
1085 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
1086 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
1087 create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r7000.dts
1088 create mode 100644 arch/arm/boot/dts/bcm958625k.dts
1089 create mode 100644 arch/arm/boot/dts/bcm9hmidc.dtsi
1090 create mode 100644 arch/arm/boot/dts/exynos5250-snow-common.dtsi
1091 create mode 100644 arch/arm/boot/dts/exynos5250-snow-rev5.dts
1092 create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
1093 create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu4.dts
1094 create mode 100644 arch/arm/boot/dts/imx6dl-nit6xlite.dts
1095 create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_max.dts
1096 create mode 100644 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
1097 create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
1098 create mode 100644 arch/arm/boot/dts/meson8b-mxq.dts
1099 create mode 100644 arch/arm/boot/dts/meson8b-odroidc1.dts
1100 create mode 100644 arch/arm/boot/dts/meson8b.dtsi
1101 create mode 100644 arch/arm/boot/dts/omap5-board-common.dtsi
1102 create mode 100644 arch/arm/boot/dts/omap5-igep0050.dts
1103 delete mode 100644 arch/arm/boot/dts/r8a7778-bockw-reference.dts
1104 create mode 100644 arch/arm/boot/dts/r8a7791-porter.dts
1105 create mode 100644 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi
1106 create mode 100644 arch/arm/boot/dts/rk3288-rock2-som.dtsi
1107 create mode 100644 arch/arm/boot/dts/rk3288-rock2-square.dts
1108 create mode 100644 arch/arm/boot/dts/rk3288-veyron-jaq.dts
1109 create mode 100644 arch/arm/boot/dts/sama5d2-pinfunc.h
1110 create mode 100644 arch/arm/boot/dts/sun4i-a10-inet1.dts
1111 create mode 100644 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
1112 create mode 100644 arch/arm/boot/dts/sun4i-a10-pcduino2.dts
1113 create mode 100644 arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
1114 create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
1115 create mode 100644 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
1116 create mode 100644 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts
1117 create mode 100644 arch/arm/boot/dts/sun5i-a13-q8-tablet.dts
1118 create mode 100644 arch/arm/boot/dts/sun5i-q8-common.dtsi
1119 create mode 100644 arch/arm/boot/dts/sun5i-r8-chip.dts
1120 create mode 100644 arch/arm/boot/dts/sun5i-r8.dtsi
1121 create mode 100644 arch/arm/boot/dts/sun6i-a31s-primo81.dts
1122 create mode 100644 arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
1123 create mode 100644 arch/arm/boot/dts/sun6i-a31s-sina31s.dts
1124 create mode 100644 arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
1125 create mode 100644 arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
1126 create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
1127 create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
1128 create mode 100644 arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
1129 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts
1130 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
1131 create mode 100644 arch/arm/boot/dts/sun8i-a23-q8-tablet.dts
1132 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts
1133 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts
1134 create mode 100644 arch/arm/boot/dts/sun8i-a33-q8-tablet.dts
1135 create mode 100644 arch/arm/boot/dts/sun8i-q8-common.dtsi
1136 create mode 100644 arch/arm/boot/dts/sunxi-q8-common.dtsi
1137 create mode 100644 arch/arm/boot/dts/uniphier-proxstream2-gentil.dts
1138 create mode 100644 arch/arm/boot/dts/uniphier-proxstream2-vodka.dts
1139 delete mode 100644 arch/arm/configs/bockw_defconfig
1140 create mode 100644 arch/arm/include/asm/hardware/cache-uniphier.h
1141 create mode 100644 arch/arm/mach-bcm/bcm_nsp.c
1142 create mode 100644 arch/arm/mach-mediatek/platsmp.c
1143 delete mode 100644 arch/arm/mach-omap1/board-voiceblue.c
1144 delete mode 100644 arch/arm/mach-omap1/include/mach/board-voiceblue.h
1145 delete mode 100644 arch/arm/mach-omap2/clkt34xx_dpll3m2.c
1146 delete mode 100644 arch/arm/mach-omap2/devices.h
1147 delete mode 100644 arch/arm/mach-omap2/sram34xx.S
1148 delete mode 100644 arch/arm/mach-shmobile/Makefile.boot
1149 delete mode 100644 arch/arm/mach-shmobile/board-bockw-reference.c
1150 delete mode 100644 arch/arm/mach-shmobile/board-bockw.c
1151 delete mode 100644 arch/arm/mach-shmobile/clock-r8a7778.c
1152 delete mode 100644 arch/arm/mach-shmobile/clock.c
1153 delete mode 100644 arch/arm/mach-shmobile/clock.h
1154 delete mode 100644 arch/arm/mach-shmobile/console.c
1155 delete mode 100644 arch/arm/mach-shmobile/intc.h
1156 delete mode 100644 arch/arm/mach-shmobile/r8a7778.h
1157 delete mode 100644 arch/arm/mach-shmobile/sh-gpio.h
1158 create mode 100644 arch/arm/mach-uniphier/headsmp.S
1159 create mode 100644 arch/arm/mm/cache-uniphier.c
1160 create mode 100644 arch/arm64/boot/dts/altera/Makefile
1161 create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
1162 create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
1163 create mode 100644 arch/arm64/boot/dts/apm/apm-merlin.dts
1164 create mode 100644 arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
1165 create mode 120000 arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
1166 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts
1167 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts
1168 rename arch/arm64/boot/dts/freescale/{fsl-ls2085a-simu.dts => fsl-ls2080a-simu.dts} (81%)
1169 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
1170 delete mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi
1171 create mode 100644 arch/arm64/boot/dts/hisilicon/hip05-d02.dts
1172 create mode 100644 arch/arm64/boot/dts/hisilicon/hip05.dtsi
1173 create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts
1174 create mode 100644 drivers/bus/sunxi-rsb.c
1175 create mode 100644 drivers/clk/bcm/clk-bcm2835.c
1176 delete mode 100644 drivers/clk/clk-bcm2835.c
1177 create mode 100644 drivers/clk/clk-multiplier.c
1178 create mode 100644 drivers/clk/clk-scpi.c
1179 create mode 100644 drivers/clk/sunxi/clk-a10-codec.c
1180 create mode 100644 drivers/clk/sunxi/clk-a10-mod1.c
1181 create mode 100644 drivers/clk/sunxi/clk-a10-pll2.c
1182 create mode 100644 drivers/clocksource/timer-ti-32k.c
1183 create mode 100644 drivers/cpufreq/scpi-cpufreq.c
1184 create mode 100644 drivers/firmware/arm_scpi.c
1185 create mode 100644 drivers/firmware/raspberrypi.c
1186 create mode 100644 drivers/hwmon/scpi-hwmon.c
1187 create mode 100644 drivers/soc/brcmstb/Kconfig
1188 create mode 100644 drivers/soc/brcmstb/Makefile
1189 create mode 100644 drivers/soc/brcmstb/biuctrl.c
1190 create mode 100644 drivers/soc/brcmstb/common.c
1191 create mode 100644 drivers/soc/rockchip/Kconfig
1192 create mode 100644 drivers/soc/rockchip/Makefile
1193 create mode 100644 drivers/soc/rockchip/pm_domains.c
1194 create mode 100644 include/dt-bindings/clock/bcm2835.h
1195 create mode 100644 include/dt-bindings/clock/sun4i-a10-pll2.h
1196 create mode 100644 include/dt-bindings/power/rk3288-power.h
1197 create mode 100644 include/linux/mfd/syscon/imx7-iomuxc-gpr.h
1198 create mode 100644 include/linux/scpi_protocol.h
1199 create mode 100644 include/linux/soc/brcmstb/brcmstb.h
1200 create mode 100644 include/linux/sunxi-rsb.h
1201 create mode 100644 include/soc/bcm2835/raspberrypi-firmware.h
1202 create mode 100644 include/soc/brcmstb/common.h
1203 Merging at91/at91-next (c544ee640869 Merge tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
1204 $ git merge at91/at91-next
1205 Merge made by the 'recursive' strategy.
1206 arch/arm/mach-at91/Kconfig | 1 +
1207 1 file changed, 1 insertion(+)
1208 Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
1209 $ git merge bcm2835/for-next
1211 Merging berlin/berlin/for-next (27527ea5f2fd Merge branch 'berlin/soc' into berlin/for-next)
1212 $ git merge berlin/berlin/for-next
1213 Merge made by the 'recursive' strategy.
1214 arch/arm/mach-berlin/Kconfig | 3 ---
1215 arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 22 ++++++++++++++++++++++
1216 2 files changed, 22 insertions(+), 3 deletions(-)
1217 Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
1218 $ git merge cortex-m/for-next
1220 Merging imx-mxs/for-next (f843df81257a Merge branch 'imx/defconfig' into for-next)
1221 $ git merge imx-mxs/for-next
1223 Merge made by the 'recursive' strategy.
1224 Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next)
1225 $ git merge keystone/next
1226 Merge made by the 'recursive' strategy.
1227 drivers/soc/ti/knav_qmss_queue.c | 6 +++---
1228 1 file changed, 3 insertions(+), 3 deletions(-)
1229 Merging mvebu/for-next (4e91d7a20ccc Merge branch 'mvebu/config' into mvebu/for-next)
1230 $ git merge mvebu/for-next
1231 Resolved 'arch/arm/mach-mvebu/pmsu.c' using previous resolution.
1232 Auto-merging arch/arm/mach-mvebu/pmsu.c
1233 CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/pmsu.c
1234 Automatic merge failed; fix conflicts and then commit the result.
1236 [master a6a51090c5d6] Merge remote-tracking branch 'mvebu/for-next'
1237 $ git diff -M --stat --summary HEAD^..
1238 Merging omap/for-next (f2a148747f11 Merge branch 'omap-for-v4.3/fixes' into for-next)
1239 $ git merge omap/for-next
1241 Merge made by the 'recursive' strategy.
1242 Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
1243 $ git merge omap-pending/for-next
1244 Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution.
1245 Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution.
1246 Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c
1247 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
1248 Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c
1249 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
1250 Automatic merge failed; fix conflicts and then commit the result.
1252 [master 122560492bd0] Merge remote-tracking branch 'omap-pending/for-next'
1253 $ git diff -M --stat --summary HEAD^..
1254 Merging qcom/qcom/for-next (fcbba086b456 ARM: dts: msm8974: Add SCM firmware node)
1255 $ git merge qcom/qcom/for-next
1256 Resolved 'drivers/soc/qcom/Kconfig' using previous resolution.
1257 Resolved 'drivers/soc/qcom/smd-rpm.c' using previous resolution.
1258 Auto-merging include/linux/qcom_scm.h
1259 Auto-merging drivers/soc/qcom/smd-rpm.c
1260 CONFLICT (content): Merge conflict in drivers/soc/qcom/smd-rpm.c
1261 Auto-merging drivers/soc/qcom/Kconfig
1262 CONFLICT (content): Merge conflict in drivers/soc/qcom/Kconfig
1263 Auto-merging drivers/firmware/qcom_scm-32.c
1264 Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi
1265 Automatic merge failed; fix conflicts and then commit the result.
1267 [master f65388df19cd] Merge remote-tracking branch 'qcom/qcom/for-next'
1268 $ git diff -M --stat --summary HEAD^..
1269 .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++
1270 arch/arm/boot/dts/qcom-msm8974.dtsi | 11 +
1271 drivers/firmware/qcom_scm-32.c | 82 +++++++
1272 drivers/firmware/qcom_scm-64.c | 25 ++
1273 drivers/firmware/qcom_scm.c | 271 ++++++++++++++++++++-
1274 drivers/firmware/qcom_scm.h | 12 +
1275 include/linux/qcom_scm.h | 6 +
1276 7 files changed, 424 insertions(+), 8 deletions(-)
1277 create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt
1278 Merging renesas/next (c7aba848d39f Merge branches 'heads/defconfig-for-v4.4' and 'heads/dt-for-v4.4' into next)
1279 $ git merge renesas/next
1281 Merge made by the 'recursive' strategy.
1282 Merging rockchip/for-next (55e899c44d10 Merge branch 'v4.4-armsoc/drivers' into for-next)
1283 $ git merge rockchip/for-next
1285 Merge made by the 'recursive' strategy.
1286 Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
1287 $ git merge rpi/for-rpi-next
1289 Merging samsung/for-next (4ccfae394061 Merge branch 'v4.4-samsung-defconfig' into for-next)
1290 $ git merge samsung/for-next
1291 Resolved 'drivers/soc/Kconfig' using previous resolution.
1292 Resolved 'drivers/soc/Makefile' using previous resolution.
1293 Auto-merging drivers/soc/Makefile
1294 CONFLICT (content): Merge conflict in drivers/soc/Makefile
1295 Auto-merging drivers/soc/Kconfig
1296 CONFLICT (content): Merge conflict in drivers/soc/Kconfig
1297 Auto-merging arch/arm/mach-exynos/suspend.c
1298 Removing arch/arm/mach-exynos/regs-srom.h
1299 Auto-merging MAINTAINERS
1300 Automatic merge failed; fix conflicts and then commit the result.
1302 [master 6b184190198b] Merge remote-tracking branch 'samsung/for-next'
1303 $ git diff -M --stat --summary HEAD^..
1304 .../bindings/arm/samsung/exynos-srom.txt | 12 ++
1306 arch/arm/boot/dts/exynos4.dtsi | 5 +
1307 arch/arm/boot/dts/exynos5.dtsi | 5 +
1308 arch/arm/mach-exynos/Kconfig | 2 +
1309 arch/arm/mach-exynos/exynos.c | 22 ---
1310 arch/arm/mach-exynos/include/mach/map.h | 8 -
1311 arch/arm/mach-exynos/regs-srom.h | 53 -------
1312 arch/arm/mach-exynos/suspend.c | 20 +--
1313 arch/arm/plat-samsung/include/plat/map-s5p.h | 1 -
1314 drivers/cpufreq/s5pv210-cpufreq.c | 2 -
1315 drivers/soc/Kconfig | 1 +
1316 drivers/soc/Makefile | 1 +
1317 drivers/soc/samsung/Kconfig | 13 ++
1318 drivers/soc/samsung/Makefile | 1 +
1319 drivers/soc/samsung/exynos-srom.c | 175 +++++++++++++++++++++
1320 drivers/soc/samsung/exynos-srom.h | 51 ++++++
1321 17 files changed, 269 insertions(+), 104 deletions(-)
1322 create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-srom.txt
1323 delete mode 100644 arch/arm/mach-exynos/regs-srom.h
1324 create mode 100644 drivers/soc/samsung/Kconfig
1325 create mode 100644 drivers/soc/samsung/Makefile
1326 create mode 100644 drivers/soc/samsung/exynos-srom.c
1327 create mode 100644 drivers/soc/samsung/exynos-srom.h
1328 Merging samsung-krzk/for-next (6ff33f3902c3 Linux 4.3-rc1)
1329 $ git merge samsung-krzk/for-next
1331 Merging sunxi/sunxi/for-next (7022e5f74246 Merge branch 'sunxi/dt-for-4.4' into sunxi/for-next)
1332 $ git merge sunxi/sunxi/for-next
1334 Merge made by the 'recursive' strategy.
1335 Merging tegra/for-next (2d37df587e3c Merge branch for-4.4/defconfig into for-next)
1336 $ git merge tegra/for-next
1337 Auto-merging drivers/clk/tegra/clk-dfll.c
1338 Merge made by the 'recursive' strategy.
1339 drivers/clk/tegra/clk-dfll.c | 114 ++++++++++++++++++------------------
1340 drivers/clk/tegra/clk-tegra-audio.c | 25 +++++---
1341 drivers/clk/tegra/clk-tegra114.c | 8 ++-
1342 drivers/clk/tegra/clk-tegra124.c | 8 ++-
1343 drivers/clk/tegra/clk-tegra30.c | 8 ++-
1344 drivers/clk/tegra/clk.h | 106 +++++++++++++++++++++------------
1345 drivers/clk/tegra/cvb.c | 7 ---
1346 7 files changed, 163 insertions(+), 113 deletions(-)
1347 Merging arm64/for-next/core (aa644fa64c25 ARM64: Enable multi-core scheduler support by default)
1348 $ git merge arm64/for-next/core
1349 Resolved 'arch/arm64/kernel/suspend.c' using previous resolution.
1350 Auto-merging arch/arm64/mm/fault.c
1351 Auto-merging arch/arm64/kernel/suspend.c
1352 CONFLICT (content): Merge conflict in arch/arm64/kernel/suspend.c
1353 Auto-merging arch/arm64/kernel/setup.c
1354 Auto-merging arch/arm64/kernel/debug-monitors.c
1355 Removing arch/arm64/include/asm/pmu.h
1356 Auto-merging arch/arm64/configs/defconfig
1357 Auto-merging arch/arm64/boot/dts/arm/juno.dts
1358 Auto-merging arch/arm64/boot/dts/arm/juno-r1.dts
1359 Auto-merging arch/arm64/Makefile
1360 Auto-merging MAINTAINERS
1361 Auto-merging Documentation/devicetree/bindings/arm/pmu.txt
1362 Automatic merge failed; fix conflicts and then commit the result.
1364 [master 6da402b18161] Merge remote-tracking branch 'arm64/for-next/core'
1365 $ git diff -M --stat --summary HEAD^..
1366 Documentation/arm/uefi.txt | 2 -
1367 Documentation/arm64/booting.txt | 7 +-
1368 Documentation/devicetree/bindings/arm/pmu.txt | 2 +
1369 .../features/debug/KASAN/arch-support.txt | 2 +-
1371 arch/arm64/Kconfig | 69 +-
1372 arch/arm64/Kconfig.debug | 2 +-
1373 arch/arm64/Makefile | 7 +
1374 arch/arm64/boot/dts/arm/juno-r1.dts | 18 +-
1375 arch/arm64/boot/dts/arm/juno.dts | 18 +-
1376 arch/arm64/configs/defconfig | 9 +
1377 arch/arm64/include/asm/assembler.h | 11 +
1378 arch/arm64/include/asm/atomic.h | 63 +-
1379 arch/arm64/include/asm/atomic_ll_sc.h | 98 +-
1380 arch/arm64/include/asm/atomic_lse.h | 193 ++--
1381 arch/arm64/include/asm/cache.h | 2 +-
1382 arch/arm64/include/asm/cacheflush.h | 7 +
1383 arch/arm64/include/asm/cachetype.h | 4 +-
1384 arch/arm64/include/asm/cmpxchg.h | 279 +++--
1385 arch/arm64/include/asm/cpu.h | 4 +
1386 arch/arm64/include/asm/cpufeature.h | 91 +-
1387 arch/arm64/include/asm/cputype.h | 15 -
1388 arch/arm64/include/asm/fixmap.h | 7 +-
1389 arch/arm64/include/asm/hw_breakpoint.h | 9 +-
1390 arch/arm64/include/asm/hwcap.h | 8 +
1391 arch/arm64/include/asm/irq.h | 1 -
1392 arch/arm64/include/asm/kasan.h | 38 +
1393 arch/arm64/include/asm/kernel-pgtable.h | 83 ++
1394 arch/arm64/include/asm/memory.h | 6 +-
1395 arch/arm64/include/asm/mmu.h | 15 +-
1396 arch/arm64/include/asm/mmu_context.h | 113 +--
1397 arch/arm64/include/asm/page.h | 27 +-
1398 arch/arm64/include/asm/pgalloc.h | 1 +
1399 arch/arm64/include/asm/pgtable-hwdef.h | 48 +-
1400 arch/arm64/include/asm/pgtable.h | 30 +-
1401 arch/arm64/include/asm/pmu.h | 83 --
1402 arch/arm64/include/asm/processor.h | 2 +-
1403 arch/arm64/include/asm/ptrace.h | 16 +-
1404 arch/arm64/include/asm/string.h | 16 +
1405 arch/arm64/include/asm/sysreg.h | 157 ++-
1406 arch/arm64/include/asm/thread_info.h | 5 +-
1407 arch/arm64/include/asm/tlb.h | 26 +-
1408 arch/arm64/include/asm/tlbflush.h | 18 +-
1409 arch/arm64/kernel/Makefile | 11 +-
1410 arch/arm64/kernel/arm64ksyms.c | 3 +
1411 arch/arm64/kernel/asm-offsets.c | 2 +-
1412 arch/arm64/kernel/cpu_errata.c | 2 +-
1413 arch/arm64/kernel/cpufeature.c | 851 +++++++++++++++-
1414 arch/arm64/kernel/cpuinfo.c | 254 +++--
1415 arch/arm64/kernel/debug-monitors.c | 6 +-
1416 arch/arm64/kernel/efi-entry.S | 10 +-
1417 arch/arm64/kernel/efi.c | 5 +-
1418 arch/arm64/kernel/entry.S | 2 +
1419 arch/arm64/kernel/fpsimd.c | 16 +-
1420 arch/arm64/kernel/head.S | 76 +-
1421 arch/arm64/kernel/hw_breakpoint.c | 19 +-
1422 arch/arm64/kernel/image.h | 38 +-
1423 arch/arm64/kernel/irq.c | 62 --
1424 arch/arm64/kernel/module.c | 16 +-
1425 arch/arm64/kernel/perf_event.c | 1066 ++++----------------
1426 arch/arm64/kernel/process.c | 3 +
1427 arch/arm64/kernel/setup.c | 245 +----
1428 arch/arm64/kernel/smp.c | 22 +-
1429 arch/arm64/kernel/suspend.c | 2 +-
1430 arch/arm64/kernel/traps.c | 15 +-
1431 arch/arm64/kernel/vmlinux.lds.S | 6 +-
1432 arch/arm64/kvm/Kconfig | 3 +
1433 arch/arm64/kvm/reset.c | 2 +-
1434 arch/arm64/kvm/sys_regs.c | 12 +-
1435 arch/arm64/lib/copy_from_user.S | 78 +-
1436 arch/arm64/lib/copy_in_user.S | 67 +-
1437 arch/arm64/lib/copy_template.S | 193 ++++
1438 arch/arm64/lib/copy_to_user.S | 67 +-
1439 arch/arm64/lib/memchr.S | 2 +-
1440 arch/arm64/lib/memcmp.S | 2 +-
1441 arch/arm64/lib/memcpy.S | 184 +---
1442 arch/arm64/lib/memmove.S | 9 +-
1443 arch/arm64/lib/memset.S | 5 +-
1444 arch/arm64/lib/strcmp.S | 2 +-
1445 arch/arm64/lib/strlen.S | 2 +-
1446 arch/arm64/lib/strncmp.S | 2 +-
1447 arch/arm64/mm/Makefile | 3 +
1448 arch/arm64/mm/cache.S | 10 +-
1449 arch/arm64/mm/context.c | 236 +++--
1450 arch/arm64/mm/dump.c | 18 +-
1451 arch/arm64/mm/fault.c | 2 +-
1452 arch/arm64/mm/init.c | 19 +-
1453 arch/arm64/mm/kasan_init.c | 165 +++
1454 arch/arm64/mm/mmu.c | 145 ++-
1455 arch/arm64/mm/pageattr.c | 2 +-
1456 arch/arm64/mm/pgd.c | 2 -
1457 arch/arm64/mm/proc.S | 10 +-
1458 drivers/firmware/efi/Makefile | 8 +
1459 drivers/firmware/efi/libstub/Makefile | 42 +-
1460 .../firmware/efi/libstub/arm64-stub.c | 0
1461 drivers/firmware/efi/libstub/fdt.c | 9 -
1462 drivers/firmware/efi/libstub/string.c | 57 ++
1463 drivers/perf/Kconfig | 2 +-
1464 include/linux/irq.h | 2 +
1465 kernel/irq/Kconfig | 4 +
1466 kernel/irq/Makefile | 1 +
1467 kernel/irq/cpuhotplug.c | 82 ++
1468 scripts/Makefile.kasan | 4 +-
1469 103 files changed, 3385 insertions(+), 2421 deletions(-)
1470 create mode 100644 arch/arm64/include/asm/kasan.h
1471 create mode 100644 arch/arm64/include/asm/kernel-pgtable.h
1472 delete mode 100644 arch/arm64/include/asm/pmu.h
1473 create mode 100644 arch/arm64/lib/copy_template.S
1474 create mode 100644 arch/arm64/mm/kasan_init.c
1475 rename arch/arm64/kernel/efi-stub.c => drivers/firmware/efi/libstub/arm64-stub.c (100%)
1476 create mode 100644 drivers/firmware/efi/libstub/string.c
1477 create mode 100644 kernel/irq/cpuhotplug.c
1478 Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
1479 $ git merge blackfin/for-linus
1481 Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
1482 $ git merge c6x/for-linux-next
1483 Removing arch/c6x/include/asm/clkdev.h
1484 Auto-merging arch/c6x/include/asm/Kbuild
1485 Merge made by the 'recursive' strategy.
1486 arch/c6x/include/asm/Kbuild | 1 +
1487 arch/c6x/include/asm/clkdev.h | 22 ----------------------
1488 2 files changed, 1 insertion(+), 22 deletions(-)
1489 delete mode 100644 arch/c6x/include/asm/clkdev.h
1490 Merging cris/for-next (918fc2ee791e cris: Drop reference to get_cmos_time())
1491 $ git merge cris/for-next
1492 Removing arch/cris/include/arch-v32/arch/io.h
1493 Removing arch/cris/arch-v32/mach-fs/io.c
1494 Removing arch/cris/arch-v32/mach-a3/io.c
1495 Removing arch/cris/arch-v32/drivers/mach-fs/gpio.c
1496 Removing arch/cris/arch-v32/drivers/mach-a3/gpio.c
1497 Removing arch/cris/arch-v32/drivers/i2c.h
1498 Removing arch/cris/arch-v32/drivers/i2c.c
1499 Merge made by the 'recursive' strategy.
1500 arch/cris/Kconfig | 1 -
1501 arch/cris/arch-v10/kernel/head.S | 106 ---
1502 arch/cris/arch-v10/kernel/kgdb.c | 89 +--
1503 arch/cris/arch-v10/mm/init.c | 14 +-
1504 arch/cris/arch-v32/Kconfig | 89 ---
1505 arch/cris/arch-v32/drivers/Kconfig | 167 -----
1506 arch/cris/arch-v32/drivers/Makefile | 1 -
1507 arch/cris/arch-v32/drivers/axisflashmap.c | 40 +-
1508 arch/cris/arch-v32/drivers/i2c.c | 751 ---------------------
1509 arch/cris/arch-v32/drivers/i2c.h | 16 -
1510 arch/cris/arch-v32/drivers/mach-a3/Makefile | 1 -
1511 arch/cris/arch-v32/drivers/mach-a3/gpio.c | 999 ----------------------------
1512 arch/cris/arch-v32/drivers/mach-fs/Makefile | 1 -
1513 arch/cris/arch-v32/drivers/mach-fs/gpio.c | 978 ---------------------------
1514 arch/cris/arch-v32/kernel/crisksyms.c | 3 -
1515 arch/cris/arch-v32/kernel/debugport.c | 2 -
1516 arch/cris/arch-v32/kernel/head.S | 4 -
1517 arch/cris/arch-v32/kernel/irq.c | 6 +-
1518 arch/cris/arch-v32/kernel/kgdb.c | 96 ++-
1519 arch/cris/arch-v32/kernel/setup.c | 8 -
1520 arch/cris/arch-v32/mach-a3/Makefile | 2 +-
1521 arch/cris/arch-v32/mach-a3/io.c | 149 -----
1522 arch/cris/arch-v32/mach-fs/Kconfig | 19 -
1523 arch/cris/arch-v32/mach-fs/Makefile | 2 +-
1524 arch/cris/arch-v32/mach-fs/io.c | 191 ------
1525 arch/cris/boot/dts/artpec3.dtsi | 46 ++
1526 arch/cris/boot/dts/dev88.dts | 49 ++
1527 arch/cris/boot/dts/etraxfs.dtsi | 8 +
1528 arch/cris/boot/dts/include/dt-bindings | 1 +
1529 arch/cris/boot/dts/p1343.dts | 76 +++
1530 arch/cris/boot/rescue/head_v10.S | 3 -
1531 arch/cris/include/arch-v32/arch/io.h | 140 ----
1532 arch/cris/include/arch-v32/arch/irq.h | 2 +-
1533 arch/cris/include/asm/eshlibld.h | 3 +-
1534 arch/cris/include/asm/io.h | 2 +
1535 arch/cris/include/uapi/asm/etraxgpio.h | 157 -----
1536 arch/cris/kernel/crisksyms.c | 2 -
1537 arch/cris/kernel/time.c | 25 -
1538 38 files changed, 272 insertions(+), 3977 deletions(-)
1539 delete mode 100644 arch/cris/arch-v32/drivers/i2c.c
1540 delete mode 100644 arch/cris/arch-v32/drivers/i2c.h
1541 delete mode 100644 arch/cris/arch-v32/drivers/mach-a3/gpio.c
1542 delete mode 100644 arch/cris/arch-v32/drivers/mach-fs/gpio.c
1543 delete mode 100644 arch/cris/arch-v32/mach-a3/io.c
1544 delete mode 100644 arch/cris/arch-v32/mach-fs/io.c
1545 create mode 100644 arch/cris/boot/dts/artpec3.dtsi
1546 create mode 120000 arch/cris/boot/dts/include/dt-bindings
1547 create mode 100644 arch/cris/boot/dts/p1343.dts
1548 delete mode 100644 arch/cris/include/arch-v32/arch/io.h
1549 Merging h8300/h8300-next (6829bca19fa4 h8300: Don't set CROSS_COMPILE unconditionally)
1550 $ git merge h8300/h8300-next
1551 Merge made by the 'recursive' strategy.
1552 arch/h8300/Makefile | 2 ++
1553 arch/h8300/boot/compressed/Makefile | 5 +++--
1554 arch/h8300/boot/compressed/head.S | 4 ++--
1555 arch/h8300/boot/compressed/misc.c | 7 +------
1556 arch/h8300/boot/compressed/vmlinux.lds | 2 +-
1557 arch/h8300/boot/dts/edosk2674.dts | 6 +++---
1558 arch/h8300/include/asm/io.h | 12 ++++++------
1559 arch/h8300/include/asm/thread_info.h | 14 ++++++--------
1560 arch/h8300/kernel/vmlinux.lds.S | 4 ++--
1561 drivers/clk/h8300/clk-div.c | 6 +++++-
1562 drivers/clocksource/h8300_timer8.c | 5 +++--
1563 include/asm-generic/uaccess.h | 10 ++++++----
1564 12 files changed, 40 insertions(+), 37 deletions(-)
1565 Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
1566 $ git merge hexagon/linux-next
1568 Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
1569 $ git merge ia64/next
1570 Merge made by the 'recursive' strategy.
1571 fs/pstore/Kconfig | 2 +-
1572 fs/pstore/Makefile | 6 +++---
1573 fs/pstore/ftrace.c | 25 +++++++++++++++++++------
1574 fs/pstore/inode.c | 11 ++++++++++-
1575 fs/pstore/internal.h | 6 +++++-
1576 fs/pstore/platform.c | 42 +++++++++++++++++++++++++++++++++++++++++-
1577 fs/pstore/pmsg.c | 9 +++++++++
1578 fs/pstore/ram.c | 19 ++++++++-----------
1579 include/linux/pstore.h | 14 +-------------
1580 kernel/printk/printk.c | 1 +
1581 10 files changed, 98 insertions(+), 37 deletions(-)
1582 Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address)
1583 $ git merge m68k/for-next
1584 Merge made by the 'recursive' strategy.
1585 arch/m68k/sun3/idprom.c | 5 +----
1586 1 file changed, 1 insertion(+), 4 deletions(-)
1587 Merging m68knommu/for-next (4ac313111018 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU)
1588 $ git merge m68knommu/for-next
1589 Merge made by the 'recursive' strategy.
1590 fs/binfmt_elf_fdpic.c | 7 +------
1591 1 file changed, 1 insertion(+), 6 deletions(-)
1592 Merging metag/for-next (3dce23eb8878 metag: Turn irq_ctx_* macros into static inlines)
1593 $ git merge metag/for-next
1594 Merge made by the 'recursive' strategy.
1595 arch/metag/include/asm/irq.h | 8 ++++++--
1596 arch/metag/kernel/smp.c | 2 ++
1597 2 files changed, 8 insertions(+), 2 deletions(-)
1598 Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
1599 $ git merge microblaze/next
1601 Merging mips/mips-for-linux-next (4deb27263d5f Merge branch '4.3-fixes' into mips-for-linux-next)
1602 $ git merge mips/mips-for-linux-next
1603 Merge made by the 'recursive' strategy.
1604 arch/mips/Kbuild | 1 +
1605 arch/mips/Kconfig | 30 ++-
1606 arch/mips/Kconfig.debug | 72 +++++
1607 arch/mips/Makefile | 4 +
1608 arch/mips/bcm47xx/setup.c | 19 +-
1609 arch/mips/bcm47xx/sprom.c | 46 ++--
1610 arch/mips/boot/dts/mti/malta.dts | 4 +
1611 arch/mips/configs/bigsur_defconfig | 12 +-
1612 arch/mips/configs/capcella_defconfig | 6 +-
1613 arch/mips/configs/e55_defconfig | 6 +-
1614 arch/mips/configs/fuloong2e_defconfig | 14 +-
1615 arch/mips/configs/lasat_defconfig | 10 +-
1616 arch/mips/configs/lemote2f_defconfig | 11 +-
1617 arch/mips/configs/malta_defconfig | 6 +-
1618 arch/mips/configs/malta_kvm_defconfig | 16 +-
1619 arch/mips/configs/malta_kvm_guest_defconfig | 16 +-
1620 arch/mips/configs/malta_qemu_32r6_defconfig | 11 +-
1621 arch/mips/configs/maltaaprp_defconfig | 11 +-
1622 arch/mips/configs/maltasmvp_eva_defconfig | 11 +-
1623 arch/mips/configs/maltaup_defconfig | 11 +-
1624 arch/mips/configs/maltaup_xpa_defconfig | 16 +-
1625 arch/mips/configs/mpc30x_defconfig | 6 +-
1626 arch/mips/include/asm/abi.h | 5 +-
1627 arch/mips/include/asm/atomic.h | 2 +-
1628 arch/mips/include/asm/bcache.h | 27 ++
1629 arch/mips/include/asm/clocksource.h | 29 ++
1630 arch/mips/include/asm/cpu-features.h | 6 +-
1631 arch/mips/include/asm/debug.h | 22 ++
1632 arch/mips/include/asm/elf.h | 7 +
1633 arch/mips/include/asm/fw/fw.h | 16 --
1634 arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 5 -
1635 .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 14 +
1636 arch/mips/include/asm/mach-malta/malta-dtshim.h | 29 ++
1637 arch/mips/include/asm/mips-cm.h | 78 +++++-
1638 arch/mips/include/asm/mips-cpc.h | 3 +-
1639 arch/mips/include/asm/mipsregs.h | 15 +-
1640 arch/mips/include/asm/processor.h | 8 +-
1641 arch/mips/include/asm/vdso.h | 139 ++++++++--
1642 arch/mips/include/uapi/asm/Kbuild | 2 +-
1643 arch/mips/include/uapi/asm/auxvec.h | 17 ++
1644 arch/mips/jz4740/board-qi_lb60.c | 13 +-
1645 arch/mips/kernel/Makefile | 1 +
1646 arch/mips/kernel/cps-vec-ns16550.S | 202 ++++++++++++++
1647 arch/mips/kernel/cps-vec.S | 44 +++-
1648 arch/mips/kernel/cpu-probe.c | 3 +-
1649 arch/mips/kernel/csrc-r4k.c | 44 ++++
1650 arch/mips/kernel/idle.c | 11 +-
1651 arch/mips/kernel/mips-cm.c | 114 +++++---
1652 arch/mips/kernel/mips-cpc.c | 6 +
1653 arch/mips/kernel/mips-r2-to-r6-emul.c | 2 +-
1654 arch/mips/kernel/segment.c | 2 +-
1655 arch/mips/kernel/setup.c | 1 +
1656 arch/mips/kernel/signal.c | 12 +-
1657 arch/mips/kernel/signal32.c | 7 +-
1658 arch/mips/kernel/signal_n32.c | 5 +-
1659 arch/mips/kernel/smp-cps.c | 35 ++-
1660 arch/mips/kernel/smp-gic.c | 2 +
1661 arch/mips/kernel/spinlock_test.c | 4 +-
1662 arch/mips/kernel/stacktrace.c | 27 +-
1663 arch/mips/kernel/traps.c | 9 +-
1664 arch/mips/kernel/unaligned.c | 2 +-
1665 arch/mips/kernel/vdso.c | 207 +++++++++------
1666 arch/mips/lantiq/clk.c | 17 ++
1667 arch/mips/lantiq/clk.h | 13 +
1668 arch/mips/lantiq/irq.c | 8 +-
1669 arch/mips/lantiq/xway/clk.c | 175 +++++++++++-
1670 arch/mips/lantiq/xway/prom.c | 35 ++-
1671 arch/mips/lantiq/xway/reset.c | 114 ++++++--
1672 arch/mips/lantiq/xway/sysctrl.c | 260 +++++++++++++++---
1673 arch/mips/lib/Makefile | 2 +-
1674 arch/mips/lib/bswapdi.c | 15 ++
1675 arch/mips/lib/bswapsi.c | 11 +
1676 arch/mips/math-emu/me-debugfs.c | 2 +-
1677 arch/mips/mm/Makefile | 1 +
1678 arch/mips/mm/sc-debugfs.c | 81 ++++++
1679 arch/mips/mm/sc-mips.c | 65 ++++-
1680 arch/mips/mm/tlbex.c | 97 ++++---
1681 arch/mips/mti-malta/Makefile | 15 +-
1682 arch/mips/mti-malta/malta-dtshim.c | 162 ++++++++++++
1683 arch/mips/mti-malta/malta-init.c | 1 +
1684 arch/mips/mti-malta/malta-memory.c | 131 +--------
1685 arch/mips/mti-malta/malta-setup.c | 5 +-
1686 arch/mips/pci/pci-rt3883.c | 6 +-
1687 arch/mips/vdso/.gitignore | 4 +
1688 arch/mips/vdso/Makefile | 160 +++++++++++
1689 arch/mips/vdso/elf.S | 68 +++++
1690 arch/mips/vdso/genvdso.c | 293 +++++++++++++++++++++
1691 arch/mips/vdso/genvdso.h | 187 +++++++++++++
1692 arch/mips/vdso/gettimeofday.c | 232 ++++++++++++++++
1693 arch/mips/vdso/sigreturn.S | 49 ++++
1694 arch/mips/vdso/vdso.h | 89 +++++++
1695 arch/mips/vdso/vdso.lds.S | 105 ++++++++
1696 drivers/clocksource/mips-gic-timer.c | 7 +-
1697 drivers/irqchip/irq-mips-gic.c | 14 +
1698 include/linux/irqchip/mips-gic.h | 17 ++
1699 95 files changed, 3350 insertions(+), 607 deletions(-)
1700 create mode 100644 arch/mips/include/asm/clocksource.h
1701 create mode 100644 arch/mips/include/asm/debug.h
1702 create mode 100644 arch/mips/include/asm/mach-malta/malta-dtshim.h
1703 create mode 100644 arch/mips/include/uapi/asm/auxvec.h
1704 create mode 100644 arch/mips/kernel/cps-vec-ns16550.S
1705 create mode 100644 arch/mips/lib/bswapdi.c
1706 create mode 100644 arch/mips/lib/bswapsi.c
1707 create mode 100644 arch/mips/mm/sc-debugfs.c
1708 create mode 100644 arch/mips/mti-malta/malta-dtshim.c
1709 create mode 100644 arch/mips/vdso/.gitignore
1710 create mode 100644 arch/mips/vdso/Makefile
1711 create mode 100644 arch/mips/vdso/elf.S
1712 create mode 100644 arch/mips/vdso/genvdso.c
1713 create mode 100644 arch/mips/vdso/genvdso.h
1714 create mode 100644 arch/mips/vdso/gettimeofday.c
1715 create mode 100644 arch/mips/vdso/sigreturn.S
1716 create mode 100644 arch/mips/vdso/vdso.h
1717 create mode 100644 arch/mips/vdso/vdso.lds.S
1718 Merging nios2/for-next (8840da98bfec nios2: Switch to generic __xchg())
1719 $ git merge nios2/for-next
1720 Merge made by the 'recursive' strategy.
1721 arch/nios2/include/asm/cmpxchg.h | 47 ----------------------------------------
1722 arch/nios2/kernel/setup.c | 2 +-
1723 2 files changed, 1 insertion(+), 48 deletions(-)
1724 Merging parisc-hd/for-next (a01fece2e418 parisc: Change L1_CACHE_BYTES to 16)
1725 $ git merge parisc-hd/for-next
1726 Auto-merging include/linux/netdevice.h
1727 Merge made by the 'recursive' strategy.
1728 arch/parisc/include/asm/cache.h | 18 +++++-------------
1729 arch/parisc/include/uapi/asm/unistd.h | 4 +++-
1730 arch/parisc/kernel/syscall_table.S | 2 ++
1731 drivers/parisc/lba_pci.c | 12 ++++++------
1732 drivers/tty/serial/mux.c | 9 ++-------
1733 include/linux/netdevice.h | 4 ++--
1734 6 files changed, 20 insertions(+), 29 deletions(-)
1735 Merging powerpc/next (353169acf185 powerpc/eeh: Fix recursive fenced PHB on Broadcom shiner adapter)
1736 $ git merge powerpc/next
1737 Removing arch/powerpc/boot/prpmc2800.c
1738 Removing arch/powerpc/boot/dts/prpmc2800.dts
1739 Merge made by the 'recursive' strategy.
1740 arch/powerpc/Makefile | 6 +-
1741 arch/powerpc/boot/dts/prpmc2800.dts | 297 -----------
1742 arch/powerpc/boot/page.h | 4 +-
1743 arch/powerpc/boot/prpmc2800.c | 571 ---------------------
1744 arch/powerpc/boot/wrapper | 25 +-
1745 arch/powerpc/configs/cell_defconfig | 2 +-
1746 arch/powerpc/configs/ps3_defconfig | 7 +-
1747 arch/powerpc/include/asm/mmu-hash64.h | 1 +
1748 arch/powerpc/include/asm/msi_bitmap.h | 1 +
1749 arch/powerpc/include/asm/page.h | 25 +-
1750 arch/powerpc/include/asm/pgtable-ppc64.h | 10 +-
1751 arch/powerpc/include/asm/pgtable.h | 6 +-
1752 arch/powerpc/include/asm/systbl.h | 12 +
1753 arch/powerpc/include/asm/unistd.h | 2 +-
1754 arch/powerpc/include/uapi/asm/unistd.h | 12 +
1755 arch/powerpc/kernel/eeh.c | 8 +-
1756 arch/powerpc/kernel/eeh_driver.c | 27 +-
1757 arch/powerpc/kernel/io-workarounds.c | 2 +-
1758 arch/powerpc/kernel/nvram_64.c | 15 +-
1759 arch/powerpc/kernel/pci-common.c | 1 +
1760 arch/powerpc/kernel/prom.c | 13 +-
1761 arch/powerpc/kernel/vdso32/Makefile | 2 +-
1762 arch/powerpc/kernel/vdso32/datapage.S | 12 +-
1763 arch/powerpc/kernel/vdso64/Makefile | 2 +-
1764 arch/powerpc/kernel/vdso64/datapage.S | 12 +-
1765 arch/powerpc/kernel/vmlinux.lds.S | 6 +
1766 arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +-
1767 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 8 +-
1768 arch/powerpc/kvm/e500_mmu_host.c | 2 +-
1769 arch/powerpc/mm/hash_utils_64.c | 7 +-
1770 arch/powerpc/mm/hugetlbpage.c | 40 +-
1771 arch/powerpc/mm/numa.c | 5 +-
1772 arch/powerpc/mm/slb.c | 49 +-
1773 arch/powerpc/mm/tlb_hash64.c | 9 +-
1774 arch/powerpc/perf/callchain.c | 2 +-
1775 arch/powerpc/platforms/Kconfig.cputype | 11 -
1776 arch/powerpc/platforms/cell/Kconfig | 4 +-
1777 arch/powerpc/platforms/maple/Kconfig | 2 +-
1778 arch/powerpc/platforms/pasemi/Kconfig | 2 +-
1779 arch/powerpc/platforms/powermac/Kconfig | 2 +-
1780 arch/powerpc/platforms/powernv/eeh-powernv.c | 86 ++--
1781 arch/powerpc/platforms/powernv/setup.c | 21 +-
1782 arch/powerpc/platforms/ps3/Kconfig | 2 +-
1783 arch/powerpc/platforms/pseries/Kconfig | 7 +-
1784 arch/powerpc/platforms/pseries/Makefile | 7 +-
1785 arch/powerpc/platforms/pseries/dlpar.c | 31 +-
1786 arch/powerpc/platforms/pseries/eeh_pseries.c | 60 +--
1787 arch/powerpc/platforms/pseries/hvcserver.c | 2 +-
1788 arch/powerpc/platforms/pseries/iommu.c | 10 -
1789 arch/powerpc/platforms/pseries/of_helpers.c | 35 ++
1790 arch/powerpc/platforms/pseries/of_helpers.h | 8 +
1791 arch/powerpc/platforms/pseries/reconfig.c | 34 +-
1792 arch/powerpc/platforms/pseries/setup.c | 4 -
1793 arch/powerpc/sysdev/mpc5xxx_clocks.c | 5 +-
1794 arch/powerpc/sysdev/mpc8xx_pic.c | 2 +-
1795 arch/powerpc/sysdev/msi_bitmap.c | 16 +-
1796 arch/powerpc/xmon/nonstdio.c | 64 ++-
1797 arch/powerpc/xmon/nonstdio.h | 3 +
1798 arch/powerpc/xmon/xmon.c | 79 ++-
1799 drivers/char/agp/uninorth-agp.c | 16 +-
1800 drivers/macintosh/Kconfig | 5 +-
1801 drivers/misc/cxl/vphb.c | 2 +
1802 drivers/ps3/ps3-lpm.c | 2 +-
1803 drivers/ps3/ps3-vuart.c | 3 +-
1804 scripts/kconfig/Makefile | 5 +-
1805 tools/testing/selftests/powerpc/Makefile | 12 +-
1806 .../selftests/powerpc/benchmarks/.gitignore | 1 +
1807 .../testing/selftests/powerpc/benchmarks/Makefile | 12 +
1808 .../selftests/powerpc/benchmarks/gettimeofday.c | 31 ++
1809 .../powerpc/pmu/ebb/back_to_back_ebbs_test.c | 2 +
1810 .../powerpc/pmu/ebb/close_clears_pmcc_test.c | 2 +
1811 .../powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c | 2 +
1812 .../powerpc/pmu/ebb/cpu_event_vs_ebb_test.c | 2 +
1813 .../selftests/powerpc/pmu/ebb/cycles_test.c | 2 +
1814 .../powerpc/pmu/ebb/cycles_with_freeze_test.c | 2 +
1815 .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 2 +
1816 tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 11 +
1817 tools/testing/selftests/powerpc/pmu/ebb/ebb.h | 1 +
1818 .../selftests/powerpc/pmu/ebb/ebb_on_child_test.c | 2 +
1819 .../powerpc/pmu/ebb/ebb_on_willing_child_test.c | 2 +
1820 .../powerpc/pmu/ebb/ebb_vs_cpu_event_test.c | 2 +
1821 .../powerpc/pmu/ebb/event_attributes_test.c | 2 +
1822 .../selftests/powerpc/pmu/ebb/fork_cleanup_test.c | 2 +
1823 .../powerpc/pmu/ebb/instruction_count_test.c | 2 +
1824 .../powerpc/pmu/ebb/lost_exception_test.c | 2 +
1825 .../selftests/powerpc/pmu/ebb/multi_counter_test.c | 2 +
1826 .../powerpc/pmu/ebb/multi_ebb_procs_test.c | 2 +
1827 .../selftests/powerpc/pmu/ebb/no_handler_test.c | 2 +
1828 .../selftests/powerpc/pmu/ebb/pmae_handling_test.c | 2 +
1829 .../powerpc/pmu/ebb/pmc56_overflow_test.c | 2 +
1830 .../selftests/powerpc/pmu/ebb/reg_access_test.c | 2 +
1831 .../pmu/ebb/task_event_pinned_vs_ebb_test.c | 2 +
1832 .../powerpc/pmu/ebb/task_event_vs_ebb_test.c | 2 +
1833 .../testing/selftests/powerpc/syscalls/.gitignore | 1 +
1834 tools/testing/selftests/powerpc/syscalls/Makefile | 12 +
1835 tools/testing/selftests/powerpc/syscalls/ipc.h | 47 ++
1836 .../selftests/powerpc/syscalls/ipc_unmuxed.c | 61 +++
1837 tools/testing/selftests/powerpc/tm/tm-syscall.c | 14 +-
1838 98 files changed, 788 insertions(+), 1194 deletions(-)
1839 delete mode 100644 arch/powerpc/boot/dts/prpmc2800.dts
1840 delete mode 100644 arch/powerpc/boot/prpmc2800.c
1841 create mode 100644 arch/powerpc/platforms/pseries/of_helpers.c
1842 create mode 100644 arch/powerpc/platforms/pseries/of_helpers.h
1843 create mode 100644 tools/testing/selftests/powerpc/benchmarks/.gitignore
1844 create mode 100644 tools/testing/selftests/powerpc/benchmarks/Makefile
1845 create mode 100644 tools/testing/selftests/powerpc/benchmarks/gettimeofday.c
1846 create mode 100644 tools/testing/selftests/powerpc/syscalls/.gitignore
1847 create mode 100644 tools/testing/selftests/powerpc/syscalls/Makefile
1848 create mode 100644 tools/testing/selftests/powerpc/syscalls/ipc.h
1849 create mode 100644 tools/testing/selftests/powerpc/syscalls/ipc_unmuxed.c
1850 Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
1851 $ git merge powerpc-mpe/next
1853 Merging fsl/next (e1f580e8ced5 powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry)
1854 $ git merge fsl/next
1855 Auto-merging include/linux/fsl/guts.h
1856 Auto-merging drivers/clk/Kconfig
1857 Auto-merging arch/powerpc/boot/dts/fsl/t4240rdb.dts
1858 Auto-merging arch/powerpc/boot/dts/fsl/t4240qds.dts
1859 Auto-merging arch/powerpc/boot/dts/fsl/t2081qds.dts
1860 Auto-merging arch/powerpc/boot/dts/fsl/t2080rdb.dts
1861 Auto-merging arch/powerpc/boot/dts/fsl/t2080qds.dts
1862 Auto-merging arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi
1863 Auto-merging arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts
1864 Auto-merging arch/powerpc/boot/dts/fsl/t1042rdb.dts
1865 Auto-merging arch/powerpc/boot/dts/fsl/t1042qds.dts
1866 Auto-merging arch/powerpc/boot/dts/fsl/t1042d4rdb.dts
1867 Auto-merging arch/powerpc/boot/dts/fsl/t1040rdb.dts
1868 Auto-merging arch/powerpc/boot/dts/fsl/t1040qds.dts
1869 Auto-merging arch/powerpc/boot/dts/fsl/t1040d4rdb.dts
1870 Auto-merging arch/powerpc/boot/dts/fsl/t1024rdb.dts
1871 Auto-merging arch/powerpc/boot/dts/fsl/t1024qds.dts
1872 Auto-merging arch/powerpc/boot/dts/fsl/t1023rdb.dts
1873 Auto-merging arch/powerpc/boot/dts/fsl/ppa8548.dts
1874 Auto-merging arch/powerpc/boot/dts/fsl/p5040ds.dts
1875 Auto-merging arch/powerpc/boot/dts/fsl/p5020ds.dts
1876 Auto-merging arch/powerpc/boot/dts/fsl/p4080ds.dts
1877 Auto-merging arch/powerpc/boot/dts/fsl/p3041ds.dts
1878 Auto-merging arch/powerpc/boot/dts/fsl/p2041rdb.dts
1879 Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb.dts
1880 Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb-pc_36b.dts
1881 Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb-pc_32b.dts
1882 Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi
1883 Auto-merging arch/powerpc/boot/dts/fsl/p2020ds.dts
1884 Auto-merging arch/powerpc/boot/dts/fsl/p1025twr.dtsi
1885 Auto-merging arch/powerpc/boot/dts/fsl/p1025twr.dts
1886 Auto-merging arch/powerpc/boot/dts/fsl/p1025rdb_36b.dts
1887 Auto-merging arch/powerpc/boot/dts/fsl/p1025rdb_32b.dts
1888 Auto-merging arch/powerpc/boot/dts/fsl/p1024rdb_36b.dts
1889 Auto-merging arch/powerpc/boot/dts/fsl/p1024rdb_32b.dts
1890 Auto-merging arch/powerpc/boot/dts/fsl/p1023rdb.dts
1891 Auto-merging arch/powerpc/boot/dts/fsl/p1022rdk.dts
1892 Auto-merging arch/powerpc/boot/dts/fsl/p1022ds_36b.dts
1893 Auto-merging arch/powerpc/boot/dts/fsl/p1022ds_32b.dts
1894 Auto-merging arch/powerpc/boot/dts/fsl/p1022ds.dtsi
1895 Auto-merging arch/powerpc/boot/dts/fsl/p1021rdb-pc_36b.dts
1896 Auto-merging arch/powerpc/boot/dts/fsl/p1021rdb-pc_32b.dts
1897 Auto-merging arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi
1898 Auto-merging arch/powerpc/boot/dts/fsl/p1021mds.dts
1899 Auto-merging arch/powerpc/boot/dts/fsl/p1020utm-pc_36b.dts
1900 Auto-merging arch/powerpc/boot/dts/fsl/p1020utm-pc_32b.dts
1901 Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb_36b.dts
1902 Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb.dts
1903 Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts
1904 Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb-pc_36b.dts
1905 Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb-pc_32b.dts
1906 Auto-merging arch/powerpc/boot/dts/fsl/p1020mbg-pc_36b.dts
1907 Auto-merging arch/powerpc/boot/dts/fsl/p1020mbg-pc_32b.dts
1908 Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
1909 Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pb_36b.dts
1910 Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pb.dts
1911 Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pa_36b.dts
1912 Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pa.dts
1913 Auto-merging arch/powerpc/boot/dts/fsl/oca4080.dts
1914 Auto-merging arch/powerpc/boot/dts/fsl/mvme2500.dts
1915 Auto-merging arch/powerpc/boot/dts/fsl/mpc8572ds_36b.dts
1916 Auto-merging arch/powerpc/boot/dts/fsl/mpc8572ds.dts
1917 Auto-merging arch/powerpc/boot/dts/fsl/mpc8569mds.dts
1918 Auto-merging arch/powerpc/boot/dts/fsl/mpc8568mds.dts
1919 Auto-merging arch/powerpc/boot/dts/fsl/mpc8560ads.dts
1920 Auto-merging arch/powerpc/boot/dts/fsl/mpc8555cds.dts
1921 Auto-merging arch/powerpc/boot/dts/fsl/mpc8548cds_36b.dts
1922 Auto-merging arch/powerpc/boot/dts/fsl/mpc8548cds_32b.dts
1923 Auto-merging arch/powerpc/boot/dts/fsl/mpc8544ds.dts
1924 Auto-merging arch/powerpc/boot/dts/fsl/mpc8541cds.dts
1925 Auto-merging arch/powerpc/boot/dts/fsl/mpc8540ads.dts
1926 Auto-merging arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts
1927 Auto-merging arch/powerpc/boot/dts/fsl/mpc8536ds.dts
1928 Auto-merging arch/powerpc/boot/dts/fsl/kmcoge4.dts
1929 Auto-merging arch/powerpc/boot/dts/fsl/ge_imp3a.dts
1930 Auto-merging arch/powerpc/boot/dts/fsl/c293pcie.dts
1931 Auto-merging arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi
1932 Auto-merging arch/powerpc/boot/dts/fsl/bsc9132qds.dts
1933 Auto-merging arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi
1934 Auto-merging arch/powerpc/boot/dts/fsl/bsc9131rdb.dts
1935 Auto-merging arch/powerpc/boot/dts/fsl/b4qds.dtsi
1936 Auto-merging arch/powerpc/boot/dts/fsl/b4860qds.dts
1937 Auto-merging arch/powerpc/boot/dts/fsl/b4420qds.dts
1938 Merge made by the 'recursive' strategy.
1939 Documentation/devicetree/bindings/chosen.txt | 8 +
1940 .../devicetree/bindings/clock/qoriq-clock.txt | 61 +-
1941 .../devicetree/bindings/net/maxim,ds26522.txt | 13 +
1942 arch/powerpc/Kconfig | 2 +-
1943 arch/powerpc/boot/Makefile | 3 +
1944 arch/powerpc/boot/dts/{ => fsl}/b4420qds.dts | 4 +-
1945 arch/powerpc/boot/dts/fsl/b4420si-post.dtsi | 4 +-
1946 arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi | 13 +-
1947 arch/powerpc/boot/dts/{ => fsl}/b4860qds.dts | 4 +-
1948 arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 26 +-
1949 arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi | 20 +-
1950 arch/powerpc/boot/dts/{ => fsl}/b4qds.dtsi | 2 +-
1951 arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 33 +-
1952 arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dts | 4 +-
1953 arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dtsi | 12 +
1954 arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dts | 4 +-
1955 arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dtsi | 12 +
1956 arch/powerpc/boot/dts/{ => fsl}/c293pcie.dts | 4 +-
1957 arch/powerpc/boot/dts/fsl/cyrus_p5020.dts | 155 +++
1958 arch/powerpc/boot/dts/{ => fsl}/ge_imp3a.dts | 4 +-
1959 arch/powerpc/boot/dts/{ => fsl}/kmcoge4.dts | 4 +-
1960 arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dts | 4 +-
1961 arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dtsi | 0
1962 arch/powerpc/boot/dts/{ => fsl}/mpc8536ds_36b.dts | 4 +-
1963 arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi | 2 +-
1964 arch/powerpc/boot/dts/{ => fsl}/mpc8540ads.dts | 2 +-
1965 arch/powerpc/boot/dts/{ => fsl}/mpc8541cds.dts | 2 +-
1966 arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dts | 4 +-
1967 arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dtsi | 0
1968 arch/powerpc/boot/dts/{ => fsl}/mpc8548cds.dtsi | 0
1969 arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_32b.dts | 4 +-
1970 arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_36b.dts | 4 +-
1971 arch/powerpc/boot/dts/{ => fsl}/mpc8555cds.dts | 2 +-
1972 arch/powerpc/boot/dts/{ => fsl}/mpc8560ads.dts | 2 +-
1973 arch/powerpc/boot/dts/{ => fsl}/mpc8568mds.dts | 4 +-
1974 arch/powerpc/boot/dts/{ => fsl}/mpc8569mds.dts | 4 +-
1975 arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dts | 4 +-
1976 arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dtsi | 0
1977 arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_36b.dts | 4 +-
1978 .../boot/dts/{ => fsl}/mpc8572ds_camp_core0.dts | 0
1979 .../boot/dts/{ => fsl}/mpc8572ds_camp_core1.dts | 0
1980 arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi | 2 +-
1981 arch/powerpc/boot/dts/{ => fsl}/mvme2500.dts | 4 +-
1982 arch/powerpc/boot/dts/{ => fsl}/oca4080.dts | 4 +-
1983 arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dts | 4 +-
1984 arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dtsi | 0
1985 .../powerpc/boot/dts/{ => fsl}/p1010rdb-pa_36b.dts | 4 +-
1986 arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb.dts | 4 +-
1987 .../powerpc/boot/dts/{ => fsl}/p1010rdb-pb_36b.dts | 4 +-
1988 arch/powerpc/boot/dts/{ => fsl}/p1010rdb.dtsi | 12 +
1989 arch/powerpc/boot/dts/{ => fsl}/p1010rdb_32b.dtsi | 0
1990 arch/powerpc/boot/dts/{ => fsl}/p1010rdb_36b.dtsi | 0
1991 arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc.dtsi | 0
1992 .../powerpc/boot/dts/{ => fsl}/p1020mbg-pc_32b.dts | 4 +-
1993 .../powerpc/boot/dts/{ => fsl}/p1020mbg-pc_36b.dts | 4 +-
1994 arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc.dtsi | 0
1995 .../powerpc/boot/dts/{ => fsl}/p1020rdb-pc_32b.dts | 4 +-
1996 .../powerpc/boot/dts/{ => fsl}/p1020rdb-pc_36b.dts | 4 +-
1997 .../boot/dts/{ => fsl}/p1020rdb-pc_camp_core0.dts | 0
1998 .../boot/dts/{ => fsl}/p1020rdb-pc_camp_core1.dts | 0
1999 arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pd.dts | 16 +-
2000 arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dts | 4 +-
2001 arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dtsi | 0
2002 arch/powerpc/boot/dts/{ => fsl}/p1020rdb_36b.dts | 4 +-
2003 arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc.dtsi | 0
2004 .../powerpc/boot/dts/{ => fsl}/p1020utm-pc_32b.dts | 4 +-
2005 .../powerpc/boot/dts/{ => fsl}/p1020utm-pc_36b.dts | 4 +-
2006 arch/powerpc/boot/dts/{ => fsl}/p1021mds.dts | 4 +-
2007 arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc.dtsi | 12 +
2008 .../powerpc/boot/dts/{ => fsl}/p1021rdb-pc_32b.dts | 4 +-
2009 .../powerpc/boot/dts/{ => fsl}/p1021rdb-pc_36b.dts | 4 +-
2010 arch/powerpc/boot/dts/{ => fsl}/p1022ds.dtsi | 12 +
2011 arch/powerpc/boot/dts/{ => fsl}/p1022ds_32b.dts | 4 +-
2012 arch/powerpc/boot/dts/{ => fsl}/p1022ds_36b.dts | 4 +-
2013 arch/powerpc/boot/dts/{ => fsl}/p1022rdk.dts | 4 +-
2014 arch/powerpc/boot/dts/{ => fsl}/p1023rdb.dts | 4 +-
2015 arch/powerpc/boot/dts/{ => fsl}/p1024rdb.dtsi | 0
2016 arch/powerpc/boot/dts/{ => fsl}/p1024rdb_32b.dts | 4 +-
2017 arch/powerpc/boot/dts/{ => fsl}/p1024rdb_36b.dts | 4 +-
2018 arch/powerpc/boot/dts/{ => fsl}/p1025rdb.dtsi | 0
2019 arch/powerpc/boot/dts/{ => fsl}/p1025rdb_32b.dts | 4 +-
2020 arch/powerpc/boot/dts/{ => fsl}/p1025rdb_36b.dts | 4 +-
2021 arch/powerpc/boot/dts/{ => fsl}/p1025twr.dts | 4 +-
2022 arch/powerpc/boot/dts/{ => fsl}/p1025twr.dtsi | 12 +
2023 arch/powerpc/boot/dts/{ => fsl}/p2020ds.dts | 4 +-
2024 arch/powerpc/boot/dts/{ => fsl}/p2020ds.dtsi | 0
2025 arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc.dtsi | 12 +-
2026 .../powerpc/boot/dts/{ => fsl}/p2020rdb-pc_32b.dts | 4 +-
2027 .../powerpc/boot/dts/{ => fsl}/p2020rdb-pc_36b.dts | 4 +-
2028 arch/powerpc/boot/dts/{ => fsl}/p2020rdb.dts | 4 +-
2029 arch/powerpc/boot/dts/{ => fsl}/p2041rdb.dts | 4 +-
2030 arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 29 +-
2031 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi | 10 +-
2032 arch/powerpc/boot/dts/{ => fsl}/p3041ds.dts | 4 +-
2033 arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 29 +-
2034 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi | 10 +-
2035 arch/powerpc/boot/dts/{ => fsl}/p4080ds.dts | 4 +-
2036 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 48 +-
2037 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | 15 +-
2038 arch/powerpc/boot/dts/{ => fsl}/p5020ds.dts | 4 +-
2039 arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 29 +-
2040 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 10 +-
2041 arch/powerpc/boot/dts/{ => fsl}/p5040ds.dts | 4 +-
2042 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 56 +-
2043 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi | 17 +-
2044 arch/powerpc/boot/dts/{ => fsl}/ppa8548.dts | 4 +-
2045 arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi | 3 +-
2046 arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi | 3 +-
2047 arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi | 62 +
2048 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi | 69 +
2049 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi | 68 +
2050 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi | 68 +
2051 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi | 68 +
2052 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi | 68 +
2053 arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi | 101 ++
2054 arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi | 61 +
2055 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi | 68 +
2056 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi | 68 +
2057 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi | 68 +
2058 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi | 68 +
2059 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi | 68 +
2060 arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi | 101 ++
2061 .../dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi | 66 +
2062 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi | 63 +
2063 .../dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi | 66 +
2064 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi | 63 +
2065 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi | 62 +
2066 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi | 62 +
2067 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi | 62 +
2068 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi | 62 +
2069 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi | 62 +
2070 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi | 62 +
2071 arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi | 106 ++
2072 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi | 63 +
2073 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi | 63 +
2074 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi | 62 +
2075 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi | 62 +
2076 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi | 62 +
2077 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi | 62 +
2078 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi | 62 +
2079 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi | 62 +
2080 arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi | 106 ++
2081 arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi | 94 ++
2082 arch/powerpc/boot/dts/{ => fsl}/t1023rdb.dts | 4 +-
2083 arch/powerpc/boot/dts/fsl/t1023si-post.dtsi | 19 +
2084 arch/powerpc/boot/dts/{ => fsl}/t1024qds.dts | 4 +-
2085 arch/powerpc/boot/dts/{ => fsl}/t1024rdb.dts | 4 +-
2086 arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi | 6 +
2087 arch/powerpc/boot/dts/{ => fsl}/t1040d4rdb.dts | 4 +-
2088 arch/powerpc/boot/dts/{ => fsl}/t1040qds.dts | 4 +-
2089 arch/powerpc/boot/dts/{ => fsl}/t1040rdb.dts | 4 +-
2090 arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 31 +
2091 arch/powerpc/boot/dts/{ => fsl}/t1042d4rdb.dts | 4 +-
2092 arch/powerpc/boot/dts/{ => fsl}/t1042qds.dts | 4 +-
2093 arch/powerpc/boot/dts/{ => fsl}/t1042rdb.dts | 4 +-
2094 arch/powerpc/boot/dts/{ => fsl}/t1042rdb_pi.dts | 4 +-
2095 arch/powerpc/boot/dts/{ => fsl}/t104xd4rdb.dtsi | 10 +
2096 arch/powerpc/boot/dts/{ => fsl}/t104xqds.dtsi | 0
2097 arch/powerpc/boot/dts/{ => fsl}/t104xrdb.dtsi | 0
2098 arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi | 9 +-
2099 arch/powerpc/boot/dts/{ => fsl}/t2080qds.dts | 4 +-
2100 arch/powerpc/boot/dts/{ => fsl}/t2080rdb.dts | 4 +-
2101 arch/powerpc/boot/dts/{ => fsl}/t2081qds.dts | 4 +-
2102 arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 43 +
2103 arch/powerpc/boot/dts/{ => fsl}/t208xqds.dtsi | 0
2104 arch/powerpc/boot/dts/{ => fsl}/t208xrdb.dtsi | 0
2105 arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi | 11 +
2106 arch/powerpc/boot/dts/{ => fsl}/t4240qds.dts | 4 +-
2107 arch/powerpc/boot/dts/{ => fsl}/t4240rdb.dts | 4 +-
2108 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 88 +-
2109 arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 22 +-
2110 arch/powerpc/include/asm/exception-64e.h | 15 +-
2111 arch/powerpc/include/asm/page.h | 7 +-
2112 arch/powerpc/kernel/crash.c | 6 +-
2113 arch/powerpc/kernel/exceptions-64e.S | 17 +-
2114 arch/powerpc/kernel/head_64.S | 43 +-
2115 arch/powerpc/kernel/machine_kexec_64.c | 18 +
2116 arch/powerpc/kernel/misc_64.S | 60 +-
2117 arch/powerpc/kernel/paca.c | 9 +-
2118 arch/powerpc/kernel/setup_64.c | 25 +-
2119 arch/powerpc/mm/fsl_booke_mmu.c | 26 +-
2120 arch/powerpc/mm/mmu_decl.h | 4 +-
2121 arch/powerpc/mm/tlb_low_64e.S | 25 +-
2122 arch/powerpc/mm/tlb_nohash.c | 41 +-
2123 arch/powerpc/mm/tlb_nohash_low.S | 63 +
2124 arch/powerpc/platforms/85xx/corenet_generic.c | 11 +
2125 arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +-
2126 arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 2 +-
2127 arch/powerpc/platforms/85xx/p1022_ds.c | 2 +-
2128 arch/powerpc/platforms/85xx/p1022_rdk.c | 2 +-
2129 arch/powerpc/platforms/85xx/smp.c | 88 +-
2130 arch/powerpc/platforms/85xx/twr_p102x.c | 2 +-
2131 arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +-
2132 arch/powerpc/sysdev/cpm_common.c | 3 +-
2133 arch/powerpc/sysdev/fsl_pci.c | 86 +-
2134 arch/powerpc/sysdev/mpic.c | 23 +-
2135 drivers/clk/Kconfig | 2 +-
2136 drivers/clk/clk-qoriq.c | 1354 ++++++++++++++++----
2137 drivers/iommu/fsl_pamu.c | 2 +-
2138 .../asm/fsl_guts.h => include/linux/fsl/guts.h | 8 +-
2139 sound/soc/fsl/mpc8610_hpcd.c | 2 +-
2140 sound/soc/fsl/p1022_ds.c | 2 +-
2141 sound/soc/fsl/p1022_rdk.c | 2 +-
2142 203 files changed, 5078 insertions(+), 534 deletions(-)
2143 create mode 100644 Documentation/devicetree/bindings/net/maxim,ds26522.txt
2144 rename arch/powerpc/boot/dts/{ => fsl}/b4420qds.dts (96%)
2145 rename arch/powerpc/boot/dts/{ => fsl}/b4860qds.dts (97%)
2146 rename arch/powerpc/boot/dts/{ => fsl}/b4qds.dtsi (99%)
2147 rename arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dts (91%)
2148 rename arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dtsi (90%)
2149 rename arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dts (91%)
2150 rename arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dtsi (91%)
2151 rename arch/powerpc/boot/dts/{ => fsl}/c293pcie.dts (98%)
2152 create mode 100644 arch/powerpc/boot/dts/fsl/cyrus_p5020.dts
2153 rename arch/powerpc/boot/dts/{ => fsl}/ge_imp3a.dts (98%)
2154 rename arch/powerpc/boot/dts/{ => fsl}/kmcoge4.dts (98%)
2155 rename arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dts (97%)
2156 rename arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dtsi (100%)
2157 rename arch/powerpc/boot/dts/{ => fsl}/mpc8536ds_36b.dts (97%)
2158 rename arch/powerpc/boot/dts/{ => fsl}/mpc8540ads.dts (99%)
2159 rename arch/powerpc/boot/dts/{ => fsl}/mpc8541cds.dts (99%)
2160 rename arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dts (97%)
2161 rename arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dtsi (100%)
2162 rename arch/powerpc/boot/dts/{ => fsl}/mpc8548cds.dtsi (100%)
2163 rename arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_32b.dts (96%)
2164 rename arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_36b.dts (96%)
2165 rename arch/powerpc/boot/dts/{ => fsl}/mpc8555cds.dts (99%)
2166 rename arch/powerpc/boot/dts/{ => fsl}/mpc8560ads.dts (99%)
2167 rename arch/powerpc/boot/dts/{ => fsl}/mpc8568mds.dts (99%)
2168 rename arch/powerpc/boot/dts/{ => fsl}/mpc8569mds.dts (99%)
2169 rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dts (96%)
2170 rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dtsi (100%)
2171 rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_36b.dts (96%)
2172 rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_camp_core0.dts (100%)
2173 rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_camp_core1.dts (100%)
2174 rename arch/powerpc/boot/dts/{ => fsl}/mvme2500.dts (98%)
2175 rename arch/powerpc/boot/dts/{ => fsl}/oca4080.dts (98%)
2176 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dts (88%)
2177 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dtsi (100%)
2178 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa_36b.dts (96%)
2179 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb.dts (89%)
2180 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb_36b.dts (96%)
2181 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb.dtsi (94%)
2182 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb_32b.dtsi (100%)
2183 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb_36b.dtsi (100%)
2184 rename arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc.dtsi (100%)
2185 rename arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc_32b.dts (97%)
2186 rename arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc_36b.dts (97%)
2187 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc.dtsi (100%)
2188 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_32b.dts (97%)
2189 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_36b.dts (97%)
2190 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_camp_core0.dts (100%)
2191 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_camp_core1.dts (100%)
2192 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pd.dts (95%)
2193 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dts (95%)
2194 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dtsi (100%)
2195 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb_36b.dts (95%)
2196 rename arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc.dtsi (100%)
2197 rename arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc_32b.dts (97%)
2198 rename arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc_36b.dts (97%)
2199 rename arch/powerpc/boot/dts/{ => fsl}/p1021mds.dts (99%)
2200 rename arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc.dtsi (95%)
2201 rename arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc_32b.dts (97%)
2202 rename arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc_36b.dts (97%)
2203 rename arch/powerpc/boot/dts/{ => fsl}/p1022ds.dtsi (94%)
2204 rename arch/powerpc/boot/dts/{ => fsl}/p1022ds_32b.dts (98%)
2205 rename arch/powerpc/boot/dts/{ => fsl}/p1022ds_36b.dts (98%)
2206 rename arch/powerpc/boot/dts/{ => fsl}/p1022rdk.dts (98%)
2207 rename arch/powerpc/boot/dts/{ => fsl}/p1023rdb.dts (99%)
2208 rename arch/powerpc/boot/dts/{ => fsl}/p1024rdb.dtsi (100%)
2209 rename arch/powerpc/boot/dts/{ => fsl}/p1024rdb_32b.dts (97%)
2210 rename arch/powerpc/boot/dts/{ => fsl}/p1024rdb_36b.dts (97%)
2211 rename arch/powerpc/boot/dts/{ => fsl}/p1025rdb.dtsi (100%)
2212 rename arch/powerpc/boot/dts/{ => fsl}/p1025rdb_32b.dts (98%)
2213 rename arch/powerpc/boot/dts/{ => fsl}/p1025rdb_36b.dts (97%)
2214 rename arch/powerpc/boot/dts/{ => fsl}/p1025twr.dts (97%)
2215 rename arch/powerpc/boot/dts/{ => fsl}/p1025twr.dtsi (96%)
2216 rename arch/powerpc/boot/dts/{ => fsl}/p2020ds.dts (96%)
2217 rename arch/powerpc/boot/dts/{ => fsl}/p2020ds.dtsi (100%)
2218 rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc.dtsi (97%)
2219 rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc_32b.dts (97%)
2220 rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc_36b.dts (97%)
2221 rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb.dts (98%)
2222 rename arch/powerpc/boot/dts/{ => fsl}/p2041rdb.dts (98%)
2223 rename arch/powerpc/boot/dts/{ => fsl}/p3041ds.dts (99%)
2224 rename arch/powerpc/boot/dts/{ => fsl}/p4080ds.dts (98%)
2225 rename arch/powerpc/boot/dts/{ => fsl}/p5020ds.dts (99%)
2226 rename arch/powerpc/boot/dts/{ => fsl}/p5040ds.dts (98%)
2227 rename arch/powerpc/boot/dts/{ => fsl}/ppa8548.dts (97%)
2228 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi
2229 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi
2230 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi
2231 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi
2232 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi
2233 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi
2234 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi
2235 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi
2236 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi
2237 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi
2238 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi
2239 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi
2240 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi
2241 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi
2242 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi
2243 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi
2244 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi
2245 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi
2246 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi
2247 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi
2248 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi
2249 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi
2250 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi
2251 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi
2252 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi
2253 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi
2254 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi
2255 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi
2256 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi
2257 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi
2258 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi
2259 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi
2260 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi
2261 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi
2262 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi
2263 rename arch/powerpc/boot/dts/{ => fsl}/t1023rdb.dts (98%)
2264 rename arch/powerpc/boot/dts/{ => fsl}/t1024qds.dts (98%)
2265 rename arch/powerpc/boot/dts/{ => fsl}/t1024rdb.dts (98%)
2266 rename arch/powerpc/boot/dts/{ => fsl}/t1040d4rdb.dts (96%)
2267 rename arch/powerpc/boot/dts/{ => fsl}/t1040qds.dts (96%)
2268 rename arch/powerpc/boot/dts/{ => fsl}/t1040rdb.dts (96%)
2269 rename arch/powerpc/boot/dts/{ => fsl}/t1042d4rdb.dts (96%)
2270 rename arch/powerpc/boot/dts/{ => fsl}/t1042qds.dts (96%)
2271 rename arch/powerpc/boot/dts/{ => fsl}/t1042rdb.dts (96%)
2272 rename arch/powerpc/boot/dts/{ => fsl}/t1042rdb_pi.dts (96%)
2273 rename arch/powerpc/boot/dts/{ => fsl}/t104xd4rdb.dtsi (95%)
2274 rename arch/powerpc/boot/dts/{ => fsl}/t104xqds.dtsi (100%)
2275 rename arch/powerpc/boot/dts/{ => fsl}/t104xrdb.dtsi (100%)
2276 rename arch/powerpc/boot/dts/{ => fsl}/t2080qds.dts (96%)
2277 rename arch/powerpc/boot/dts/{ => fsl}/t2080rdb.dts (97%)
2278 rename arch/powerpc/boot/dts/{ => fsl}/t2081qds.dts (96%)
2279 rename arch/powerpc/boot/dts/{ => fsl}/t208xqds.dtsi (100%)
2280 rename arch/powerpc/boot/dts/{ => fsl}/t208xrdb.dtsi (100%)
2281 rename arch/powerpc/boot/dts/{ => fsl}/t4240qds.dts (99%)
2282 rename arch/powerpc/boot/dts/{ => fsl}/t4240rdb.dts (98%)
2283 rename arch/powerpc/include/asm/fsl_guts.h => include/linux/fsl/guts.h (98%)
2284 Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
2285 $ git merge mpc5xxx/next
2286 Merge made by the 'recursive' strategy.
2287 .../bindings/powerpc/fsl/mpc512x_lpbfifo.txt | 21 +
2288 arch/powerpc/boot/dts/mpc5121.dtsi | 11 +-
2289 arch/powerpc/boot/dts/mpc5125twr.dts | 11 +-
2290 arch/powerpc/configs/mpc512x_defconfig | 1 +
2291 arch/powerpc/include/asm/mpc5121.h | 59 +++
2292 arch/powerpc/include/asm/mpc52xx_psc.h | 2 -
2293 arch/powerpc/platforms/512x/Kconfig | 6 +
2294 arch/powerpc/platforms/512x/Makefile | 1 +
2295 arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 540 +++++++++++++++++++++
2296 arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 6 +-
2297 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 +
2298 11 files changed, 650 insertions(+), 9 deletions(-)
2299 create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/mpc512x_lpbfifo.txt
2300 create mode 100644 arch/powerpc/platforms/512x/mpc512x_lpbfifo.c
2301 Merging s390/features (ef12cb904e09 s390/cio: move ccw_device_stlck functions)
2302 $ git merge s390/features
2303 Auto-merging include/linux/compiler.h
2304 Auto-merging include/asm-generic/pgtable.h
2305 Removing drivers/s390/crypto/zcrypt_pcicc.h
2306 Removing drivers/s390/crypto/zcrypt_pcicc.c
2307 Removing drivers/s390/crypto/zcrypt_pcica.h
2308 Removing drivers/s390/crypto/zcrypt_pcica.c
2309 Auto-merging arch/s390/include/asm/fpu/internal.h
2310 Merge made by the 'recursive' strategy.
2311 arch/s390/Kconfig | 1 +
2312 arch/s390/hypfs/hypfs_diag.c | 10 +-
2313 arch/s390/hypfs/hypfs_diag0c.c | 2 +
2314 arch/s390/hypfs/hypfs_sprp.c | 9 +-
2315 arch/s390/hypfs/hypfs_vm.c | 2 +
2316 arch/s390/include/asm/appldata.h | 2 +
2317 arch/s390/include/asm/atomic.h | 2 -
2318 arch/s390/include/asm/barrier.h | 8 +-
2319 arch/s390/include/asm/bitops.h | 55 +-
2320 arch/s390/include/asm/cio.h | 10 +
2321 arch/s390/include/asm/cmb.h | 1 +
2322 arch/s390/include/asm/cmpxchg.h | 30 +-
2323 arch/s390/include/asm/ctl_reg.h | 2 -
2324 arch/s390/include/asm/diag.h | 29 +
2325 arch/s390/include/asm/etr.h | 10 +-
2326 arch/s390/include/asm/fpu/api.h | 30 +
2327 .../include/asm/{fpu-internal.h => fpu/internal.h} | 51 +-
2328 arch/s390/include/asm/fpu/types.h | 25 +
2329 arch/s390/include/asm/idle.h | 2 +
2330 arch/s390/include/asm/irq.h | 13 +
2331 arch/s390/include/asm/kvm_host.h | 2 +-
2332 arch/s390/include/asm/kvm_para.h | 67 +-
2333 arch/s390/include/asm/lowcore.h | 11 +-
2334 arch/s390/include/asm/nmi.h | 98 +-
2335 arch/s390/include/asm/pgtable.h | 66 +-
2336 arch/s390/include/asm/processor.h | 98 +-
2337 arch/s390/include/asm/ptrace.h | 11 +-
2338 arch/s390/include/asm/setup.h | 50 +-
2339 arch/s390/include/asm/spinlock.h | 3 -
2340 arch/s390/include/asm/switch_to.h | 2 +-
2341 arch/s390/include/asm/thread_info.h | 22 +-
2342 arch/s390/include/asm/trace/diag.h | 43 +
2343 arch/s390/kernel/Makefile | 2 +
2344 arch/s390/kernel/asm-offsets.c | 290 +--
2345 arch/s390/kernel/compat_signal.c | 7 +-
2346 arch/s390/kernel/cpcmd.c | 2 +
2347 arch/s390/kernel/crash_dump.c | 16 +-
2348 arch/s390/kernel/diag.c | 134 +-
2349 arch/s390/kernel/early.c | 15 +-
2350 arch/s390/kernel/entry.S | 230 +--
2351 arch/s390/kernel/entry.h | 3 -
2352 arch/s390/kernel/head64.S | 7 +-
2353 arch/s390/kernel/ipl.c | 9 +-
2354 arch/s390/kernel/nmi.c | 120 +-
2355 arch/s390/kernel/perf_cpum_sf.c | 10 +-
2356 arch/s390/kernel/process.c | 36 +-
2357 arch/s390/kernel/processor.c | 5 +-
2358 arch/s390/kernel/ptrace.c | 44 +-
2359 arch/s390/kernel/s390_ksyms.c | 3 +-
2360 arch/s390/kernel/signal.c | 7 +-
2361 arch/s390/kernel/smp.c | 10 +-
2362 arch/s390/kernel/time.c | 31 +-
2363 arch/s390/kernel/topology.c | 28 +-
2364 arch/s390/kernel/trace.c | 29 +
2365 arch/s390/kernel/traps.c | 41 +-
2366 arch/s390/kernel/vdso.c | 2 +-
2367 arch/s390/kvm/kvm-s390.c | 6 -
2368 arch/s390/lib/delay.c | 30 +-
2369 arch/s390/lib/find.c | 4 +-
2370 arch/s390/lib/spinlock.c | 4 +-
2371 arch/s390/mm/extmem.c | 3 +
2372 arch/s390/mm/fault.c | 7 +-
2373 arch/s390/mm/hugetlbpage.c | 2 +
2374 arch/s390/numa/mode_emu.c | 10 +-
2375 arch/s390/pci/pci_insn.c | 6 +-
2376 arch/x86/include/asm/pgtable.h | 10 +
2377 drivers/s390/block/dasd.c | 1 +
2378 drivers/s390/block/dasd_alias.c | 5 +-
2379 drivers/s390/block/dasd_diag.c | 2 +
2380 drivers/s390/block/dasd_eckd.c | 11 +-
2381 drivers/s390/char/diag_ftp.c | 2 +
2382 drivers/s390/char/sclp_rw.c | 136 +-
2383 drivers/s390/char/sclp_rw.h | 17 +-
2384 drivers/s390/char/sclp_tty.c | 8 +-
2385 drivers/s390/cio/cio.c | 6 +-
2386 drivers/s390/cio/cmf.c | 220 ++-
2387 drivers/s390/cio/css.c | 1 +
2388 drivers/s390/cio/device.c | 4 +-
2389 drivers/s390/cio/device.h | 6 +-
2390 drivers/s390/cio/device_fsm.c | 38 +
2391 drivers/s390/cio/device_ops.c | 107 --
2392 drivers/s390/cio/device_pgid.c | 70 +-
2393 drivers/s390/crypto/Makefile | 4 +-
2394 drivers/s390/crypto/ap_bus.c | 1850 +++++++++-----------
2395 drivers/s390/crypto/ap_bus.h | 67 +-
2396 drivers/s390/crypto/zcrypt_api.c | 3 +-
2397 drivers/s390/crypto/zcrypt_cca_key.h | 2 +-
2398 drivers/s390/crypto/zcrypt_msgtype50.c | 28 +-
2399 drivers/s390/crypto/zcrypt_msgtype6.c | 59 +-
2400 drivers/s390/crypto/zcrypt_pcica.c | 420 -----
2401 drivers/s390/crypto/zcrypt_pcica.h | 115 --
2402 drivers/s390/crypto/zcrypt_pcicc.c | 627 -------
2403 drivers/s390/crypto/zcrypt_pcicc.h | 174 --
2404 drivers/s390/virtio/virtio_ccw.c | 15 +-
2405 drivers/watchdog/diag288_wdt.c | 4 +
2406 fs/proc/task_mmu.c | 4 +-
2407 include/asm-generic/pgtable.h | 10 +
2408 include/linux/compiler.h | 2 +-
2409 98 files changed, 2374 insertions(+), 3574 deletions(-)
2410 create mode 100644 arch/s390/include/asm/fpu/api.h
2411 rename arch/s390/include/asm/{fpu-internal.h => fpu/internal.h} (59%)
2412 create mode 100644 arch/s390/include/asm/fpu/types.h
2413 create mode 100644 arch/s390/include/asm/trace/diag.h
2414 create mode 100644 arch/s390/kernel/trace.c
2415 delete mode 100644 drivers/s390/crypto/zcrypt_pcica.c
2416 delete mode 100644 drivers/s390/crypto/zcrypt_pcica.h
2417 delete mode 100644 drivers/s390/crypto/zcrypt_pcicc.c
2418 delete mode 100644 drivers/s390/crypto/zcrypt_pcicc.h
2419 Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
2420 $ git merge sparc-next/master
2422 Merging tile/master (09745f38a74e arch/tile: turn off timer tick for oneshot_stopped state)
2423 $ git merge tile/master
2424 Merge made by the 'recursive' strategy.
2425 arch/tile/Kconfig | 1 +
2426 arch/tile/include/asm/insn.h | 59 +++++++++++++++++++++++++++
2427 arch/tile/include/asm/jump_label.h | 58 +++++++++++++++++++++++++++
2428 arch/tile/include/asm/page.h | 10 +++++
2429 arch/tile/include/asm/processor.h | 2 +-
2430 arch/tile/include/asm/thread_info.h | 8 +++-
2431 arch/tile/kernel/Makefile | 1 +
2432 arch/tile/kernel/ftrace.c | 13 +-----
2433 arch/tile/kernel/intvec_32.S | 46 +++++++--------------
2434 arch/tile/kernel/intvec_64.S | 49 +++++++----------------
2435 arch/tile/kernel/jump_label.c | 64 ++++++++++++++++++++++++++++++
2436 arch/tile/kernel/kgdb.c | 2 +-
2437 arch/tile/kernel/kprobes.c | 4 +-
2438 arch/tile/kernel/process.c | 79 +++++++++++++++++++------------------
2439 arch/tile/kernel/time.c | 1 +
2440 15 files changed, 276 insertions(+), 121 deletions(-)
2441 create mode 100644 arch/tile/include/asm/insn.h
2442 create mode 100644 arch/tile/include/asm/jump_label.h
2443 create mode 100644 arch/tile/kernel/jump_label.c
2444 Merging uml/linux-next (56b88a3bf97a um: Fix kernel mode fault condition)
2445 $ git merge uml/linux-next
2447 Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
2448 $ git merge unicore32/unicore32
2450 Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing)
2451 $ git merge xtensa/for_next
2453 Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled)
2454 $ git merge btrfs/next
2456 Merging ceph/master (8dbd263de1cb ceph: improve readahead for file holes)
2457 $ git merge ceph/master
2458 Merge made by the 'recursive' strategy.
2459 Merging cifs/for-next (5fe43a837f7b [SMB3] Fix build so persistent handles disabled if SMB2 support not configured)
2460 $ git merge cifs/for-next
2461 Merge made by the 'recursive' strategy.
2462 fs/cifs/cifsfs.c | 4 ++
2463 fs/cifs/cifsglob.h | 16 ++++--
2464 fs/cifs/cifsproto.h | 5 +-
2465 fs/cifs/connect.c | 80 ++++++++++++++++++++++++++++-
2466 fs/cifs/misc.c | 2 +-
2467 fs/cifs/smb2file.c | 19 +++++++
2468 fs/cifs/smb2misc.c | 39 +++++++++++---
2469 fs/cifs/smb2ops.c | 19 ++++---
2470 fs/cifs/smb2pdu.c | 132 +++++++++++++++++++++++++++++++++++++++++++++---
2471 fs/cifs/smb2pdu.h | 53 +++++++++++++++++--
2472 fs/cifs/smb2proto.h | 3 +-
2473 fs/cifs/smb2transport.c | 102 ++++++++++++++++++++++++++++++++++---
2474 fs/cifs/smbfsctl.h | 2 +-
2475 13 files changed, 435 insertions(+), 41 deletions(-)
2476 Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
2477 $ git merge ecryptfs/next
2478 Merge made by the 'recursive' strategy.
2479 fs/ecryptfs/main.c | 3 +--
2480 1 file changed, 1 insertion(+), 2 deletions(-)
2481 Merging ext3/for_next (d4eb6dee4712 ext4: Update EXT4_USE_FOR_EXT2 description)
2482 $ git merge ext3/for_next
2484 Merging ext4/dev (1a70ea8d47aa ext4: fix abs() usage in ext4_mb_check_group_pa)
2485 $ git merge ext4/dev
2486 Auto-merging fs/ext4/readpage.c
2487 Merge made by the 'recursive' strategy.
2489 fs/ext4/Makefile | 2 +-
2490 fs/ext4/balloc.c | 92 ++++---
2491 fs/ext4/block_validity.c | 2 +-
2492 fs/ext4/crypto.c | 52 ++--
2493 fs/ext4/crypto_fname.c | 2 -
2494 fs/ext4/crypto_key.c | 16 +-
2495 fs/ext4/crypto_policy.c | 3 +-
2496 fs/ext4/dir.c | 7 +-
2497 fs/ext4/ext4.h | 177 ++++++++++--
2498 fs/ext4/ext4_jbd2.c | 6 +-
2499 fs/ext4/ext4_jbd2.h | 10 +-
2500 fs/ext4/extents.c | 82 +++---
2501 fs/ext4/extents_status.c | 60 +---
2502 fs/ext4/extents_status.h | 2 +
2503 fs/ext4/ialloc.c | 113 +++++---
2504 fs/ext4/indirect.c | 5 +-
2505 fs/ext4/inline.c | 3 +-
2506 fs/ext4/inode.c | 83 ++++--
2507 fs/ext4/ioctl.c | 15 +-
2508 fs/ext4/mballoc.c | 88 +++---
2509 fs/ext4/migrate.c | 9 +-
2510 fs/ext4/mmp.c | 8 +-
2511 fs/ext4/namei.c | 36 ++-
2512 fs/ext4/page-io.c | 5 +-
2513 fs/ext4/readpage.c | 2 +-
2514 fs/ext4/resize.c | 34 +--
2515 fs/ext4/super.c | 695 ++++++++++-------------------------------------
2516 fs/ext4/symlink.c | 2 +-
2517 fs/ext4/sysfs.c | 448 ++++++++++++++++++++++++++++++
2518 fs/ext4/xattr.c | 32 +--
2519 fs/jbd2/checkpoint.c | 8 +-
2520 fs/jbd2/commit.c | 22 +-
2521 fs/jbd2/journal.c | 27 +-
2522 fs/jbd2/recovery.c | 26 +-
2523 fs/jbd2/revoke.c | 4 +-
2524 include/linux/jbd2.h | 84 +++++-
2525 include/uapi/linux/fs.h | 1 +
2526 38 files changed, 1276 insertions(+), 994 deletions(-)
2527 create mode 100644 fs/ext4/sysfs.c
2528 Merging f2fs/dev (f96999c35f46 f2fs: refactor __find_rev_next_{zero}_bit)
2529 $ git merge f2fs/dev
2530 Merge made by the 'recursive' strategy.
2531 Documentation/ABI/testing/sysfs-fs-f2fs | 12 ++
2532 Documentation/filesystems/f2fs.txt | 3 +-
2533 fs/f2fs/checkpoint.c | 49 ++++-
2534 fs/f2fs/data.c | 176 +++++++++++-------
2535 fs/f2fs/debug.c | 36 ++--
2536 fs/f2fs/dir.c | 19 +-
2537 fs/f2fs/extent_cache.c | 193 ++++++++-----------
2538 fs/f2fs/f2fs.h | 86 +++++++--
2539 fs/f2fs/file.c | 317 +++++++++++++++++---------------
2540 fs/f2fs/gc.c | 77 +++++---
2542 fs/f2fs/inline.c | 42 ++++-
2543 fs/f2fs/inode.c | 8 +-
2544 fs/f2fs/namei.c | 10 +-
2545 fs/f2fs/node.c | 26 ++-
2546 fs/f2fs/node.h | 4 +-
2547 fs/f2fs/recovery.c | 15 +-
2548 fs/f2fs/segment.c | 203 ++++++++++++--------
2549 fs/f2fs/segment.h | 4 +-
2550 fs/f2fs/super.c | 37 +++-
2551 include/trace/events/f2fs.h | 69 ++++++-
2552 21 files changed, 857 insertions(+), 535 deletions(-)
2553 Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
2554 $ git merge fscache/fscache
2555 Merge made by the 'recursive' strategy.
2556 fs/fscache/netfs.c | 38 ++++++++++++++++++--------------------
2557 1 file changed, 18 insertions(+), 20 deletions(-)
2558 Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry)
2559 $ git merge fuse/for-next
2561 Merging gfs2/for-next (f3dd1649122b gfs2: Remove gl_spin define)
2562 $ git merge gfs2/for-next
2563 Merge made by the 'recursive' strategy.
2564 Documentation/filesystems/gfs2-glocks.txt | 6 +--
2565 fs/gfs2/file.c | 2 +-
2566 fs/gfs2/glock.c | 84 +++++++++++++++----------------
2567 fs/gfs2/glock.h | 4 +-
2568 fs/gfs2/glops.c | 10 ++--
2569 fs/gfs2/incore.h | 3 +-
2570 fs/gfs2/main.c | 2 +-
2571 fs/gfs2/ops_fstype.c | 4 +-
2572 fs/gfs2/rgrp.c | 4 +-
2573 fs/gfs2/trans.c | 4 ++
2574 10 files changed, 64 insertions(+), 59 deletions(-)
2575 Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
2576 $ git merge jfs/jfs-next
2578 Merging nfs/linux-next (a85240d2543e Merge branch 'bugfixes')
2579 $ git merge nfs/linux-next
2580 Merge made by the 'recursive' strategy.
2581 fs/nfs/blocklayout/blocklayout.c | 7 +-
2582 fs/nfs/callback.h | 12 --
2583 fs/nfs/callback_proc.c | 2 -
2584 fs/nfs/callback_xdr.c | 39 +++----
2585 fs/nfs/client.c | 1 +
2586 fs/nfs/delegation.c | 6 +-
2587 fs/nfs/mount_clnt.c | 4 +-
2588 fs/nfs/nfs42.h | 1 +
2589 fs/nfs/nfs42proc.c | 71 ++++++++++++
2590 fs/nfs/nfs42xdr.c | 97 +++++++++++++++-
2591 fs/nfs/nfs4_fs.h | 6 +-
2592 fs/nfs/nfs4file.c | 136 ++++++++++++++++++++++
2593 fs/nfs/nfs4proc.c | 177 ++++++++++++++--------------
2594 fs/nfs/nfs4xdr.c | 26 +++++
2595 fs/nfs/nfsroot.c | 2 +-
2596 fs/nfs/pnfs.c | 12 +-
2597 fs/nfs/read.c | 9 +-
2598 fs/nfs/super.c | 2 -
2599 fs/nfs/write.c | 7 ++
2600 include/linux/nfs4.h | 3 +
2601 include/linux/nfs_fs_sb.h | 2 +
2602 include/linux/nfs_xdr.h | 26 ++++-
2603 include/linux/sunrpc/xprtsock.h | 2 +
2604 include/uapi/linux/nfs.h | 13 +++
2605 net/sunrpc/xprtsock.c | 241 ++++++++++++++++++++++++++-------------
2606 25 files changed, 677 insertions(+), 227 deletions(-)
2607 Merging nfsd/nfsd-next (1bc483f959c8 SUNRPC: drop stale comment in svc_setup_socket())
2608 $ git merge nfsd/nfsd-next
2609 Auto-merging fs/namei.c
2610 Merge made by the 'recursive' strategy.
2611 fs/file_table.c | 94 ++++--
2612 fs/lockd/host.c | 8 +-
2613 fs/lockd/mon.c | 125 ++-----
2614 fs/lockd/netns.h | 4 +-
2615 fs/lockd/svc.c | 2 +-
2616 fs/lockd/svc4proc.c | 2 +-
2617 fs/lockd/svcproc.c | 2 +-
2619 fs/namei.c | 74 ++++
2620 fs/nfsd/Kconfig | 2 +
2621 fs/nfsd/Makefile | 3 +-
2622 fs/nfsd/export.c | 14 +
2623 fs/nfsd/filecache.c | 712 +++++++++++++++++++++++++++++++++++++++
2624 fs/nfsd/filecache.h | 44 +++
2625 fs/nfsd/nfs3proc.c | 2 +-
2626 fs/nfsd/nfs3xdr.c | 6 +-
2627 fs/nfsd/nfs4layouts.c | 46 ++-
2628 fs/nfsd/nfs4proc.c | 36 +-
2629 fs/nfsd/nfs4state.c | 267 ++++++++-------
2630 fs/nfsd/nfs4xdr.c | 24 +-
2631 fs/nfsd/nfscache.c | 6 +-
2632 fs/nfsd/nfsctl.c | 10 +
2633 fs/nfsd/nfsfh.c | 5 +-
2634 fs/nfsd/nfsfh.h | 20 +-
2635 fs/nfsd/nfsproc.c | 2 +-
2636 fs/nfsd/nfssvc.c | 16 +-
2637 fs/nfsd/state.h | 53 ++-
2638 fs/nfsd/trace.c | 2 -
2639 fs/nfsd/trace.h | 137 ++++++++
2640 fs/nfsd/vfs.c | 296 +++++-----------
2641 fs/nfsd/vfs.h | 15 +-
2642 fs/nfsd/xdr4.h | 17 +-
2643 fs/notify/group.c | 2 +
2644 fs/notify/inode_mark.c | 1 +
2645 fs/notify/mark.c | 70 +---
2646 include/linux/file.h | 3 +-
2647 include/linux/fs.h | 1 +
2648 include/linux/fsnotify_backend.h | 5 +-
2649 include/linux/lockd/lockd.h | 10 +-
2650 include/linux/namei.h | 1 +
2651 include/linux/sunrpc/cache.h | 17 +-
2653 net/sunrpc/auth_gss/auth_gss.c | 13 +-
2654 net/sunrpc/cache.c | 56 ++-
2655 net/sunrpc/svcsock.c | 40 ++-
2656 45 files changed, 1629 insertions(+), 675 deletions(-)
2657 create mode 100644 fs/nfsd/filecache.c
2658 create mode 100644 fs/nfsd/filecache.h
2659 Merging orangefs/for-next (548049495cb4 Orangefs: fix some checkpatch.pl complaints that had creeped in.)
2660 $ git merge orangefs/for-next
2661 Auto-merging fs/Makefile
2662 Merge made by the 'recursive' strategy.
2663 Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++
2664 Documentation/filesystems/orangefs.txt | 137 +++
2667 fs/orangefs/Kconfig | 6 +
2668 fs/orangefs/Makefile | 10 +
2669 fs/orangefs/acl.c | 175 +++
2670 fs/orangefs/dcache.c | 142 +++
2671 fs/orangefs/devpvfs2-req.c | 1004 ++++++++++++++++
2672 fs/orangefs/dir.c | 345 ++++++
2673 fs/orangefs/downcall.h | 138 +++
2674 fs/orangefs/file.c | 1002 ++++++++++++++++
2675 fs/orangefs/inode.c | 469 ++++++++
2676 fs/orangefs/namei.c | 469 ++++++++
2677 fs/orangefs/protocol.h | 443 +++++++
2678 fs/orangefs/pvfs2-bufmap.c | 566 +++++++++
2679 fs/orangefs/pvfs2-bufmap.h | 61 +
2680 fs/orangefs/pvfs2-cache.c | 260 ++++
2681 fs/orangefs/pvfs2-debug.h | 292 +++++
2682 fs/orangefs/pvfs2-debugfs.c | 458 +++++++
2683 fs/orangefs/pvfs2-debugfs.h | 3 +
2684 fs/orangefs/pvfs2-dev-proto.h | 102 ++
2685 fs/orangefs/pvfs2-kernel.h | 861 ++++++++++++++
2686 fs/orangefs/pvfs2-mod.c | 315 +++++
2687 fs/orangefs/pvfs2-sysfs.c | 1787 ++++++++++++++++++++++++++++
2688 fs/orangefs/pvfs2-sysfs.h | 2 +
2689 fs/orangefs/pvfs2-utils.c | 1165 ++++++++++++++++++
2690 fs/orangefs/super.c | 553 +++++++++
2691 fs/orangefs/symlink.c | 31 +
2692 fs/orangefs/upcall.h | 255 ++++
2693 fs/orangefs/waitqueue.c | 529 ++++++++
2694 fs/orangefs/xattr.c | 530 +++++++++
2695 32 files changed, 12199 insertions(+)
2696 create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs
2697 create mode 100644 Documentation/filesystems/orangefs.txt
2698 create mode 100644 fs/orangefs/Kconfig
2699 create mode 100644 fs/orangefs/Makefile
2700 create mode 100644 fs/orangefs/acl.c
2701 create mode 100644 fs/orangefs/dcache.c
2702 create mode 100644 fs/orangefs/devpvfs2-req.c
2703 create mode 100644 fs/orangefs/dir.c
2704 create mode 100644 fs/orangefs/downcall.h
2705 create mode 100644 fs/orangefs/file.c
2706 create mode 100644 fs/orangefs/inode.c
2707 create mode 100644 fs/orangefs/namei.c
2708 create mode 100644 fs/orangefs/protocol.h
2709 create mode 100644 fs/orangefs/pvfs2-bufmap.c
2710 create mode 100644 fs/orangefs/pvfs2-bufmap.h
2711 create mode 100644 fs/orangefs/pvfs2-cache.c
2712 create mode 100644 fs/orangefs/pvfs2-debug.h
2713 create mode 100644 fs/orangefs/pvfs2-debugfs.c
2714 create mode 100644 fs/orangefs/pvfs2-debugfs.h
2715 create mode 100644 fs/orangefs/pvfs2-dev-proto.h
2716 create mode 100644 fs/orangefs/pvfs2-kernel.h
2717 create mode 100644 fs/orangefs/pvfs2-mod.c
2718 create mode 100644 fs/orangefs/pvfs2-sysfs.c
2719 create mode 100644 fs/orangefs/pvfs2-sysfs.h
2720 create mode 100644 fs/orangefs/pvfs2-utils.c
2721 create mode 100644 fs/orangefs/super.c
2722 create mode 100644 fs/orangefs/symlink.c
2723 create mode 100644 fs/orangefs/upcall.h
2724 create mode 100644 fs/orangefs/waitqueue.c
2725 create mode 100644 fs/orangefs/xattr.c
2726 Merging overlayfs/overlayfs-next (8d3095f4ad47 ovl: default permissions)
2727 $ git merge overlayfs/overlayfs-next
2728 Auto-merging fs/overlayfs/super.c
2729 Merge made by the 'recursive' strategy.
2730 fs/overlayfs/inode.c | 23 +++++++++++++++++++++++
2731 fs/overlayfs/overlayfs.h | 3 +++
2732 fs/overlayfs/super.c | 28 ++++++++++++++++++++++++++++
2733 3 files changed, 54 insertions(+)
2734 Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
2735 $ git merge squashfs/master
2737 Merging v9fs/for-next (46cfbe8e037a 9p: trans_fd, bail out if recv fcall if missing)
2738 $ git merge v9fs/for-next
2739 Merge made by the 'recursive' strategy.
2740 net/9p/trans_fd.c | 88 +++++++++++++++++++++++++++------------------------
2741 net/9p/trans_virtio.c | 2 +-
2742 2 files changed, 47 insertions(+), 43 deletions(-)
2743 Merging ubifs/linux-next (1cb8f9776c7d ubi: fastmap: Implement produce_free_peb())
2744 $ git merge ubifs/linux-next
2745 Merge made by the 'recursive' strategy.
2746 drivers/mtd/ubi/attach.c | 4 +---
2747 drivers/mtd/ubi/eba.c | 2 +-
2748 drivers/mtd/ubi/fastmap-wl.c | 29 +++++++++++++++++++++++++++++
2749 drivers/mtd/ubi/fastmap.c | 2 +-
2750 drivers/mtd/ubi/gluebi.c | 4 ++--
2751 drivers/mtd/ubi/ubi-media.h | 2 +-
2752 fs/ubifs/debug.c | 8 ++++----
2753 fs/ubifs/lpt.c | 6 ++----
2754 fs/ubifs/recovery.c | 2 +-
2755 fs/ubifs/tnc.c | 3 +--
2756 fs/ubifs/ubifs.h | 4 ++--
2757 11 files changed, 45 insertions(+), 21 deletions(-)
2758 Merging xfs/for-next (fcd8a399a9d4 Merge branch 'xfs-stats-fixes' into for-next)
2759 $ git merge xfs/for-next
2760 Merge made by the 'recursive' strategy.
2761 fs/xfs/Makefile | 2 +-
2762 fs/xfs/kmem.c | 10 +-
2763 fs/xfs/libxfs/xfs_alloc.c | 20 ++--
2764 fs/xfs/libxfs/xfs_attr.c | 6 +-
2765 fs/xfs/libxfs/xfs_attr_leaf.c | 3 +
2766 fs/xfs/libxfs/xfs_attr_remote.c | 2 +-
2767 fs/xfs/libxfs/xfs_bmap.c | 30 +++---
2768 fs/xfs/libxfs/xfs_btree.c | 21 ++++-
2769 fs/xfs/libxfs/xfs_btree.h | 39 ++++----
2770 fs/xfs/libxfs/xfs_da_btree.c | 4 +
2771 fs/xfs/libxfs/xfs_dir2.c | 6 +-
2772 fs/xfs/libxfs/xfs_dir2_block.c | 3 +
2773 fs/xfs/libxfs/xfs_dir2_data.c | 3 +
2774 fs/xfs/libxfs/xfs_dir2_leaf.c | 3 +
2775 fs/xfs/libxfs/xfs_dir2_node.c | 3 +
2776 fs/xfs/libxfs/xfs_format.h | 10 +-
2777 fs/xfs/libxfs/xfs_fs.h | 10 ++
2778 fs/xfs/libxfs/xfs_ialloc.c | 10 +-
2779 fs/xfs/libxfs/xfs_sb.c | 10 ++
2780 fs/xfs/libxfs/xfs_symlink_remote.c | 7 ++
2781 fs/xfs/xfs_aops.c | 23 +++--
2782 fs/xfs/xfs_attr_list.c | 2 +-
2783 fs/xfs/xfs_bmap_util.c | 2 +-
2784 fs/xfs/xfs_buf.c | 21 +++--
2785 fs/xfs/xfs_dir2_readdir.c | 2 +-
2786 fs/xfs/xfs_dquot.c | 14 +--
2787 fs/xfs/xfs_file.c | 29 +++---
2788 fs/xfs/xfs_icache.c | 18 ++--
2789 fs/xfs/xfs_inode.c | 6 +-
2790 fs/xfs/xfs_ioctl.c | 8 +-
2791 fs/xfs/xfs_ioctl32.c | 2 +-
2792 fs/xfs/xfs_iomap.c | 51 ++++++----
2793 fs/xfs/xfs_iops.c | 4 +-
2794 fs/xfs/xfs_linux.h | 7 ++
2795 fs/xfs/xfs_log.c | 93 +++++++++++++++----
2796 fs/xfs/xfs_log.h | 1 +
2797 fs/xfs/xfs_log_priv.h | 51 ++++++++++
2798 fs/xfs/xfs_log_recover.c | 12 ++-
2799 fs/xfs/xfs_message.c | 7 ++
2800 fs/xfs/xfs_mount.c | 11 ++-
2801 fs/xfs/xfs_mount.h | 1 +
2802 fs/xfs/xfs_pnfs.c | 5 +
2803 fs/xfs/xfs_qm.c | 14 +--
2804 fs/xfs/xfs_stats.c | 93 +++++++++----------
2805 fs/xfs/xfs_stats.h | 36 +++++---
2806 fs/xfs/xfs_super.c | 49 ++++++++--
2807 fs/xfs/xfs_sysctl.c | 15 +--
2808 fs/xfs/xfs_sysfs.c | 185 ++++++++++++++++++++++---------------
2809 fs/xfs/xfs_sysfs.h | 1 +
2810 fs/xfs/xfs_trace.h | 1 +
2811 fs/xfs/xfs_trans.c | 6 +-
2812 fs/xfs/xfs_trans_ail.c | 12 +--
2813 52 files changed, 658 insertions(+), 326 deletions(-)
2814 Merging file-locks/linux-next (616fb38fa7a9 locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait)
2815 $ git merge file-locks/linux-next
2816 Auto-merging include/linux/fs.h
2817 Auto-merging fs/nfs/nfs4proc.c
2818 Auto-merging fs/locks.c
2819 Auto-merging fs/gfs2/file.c
2820 Auto-merging fs/cifs/file.c
2821 Merge made by the 'recursive' strategy.
2822 drivers/staging/lustre/lustre/llite/file.c | 8 +--
2823 fs/9p/vfs_file.c | 4 +-
2824 fs/ceph/locks.c | 4 +-
2825 fs/cifs/file.c | 2 +-
2826 fs/dlm/plock.c | 4 +-
2827 fs/fuse/file.c | 2 +-
2828 fs/gfs2/file.c | 8 +--
2829 fs/lockd/clntproc.c | 13 +---
2830 fs/locks.c | 106 ++++++++++++++++++-----------
2831 fs/nfs/file.c | 13 +---
2832 fs/nfs/nfs4proc.c | 13 +---
2833 fs/ocfs2/locks.c | 8 +--
2834 include/linux/fs.h | 21 ++----
2835 include/trace/events/filelock.h | 38 ++++++++++-
2836 14 files changed, 127 insertions(+), 117 deletions(-)
2837 Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root)
2838 $ git merge vfs/for-next
2840 Merging pci/next (92034b73a1aa Merge branch 'pci/host-rcar' into next)
2841 $ git merge pci/next
2842 Auto-merging drivers/pci/quirks.c
2843 Auto-merging drivers/pci/probe.c
2844 Auto-merging drivers/pci/pci-driver.c
2845 Auto-merging drivers/pci/msi.c
2846 Auto-merging arch/x86/pci/common.c
2847 Auto-merging arch/powerpc/platforms/pseries/setup.c
2848 Auto-merging MAINTAINERS
2849 Auto-merging Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
2850 Merge made by the 'recursive' strategy.
2851 .../bindings/arm/hisilicon/hisilicon.txt | 17 +
2852 .../devicetree/bindings/pci/altera-pcie-msi.txt | 28 +
2853 .../devicetree/bindings/pci/altera-pcie.txt | 49 ++
2854 .../devicetree/bindings/pci/brcm,iproc-pcie.txt | 20 +
2855 .../devicetree/bindings/pci/designware-pcie.txt | 3 +-
2856 .../devicetree/bindings/pci/hisilicon-pcie.txt | 44 ++
2857 .../devicetree/bindings/pci/host-generic-pci.txt | 5 +-
2859 arch/arm/include/asm/Kbuild | 1 +
2860 arch/arm/include/asm/mach/pci.h | 6 -
2861 arch/arm/kernel/bios32.c | 12 +-
2862 arch/arm64/boot/dts/amd/amd-overdrive.dts | 1 -
2863 arch/powerpc/platforms/pseries/setup.c | 14 +-
2864 arch/sparc/kernel/pci.c | 7 +-
2865 arch/sparc/kernel/pci_common.c | 17 +-
2866 arch/sparc/kernel/pci_impl.h | 1 +
2867 arch/x86/pci/common.c | 8 +
2868 arch/x86/pci/legacy.c | 2 +-
2869 drivers/of/of_pci.c | 26 +
2870 drivers/pci/host/Kconfig | 30 +-
2871 drivers/pci/host/Makefile | 3 +
2872 drivers/pci/host/pci-dra7xx.c | 7 +
2873 drivers/pci/host/pci-exynos.c | 5 +-
2874 drivers/pci/host/pci-host-generic.c | 41 +-
2875 drivers/pci/host/pci-imx6.c | 5 +-
2876 drivers/pci/host/pci-keystone-dw.c | 8 +-
2877 drivers/pci/host/pci-keystone.h | 2 +-
2878 drivers/pci/host/pci-mvebu.c | 473 ++++++++++++-----
2879 drivers/pci/host/pci-tegra.c | 4 +-
2880 drivers/pci/host/pci-xgene.c | 22 -
2881 drivers/pci/host/pcie-altera-msi.c | 312 +++++++++++
2882 drivers/pci/host/pcie-altera.c | 579 +++++++++++++++++++++
2883 drivers/pci/host/pcie-designware.c | 375 ++++++-------
2884 drivers/pci/host/pcie-designware.h | 20 +-
2885 drivers/pci/host/pcie-hisi.c | 198 +++++++
2886 drivers/pci/host/pcie-iproc-platform.c | 27 +
2887 drivers/pci/host/pcie-iproc.c | 163 +++++-
2888 drivers/pci/host/pcie-iproc.h | 20 +-
2889 drivers/pci/host/pcie-rcar.c | 86 +--
2890 drivers/pci/host/pcie-spear13xx.c | 24 +-
2891 drivers/pci/hotplug/pciehp_ctrl.c | 75 +--
2892 drivers/pci/iov.c | 101 ++--
2893 drivers/pci/msi.c | 34 +-
2894 drivers/pci/pci-driver.c | 8 +-
2895 drivers/pci/pci.c | 225 +++++++-
2896 drivers/pci/pci.h | 1 +
2897 drivers/pci/pcie/aer/aerdrv_core.c | 28 +
2898 drivers/pci/probe.c | 6 +
2899 drivers/pci/quirks.c | 58 +++
2900 drivers/pci/setup-bus.c | 50 +-
2901 drivers/pci/setup-res.c | 7 +
2902 include/linux/aer.h | 5 +
2903 include/linux/msi.h | 2 +
2904 include/linux/of_pci.h | 3 +
2905 include/linux/pci.h | 12 +
2906 include/uapi/linux/pci_regs.h | 43 +-
2907 56 files changed, 2727 insertions(+), 619 deletions(-)
2908 create mode 100644 Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
2909 create mode 100644 Documentation/devicetree/bindings/pci/altera-pcie.txt
2910 create mode 100644 Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
2911 create mode 100644 drivers/pci/host/pcie-altera-msi.c
2912 create mode 100644 drivers/pci/host/pcie-altera.c
2913 create mode 100644 drivers/pci/host/pcie-hisi.c
2914 $ git am -3 ../patches/0001-PCI-altera-disable-MSI-driver-for-now.patch
2915 Applying: PCI: altera: disable MSI driver for now
2917 Unstaged changes after reset:
2918 M drivers/pci/host/Kconfig
2920 $ git commit -v -a --amend
2921 [master 782b52e186d5] Merge remote-tracking branch 'pci/next'
2922 Date: Mon Nov 2 10:39:29 2015 +1100
2923 Merging hid/for-next (a34ab1fb2bb1 Merge branch 'for-4.4/upstream' into for-next)
2924 $ git merge hid/for-next
2925 Auto-merging drivers/hid/hid-core.c
2926 Removing Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra
2927 Removing Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus
2928 Removing Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
2929 Merge made by the 'recursive' strategy.
2930 .../sysfs-driver-hid-roccat-arvo | 0
2931 .../sysfs-driver-hid-roccat-isku | 0
2932 .../ABI/obsolete/sysfs-driver-hid-roccat-koneplus | 99 ++-
2933 .../sysfs-driver-hid-roccat-konepure | 0
2934 .../ABI/obsolete/sysfs-driver-hid-roccat-kovaplus | 50 ++
2935 .../sysfs-driver-hid-roccat-lua | 0
2936 .../ABI/obsolete/sysfs-driver-hid-roccat-pyra | 50 ++
2937 .../sysfs-driver-hid-roccat-ryos | 0
2938 .../sysfs-driver-hid-roccat-savu | 0
2939 Documentation/ABI/testing/sysfs-driver-hid-corsair | 15 +
2940 .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 96 ---
2941 .../ABI/testing/sysfs-driver-hid-roccat-kovaplus | 49 --
2942 .../ABI/testing/sysfs-driver-hid-roccat-pyra | 49 --
2943 drivers/hid/Kconfig | 15 +-
2944 drivers/hid/Makefile | 1 +
2945 drivers/hid/hid-appleir.c | 4 +-
2946 drivers/hid/hid-aureal.c | 3 +-
2947 drivers/hid/hid-core.c | 9 +-
2948 drivers/hid/hid-corsair.c | 673 +++++++++++++++++++++
2949 drivers/hid/hid-dr.c | 58 ++
2950 drivers/hid/hid-elecom.c | 2 +-
2951 drivers/hid/hid-elo.c | 4 +-
2952 drivers/hid/hid-ids.h | 7 +
2953 drivers/hid/hid-input.c | 10 +-
2954 drivers/hid/hid-lenovo.c | 4 +-
2955 drivers/hid/hid-logitech-hidpp.c | 163 ++++-
2956 drivers/hid/hid-magicmouse.c | 8 +-
2957 drivers/hid/hid-microsoft.c | 2 +
2958 drivers/hid/hid-multitouch.c | 68 ++-
2959 drivers/hid/hid-ntrig.c | 6 +-
2960 drivers/hid/hid-prodikeys.c | 4 +-
2961 drivers/hid/hid-rmi.c | 11 +-
2962 drivers/hid/hid-saitek.c | 2 +
2963 drivers/hid/hid-sensor-hub.c | 25 +-
2964 drivers/hid/hid-sony.c | 13 +-
2965 drivers/hid/hid-uclogic.c | 6 +-
2966 drivers/hid/i2c-hid/i2c-hid.c | 1 +
2967 drivers/hid/usbhid/hid-quirks.c | 2 +
2968 drivers/hid/wacom_sys.c | 62 +-
2969 drivers/hid/wacom_wac.c | 192 ++++--
2970 drivers/hid/wacom_wac.h | 8 +-
2971 include/linux/hid.h | 4 +-
2972 42 files changed, 1469 insertions(+), 306 deletions(-)
2973 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-arvo (100%)
2974 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-isku (100%)
2975 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-konepure (100%)
2976 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-lua (100%)
2977 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-ryos (100%)
2978 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-savu (100%)
2979 create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-corsair
2980 delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
2981 delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus
2982 delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra
2983 create mode 100644 drivers/hid/hid-corsair.c
2984 Merging i2c/i2c/for-next (121c7794864c Merge branch 'i2c/for-4.4' into i2c/for-next)
2985 $ git merge i2c/i2c/for-next
2986 Resolved 'MAINTAINERS' using previous resolution.
2987 Removing include/linux/i2c/i2c-rcar.h
2988 Auto-merging drivers/i2c/busses/i2c-ismt.c
2989 Auto-merging MAINTAINERS
2990 CONFLICT (content): Merge conflict in MAINTAINERS
2991 Automatic merge failed; fix conflicts and then commit the result.
2993 [master cdf10298a443] Merge remote-tracking branch 'i2c/i2c/for-next'
2994 $ git diff -M --stat --summary HEAD^..
2995 Documentation/acpi/enumeration.txt | 11 +-
2996 Documentation/acpi/i2c-muxes.txt | 58 ++
2997 .../devicetree/bindings/i2c/i2c-davinci.txt | 6 +-
2998 Documentation/devicetree/bindings/i2c/i2c-imx.txt | 9 +
2999 Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 1 +
3000 .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 1 +
3001 .../devicetree/bindings/i2c/i2c-uniphier-f.txt | 25 +
3002 .../devicetree/bindings/i2c/i2c-uniphier.txt | 25 +
3003 Documentation/i2c/busses/i2c-i801 | 2 +
3005 drivers/i2c/busses/Kconfig | 24 +-
3006 drivers/i2c/busses/Makefile | 2 +
3007 drivers/i2c/busses/i2c-at91.c | 82 ++-
3008 drivers/i2c/busses/i2c-au1550.c | 60 +--
3009 drivers/i2c/busses/i2c-davinci.c | 8 +
3010 drivers/i2c/busses/i2c-designware-core.c | 74 ++-
3011 drivers/i2c/busses/i2c-designware-core.h | 10 +-
3012 drivers/i2c/busses/i2c-designware-pcidrv.c | 33 +-
3013 drivers/i2c/busses/i2c-designware-platdrv.c | 81 +--
3014 drivers/i2c/busses/i2c-i801.c | 16 +-
3015 drivers/i2c/busses/i2c-ibm_iic.c | 1 +
3016 drivers/i2c/busses/i2c-img-scb.c | 73 +--
3017 drivers/i2c/busses/i2c-imx.c | 73 ++-
3018 drivers/i2c/busses/i2c-ismt.c | 80 +--
3019 drivers/i2c/busses/i2c-meson.c | 1 +
3020 drivers/i2c/busses/i2c-mt65xx.c | 16 +
3021 drivers/i2c/busses/i2c-ocores.c | 31 +-
3022 drivers/i2c/busses/i2c-pnx.c | 7 +-
3023 drivers/i2c/busses/i2c-pxa.c | 41 +-
3024 drivers/i2c/busses/i2c-rcar.c | 24 +-
3025 drivers/i2c/busses/i2c-rk3x.c | 1 +
3026 drivers/i2c/busses/i2c-sh_mobile.c | 1 +
3027 drivers/i2c/busses/i2c-sirf.c | 26 +-
3028 drivers/i2c/busses/i2c-stu300.c | 1 +
3029 drivers/i2c/busses/i2c-tegra.c | 1 -
3030 drivers/i2c/busses/i2c-uniphier-f.c | 584 +++++++++++++++++++++
3031 drivers/i2c/busses/i2c-uniphier.c | 441 ++++++++++++++++
3032 drivers/i2c/i2c-core.c | 82 ++-
3033 drivers/i2c/i2c-dev.c | 23 +-
3034 drivers/i2c/i2c-mux.c | 8 +
3035 drivers/mfd/intel_quark_i2c_gpio.c | 33 +-
3036 drivers/mfd/mfd-core.c | 52 +-
3037 drivers/misc/eeprom/at24.c | 22 +-
3038 fs/compat_ioctl.c | 2 +-
3039 include/linux/acpi.h | 5 +
3040 include/linux/i2c-ocores.h | 1 +
3041 include/linux/i2c/i2c-rcar.h | 10 -
3042 include/linux/mfd/core.h | 10 +-
3043 include/uapi/linux/i2c-dev.h | 4 +-
3044 49 files changed, 1777 insertions(+), 413 deletions(-)
3045 create mode 100644 Documentation/acpi/i2c-muxes.txt
3046 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier-f.txt
3047 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier.txt
3048 create mode 100644 drivers/i2c/busses/i2c-uniphier-f.c
3049 create mode 100644 drivers/i2c/busses/i2c-uniphier.c
3050 delete mode 100644 include/linux/i2c/i2c-rcar.h
3051 Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define)
3052 $ git merge jdelvare-hwmon/master
3053 Merge made by the 'recursive' strategy.
3054 drivers/hwmon/k10temp.c | 1 -
3055 1 file changed, 1 deletion(-)
3056 Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
3057 $ git merge dmi/master
3059 Merging hwmon-staging/hwmon-next (3b5ea47dbff0 hwmon: (fam15h_power) Add max compute unit accumulated power)
3060 $ git merge hwmon-staging/hwmon-next
3061 Auto-merging drivers/hwmon/Makefile
3062 Auto-merging drivers/hwmon/Kconfig
3063 Merge made by the 'recursive' strategy.
3064 Documentation/hwmon/lm75 | 5 +-
3065 Documentation/hwmon/max31790 | 37 +++
3066 drivers/hwmon/Kconfig | 10 +
3067 drivers/hwmon/Makefile | 1 +
3068 drivers/hwmon/abx500.c | 2 +-
3069 drivers/hwmon/coretemp.c | 2 +-
3070 drivers/hwmon/fam15h_power.c | 87 +++++--
3071 drivers/hwmon/ibmpowernv.c | 7 +
3072 drivers/hwmon/ina2xx.c | 243 +++++++----------
3073 drivers/hwmon/lm75.c | 7 +
3074 drivers/hwmon/max31790.c | 603 +++++++++++++++++++++++++++++++++++++++++++
3075 drivers/hwmon/nct6775.c | 101 +++++++-
3076 12 files changed, 926 insertions(+), 179 deletions(-)
3077 create mode 100644 Documentation/hwmon/max31790
3078 create mode 100644 drivers/hwmon/max31790.c
3079 Merging v4l-dvb/master (8132ccfb864a Merge branch 'v4l_for_linus' into to_next)
3080 $ git merge v4l-dvb/master
3081 Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.c
3082 Auto-merging drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
3083 Auto-merging drivers/media/platform/soc_camera/atmel-isi.h
3084 Auto-merging drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
3085 Auto-merging MAINTAINERS
3086 Removing Documentation/DocBook/media/dvb/kdapi.xml
3087 Merge made by the 'recursive' strategy.
3088 Documentation/DocBook/device-drivers.tmpl | 81 +-
3089 Documentation/DocBook/media/dvb/dvbapi.xml | 3 -
3090 Documentation/DocBook/media/dvb/kdapi.xml | 2309 --------------------
3091 Documentation/DocBook/media/v4l/biblio.xml | 18 +
3092 Documentation/DocBook/media/v4l/compat.xml | 20 +
3093 Documentation/DocBook/media/v4l/controls.xml | 14 +
3094 Documentation/DocBook/media/v4l/dev-sdr.xml | 32 +-
3095 Documentation/DocBook/media/v4l/io.xml | 10 +-
3096 Documentation/DocBook/media/v4l/pixfmt.xml | 111 +-
3097 Documentation/DocBook/media/v4l/v4l2.xml | 13 +-
3098 .../DocBook/media/v4l/vidioc-encoder-cmd.xml | 2 +-
3099 .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 7 +
3100 Documentation/DocBook/media/v4l/vidioc-g-fmt.xml | 2 +-
3101 .../DocBook/media/v4l/vidioc-g-modulator.xml | 14 +-
3102 Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 16 +
3103 .../DocBook/media/v4l/vidioc-querycap.xml | 6 +
3104 .../DocBook/media/v4l/vidioc-queryctrl.xml | 21 +-
3105 Documentation/DocBook/media_api.tmpl | 2 +-
3106 .../bindings/media/exynos-jpeg-codec.txt | 3 +-
3107 Documentation/video4linux/CARDLIST.saa7134 | 1 +
3108 Documentation/video4linux/v4l2-pci-skeleton.c | 4 +-
3110 drivers/input/touchscreen/sur40.c | 20 +-
3111 drivers/media/dvb-core/demux.h | 619 ++++--
3112 drivers/media/dvb-core/dmxdev.c | 10 +-
3113 drivers/media/dvb-core/dvb-usb-ids.h | 1 +
3114 drivers/media/dvb-core/dvb_ca_en50221.h | 99 +-
3115 drivers/media/dvb-core/dvb_demux.c | 11 +-
3116 drivers/media/dvb-core/dvb_net.c | 5 +-
3117 drivers/media/dvb-core/dvbdev.h | 4 -
3118 drivers/media/dvb-frontends/drxd_hard.c | 3 +-
3119 drivers/media/dvb-frontends/rtl2832_sdr.c | 23 +-
3120 drivers/media/i2c/ml86v7667.c | 11 +-
3121 drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
3122 drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 +
3123 drivers/media/i2c/smiapp/smiapp-core.c | 1 +
3124 drivers/media/i2c/tvp5150.c | 14 +-
3125 drivers/media/media-entity.c | 4 +-
3126 drivers/media/pci/bt8xx/bttv-driver.c | 5 +-
3127 drivers/media/pci/cobalt/Kconfig | 2 +-
3128 drivers/media/pci/cobalt/cobalt-cpld.c | 8 +-
3129 drivers/media/pci/cobalt/cobalt-driver.h | 6 +-
3130 drivers/media/pci/cobalt/cobalt-irq.c | 7 +-
3131 drivers/media/pci/cobalt/cobalt-v4l2.c | 24 +-
3132 drivers/media/pci/cx18/cx18-mailbox.c | 2 +-
3133 drivers/media/pci/cx23885/cx23885-417.c | 13 +-
3134 drivers/media/pci/cx23885/cx23885-core.c | 24 +-
3135 drivers/media/pci/cx23885/cx23885-dvb.c | 11 +-
3136 drivers/media/pci/cx23885/cx23885-vbi.c | 18 +-
3137 drivers/media/pci/cx23885/cx23885-video.c | 29 +-
3138 drivers/media/pci/cx23885/cx23885.h | 2 +-
3139 drivers/media/pci/cx25821/cx25821-alsa.c | 2 +-
3140 drivers/media/pci/cx25821/cx25821-video.c | 24 +-
3141 drivers/media/pci/cx25821/cx25821.h | 3 +-
3142 drivers/media/pci/cx88/cx88-alsa.c | 2 +-
3143 drivers/media/pci/cx88/cx88-blackbird.c | 15 +-
3144 drivers/media/pci/cx88/cx88-core.c | 8 +-
3145 drivers/media/pci/cx88/cx88-dvb.c | 13 +-
3146 drivers/media/pci/cx88/cx88-mpeg.c | 14 +-
3147 drivers/media/pci/cx88/cx88-vbi.c | 19 +-
3148 drivers/media/pci/cx88/cx88-video.c | 21 +-
3149 drivers/media/pci/cx88/cx88.h | 2 +-
3150 drivers/media/pci/dt3155/dt3155.c | 20 +-
3151 drivers/media/pci/dt3155/dt3155.h | 3 +-
3152 drivers/media/pci/ivtv/ivtv-alsa-main.c | 14 +-
3153 drivers/media/pci/ivtv/ivtv-yuv.c | 12 +-
3154 drivers/media/pci/netup_unidvb/netup_unidvb.h | 4 +-
3155 drivers/media/pci/netup_unidvb/netup_unidvb_ci.c | 10 +-
3156 drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 35 +-
3157 drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c | 2 +-
3158 drivers/media/pci/netup_unidvb/netup_unidvb_spi.c | 4 +-
3159 drivers/media/pci/saa7134/saa7134-cards.c | 43 +
3160 drivers/media/pci/saa7134/saa7134-core.c | 14 +-
3161 drivers/media/pci/saa7134/saa7134-input.c | 7 +
3162 drivers/media/pci/saa7134/saa7134-ts.c | 16 +-
3163 drivers/media/pci/saa7134/saa7134-vbi.c | 12 +-
3164 drivers/media/pci/saa7134/saa7134-video.c | 23 +-
3165 drivers/media/pci/saa7134/saa7134.h | 5 +-
3166 drivers/media/pci/saa7164/Kconfig | 1 -
3167 drivers/media/pci/saa7164/saa7164-encoder.c | 653 ++----
3168 drivers/media/pci/saa7164/saa7164-vbi.c | 629 +-----
3169 drivers/media/pci/saa7164/saa7164.h | 26 +-
3170 drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 48 +-
3171 drivers/media/pci/solo6x10/solo6x10-v4l2.c | 21 +-
3172 drivers/media/pci/solo6x10/solo6x10.h | 4 +-
3173 drivers/media/pci/sta2x11/sta2x11_vip.c | 28 +-
3174 drivers/media/pci/ttpci/av7110.c | 9 +-
3175 drivers/media/pci/ttpci/av7110_av.c | 6 +-
3176 drivers/media/pci/tw68/tw68-video.c | 22 +-
3177 drivers/media/pci/tw68/tw68.h | 3 +-
3178 drivers/media/platform/Kconfig | 2 +-
3179 drivers/media/platform/am437x/am437x-vpfe.c | 43 +-
3180 drivers/media/platform/am437x/am437x-vpfe.h | 3 +-
3181 drivers/media/platform/blackfin/bfin_capture.c | 37 +-
3182 drivers/media/platform/coda/coda-bit.c | 135 +-
3183 drivers/media/platform/coda/coda-common.c | 26 +-
3184 drivers/media/platform/coda/coda-jpeg.c | 6 +-
3185 drivers/media/platform/coda/coda.h | 8 +-
3186 drivers/media/platform/coda/trace.h | 18 +-
3187 drivers/media/platform/davinci/vpbe_display.c | 34 +-
3188 drivers/media/platform/davinci/vpif_capture.c | 33 +-
3189 drivers/media/platform/davinci/vpif_capture.h | 2 +-
3190 drivers/media/platform/davinci/vpif_display.c | 42 +-
3191 drivers/media/platform/davinci/vpif_display.h | 2 +-
3192 drivers/media/platform/exynos-gsc/gsc-core.h | 4 +-
3193 drivers/media/platform/exynos-gsc/gsc-m2m.c | 25 +-
3194 drivers/media/platform/exynos4-is/fimc-capture.c | 33 +-
3195 drivers/media/platform/exynos4-is/fimc-core.c | 2 +-
3196 drivers/media/platform/exynos4-is/fimc-core.h | 4 +-
3197 drivers/media/platform/exynos4-is/fimc-is.h | 2 +-
3198 drivers/media/platform/exynos4-is/fimc-isp-video.c | 18 +-
3199 drivers/media/platform/exynos4-is/fimc-isp-video.h | 2 +-
3200 drivers/media/platform/exynos4-is/fimc-isp.h | 4 +-
3201 drivers/media/platform/exynos4-is/fimc-lite.c | 25 +-
3202 drivers/media/platform/exynos4-is/fimc-lite.h | 4 +-
3203 drivers/media/platform/exynos4-is/fimc-m2m.c | 23 +-
3204 drivers/media/platform/exynos4-is/mipi-csis.c | 3 +-
3205 drivers/media/platform/m2m-deinterlace.c | 25 +-
3206 drivers/media/platform/marvell-ccic/mcam-core.c | 46 +-
3207 drivers/media/platform/marvell-ccic/mcam-core.h | 2 +-
3208 drivers/media/platform/mx2_emmaprp.c | 17 +-
3209 drivers/media/platform/omap3isp/ispstat.c | 5 +-
3210 drivers/media/platform/omap3isp/ispstat.h | 2 +-
3211 drivers/media/platform/omap3isp/ispvideo.c | 27 +-
3212 drivers/media/platform/omap3isp/ispvideo.h | 4 +-
3213 drivers/media/platform/rcar_jpu.c | 68 +-
3214 drivers/media/platform/s3c-camif/camif-capture.c | 26 +-
3215 drivers/media/platform/s3c-camif/camif-core.c | 2 +-
3216 drivers/media/platform/s3c-camif/camif-core.h | 4 +-
3217 drivers/media/platform/s5p-g2d/g2d.c | 19 +-
3218 drivers/media/platform/s5p-jpeg/jpeg-core.c | 475 +++-
3219 drivers/media/platform/s5p-jpeg/jpeg-core.h | 41 +-
3220 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c | 80 +-
3221 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h | 11 +-
3222 drivers/media/platform/s5p-jpeg/jpeg-regs.h | 85 +-
3223 drivers/media/platform/s5p-mfc/s5p_mfc.c | 106 +-
3224 drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +-
3225 drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 40 +-
3226 drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 75 +-
3227 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 46 +-
3228 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 68 +-
3229 drivers/media/platform/s5p-tv/mixer.h | 4 +-
3230 drivers/media/platform/s5p-tv/mixer_grp_layer.c | 2 +-
3231 drivers/media/platform/s5p-tv/mixer_reg.c | 2 +-
3232 drivers/media/platform/s5p-tv/mixer_video.c | 13 +-
3233 drivers/media/platform/s5p-tv/mixer_vp_layer.c | 5 +-
3234 drivers/media/platform/sh_veu.c | 22 +-
3235 drivers/media/platform/sh_vou.c | 29 +-
3236 drivers/media/platform/soc_camera/atmel-isi.c | 153 +-
3237 .../media/platform/soc_camera}/atmel-isi.h | 7 +-
3238 drivers/media/platform/soc_camera/mx2_camera.c | 24 +-
3239 drivers/media/platform/soc_camera/mx3_camera.c | 30 +-
3240 drivers/media/platform/soc_camera/rcar_vin.c | 64 +-
3241 .../platform/soc_camera/sh_mobile_ceu_camera.c | 63 +-
3242 drivers/media/platform/soc_camera/soc_camera.c | 4 +-
3243 drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 26 +-
3244 drivers/media/platform/sti/c8sectpfe/Kconfig | 1 -
3245 .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 4 +-
3246 drivers/media/platform/ti-vpe/vpe.c | 44 +-
3247 drivers/media/platform/vim2m.c | 57 +-
3248 drivers/media/platform/vivid/Kconfig | 8 +
3249 drivers/media/platform/vivid/vivid-core.c | 7 +-
3250 drivers/media/platform/vivid/vivid-core.h | 6 +-
3251 drivers/media/platform/vivid/vivid-ctrls.c | 55 +-
3252 drivers/media/platform/vivid/vivid-kthread-cap.c | 73 +-
3253 drivers/media/platform/vivid/vivid-kthread-out.c | 34 +-
3254 drivers/media/platform/vivid/vivid-osd.c | 1 +
3255 drivers/media/platform/vivid/vivid-sdr-cap.c | 83 +-
3256 drivers/media/platform/vivid/vivid-tpg-colors.c | 328 ++-
3257 drivers/media/platform/vivid/vivid-tpg-colors.h | 4 +-
3258 drivers/media/platform/vivid/vivid-tpg.c | 91 +
3259 drivers/media/platform/vivid/vivid-vbi-cap.c | 40 +-
3260 drivers/media/platform/vivid/vivid-vbi-out.c | 20 +-
3261 drivers/media/platform/vivid/vivid-vid-cap.c | 18 +-
3262 drivers/media/platform/vivid/vivid-vid-common.c | 56 +
3263 drivers/media/platform/vivid/vivid-vid-out.c | 18 +-
3264 drivers/media/platform/vsp1/vsp1_rpf.c | 4 +-
3265 drivers/media/platform/vsp1/vsp1_video.c | 23 +-
3266 drivers/media/platform/vsp1/vsp1_video.h | 8 +-
3267 drivers/media/platform/vsp1/vsp1_wpf.c | 4 +-
3268 drivers/media/platform/xilinx/xilinx-dma.c | 29 +-
3269 drivers/media/platform/xilinx/xilinx-dma.h | 2 +-
3270 drivers/media/usb/airspy/airspy.c | 26 +-
3271 drivers/media/usb/au0828/au0828-vbi.c | 10 +-
3272 drivers/media/usb/au0828/au0828-video.c | 48 +-
3273 drivers/media/usb/au0828/au0828.h | 3 +-
3274 drivers/media/usb/cx231xx/cx231xx-video.c | 3 +-
3275 drivers/media/usb/dvb-usb-v2/dvbsky.c | 4 +
3276 drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 +
3277 drivers/media/usb/em28xx/em28xx-vbi.c | 10 +-
3278 drivers/media/usb/em28xx/em28xx-video.c | 37 +-
3279 drivers/media/usb/em28xx/em28xx.h | 3 +-
3280 drivers/media/usb/go7007/go7007-driver.c | 29 +-
3281 drivers/media/usb/go7007/go7007-fw.c | 6 +-
3282 drivers/media/usb/go7007/go7007-priv.h | 4 +-
3283 drivers/media/usb/go7007/go7007-v4l2.c | 22 +-
3284 drivers/media/usb/gspca/gspca.c | 4 +-
3285 drivers/media/usb/hackrf/hackrf.c | 1086 ++++++---
3286 drivers/media/usb/msi2500/msi2500.c | 19 +-
3287 drivers/media/usb/pwc/pwc-if.c | 35 +-
3288 drivers/media/usb/pwc/pwc-uncompress.c | 6 +-
3289 drivers/media/usb/pwc/pwc.h | 4 +-
3290 drivers/media/usb/s2255/s2255drv.c | 29 +-
3291 drivers/media/usb/stk1160/stk1160-v4l.c | 17 +-
3292 drivers/media/usb/stk1160/stk1160-video.c | 12 +-
3293 drivers/media/usb/stk1160/stk1160.h | 4 +-
3294 drivers/media/usb/tm6000/tm6000-alsa.c | 2 +-
3295 drivers/media/usb/ttusb-dec/ttusb_dec.c | 12 +-
3296 drivers/media/usb/usbtv/usbtv-video.c | 24 +-
3297 drivers/media/usb/usbtv/usbtv.h | 3 +-
3298 drivers/media/usb/uvc/uvc_driver.c | 3 +
3299 drivers/media/usb/uvc/uvc_queue.c | 29 +-
3300 drivers/media/usb/uvc/uvc_video.c | 23 +-
3301 drivers/media/usb/uvc/uvcvideo.h | 7 +-
3302 drivers/media/v4l2-core/Makefile | 4 +-
3303 drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 51 +-
3304 drivers/media/v4l2-core/v4l2-ctrls.c | 14 +-
3305 drivers/media/v4l2-core/v4l2-dev.c | 14 +-
3306 drivers/media/v4l2-core/v4l2-ioctl.c | 51 +-
3307 drivers/media/v4l2-core/v4l2-mem2mem.c | 33 +-
3308 drivers/media/v4l2-core/v4l2-trace.c | 10 +-
3309 drivers/media/v4l2-core/vb2-trace.c | 9 +
3310 drivers/media/v4l2-core/videobuf-core.c | 4 +-
3311 drivers/media/v4l2-core/videobuf2-core.c | 2038 +++--------------
3312 drivers/media/v4l2-core/videobuf2-dma-contig.c | 7 +-
3313 drivers/media/v4l2-core/videobuf2-dma-sg.c | 7 +-
3314 drivers/media/v4l2-core/videobuf2-internal.h | 161 ++
3315 drivers/media/v4l2-core/videobuf2-memops.c | 2 +-
3316 drivers/media/v4l2-core/videobuf2-v4l2.c | 1661 ++++++++++++++
3317 drivers/media/v4l2-core/videobuf2-vmalloc.c | 2 +-
3318 drivers/staging/media/bcm2048/radio-bcm2048.c | 20 +-
3319 drivers/staging/media/davinci_vpfe/vpfe_video.c | 45 +-
3320 drivers/staging/media/davinci_vpfe/vpfe_video.h | 3 +-
3321 drivers/staging/media/lirc/lirc_sasem.c | 2 +-
3322 drivers/staging/media/lirc/lirc_serial.c | 32 +-
3323 drivers/staging/media/omap4iss/iss.c | 5 +-
3324 drivers/staging/media/omap4iss/iss_video.c | 26 +-
3325 drivers/staging/media/omap4iss/iss_video.h | 6 +-
3326 drivers/usb/gadget/function/uvc_queue.c | 28 +-
3327 drivers/usb/gadget/function/uvc_queue.h | 4 +-
3328 include/media/davinci/vpbe_display.h | 3 +-
3329 include/media/lirc_dev.h | 120 +-
3330 include/media/media-entity.h | 7 +
3331 include/media/soc_camera.h | 2 +-
3332 include/media/tuner-types.h | 182 +-
3333 include/media/tuner.h | 152 +-
3334 include/media/tveeprom.h | 83 +-
3335 include/media/v4l2-dv-timings.h | 34 +-
3336 include/media/v4l2-ioctl.h | 8 +
3337 include/media/v4l2-mem2mem.h | 11 +-
3338 include/media/videobuf2-core.h | 235 +-
3339 include/media/videobuf2-dma-contig.h | 2 +-
3340 include/media/videobuf2-dma-sg.h | 2 +-
3341 include/media/videobuf2-dvb.h | 8 +-
3342 include/media/videobuf2-memops.h | 2 +-
3343 include/media/videobuf2-v4l2.h | 149 ++
3344 include/media/videobuf2-vmalloc.h | 2 +-
3345 include/trace/events/v4l2.h | 63 +-
3346 include/trace/events/vb2.h | 65 +
3347 include/uapi/linux/v4l2-controls.h | 1 +
3348 include/uapi/linux/videodev2.h | 34 +-
3349 scripts/kernel-doc | 25 +
3350 262 files changed, 7846 insertions(+), 7866 deletions(-)
3351 delete mode 100644 Documentation/DocBook/media/dvb/kdapi.xml
3352 rename {include/media => drivers/media/platform/soc_camera}/atmel-isi.h (95%)
3353 create mode 100644 drivers/media/v4l2-core/vb2-trace.c
3354 create mode 100644 drivers/media/v4l2-core/videobuf2-internal.h
3355 create mode 100644 drivers/media/v4l2-core/videobuf2-v4l2.c
3356 create mode 100644 include/media/videobuf2-v4l2.h
3357 create mode 100644 include/trace/events/vb2.h
3358 Merging kbuild/for-next (bc036b590fd1 Merge branch 'kbuild/misc' into kbuild/for-next)
3359 $ git merge kbuild/for-next
3360 Auto-merging scripts/package/builddeb
3361 Auto-merging scripts/kconfig/Makefile
3362 Removing scripts/coccinelle/misc/simple_return.cocci
3363 Auto-merging lib/Kconfig.debug
3364 Auto-merging arch/x86/Kconfig
3365 Auto-merging Makefile
3366 Merge made by the 'recursive' strategy.
3367 Documentation/kbuild/Kconfig.recursion-issue-01 | 57 ++
3368 Documentation/kbuild/Kconfig.recursion-issue-02 | 63 ++
3369 Documentation/kbuild/Kconfig.select-break | 33 +
3370 Documentation/kbuild/kconfig-language.txt | 161 +++++
3371 Documentation/lto-build | 173 ++++++
3373 arch/x86/Kconfig | 2 +-
3374 init/Kconfig | 73 +++
3375 kernel/gcov/Kconfig | 2 +-
3376 lib/Kconfig.debug | 2 +-
3377 scripts/Makefile.lto | 84 +++
3378 scripts/Makefile.modpost | 7 +-
3379 scripts/coccicheck | 2 +-
3380 scripts/coccinelle/free/ifnullfree.cocci | 26 +-
3381 .../iterators/device_node_continue.cocci | 100 +++
3382 scripts/coccinelle/misc/compare_const_fl.cocci | 171 ++++++
3383 scripts/coccinelle/misc/of_table.cocci | 33 +-
3384 scripts/coccinelle/misc/simple_return.cocci | 180 ------
3385 scripts/coccinelle/null/deref_null.cocci | 4 +-
3386 scripts/coccinelle/tests/odd_ptr_err.cocci | 120 +++-
3387 scripts/kconfig/Makefile | 73 +--
3388 scripts/kconfig/expr.c | 2 +-
3389 scripts/kconfig/merge_config.sh | 18 +-
3390 scripts/kconfig/qconf.cc | 681 +++++++++++----------
3391 scripts/kconfig/qconf.h | 150 +++--
3392 scripts/kconfig/symbol.c | 2 +
3393 scripts/link-vmlinux.sh | 2 +-
3394 scripts/package/builddeb | 11 +-
3395 scripts/tags.sh | 2 +
3396 29 files changed, 1576 insertions(+), 681 deletions(-)
3397 create mode 100644 Documentation/kbuild/Kconfig.recursion-issue-01
3398 create mode 100644 Documentation/kbuild/Kconfig.recursion-issue-02
3399 create mode 100644 Documentation/kbuild/Kconfig.select-break
3400 create mode 100644 Documentation/lto-build
3401 create mode 100644 scripts/Makefile.lto
3402 create mode 100644 scripts/coccinelle/iterators/device_node_continue.cocci
3403 create mode 100644 scripts/coccinelle/misc/compare_const_fl.cocci
3404 delete mode 100644 scripts/coccinelle/misc/simple_return.cocci
3405 Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
3406 $ git merge kconfig/for-next
3408 Merging libata/for-next (f0ae0dfa91b0 Merge branch 'for-4.4' into for-next)
3409 $ git merge libata/for-next
3410 Merge made by the 'recursive' strategy.
3411 .../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 21 ++
3412 .../devicetree/bindings/ata/ahci-platform.txt | 2 -
3413 drivers/ata/Kconfig | 9 +
3414 drivers/ata/Makefile | 1 +
3415 drivers/ata/ahci.c | 2 +
3416 drivers/ata/ahci.h | 2 +
3417 drivers/ata/ahci_platform.c | 1 -
3418 drivers/ata/ahci_qoriq.c | 279 +++++++++++++++++++++
3419 drivers/ata/libahci.c | 30 +--
3420 drivers/ata/libata-scsi.c | 59 +++--
3421 drivers/ata/pata_it821x.c | 6 +-
3422 drivers/ata/pata_macio.c | 1 +
3423 drivers/ata/pata_pxa.c | 171 +++++--------
3424 drivers/ata/pata_samsung_cf.c | 2 +-
3425 include/linux/libata.h | 1 +
3426 15 files changed, 423 insertions(+), 164 deletions(-)
3427 create mode 100644 Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
3428 create mode 100644 drivers/ata/ahci_qoriq.c
3429 Merging pm/linux-next (ed8daa4024ff Merge branches 'acpi-processor' and 'acpi-assorted' into linux-next)
3430 $ git merge pm/linux-next
3431 Resolved 'arch/arm/mach-omap2/timer.c' using previous resolution.
3432 Removing include/linux/irqchip/arm-gic-acpi.h
3433 Removing include/linux/acpi_irq.h
3434 Auto-merging include/linux/acpi.h
3435 Auto-merging drivers/pci/pci.h
3436 Auto-merging drivers/pci/pci.c
3437 Auto-merging drivers/pci/pci-driver.c
3438 Removing drivers/cpufreq/cpufreq_opp.c
3439 Auto-merging drivers/cpufreq/Makefile
3440 Auto-merging drivers/cpufreq/Kconfig.arm
3441 Auto-merging drivers/clocksource/clksrc-probe.c
3442 Auto-merging drivers/clocksource/Makefile
3443 Auto-merging drivers/clocksource/Kconfig
3444 Auto-merging drivers/base/power/opp/core.c
3445 Auto-merging drivers/acpi/osl.c
3446 Auto-merging drivers/acpi/nfit.c
3447 Auto-merging arch/arm64/include/asm/irq.h
3448 Auto-merging arch/arm/mach-sunxi/sunxi.c
3449 Auto-merging arch/arm/mach-omap2/timer.c
3450 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/timer.c
3451 Automatic merge failed; fix conflicts and then commit the result.
3453 [master 99682c69513c] Merge remote-tracking branch 'pm/linux-next'
3454 $ git diff -M --stat --summary HEAD^..
3455 Documentation/ABI/testing/sysfs-power | 12 +
3456 Documentation/kernel-parameters.txt | 6 +-
3457 arch/arm/kernel/time.c | 2 +-
3458 arch/arm/mach-imx/mach-imx6q.c | 2 +-
3459 arch/arm/mach-omap2/timer.c | 6 +-
3460 arch/arm/mach-rockchip/rockchip.c | 2 +-
3461 arch/arm/mach-shmobile/setup-r8a7779.c | 2 +-
3462 arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +-
3463 arch/arm/mach-spear/spear13xx.c | 2 +-
3464 arch/arm/mach-sunxi/sunxi.c | 2 +-
3465 arch/arm/mach-u300/core.c | 2 +-
3466 arch/arm/mach-ux500/timer.c | 2 +-
3467 arch/arm/mach-zynq/common.c | 2 +-
3468 arch/arm64/include/asm/acpi.h | 1 -
3469 arch/arm64/include/asm/irq.h | 13 -
3470 arch/arm64/kernel/acpi.c | 25 -
3471 arch/arm64/kernel/time.c | 8 +-
3472 arch/ia64/include/asm/pci.h | 5 -
3473 arch/ia64/pci/pci.c | 368 ++----
3474 arch/microblaze/kernel/setup.c | 2 +-
3475 arch/mips/pistachio/time.c | 2 +-
3476 arch/mips/ralink/clk.c | 2 +-
3477 arch/nios2/kernel/time.c | 2 +-
3478 arch/x86/include/asm/msr-index.h | 7 +
3479 arch/x86/kernel/acpi/boot.c | 22 +-
3480 arch/x86/pci/acpi.c | 296 ++---
3481 arch/xtensa/kernel/time.c | 2 +-
3482 drivers/acpi/Kconfig | 29 +-
3483 drivers/acpi/Makefile | 1 +
3484 drivers/acpi/acpi_lpss.c | 2 +-
3485 drivers/acpi/acpi_pad.c | 2 -
3486 drivers/acpi/acpi_pnp.c | 4 +-
3487 drivers/acpi/acpi_processor.c | 18 +
3488 drivers/acpi/acpica/Makefile | 18 +-
3489 drivers/acpi/acpica/acapps.h | 2 +-
3490 drivers/acpi/acpica/acdebug.h | 6 +
3491 drivers/acpi/acpica/acglobal.h | 7 +-
3492 drivers/acpi/acpica/acinterp.h | 2 -
3493 drivers/acpi/acpica/aclocal.h | 22 +-
3494 drivers/acpi/acpica/acnamesp.h | 4 -
3495 drivers/acpi/acpica/acopcode.h | 4 +-
3496 drivers/acpi/acpica/acparser.h | 4 -
3497 drivers/acpi/acpica/acutils.h | 2 -
3498 drivers/acpi/acpica/amlcode.h | 11 +-
3499 drivers/acpi/acpica/dbcmds.c | 1187 ++++++++++++++++++
3500 drivers/acpi/acpica/dbconvert.c | 484 ++++++++
3501 drivers/acpi/acpica/dbdisply.c | 1108 +++++++++++++++++
3502 drivers/acpi/acpica/dbexec.c | 764 ++++++++++++
3503 drivers/acpi/acpica/dbfileio.c | 256 ++++
3504 drivers/acpi/acpica/dbhistry.c | 239 ++++
3505 drivers/acpi/acpica/dbinput.c | 1267 ++++++++++++++++++++
3506 drivers/acpi/acpica/dbmethod.c | 369 ++++++
3507 drivers/acpi/acpica/dbnames.c | 947 +++++++++++++++
3508 drivers/acpi/acpica/dbobject.c | 533 ++++++++
3509 drivers/acpi/acpica/dbstats.c | 546 +++++++++
3510 drivers/acpi/acpica/dbtest.c | 1057 ++++++++++++++++
3511 drivers/acpi/acpica/dbutils.c | 457 +++++++
3512 drivers/acpi/acpica/dbxface.c | 513 ++++++++
3513 drivers/acpi/acpica/evxface.c | 2 +-
3514 drivers/acpi/acpica/exconvrt.c | 1 +
3515 drivers/acpi/acpica/exresolv.c | 1 -
3516 drivers/acpi/acpica/exresop.c | 2 +
3517 drivers/acpi/acpica/exstore.c | 120 +-
3518 drivers/acpi/acpica/exstoren.c | 5 +-
3519 drivers/acpi/acpica/nsdump.c | 6 -
3520 drivers/acpi/acpica/nspredef.c | 2 +-
3521 drivers/acpi/acpica/pstree.c | 2 -
3522 drivers/acpi/acpica/psutils.c | 2 -
3523 drivers/acpi/acpica/rsdump.c | 3 -
3524 drivers/acpi/acpica/rsutils.c | 2 -
3525 drivers/acpi/acpica/rsxface.c | 4 +-
3526 drivers/acpi/acpica/utdecode.c | 21 +-
3527 drivers/acpi/acpica/utfileio.c | 6 +
3528 drivers/acpi/acpica/utinit.c | 15 +-
3529 drivers/acpi/acpica/utmutex.c | 21 +
3530 drivers/acpi/acpica/utxface.c | 19 +-
3531 drivers/acpi/cppc_acpi.c | 733 +++++++++++
3532 drivers/acpi/device_pm.c | 19 +-
3533 drivers/acpi/device_sysfs.c | 120 +-
3534 drivers/acpi/ec.c | 115 +-
3535 drivers/acpi/glue.c | 5 +-
3536 drivers/acpi/internal.h | 6 +-
3537 drivers/acpi/nfit.c | 6 +-
3538 drivers/acpi/nfit.h | 2 +-
3539 drivers/acpi/osl.c | 24 +-
3540 drivers/acpi/pci_root.c | 204 ++++
3541 drivers/acpi/proc.c | 4 +-
3542 drivers/acpi/processor_driver.c | 6 +
3543 drivers/acpi/property.c | 427 +++++--
3544 drivers/acpi/resource.c | 9 +-
3545 drivers/acpi/scan.c | 67 +-
3546 drivers/acpi/sleep.c | 9 +-
3547 drivers/acpi/sysfs.c | 3 +
3548 drivers/acpi/tables.c | 94 +-
3549 drivers/acpi/video_detect.c | 9 +
3550 drivers/base/power/Makefile | 2 +-
3551 drivers/base/power/domain.c | 280 +----
3552 drivers/base/power/generic_ops.c | 23 +-
3553 drivers/base/power/opp/Makefile | 2 +
3554 drivers/base/power/{opp.c => opp/core.c} | 363 +-----
3555 drivers/base/power/opp/cpu.c | 267 +++++
3556 drivers/base/power/opp/opp.h | 143 +++
3557 drivers/base/power/wakeup.c | 16 +-
3558 drivers/base/property.c | 88 +-
3559 drivers/clocksource/Kconfig | 9 +
3560 drivers/clocksource/Makefile | 2 +-
3561 drivers/clocksource/arm_arch_timer.c | 10 +-
3562 .../clocksource/{clksrc-of.c => clksrc-probe.c} | 6 +-
3563 drivers/cpufreq/Kconfig.arm | 17 +
3564 drivers/cpufreq/Kconfig.x86 | 1 +
3565 drivers/cpufreq/Makefile | 3 +-
3566 drivers/cpufreq/arm_big_little.h | 2 +-
3567 drivers/cpufreq/arm_big_little_dt.c | 4 +-
3568 drivers/cpufreq/cppc_cpufreq.c | 176 +++
3569 drivers/cpufreq/cpufreq-dt.c | 10 +-
3570 drivers/cpufreq/cpufreq.c | 7 -
3571 drivers/cpufreq/cpufreq_conservative.c | 31 +-
3572 drivers/cpufreq/cpufreq_governor.c | 12 +-
3573 drivers/cpufreq/cpufreq_governor.h | 1 -
3574 drivers/cpufreq/cpufreq_opp.c | 114 --
3575 drivers/cpufreq/exynos5440-cpufreq.c | 6 +-
3576 drivers/cpufreq/imx6q-cpufreq.c | 56 +-
3577 drivers/cpufreq/integrator-cpufreq.c | 2 +
3578 drivers/cpufreq/intel_pstate.c | 390 +++++-
3579 drivers/cpufreq/mt8173-cpufreq.c | 6 +-
3580 drivers/cpufreq/powernv-cpufreq.c | 10 +-
3581 drivers/cpufreq/tegra20-cpufreq.c | 2 -
3582 drivers/dma/acpi-dma.c | 25 +-
3583 drivers/gpio/gpiolib-acpi.c | 153 ++-
3584 drivers/gpio/gpiolib.c | 3 +-
3585 drivers/gpio/gpiolib.h | 10 +-
3586 drivers/input/serio/i8042.c | 32 +-
3587 drivers/irqchip/irq-gic.c | 69 +-
3588 drivers/irqchip/irqchip.c | 5 +-
3589 drivers/pci/pci-driver.c | 7 +
3590 drivers/pci/pci.c | 70 +-
3591 drivers/pci/pci.h | 1 +
3592 drivers/pnp/pnpacpi/core.c | 4 +-
3593 drivers/power/avs/rockchip-io-domain.c | 1 +
3594 drivers/powercap/intel_rapl.c | 1 +
3595 drivers/soc/dove/pmu.c | 1 -
3596 include/acpi/acexcep.h | 7 +-
3597 include/acpi/acpi_bus.h | 37 +-
3598 include/acpi/acpiosxf.h | 3 +-
3599 include/acpi/acpixf.h | 14 +-
3600 include/acpi/actbl1.h | 2 +-
3601 include/acpi/cppc_acpi.h | 138 +++
3602 include/acpi/platform/acenv.h | 8 +-
3603 include/acpi/platform/aclinux.h | 7 +-
3604 include/acpi/platform/aclinuxex.h | 5 +
3605 include/acpi/processor.h | 14 +
3606 include/asm-generic/vmlinux.lds.h | 12 +
3607 include/linux/acpi.h | 159 ++-
3608 include/linux/acpi_irq.h | 10 -
3609 include/linux/clocksource.h | 13 +-
3610 include/linux/fwnode.h | 1 +
3611 include/linux/ioport.h | 1 +
3612 include/linux/irqchip.h | 17 +
3613 include/linux/irqchip/arm-gic-acpi.h | 31 -
3614 include/linux/pci-acpi.h | 24 +
3615 include/linux/pm.h | 1 +
3616 include/linux/pm_domain.h | 64 -
3617 include/linux/pm_opp.h | 24 +-
3618 include/linux/property.h | 4 +
3619 include/linux/suspend.h | 39 +
3620 kernel/irq/pm.c | 2 +-
3621 kernel/power/hibernate.c | 2 +-
3622 kernel/power/main.c | 17 +
3623 kernel/power/suspend.c | 4 +
3624 tools/power/acpi/tools/acpidump/apfiles.c | 2 +-
3625 170 files changed, 13858 insertions(+), 2007 deletions(-)
3626 create mode 100644 drivers/acpi/acpica/dbcmds.c
3627 create mode 100644 drivers/acpi/acpica/dbconvert.c
3628 create mode 100644 drivers/acpi/acpica/dbdisply.c
3629 create mode 100644 drivers/acpi/acpica/dbexec.c
3630 create mode 100644 drivers/acpi/acpica/dbfileio.c
3631 create mode 100644 drivers/acpi/acpica/dbhistry.c
3632 create mode 100644 drivers/acpi/acpica/dbinput.c
3633 create mode 100644 drivers/acpi/acpica/dbmethod.c
3634 create mode 100644 drivers/acpi/acpica/dbnames.c
3635 create mode 100644 drivers/acpi/acpica/dbobject.c
3636 create mode 100644 drivers/acpi/acpica/dbstats.c
3637 create mode 100644 drivers/acpi/acpica/dbtest.c
3638 create mode 100644 drivers/acpi/acpica/dbutils.c
3639 create mode 100644 drivers/acpi/acpica/dbxface.c
3640 create mode 100644 drivers/acpi/cppc_acpi.c
3641 create mode 100644 drivers/base/power/opp/Makefile
3642 rename drivers/base/power/{opp.c => opp/core.c} (79%)
3643 create mode 100644 drivers/base/power/opp/cpu.c
3644 create mode 100644 drivers/base/power/opp/opp.h
3645 rename drivers/clocksource/{clksrc-of.c => clksrc-probe.c} (91%)
3646 create mode 100644 drivers/cpufreq/cppc_cpufreq.c
3647 delete mode 100644 drivers/cpufreq/cpufreq_opp.c
3648 create mode 100644 include/acpi/cppc_acpi.h
3649 delete mode 100644 include/linux/acpi_irq.h
3650 delete mode 100644 include/linux/irqchip/arm-gic-acpi.h
3651 $ git am -3 ../patches/0001-ARM-mediatek-fixup-for-clocksource_of_init-API-chang.patch
3652 Applying: ARM: mediatek: fixup for clocksource_of_init API change
3654 Unstaged changes after reset:
3655 M arch/arm/mach-mediatek/mediatek.c
3657 $ git commit -v -a --amend
3658 [master 44ace0fbf1ac] Merge remote-tracking branch 'pm/linux-next'
3659 Date: Mon Nov 2 10:53:48 2015 +1100
3660 Merging idle/next (f05bd12f0e9c Merge branch 'cpuidle' into release)
3661 $ git merge idle/next
3663 Merge made by the 'recursive' strategy.
3664 Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
3665 $ git merge apm/for-next
3667 Merging thermal/next (a353d85dc365 Merge branches 'thermal-core' and 'thermal-intel' of .git into next)
3668 $ git merge thermal/next
3669 Merge made by the 'recursive' strategy.
3670 drivers/acpi/thermal.c | 12 ++++++------
3671 drivers/platform/x86/asus-wmi.c | 2 +-
3672 drivers/platform/x86/intel_menlow.c | 8 ++++----
3673 drivers/thermal/Kconfig | 3 +++
3674 drivers/thermal/cpu_cooling.c | 8 +++-----
3675 include/linux/thermal.h | 8 +++++---
3676 tools/thermal/tmon/Makefile | 3 +++
3677 7 files changed, 25 insertions(+), 19 deletions(-)
3678 Merging thermal-soc/next (8fb2b9ac2aad thermal: underflow bug in imx_set_trip_temp())
3679 $ git merge thermal-soc/next
3680 Auto-merging drivers/thermal/Kconfig
3681 Auto-merging drivers/base/power/opp/core.c
3682 Merge made by the 'recursive' strategy.
3683 .../devicetree/bindings/thermal/ti_soc_thermal.txt | 14 +
3684 drivers/base/power/opp/core.c | 4 +-
3685 drivers/thermal/Kconfig | 14 +
3686 drivers/thermal/Makefile | 3 +
3687 drivers/thermal/armada_thermal.c | 6 +-
3688 drivers/thermal/devfreq_cooling.c | 569 +++++++++++++++++++++
3689 drivers/thermal/imx_thermal.c | 21 +-
3690 drivers/thermal/rockchip_thermal.c | 38 +-
3691 drivers/thermal/ti-soc-thermal/Kconfig | 15 +
3692 drivers/thermal/ti-soc-thermal/Makefile | 1 +
3693 .../thermal/ti-soc-thermal/omap3-thermal-data.c | 176 +++++++
3694 drivers/thermal/ti-soc-thermal/ti-bandgap.c | 14 +
3695 drivers/thermal/ti-soc-thermal/ti-bandgap.h | 11 +
3696 include/linux/devfreq_cooling.h | 81 +++
3697 include/trace/events/thermal.h | 53 ++
3698 15 files changed, 985 insertions(+), 35 deletions(-)
3699 create mode 100644 drivers/thermal/devfreq_cooling.c
3700 create mode 100644 drivers/thermal/ti-soc-thermal/omap3-thermal-data.c
3701 create mode 100644 include/linux/devfreq_cooling.h
3702 Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
3703 $ git merge ieee1394/for-next
3705 Merging dlm/next (b3a5bbfd780d dlm: print error from kernel_sendpage)
3706 $ git merge dlm/next
3708 Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE)
3709 $ git merge swiotlb/linux-next
3711 Merging slave-dma/next (6782af4b4071 Merge branch 'for-linus' into next)
3712 $ git merge slave-dma/next
3713 Auto-merging drivers/dma/acpi-dma.c
3714 Auto-merging arch/arm/mach-omap2/Kconfig
3715 Removing arch/arm/common/edma.c
3716 Auto-merging arch/arm/boot/dts/am437x-gp-evm.dts
3717 Auto-merging arch/arm/boot/dts/am335x-evm.dts
3718 Auto-merging arch/arm/Kconfig
3719 Merge made by the 'recursive' strategy.
3720 .../devicetree/bindings/dma/ti-dma-crossbar.txt | 15 +-
3721 Documentation/devicetree/bindings/dma/ti-edma.txt | 117 +-
3722 arch/arm/Kconfig | 1 -
3723 arch/arm/boot/dts/am335x-evm.dts | 9 +-
3724 arch/arm/boot/dts/am335x-pepper.dts | 11 +-
3725 arch/arm/boot/dts/am33xx.dtsi | 96 +-
3726 arch/arm/boot/dts/am4372.dtsi | 82 +-
3727 arch/arm/boot/dts/am437x-gp-evm.dts | 9 +-
3728 arch/arm/common/Kconfig | 3 -
3729 arch/arm/common/Makefile | 1 -
3730 arch/arm/common/edma.c | 1876 --------------------
3731 arch/arm/mach-davinci/devices-da8xx.c | 122 +-
3732 arch/arm/mach-davinci/dm355.c | 40 +-
3733 arch/arm/mach-davinci/dm365.c | 25 +-
3734 arch/arm/mach-davinci/dm644x.c | 40 +-
3735 arch/arm/mach-davinci/dm646x.c | 44 +-
3736 arch/arm/mach-omap2/Kconfig | 1 -
3737 arch/avr32/mach-at32ap/at32ap700x.c | 9 +-
3738 drivers/dma/Kconfig | 4 +-
3739 drivers/dma/Makefile | 2 +-
3740 drivers/dma/acpi-dma.c | 11 +-
3741 drivers/dma/at_hdmac.c | 168 +-
3742 drivers/dma/at_hdmac_regs.h | 2 +-
3743 drivers/dma/at_xdmac.c | 106 +-
3744 drivers/dma/dmaengine.c | 6 +-
3745 drivers/dma/dw/core.c | 75 +-
3746 drivers/dma/dw/pci.c | 20 +-
3747 drivers/dma/dw/platform.c | 17 +-
3748 drivers/dma/edma.c | 1839 ++++++++++++++++---
3749 drivers/dma/fsldma.c | 1 +
3750 drivers/dma/idma64.c | 22 +-
3751 drivers/dma/idma64.h | 14 +-
3752 drivers/dma/imx-sdma.c | 5 +-
3753 drivers/dma/ioat/dma.c | 3 +-
3754 drivers/dma/ioat/dma.h | 6 +-
3755 drivers/dma/ioat/init.c | 114 +-
3756 drivers/dma/ioat/prep.c | 34 +
3757 drivers/dma/moxart-dma.c | 1 +
3758 drivers/dma/mpc512x_dma.c | 1 +
3759 drivers/dma/omap-dma.c | 6 +-
3760 drivers/dma/sh/usb-dmac.c | 11 +-
3761 drivers/dma/sirf-dma.c | 1 +
3762 drivers/dma/ste_dma40.c | 2 +-
3763 drivers/dma/sun6i-dma.c | 1 +
3764 drivers/dma/ti-dma-crossbar.c | 251 ++-
3765 drivers/dma/virt-dma.h | 18 +-
3766 drivers/dma/xgene-dma.c | 63 +-
3767 drivers/dma/xilinx/xilinx_vdma.c | 1 +
3768 drivers/dma/zx296702_dma.c | 2 +-
3769 include/linux/of_dma.h | 2 +-
3770 include/linux/platform_data/dma-dw.h | 2 +
3771 include/linux/platform_data/edma.h | 104 +-
3772 52 files changed, 2659 insertions(+), 2757 deletions(-)
3773 delete mode 100644 arch/arm/common/edma.c
3774 Merging net-next/master (1cf7d8dda2bd net: hisilicon: Remove .owner assignment from platform_driver)
3775 $ git merge net-next/master
3776 Auto-merging net/tipc/udp_media.c
3777 Removing net/netfilter/nfnetlink_queue_ct.c
3778 Auto-merging net/netfilter/nfnetlink_queue.c
3779 Removing net/mac80211/event.c
3780 Removing net/mac80211/cfg.h
3781 Removing include/net/vrf.h
3782 Removing include/net/netfilter/nfnetlink_queue.h
3783 Auto-merging include/linux/platform_data/atmel.h
3784 Auto-merging include/linux/netdevice.h
3785 Removing drivers/nfc/st21nfca/st21nfca_se.h
3786 Removing drivers/nfc/st21nfca/st21nfca_dep.h
3787 Auto-merging drivers/nfc/st21nfca/se.c
3788 Auto-merging drivers/nfc/st21nfca/dep.c
3789 Auto-merging drivers/nfc/st21nfca/core.c
3790 Removing drivers/nfc/st-nci/st-nci_se.h
3791 Auto-merging drivers/nfc/st-nci/se.c
3792 Auto-merging drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
3793 Auto-merging drivers/net/wireless/realtek/rtlwifi/core.c
3794 Auto-merging drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile
3795 Auto-merging drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile
3796 Removing drivers/net/wireless/b43/pcmcia.h
3797 Removing drivers/net/wireless/b43/pcmcia.c
3798 Auto-merging drivers/net/ethernet/rocker/rocker.c
3799 Auto-merging drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
3800 Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
3801 Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c
3802 Removing drivers/net/ethernet/hisilicon/hip04_mdio.c
3803 Auto-merging drivers/net/ethernet/freescale/fec_main.c
3804 Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.h
3805 Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c
3806 Auto-merging drivers/net/arcnet/com20020.h
3807 Auto-merging drivers/net/arcnet/arcdevice.h
3808 Auto-merging drivers/irqchip/irq-armada-370-xp.c
3809 Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
3810 Auto-merging arch/arm/boot/dts/dra7.dtsi
3811 Auto-merging arch/arm/boot/dts/am4372.dtsi
3812 Auto-merging MAINTAINERS
3813 Merge made by the 'recursive' strategy.
3814 Documentation/DocBook/80211.tmpl | 5 +-
3815 .../devicetree/bindings/net/apm-xgene-enet.txt | 10 +
3816 .../devicetree/bindings/net/brcm,iproc-mdio.txt | 23 +
3817 .../devicetree/bindings/net/can/sun4i_can.txt | 36 +
3818 Documentation/devicetree/bindings/net/cpsw.txt | 7 +
3819 .../devicetree/bindings/net/fsl-tsec-phy.txt | 4 +
3820 .../bindings/net/hisilicon-hip04-net.txt | 4 +-
3821 .../devicetree/bindings/net/hisilicon-hns-dsaf.txt | 49 +
3822 .../devicetree/bindings/net/hisilicon-hns-mdio.txt | 22 +
3823 .../devicetree/bindings/net/hisilicon-hns-nic.txt | 47 +
3824 .../bindings/net/ieee802154/mrf24j40.txt | 20 +
3825 .../devicetree/bindings/net/nfc/nfcmrvl.txt | 61 +-
3826 .../devicetree/bindings/net/nfc/st-nci-i2c.txt | 7 +
3827 .../devicetree/bindings/net/nfc/st-nci-spi.txt | 9 +-
3828 .../devicetree/bindings/net/renesas,ravb.txt | 69 +-
3829 Documentation/filesystems/nfs/nfsroot.txt | 3 +
3830 Documentation/networking/ieee802154.txt | 8 +-
3831 Documentation/networking/ip-sysctl.txt | 23 +-
3832 Documentation/networking/ipvs-sysctl.txt | 10 +
3833 Documentation/networking/l2tp.txt | 7 +-
3834 Documentation/networking/switchdev.txt | 65 +-
3835 Documentation/networking/vrf.txt | 301 +-
3837 arch/arm/boot/dts/am4372.dtsi | 1 +
3838 arch/arm/boot/dts/dra7.dtsi | 1 +
3839 arch/arm/mach-gemini/board-nas4220b.c | 1 -
3840 arch/arm/mach-gemini/board-wbd111.c | 1 -
3841 arch/arm/mach-gemini/board-wbd222.c | 1 -
3842 arch/arm/net/bpf_jit_32.c | 40 +-
3843 arch/arm/net/bpf_jit_32.h | 5 +
3844 arch/arm64/boot/dts/apm/apm-storm.dtsi | 28 +
3845 arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 191 +
3846 arch/arm64/net/bpf_jit_comp.c | 2 +-
3847 arch/m68k/mac/psc.c | 1 +
3848 arch/mips/bcm47xx/Kconfig | 1 +
3849 arch/mips/net/bpf_jit.c | 2 +-
3850 arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | 2 +
3851 arch/powerpc/net/bpf_jit_comp.c | 2 +-
3852 arch/s390/net/bpf_jit_comp.c | 2 +-
3853 arch/sparc/net/bpf_jit_comp.c | 2 +-
3854 arch/x86/net/bpf_jit_comp.c | 2 +-
3855 drivers/atm/iphase.c | 5 +-
3856 drivers/base/regmap/internal.h | 2 +
3857 drivers/base/regmap/regmap.c | 29 +-
3858 drivers/bcma/main.c | 9 +-
3859 drivers/bluetooth/Kconfig | 8 +-
3860 drivers/bluetooth/ath3k.c | 4 +
3861 drivers/bluetooth/bfusb.c | 11 -
3862 drivers/bluetooth/bluecard_cs.c | 8 +-
3863 drivers/bluetooth/bpa10x.c | 186 +-
3864 drivers/bluetooth/bt3c_cs.c | 20 +-
3865 drivers/bluetooth/btbcm.c | 71 +-
3866 drivers/bluetooth/btintel.c | 369 ++
3867 drivers/bluetooth/btintel.h | 43 +-
3868 drivers/bluetooth/btmrvl_main.c | 33 +-
3869 drivers/bluetooth/btmrvl_sdio.c | 54 +-
3870 drivers/bluetooth/btsdio.c | 14 +-
3871 drivers/bluetooth/btuart_cs.c | 10 +-
3872 drivers/bluetooth/btusb.c | 366 +-
3873 drivers/bluetooth/btwilink.c | 13 -
3874 drivers/bluetooth/dtl1_cs.c | 5 -
3875 drivers/bluetooth/hci_ath.c | 1 +
3876 drivers/bluetooth/hci_bcm.c | 446 +-
3877 drivers/bluetooth/hci_h4.c | 1 +
3878 drivers/bluetooth/hci_h5.c | 10 +-
3879 drivers/bluetooth/hci_intel.c | 600 +-
3880 drivers/bluetooth/hci_ldisc.c | 24 +-
3881 drivers/bluetooth/hci_qca.c | 17 +-
3882 drivers/bluetooth/hci_uart.h | 2 +-
3883 drivers/bluetooth/hci_vhci.c | 8 -
3884 drivers/infiniband/hw/nes/nes_nic.c | 3 -
3885 drivers/irqchip/irq-armada-370-xp.c | 14 +-
3886 drivers/isdn/hisax/hfc4s8s_l1.c | 10 +-
3887 drivers/isdn/mISDN/dsp_pipeline.c | 12 +-
3888 drivers/net/Kconfig | 5 +-
3889 drivers/net/arcnet/arc-rawmode.c | 142 +-
3890 drivers/net/arcnet/arc-rimi.c | 145 +-
3891 {include/linux => drivers/net/arcnet}/arcdevice.h | 167 +-
3892 drivers/net/arcnet/arcnet.c | 700 +--
3893 drivers/net/arcnet/capmode.c | 138 +-
3894 drivers/net/arcnet/com20020-isa.c | 54 +-
3895 drivers/net/arcnet/com20020-pci.c | 175 +-
3896 drivers/net/arcnet/com20020.c | 263 +-
3897 {include/linux => drivers/net/arcnet}/com20020.h | 89 +-
3898 drivers/net/arcnet/com20020_cs.c | 325 +-
3899 drivers/net/arcnet/com9026.h | 17 +
3900 drivers/net/arcnet/com90io.c | 209 +-
3901 drivers/net/arcnet/com90xx.c | 323 +-
3902 drivers/net/arcnet/rfc1051.c | 77 +-
3903 drivers/net/arcnet/rfc1201.c | 238 +-
3904 drivers/net/bonding/bond_main.c | 6 +-
3905 drivers/net/can/Kconfig | 10 +
3906 drivers/net/can/Makefile | 1 +
3907 drivers/net/can/at91_can.c | 21 -
3908 drivers/net/can/flexcan.c | 197 +-
3909 drivers/net/can/sun4i_can.c | 857 +++
3910 drivers/net/dsa/bcm_sf2.c | 338 +-
3911 drivers/net/dsa/bcm_sf2.h | 62 +
3912 drivers/net/dsa/bcm_sf2_regs.h | 43 +
3913 drivers/net/dsa/mv88e6060.c | 4 +-
3914 drivers/net/dsa/mv88e6123_61_65.c | 1 -
3915 drivers/net/dsa/mv88e6131.c | 1 -
3916 drivers/net/dsa/mv88e6171.c | 8 +-
3917 drivers/net/dsa/mv88e6352.c | 8 +-
3918 drivers/net/dsa/mv88e6xxx.c | 977 +---
3919 drivers/net/dsa/mv88e6xxx.h | 44 +-
3920 drivers/net/dummy.c | 6 +-
3921 drivers/net/ethernet/8390/Kconfig | 2 +-
3922 drivers/net/ethernet/8390/mac8390.c | 32 +-
3923 drivers/net/ethernet/aeroflex/greth.c | 2 -
3924 drivers/net/ethernet/amd/7990.c | 1 +
3925 drivers/net/ethernet/amd/Kconfig | 2 +-
3926 drivers/net/ethernet/amd/au1000_eth.c | 1 -
3927 drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 83 +-
3928 drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 10 +-
3929 drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 107 +-
3930 drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 +-
3931 drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 16 +-
3932 drivers/net/ethernet/amd/xgbe/xgbe.h | 18 +-
3933 drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 11 +-
3934 drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 1 +
3935 drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 65 +-
3936 drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 7 +
3937 drivers/net/ethernet/apple/Kconfig | 2 +-
3938 drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 4 -
3939 drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 4 -
3940 drivers/net/ethernet/atheros/atlx/atl1.c | 1 -
3941 drivers/net/ethernet/atheros/atlx/atl2.c | 4 -
3942 drivers/net/ethernet/broadcom/Kconfig | 19 +
3943 drivers/net/ethernet/broadcom/Makefile | 1 +
3944 drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 -
3945 drivers/net/ethernet/broadcom/bcmsysport.c | 1 -
3946 drivers/net/ethernet/broadcom/bnx2.c | 81 +-
3947 drivers/net/ethernet/broadcom/bnx2.h | 1 +
3948 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 4 -
3949 drivers/net/ethernet/broadcom/bnxt/Makefile | 3 +
3950 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5728 +++++++++++++++++++
3951 drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1086 ++++
3952 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 1149 ++++
3953 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 17 +
3954 drivers/net/ethernet/broadcom/bnxt/bnxt_fw_hdr.h | 104 +
3955 drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 4046 +++++++++++++
3956 drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h | 59 +
3957 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 816 +++
3958 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 23 +
3959 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 150 +-
3960 drivers/net/ethernet/broadcom/genet/bcmgenet.h | 9 +-
3961 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 1 -
3962 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 4 +
3963 drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 21 +-
3964 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 206 +-
3965 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 39 +-
3966 drivers/net/ethernet/chelsio/cxgb4/sge.c | 36 +-
3967 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 1470 +++--
3968 drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 5 +
3969 .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +-
3970 drivers/net/ethernet/cisco/enic/enic.h | 1 +
3971 drivers/net/ethernet/cisco/enic/enic_main.c | 50 +-
3972 drivers/net/ethernet/cisco/enic/vnic_dev.c | 4 +-
3973 drivers/net/ethernet/cisco/enic/vnic_dev.h | 2 +
3974 drivers/net/ethernet/dec/tulip/de2104x.c | 1 -
3975 drivers/net/ethernet/emulex/benet/be_ethtool.c | 3 -
3976 drivers/net/ethernet/ethoc.c | 14 +-
3977 drivers/net/ethernet/freescale/fec_main.c | 3 +-
3978 drivers/net/ethernet/freescale/fec_ptp.c | 6 +-
3979 drivers/net/ethernet/freescale/gianfar.c | 157 +-
3980 drivers/net/ethernet/freescale/gianfar.h | 12 +-
3981 drivers/net/ethernet/freescale/gianfar_ethtool.c | 45 +-
3982 drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 2 -
3983 drivers/net/ethernet/hisilicon/Kconfig | 35 +-
3984 drivers/net/ethernet/hisilicon/Makefile | 4 +-
3985 drivers/net/ethernet/hisilicon/hip04_mdio.c | 185 -
3986 drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +-
3987 drivers/net/ethernet/hisilicon/hns/Makefile | 12 +
3988 drivers/net/ethernet/hisilicon/hns/hnae.c | 457 ++
3989 drivers/net/ethernet/hisilicon/hns/hnae.h | 585 ++
3990 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 783 +++
3991 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 704 +++
3992 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h | 45 +
3993 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 902 +++
3994 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 456 ++
3995 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 2474 ++++++++
3996 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 428 ++
3997 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 310 +
3998 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h | 43 +
3999 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 583 ++
4000 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | 105 +
4001 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 1021 ++++
4002 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 139 +
4003 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 972 ++++
4004 .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 837 +++
4005 .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h | 15 +
4006 drivers/net/ethernet/hisilicon/hns/hns_enet.c | 1642 ++++++
4007 drivers/net/ethernet/hisilicon/hns/hns_enet.h | 84 +
4008 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 1214 ++++
4009 drivers/net/ethernet/hisilicon/hns_mdio.c | 521 ++
4010 drivers/net/ethernet/ibm/emac/core.c | 1 -
4011 drivers/net/ethernet/ibm/emac/core.h | 2 +-
4012 drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 -
4013 drivers/net/ethernet/intel/e1000/e1000_hw.c | 8 -
4014 drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
4015 drivers/net/ethernet/intel/e1000e/ethtool.c | 2 -
4016 drivers/net/ethernet/intel/e1000e/netdev.c | 3 +-
4017 drivers/net/ethernet/intel/fm10k/fm10k.h | 19 +
4018 drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 11 +-
4019 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 220 +-
4020 drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 8 +-
4021 drivers/net/ethernet/intel/fm10k/fm10k_main.c | 50 +-
4022 drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 48 +-
4023 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 39 +-
4024 drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 198 +-
4025 drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 105 +-
4026 drivers/net/ethernet/intel/fm10k/fm10k_type.h | 7 +-
4027 drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 14 -
4028 drivers/net/ethernet/intel/i40e/i40e.h | 70 +-
4029 drivers/net/ethernet/intel/i40e/i40e_adminq.c | 79 +-
4030 drivers/net/ethernet/intel/i40e/i40e_adminq.h | 9 +-
4031 drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 27 +-
4032 drivers/net/ethernet/intel/i40e/i40e_common.c | 119 +-
4033 drivers/net/ethernet/intel/i40e/i40e_dcb.c | 292 +-
4034 drivers/net/ethernet/intel/i40e/i40e_dcb.h | 39 +
4035 drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 9 +-
4036 drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 168 +-
4037 drivers/net/ethernet/intel/i40e/i40e_devids.h | 55 +
4038 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 406 +-
4039 drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 13 +-
4040 drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 3 +-
4041 drivers/net/ethernet/intel/i40e/i40e_main.c | 1159 ++--
4042 drivers/net/ethernet/intel/i40e/i40e_nvm.c | 430 +-
4043 drivers/net/ethernet/intel/i40e/i40e_prototype.h | 9 +-
4044 drivers/net/ethernet/intel/i40e/i40e_ptp.c | 7 +-
4045 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 426 +-
4046 drivers/net/ethernet/intel/i40e/i40e_txrx.h | 57 +-
4047 drivers/net/ethernet/intel/i40e/i40e_type.h | 124 +-
4048 drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 2 +-
4049 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 91 +-
4050 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 5 +-
4051 drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 57 +-
4052 drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 9 +-
4053 .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 4 +-
4054 drivers/net/ethernet/intel/i40evf/i40e_common.c | 41 +-
4055 drivers/net/ethernet/intel/i40evf/i40e_devids.h | 55 +
4056 drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 6 +-
4057 drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 293 +-
4058 drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 41 +-
4059 drivers/net/ethernet/intel/i40evf/i40e_type.h | 116 +-
4060 drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 2 +-
4061 drivers/net/ethernet/intel/i40evf/i40evf.h | 12 +-
4062 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 195 +-
4063 .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 64 +-
4064 drivers/net/ethernet/intel/igb/igb.h | 4 +-
4065 drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 -
4066 drivers/net/ethernet/intel/igb/igb_main.c | 35 +-
4067 drivers/net/ethernet/intel/igb/igb_ptp.c | 8 +-
4068 drivers/net/ethernet/intel/igbvf/ethtool.c | 2 -
4069 drivers/net/ethernet/intel/igbvf/netdev.c | 3 +-
4070 drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 3 -
4071 drivers/net/ethernet/intel/ixgbe/ixgbe.h | 13 +-
4072 drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 202 +-
4073 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 226 +-
4074 drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 5 +
4075 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 8 +-
4076 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 5 +-
4077 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 2 +-
4078 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 136 +-
4079 drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 2 +
4080 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 291 +-
4081 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 35 +-
4082 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 96 +
4083 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 1 +
4084 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 13 +
4085 drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 102 +-
4086 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 503 +-
4087 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 6 +
4088 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 23 +-
4089 drivers/net/ethernet/intel/ixgbevf/mbx.h | 2 +
4090 drivers/net/ethernet/intel/ixgbevf/vf.c | 41 +
4091 drivers/net/ethernet/intel/ixgbevf/vf.h | 1 +
4092 drivers/net/ethernet/marvell/mv643xx_eth.c | 44 +-
4093 drivers/net/ethernet/marvell/mvneta.c | 433 +-
4094 drivers/net/ethernet/marvell/sky2.c | 12 +
4095 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 3 -
4096 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 167 +-
4097 drivers/net/ethernet/mellanox/mlx4/fw.c | 16 +
4098 drivers/net/ethernet/mellanox/mlx4/main.c | 2 +
4099 drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +
4100 drivers/net/ethernet/mellanox/mlx4/mr.c | 2 +-
4101 drivers/net/ethernet/mellanox/mlx4/qp.c | 6 +-
4102 .../net/ethernet/mellanox/mlx4/resource_tracker.c | 4 +-
4103 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 192 +-
4104 drivers/net/ethernet/mellanox/mlx5/core/cq.c | 1 +
4105 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 +-
4106 drivers/net/ethernet/mellanox/mlx5/core/eq.c | 1 +
4107 drivers/net/ethernet/mellanox/mlx5/core/health.c | 224 +-
4108 drivers/net/ethernet/mellanox/mlx5/core/main.c | 571 +-
4109 .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 26 +-
4110 drivers/net/ethernet/mellanox/mlx5/core/mr.c | 1 +
4111 .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 76 +-
4112 drivers/net/ethernet/mellanox/mlx5/core/port.c | 35 +-
4113 drivers/net/ethernet/mellanox/mlx5/core/qp.c | 1 +
4114 drivers/net/ethernet/mellanox/mlx5/core/srq.c | 1 +
4115 drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 4 +-
4116 drivers/net/ethernet/mellanox/mlxsw/Kconfig | 11 +
4117 drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +
4118 drivers/net/ethernet/mellanox/mlxsw/cmd.h | 51 +-
4119 drivers/net/ethernet/mellanox/mlxsw/core.c | 7 +-
4120 drivers/net/ethernet/mellanox/mlxsw/core.h | 5 +
4121 drivers/net/ethernet/mellanox/mlxsw/item.h | 50 +-
4122 drivers/net/ethernet/mellanox/mlxsw/pci.c | 63 +-
4123 drivers/net/ethernet/mellanox/mlxsw/pci.h | 5 +-
4124 drivers/net/ethernet/mellanox/mlxsw/reg.h | 1263 ++++-
4125 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 1949 +++++++
4126 drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 122 +
4127 .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 422 ++
4128 .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 903 +++
4129 drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 41 +-
4130 drivers/net/ethernet/mellanox/mlxsw/txheader.h | 1 +
4131 drivers/net/ethernet/microchip/Kconfig | 9 +
4132 drivers/net/ethernet/microchip/Makefile | 1 +
4133 drivers/net/ethernet/microchip/encx24j600-regmap.c | 513 ++
4134 drivers/net/ethernet/microchip/encx24j600.c | 1127 ++++
4135 drivers/net/ethernet/microchip/encx24j600_hw.h | 437 ++
4136 drivers/net/ethernet/neterion/s2io.c | 2 -
4137 drivers/net/ethernet/neterion/vxge/vxge-ethtool.c | 4 -
4138 drivers/net/ethernet/octeon/octeon_mgmt.c | 4 -
4139 .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 1 -
4140 drivers/net/ethernet/qlogic/Kconfig | 11 +
4141 drivers/net/ethernet/qlogic/Makefile | 2 +
4142 .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 2 -
4143 drivers/net/ethernet/qlogic/qed/Makefile | 4 +
4144 drivers/net/ethernet/qlogic/qed/qed.h | 496 ++
4145 drivers/net/ethernet/qlogic/qed/qed_cxt.c | 847 +++
4146 drivers/net/ethernet/qlogic/qed/qed_cxt.h | 139 +
4147 drivers/net/ethernet/qlogic/qed/qed_dev.c | 1797 ++++++
4148 drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 283 +
4149 drivers/net/ethernet/qlogic/qed/qed_hsi.h | 5291 +++++++++++++++++
4150 drivers/net/ethernet/qlogic/qed/qed_hw.c | 776 +++
4151 drivers/net/ethernet/qlogic/qed/qed_hw.h | 263 +
4152 .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 798 +++
4153 drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 531 ++
4154 drivers/net/ethernet/qlogic/qed/qed_init_ops.h | 110 +
4155 drivers/net/ethernet/qlogic/qed/qed_int.c | 1134 ++++
4156 drivers/net/ethernet/qlogic/qed/qed_int.h | 391 ++
4157 drivers/net/ethernet/qlogic/qed/qed_l2.c | 1704 ++++++
4158 drivers/net/ethernet/qlogic/qed/qed_main.c | 1169 ++++
4159 drivers/net/ethernet/qlogic/qed/qed_mcp.c | 860 +++
4160 drivers/net/ethernet/qlogic/qed/qed_mcp.h | 369 ++
4161 drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 366 ++
4162 drivers/net/ethernet/qlogic/qed/qed_sp.h | 360 ++
4163 drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 170 +
4164 drivers/net/ethernet/qlogic/qed/qed_spq.c | 860 +++
4165 drivers/net/ethernet/qlogic/qede/Makefile | 3 +
4166 drivers/net/ethernet/qlogic/qede/qede.h | 285 +
4167 drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 385 ++
4168 drivers/net/ethernet/qlogic/qede/qede_main.c | 2584 +++++++++
4169 drivers/net/ethernet/qlogic/qla3xxx.c | 2 -
4170 drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 2 +-
4171 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +-
4172 drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 7 -
4173 drivers/net/ethernet/realtek/8139cp.c | 24 +-
4174 drivers/net/ethernet/realtek/8139too.c | 1 -
4175 drivers/net/ethernet/renesas/ravb.h | 7 +
4176 drivers/net/ethernet/renesas/ravb_main.c | 101 +-
4177 drivers/net/ethernet/rocker/rocker.c | 467 +-
4178 drivers/net/ethernet/sfc/ef10.c | 30 +-
4179 drivers/net/ethernet/sfc/efx.c | 4 +-
4180 drivers/net/ethernet/sfc/mcdi.c | 13 +-
4181 drivers/net/ethernet/sfc/net_driver.h | 130 +-
4182 drivers/net/ethernet/smsc/smc91x.c | 29 +-
4183 drivers/net/ethernet/smsc/smc91x.h | 99 +-
4184 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 +-
4185 drivers/net/ethernet/sun/cassini.c | 3 -
4186 drivers/net/ethernet/tehuti/tehuti.c | 5 -
4187 drivers/net/ethernet/ti/cpmac.c | 1 -
4188 drivers/net/ethernet/ti/cpsw-common.c | 64 +-
4189 drivers/net/ethernet/ti/cpsw-phy-sel.c | 10 +-
4190 drivers/net/ethernet/ti/cpsw.c | 33 +-
4191 drivers/net/ethernet/ti/cpsw.h | 3 +-
4192 drivers/net/ethernet/ti/davinci_emac.c | 52 +-
4193 drivers/net/ethernet/ti/tlan.c | 1 -
4194 drivers/net/ethernet/xilinx/ll_temac_mdio.c | 9 +-
4195 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1 -
4196 drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 5 +-
4197 drivers/net/fjes/fjes_ethtool.c | 2 -
4198 drivers/net/geneve.c | 515 +-
4199 drivers/net/ieee802154/Kconfig | 8 +
4200 drivers/net/ieee802154/at86rf230.c | 369 +-
4201 drivers/net/ieee802154/at86rf230.h | 8 +
4202 drivers/net/ieee802154/atusb.c | 13 +-
4203 drivers/net/ieee802154/mrf24j40.c | 1424 +++--
4204 drivers/net/ipvlan/ipvlan_core.c | 14 +-
4205 drivers/net/irda/pxaficp_ir.c | 370 +-
4206 drivers/net/macvlan.c | 2 +-
4207 drivers/net/phy/Kconfig | 28 +
4208 drivers/net/phy/Makefile | 3 +
4209 drivers/net/phy/aquantia.c | 15 +-
4210 drivers/net/phy/bcm-cygnus.c | 158 +
4211 drivers/net/phy/bcm-phy-lib.c | 213 +
4212 drivers/net/phy/bcm-phy-lib.h | 37 +
4213 drivers/net/phy/bcm63xx.c | 38 +-
4214 drivers/net/phy/bcm7xxx.c | 136 +-
4215 drivers/net/phy/broadcom.c | 149 +-
4216 drivers/net/phy/mdio-bcm-iproc.c | 213 +
4217 drivers/net/phy/mdio-gpio.c | 2 +-
4218 drivers/net/phy/mdio_bus.c | 55 +
4219 drivers/net/phy/phy_device.c | 59 +-
4220 drivers/net/phy/teranetics.c | 15 +-
4221 drivers/net/ppp/pptp.c | 7 +-
4222 drivers/net/tun.c | 2 +-
4223 drivers/net/usb/Kconfig | 4 +-
4224 drivers/net/usb/asix.h | 2 +-
4225 drivers/net/usb/asix_common.c | 115 +-
4226 drivers/net/usb/cdc-phonet.c | 27 +-
4227 drivers/net/usb/cdc_ether.c | 230 +-
4228 drivers/net/usb/cdc_mbim.c | 2 +-
4229 drivers/net/usb/cdc_ncm.c | 69 +-
4230 drivers/net/usb/dm9601.c | 1 -
4231 drivers/net/usb/lan78xx.c | 672 +--
4232 drivers/net/usb/lan78xx.h | 193 -
4233 drivers/net/usb/mcs7830.c | 1 -
4234 drivers/net/usb/qmi_wwan.c | 66 +-
4235 drivers/net/usb/smsc75xx.c | 5 -
4236 drivers/net/usb/smsc95xx.c | 5 -
4237 drivers/net/usb/sr9800.c | 4 -
4238 drivers/net/usb/usbnet.c | 138 +
4239 drivers/net/vmxnet3/vmxnet3_ethtool.c | 122 +-
4240 drivers/net/vmxnet3/vmxnet3_int.h | 4 +-
4241 drivers/net/vrf.c | 415 +-
4242 drivers/net/vxlan.c | 167 +-
4243 drivers/net/wireless/Kconfig | 7 +-
4244 drivers/net/wireless/Makefile | 4 +-
4245 drivers/net/wireless/airo.c | 139 +-
4246 drivers/net/wireless/ath/ath10k/bmi.h | 10 +
4247 drivers/net/wireless/ath/ath10k/ce.c | 67 +-
4248 drivers/net/wireless/ath/ath10k/ce.h | 23 +-
4249 drivers/net/wireless/ath/ath10k/core.c | 387 +-
4250 drivers/net/wireless/ath/ath10k/core.h | 69 +-
4251 drivers/net/wireless/ath/ath10k/debug.c | 516 +-
4252 drivers/net/wireless/ath/ath10k/debug.h | 11 +
4253 drivers/net/wireless/ath/ath10k/hif.h | 26 +-
4254 drivers/net/wireless/ath/ath10k/htc.c | 51 +-
4255 drivers/net/wireless/ath/ath10k/htc.h | 4 +-
4256 drivers/net/wireless/ath/ath10k/htt.h | 10 +-
4257 drivers/net/wireless/ath/ath10k/htt_rx.c | 48 +-
4258 drivers/net/wireless/ath/ath10k/htt_tx.c | 112 +-
4259 drivers/net/wireless/ath/ath10k/hw.h | 35 +-
4260 drivers/net/wireless/ath/ath10k/mac.c | 640 ++-
4261 drivers/net/wireless/ath/ath10k/pci.c | 333 +-
4262 drivers/net/wireless/ath/ath10k/pci.h | 11 +-
4263 drivers/net/wireless/ath/ath10k/targaddrs.h | 3 +
4264 drivers/net/wireless/ath/ath10k/testmode.c | 202 +-
4265 drivers/net/wireless/ath/ath10k/thermal.c | 2 +-
4266 drivers/net/wireless/ath/ath10k/txrx.c | 19 +-
4267 drivers/net/wireless/ath/ath10k/wmi-ops.h | 57 +
4268 drivers/net/wireless/ath/ath10k/wmi-tlv.c | 15 +
4269 drivers/net/wireless/ath/ath10k/wmi.c | 979 +++-
4270 drivers/net/wireless/ath/ath10k/wmi.h | 195 +-
4271 drivers/net/wireless/ath/ath6kl/cfg80211.c | 149 +-
4272 drivers/net/wireless/ath/ath6kl/core.h | 2 +
4273 drivers/net/wireless/ath/ath6kl/debug.c | 55 +-
4274 drivers/net/wireless/ath/ath6kl/debug.h | 2 +
4275 drivers/net/wireless/ath/ath6kl/htc_mbox.c | 4 +-
4276 drivers/net/wireless/ath/ath6kl/init.c | 2 +-
4277 drivers/net/wireless/ath/ath9k/ar9002_phy.h | 4 +-
4278 drivers/net/wireless/ath/ath9k/ar9003_calib.c | 6 +-
4279 drivers/net/wireless/ath/ath9k/ar9003_hw.c | 10 +-
4280 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 9 +-
4281 drivers/net/wireless/ath/ath9k/ath9k.h | 1 +
4282 drivers/net/wireless/ath/ath9k/common-debug.c | 14 +-
4283 drivers/net/wireless/ath/ath9k/debug.c | 4 +-
4284 drivers/net/wireless/ath/ath9k/hif_usb.c | 106 +-
4285 drivers/net/wireless/ath/ath9k/hif_usb.h | 21 +-
4286 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 7 +-
4287 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +-
4288 drivers/net/wireless/ath/ath9k/hw.c | 1 +
4289 drivers/net/wireless/ath/ath9k/hw.h | 2 +-
4290 drivers/net/wireless/ath/ath9k/init.c | 3 +-
4291 drivers/net/wireless/ath/ath9k/mac.h | 18 +-
4292 drivers/net/wireless/ath/ath9k/main.c | 10 +-
4293 drivers/net/wireless/ath/ath9k/recv.c | 2 +-
4294 drivers/net/wireless/ath/carl9170/main.c | 2 +-
4295 drivers/net/wireless/ath/carl9170/rx.c | 2 +-
4296 drivers/net/wireless/ath/dfs_pattern_detector.c | 10 +-
4297 drivers/net/wireless/ath/dfs_pattern_detector.h | 5 +
4298 drivers/net/wireless/ath/dfs_pri_detector.c | 6 +-
4299 drivers/net/wireless/ath/wcn36xx/dxe.c | 61 +-
4300 drivers/net/wireless/ath/wcn36xx/dxe.h | 1 +
4301 drivers/net/wireless/ath/wcn36xx/main.c | 2 +-
4302 drivers/net/wireless/ath/wil6210/Kconfig | 1 +
4303 drivers/net/wireless/ath/wil6210/Makefile | 1 +
4304 drivers/net/wireless/ath/wil6210/debugfs.c | 6 +
4305 drivers/net/wireless/ath/wil6210/interrupt.c | 16 +-
4306 drivers/net/wireless/ath/wil6210/main.c | 16 +-
4307 drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 +-
4308 drivers/net/wireless/ath/wil6210/pmc.c | 2 +-
4309 drivers/net/wireless/ath/wil6210/rx_reorder.c | 26 +
4310 drivers/net/wireless/ath/wil6210/txrx.c | 92 +-
4311 drivers/net/wireless/ath/wil6210/txrx.h | 7 +
4312 drivers/net/wireless/ath/wil6210/wil6210.h | 14 +-
4313 drivers/net/wireless/ath/wil6210/wil_crash_dump.c | 115 +
4314 drivers/net/wireless/ath/wil6210/wmi.c | 22 +-
4315 drivers/net/wireless/b43/Kconfig | 20 -
4316 drivers/net/wireless/b43/Makefile | 1 -
4317 drivers/net/wireless/b43/main.c | 9 +-
4318 drivers/net/wireless/b43/pcmcia.c | 145 -
4319 drivers/net/wireless/b43/pcmcia.h | 20 -
4320 drivers/net/wireless/brcm80211/Kconfig | 1 +
4321 drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 28 +-
4322 drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | 4 +-
4323 drivers/net/wireless/brcm80211/brcmfmac/bus.h | 21 +
4324 drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 279 +-
4325 drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h | 6 +-
4326 drivers/net/wireless/brcm80211/brcmfmac/chip.c | 130 +-
4327 drivers/net/wireless/brcm80211/brcmfmac/chip.h | 1 +
4328 drivers/net/wireless/brcm80211/brcmfmac/common.h | 3 +
4329 drivers/net/wireless/brcm80211/brcmfmac/core.c | 179 +-
4330 drivers/net/wireless/brcm80211/brcmfmac/core.h | 21 +-
4331 drivers/net/wireless/brcm80211/brcmfmac/debug.c | 42 +-
4332 drivers/net/wireless/brcm80211/brcmfmac/debug.h | 11 +-
4333 drivers/net/wireless/brcm80211/brcmfmac/feature.c | 15 +-
4334 drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 2 +-
4335 drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 2 +-
4336 drivers/net/wireless/brcm80211/brcmfmac/flowring.h | 2 +-
4337 drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 42 +-
4338 drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 3 +
4339 drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 1 +
4340 .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 13 +
4341 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 57 +-
4342 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h | 3 +-
4343 drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 15 +-
4344 drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 145 +-
4345 drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 5 +-
4346 drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 178 +-
4347 drivers/net/wireless/brcm80211/brcmfmac/proto.h | 18 +-
4348 drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 55 +-
4349 drivers/net/wireless/brcm80211/brcmfmac/usb.c | 29 +-
4350 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 2 +-
4351 drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +-
4352 .../net/wireless/brcm80211/include/brcm_hw_ids.h | 13 +
4353 drivers/net/wireless/cw1200/sta.c | 2 +-
4354 drivers/net/wireless/cw1200/sta.h | 2 +-
4355 drivers/net/wireless/ipw2x00/ipw2200.c | 1 -
4356 drivers/net/wireless/ipw2x00/libipw_rx.c | 2 -
4357 drivers/net/wireless/iwlegacy/4965-mac.c | 2 +-
4358 drivers/net/wireless/iwlegacy/4965.h | 2 +-
4359 drivers/net/wireless/iwlwifi/Kconfig | 1 +
4360 drivers/net/wireless/iwlwifi/dvm/mac80211.c | 2 +-
4361 drivers/net/wireless/iwlwifi/iwl-7000.c | 13 +-
4362 drivers/net/wireless/iwlwifi/iwl-8000.c | 6 +-
4363 drivers/net/wireless/iwlwifi/iwl-config.h | 12 +-
4364 drivers/net/wireless/iwlwifi/iwl-drv.c | 4 +-
4365 drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 16 +
4366 drivers/net/wireless/iwlwifi/iwl-fw-file.h | 36 +-
4367 drivers/net/wireless/iwlwifi/iwl-fw.h | 4 +-
4368 drivers/net/wireless/iwlwifi/iwl-io.c | 23 +
4369 drivers/net/wireless/iwlwifi/iwl-io.h | 21 +-
4370 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 15 +-
4371 drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 2 +-
4372 drivers/net/wireless/iwlwifi/iwl-op-mode.h | 19 +-
4373 drivers/net/wireless/iwlwifi/iwl-trans.c | 1 +
4374 drivers/net/wireless/iwlwifi/iwl-trans.h | 7 +
4375 drivers/net/wireless/iwlwifi/mvm/constants.h | 5 +-
4376 drivers/net/wireless/iwlwifi/mvm/d3.c | 3 +
4377 drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 100 +-
4378 drivers/net/wireless/iwlwifi/mvm/debugfs.c | 134 +-
4379 drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 8 +-
4380 drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h | 238 +
4381 drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 5 +-
4382 drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h | 41 +-
4383 drivers/net/wireless/iwlwifi/mvm/fw-api.h | 259 +-
4384 drivers/net/wireless/iwlwifi/mvm/fw.c | 24 +-
4385 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 39 +-
4386 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 95 +-
4387 drivers/net/wireless/iwlwifi/mvm/mvm.h | 70 +-
4388 drivers/net/wireless/iwlwifi/mvm/nvm.c | 8 +-
4389 drivers/net/wireless/iwlwifi/mvm/ops.c | 179 +-
4390 drivers/net/wireless/iwlwifi/mvm/power.c | 109 +-
4391 drivers/net/wireless/iwlwifi/mvm/rs.c | 122 +-
4392 drivers/net/wireless/iwlwifi/mvm/rx.c | 67 +-
4393 drivers/net/wireless/iwlwifi/mvm/scan.c | 122 +-
4394 drivers/net/wireless/iwlwifi/mvm/sta.c | 88 +-
4395 drivers/net/wireless/iwlwifi/mvm/time-event.c | 2 +-
4396 drivers/net/wireless/iwlwifi/mvm/tof.c | 4 +-
4397 drivers/net/wireless/iwlwifi/mvm/tof.h | 2 +-
4398 drivers/net/wireless/iwlwifi/mvm/tt.c | 23 +-
4399 drivers/net/wireless/iwlwifi/mvm/tx.c | 15 +-
4400 drivers/net/wireless/iwlwifi/mvm/utils.c | 141 +-
4401 drivers/net/wireless/iwlwifi/pcie/trans.c | 10 +-
4402 drivers/net/wireless/mac80211_hwsim.c | 7 +-
4403 drivers/net/wireless/mediatek/mt7601u/main.c | 3 +-
4404 drivers/net/wireless/mwifiex/11n_aggr.c | 12 +-
4405 drivers/net/wireless/mwifiex/11n_rxreorder.c | 4 +-
4406 drivers/net/wireless/mwifiex/Kconfig | 4 +-
4407 drivers/net/wireless/mwifiex/cfg80211.c | 22 +-
4408 drivers/net/wireless/mwifiex/debugfs.c | 66 +-
4409 drivers/net/wireless/mwifiex/fw.h | 34 +
4410 drivers/net/wireless/mwifiex/init.c | 1 +
4411 drivers/net/wireless/mwifiex/main.c | 81 +-
4412 drivers/net/wireless/mwifiex/main.h | 25 +-
4413 drivers/net/wireless/mwifiex/pcie.c | 1 -
4414 drivers/net/wireless/mwifiex/scan.c | 22 +-
4415 drivers/net/wireless/mwifiex/sdio.c | 29 +-
4416 drivers/net/wireless/mwifiex/sta_cmd.c | 34 +-
4417 drivers/net/wireless/mwifiex/sta_cmdresp.c | 36 +
4418 drivers/net/wireless/mwifiex/sta_event.c | 78 +-
4419 drivers/net/wireless/mwifiex/sta_tx.c | 7 +-
4420 drivers/net/wireless/mwifiex/tdls.c | 12 +
4421 drivers/net/wireless/mwifiex/txrx.c | 19 +-
4422 drivers/net/wireless/mwifiex/uap_cmd.c | 16 -
4423 drivers/net/wireless/mwifiex/uap_event.c | 11 +-
4424 drivers/net/wireless/mwifiex/uap_txrx.c | 10 +-
4425 drivers/net/wireless/mwifiex/usb.c | 238 +-
4426 drivers/net/wireless/mwifiex/usb.h | 20 +-
4427 drivers/net/wireless/mwifiex/wmm.c | 69 +-
4428 drivers/net/wireless/mwl8k.c | 2 +-
4429 drivers/net/wireless/orinoco/cfg.c | 6 +-
4430 drivers/net/wireless/orinoco/orinoco_usb.c | 1 +
4431 drivers/net/wireless/realtek/Makefile | 9 +
4432 drivers/net/wireless/{ => realtek}/rtl818x/Kconfig | 0
4433 .../net/wireless/{ => realtek}/rtl818x/Makefile | 0
4434 .../{ => realtek}/rtl818x/rtl8180/Makefile | 2 +-
4435 .../wireless/{ => realtek}/rtl818x/rtl8180/dev.c | 0
4436 .../{ => realtek}/rtl818x/rtl8180/grf5101.c | 0
4437 .../{ => realtek}/rtl818x/rtl8180/grf5101.h | 0
4438 .../{ => realtek}/rtl818x/rtl8180/max2820.c | 0
4439 .../{ => realtek}/rtl818x/rtl8180/max2820.h | 0
4440 .../{ => realtek}/rtl818x/rtl8180/rtl8180.h | 0
4441 .../{ => realtek}/rtl818x/rtl8180/rtl8225.c | 0
4442 .../{ => realtek}/rtl818x/rtl8180/rtl8225.h | 0
4443 .../{ => realtek}/rtl818x/rtl8180/rtl8225se.c | 0
4444 .../{ => realtek}/rtl818x/rtl8180/rtl8225se.h | 0
4445 .../{ => realtek}/rtl818x/rtl8180/sa2400.c | 0
4446 .../{ => realtek}/rtl818x/rtl8180/sa2400.h | 0
4447 .../{ => realtek}/rtl818x/rtl8187/Makefile | 2 +-
4448 .../wireless/{ => realtek}/rtl818x/rtl8187/dev.c | 0
4449 .../wireless/{ => realtek}/rtl818x/rtl8187/leds.c | 0
4450 .../wireless/{ => realtek}/rtl818x/rtl8187/leds.h | 0
4451 .../{ => realtek}/rtl818x/rtl8187/rfkill.c | 0
4452 .../{ => realtek}/rtl818x/rtl8187/rfkill.h | 0
4453 .../{ => realtek}/rtl818x/rtl8187/rtl8187.h | 0
4454 .../{ => realtek}/rtl818x/rtl8187/rtl8225.c | 0
4455 .../{ => realtek}/rtl818x/rtl8187/rtl8225.h | 0
4456 .../net/wireless/{ => realtek}/rtl818x/rtl818x.h | 0
4457 drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 34 +
4458 drivers/net/wireless/realtek/rtl8xxxu/Makefile | 1 +
4459 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 5993 ++++++++++++++++++++
4460 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 676 +++
4461 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 981 ++++
4462 drivers/net/wireless/{ => realtek}/rtlwifi/Kconfig | 0
4463 .../net/wireless/{ => realtek}/rtlwifi/Makefile | 0
4464 drivers/net/wireless/{ => realtek}/rtlwifi/base.c | 0
4465 drivers/net/wireless/{ => realtek}/rtlwifi/base.h | 0
4466 .../{ => realtek}/rtlwifi/btcoexist/Makefile | 0
4467 .../rtlwifi/btcoexist/halbt_precomp.h | 0
4468 .../rtlwifi/btcoexist/halbtc8192e2ant.c | 0
4469 .../rtlwifi/btcoexist/halbtc8192e2ant.h | 0
4470 .../rtlwifi/btcoexist/halbtc8723b1ant.c | 0
4471 .../rtlwifi/btcoexist/halbtc8723b1ant.h | 0
4472 .../rtlwifi/btcoexist/halbtc8723b2ant.c | 0
4473 .../rtlwifi/btcoexist/halbtc8723b2ant.h | 0
4474 .../rtlwifi/btcoexist/halbtc8821a1ant.c | 0
4475 .../rtlwifi/btcoexist/halbtc8821a1ant.h | 0
4476 .../rtlwifi/btcoexist/halbtc8821a2ant.c | 0
4477 .../rtlwifi/btcoexist/halbtc8821a2ant.h | 0
4478 .../{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.c | 0
4479 .../{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.h | 0
4480 .../{ => realtek}/rtlwifi/btcoexist/rtl_btc.c | 0
4481 .../{ => realtek}/rtlwifi/btcoexist/rtl_btc.h | 0
4482 drivers/net/wireless/{ => realtek}/rtlwifi/cam.c | 0
4483 drivers/net/wireless/{ => realtek}/rtlwifi/cam.h | 0
4484 drivers/net/wireless/{ => realtek}/rtlwifi/core.c | 2 +-
4485 drivers/net/wireless/{ => realtek}/rtlwifi/core.h | 0
4486 drivers/net/wireless/{ => realtek}/rtlwifi/debug.c | 0
4487 drivers/net/wireless/{ => realtek}/rtlwifi/debug.h | 0
4488 drivers/net/wireless/{ => realtek}/rtlwifi/efuse.c | 0
4489 drivers/net/wireless/{ => realtek}/rtlwifi/efuse.h | 0
4490 drivers/net/wireless/{ => realtek}/rtlwifi/pci.c | 0
4491 drivers/net/wireless/{ => realtek}/rtlwifi/pci.h | 0
4492 drivers/net/wireless/{ => realtek}/rtlwifi/ps.c | 0
4493 drivers/net/wireless/{ => realtek}/rtlwifi/ps.h | 0
4494 .../net/wireless/{ => realtek}/rtlwifi/pwrseqcmd.h | 0
4495 drivers/net/wireless/{ => realtek}/rtlwifi/rc.c | 0
4496 drivers/net/wireless/{ => realtek}/rtlwifi/rc.h | 0
4497 drivers/net/wireless/{ => realtek}/rtlwifi/regd.c | 0
4498 drivers/net/wireless/{ => realtek}/rtlwifi/regd.h | 0
4499 .../{ => realtek}/rtlwifi/rtl8188ee/Makefile | 0
4500 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/def.h | 0
4501 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.c | 0
4502 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.h | 0
4503 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.c | 0
4504 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.h | 0
4505 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.c | 0
4506 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.h | 0
4507 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/led.c | 0
4508 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/led.h | 0
4509 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.c | 0
4510 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.h | 0
4511 .../{ => realtek}/rtlwifi/rtl8188ee/pwrseq.c | 0
4512 .../{ => realtek}/rtlwifi/rtl8188ee/pwrseq.h | 0
4513 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/reg.h | 0
4514 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.c | 0
4515 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.h | 0
4516 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.c | 0
4517 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.h | 0
4518 .../{ => realtek}/rtlwifi/rtl8188ee/table.c | 0
4519 .../{ => realtek}/rtlwifi/rtl8188ee/table.h | 0
4520 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.c | 0
4521 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.h | 0
4522 .../{ => realtek}/rtlwifi/rtl8192c/Makefile | 0
4523 .../{ => realtek}/rtlwifi/rtl8192c/dm_common.c | 0
4524 .../{ => realtek}/rtlwifi/rtl8192c/dm_common.h | 0
4525 .../{ => realtek}/rtlwifi/rtl8192c/fw_common.c | 0
4526 .../{ => realtek}/rtlwifi/rtl8192c/fw_common.h | 0
4527 .../wireless/{ => realtek}/rtlwifi/rtl8192c/main.c | 0
4528 .../{ => realtek}/rtlwifi/rtl8192c/phy_common.c | 0
4529 .../{ => realtek}/rtlwifi/rtl8192c/phy_common.h | 0
4530 .../{ => realtek}/rtlwifi/rtl8192ce/Makefile | 0
4531 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/def.h | 0
4532 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.c | 0
4533 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.h | 0
4534 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.c | 0
4535 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.h | 0
4536 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/led.c | 0
4537 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/led.h | 0
4538 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.c | 0
4539 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.h | 0
4540 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/reg.h | 0
4541 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.c | 0
4542 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.h | 0
4543 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.c | 0
4544 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.h | 0
4545 .../{ => realtek}/rtlwifi/rtl8192ce/table.c | 0
4546 .../{ => realtek}/rtlwifi/rtl8192ce/table.h | 0
4547 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.c | 0
4548 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.h | 0
4549 .../{ => realtek}/rtlwifi/rtl8192cu/Makefile | 0
4550 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/def.h | 0
4551 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.c | 0
4552 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.h | 0
4553 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.c | 8 +
4554 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.h | 0
4555 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/led.c | 0
4556 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/led.h | 0
4557 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.c | 0
4558 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.h | 0
4559 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.c | 0
4560 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.h | 0
4561 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/reg.h | 0
4562 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.c | 0
4563 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.h | 0
4564 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.c | 0
4565 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.h | 0
4566 .../{ => realtek}/rtlwifi/rtl8192cu/table.c | 0
4567 .../{ => realtek}/rtlwifi/rtl8192cu/table.h | 0
4568 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.c | 0
4569 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.h | 0
4570 .../{ => realtek}/rtlwifi/rtl8192de/Makefile | 0
4571 .../wireless/{ => realtek}/rtlwifi/rtl8192de/def.h | 0
4572 .../wireless/{ => realtek}/rtlwifi/rtl8192de/dm.c | 0
4573 .../wireless/{ => realtek}/rtlwifi/rtl8192de/dm.h | 0
4574 .../wireless/{ => realtek}/rtlwifi/rtl8192de/fw.c | 0
4575 .../wireless/{ => realtek}/rtlwifi/rtl8192de/fw.h | 0
4576 .../wireless/{ => realtek}/rtlwifi/rtl8192de/hw.c | 0
4577 .../wireless/{ => realtek}/rtlwifi/rtl8192de/hw.h | 0
4578 .../wireless/{ => realtek}/rtlwifi/rtl8192de/led.c | 0
4579 .../wireless/{ => realtek}/rtlwifi/rtl8192de/led.h | 0
4580 .../wireless/{ => realtek}/rtlwifi/rtl8192de/phy.c | 0
4581 .../wireless/{ => realtek}/rtlwifi/rtl8192de/phy.h | 0
4582 .../wireless/{ => realtek}/rtlwifi/rtl8192de/reg.h | 0
4583 .../wireless/{ => realtek}/rtlwifi/rtl8192de/rf.c | 0
4584 .../wireless/{ => realtek}/rtlwifi/rtl8192de/rf.h | 0
4585 .../wireless/{ => realtek}/rtlwifi/rtl8192de/sw.c | 0
4586 .../wireless/{ => realtek}/rtlwifi/rtl8192de/sw.h | 0
4587 .../{ => realtek}/rtlwifi/rtl8192de/table.c | 0
4588 .../{ => realtek}/rtlwifi/rtl8192de/table.h | 0
4589 .../wireless/{ => realtek}/rtlwifi/rtl8192de/trx.c | 0
4590 .../wireless/{ => realtek}/rtlwifi/rtl8192de/trx.h | 0
4591 .../{ => realtek}/rtlwifi/rtl8192ee/Makefile | 0
4592 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/def.h | 0
4593 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.c | 0
4594 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.h | 0
4595 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.c | 0
4596 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.h | 0
4597 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.c | 0
4598 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.h | 0
4599 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/led.c | 0
4600 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/led.h | 0
4601 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.c | 0
4602 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.h | 0
4603 .../{ => realtek}/rtlwifi/rtl8192ee/pwrseq.c | 0
4604 .../{ => realtek}/rtlwifi/rtl8192ee/pwrseq.h | 0
4605 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/reg.h | 0
4606 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.c | 0
4607 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.h | 0
4608 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.c | 0
4609 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.h | 0
4610 .../{ => realtek}/rtlwifi/rtl8192ee/table.c | 0
4611 .../{ => realtek}/rtlwifi/rtl8192ee/table.h | 0
4612 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.c | 0
4613 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.h | 0
4614 .../{ => realtek}/rtlwifi/rtl8192se/Makefile | 0
4615 .../wireless/{ => realtek}/rtlwifi/rtl8192se/def.h | 0
4616 .../wireless/{ => realtek}/rtlwifi/rtl8192se/dm.c | 0
4617 .../wireless/{ => realtek}/rtlwifi/rtl8192se/dm.h | 0
4618 .../wireless/{ => realtek}/rtlwifi/rtl8192se/fw.c | 0
4619 .../wireless/{ => realtek}/rtlwifi/rtl8192se/fw.h | 0
4620 .../wireless/{ => realtek}/rtlwifi/rtl8192se/hw.c | 0
4621 .../wireless/{ => realtek}/rtlwifi/rtl8192se/hw.h | 0
4622 .../wireless/{ => realtek}/rtlwifi/rtl8192se/led.c | 0
4623 .../wireless/{ => realtek}/rtlwifi/rtl8192se/led.h | 0
4624 .../wireless/{ => realtek}/rtlwifi/rtl8192se/phy.c | 0
4625 .../wireless/{ => realtek}/rtlwifi/rtl8192se/phy.h | 0
4626 .../wireless/{ => realtek}/rtlwifi/rtl8192se/reg.h | 0
4627 .../wireless/{ => realtek}/rtlwifi/rtl8192se/rf.c | 0
4628 .../wireless/{ => realtek}/rtlwifi/rtl8192se/rf.h | 0
4629 .../wireless/{ => realtek}/rtlwifi/rtl8192se/sw.c | 0
4630 .../wireless/{ => realtek}/rtlwifi/rtl8192se/sw.h | 0
4631 .../{ => realtek}/rtlwifi/rtl8192se/table.c | 0
4632 .../{ => realtek}/rtlwifi/rtl8192se/table.h | 0
4633 .../wireless/{ => realtek}/rtlwifi/rtl8192se/trx.c | 0
4634 .../wireless/{ => realtek}/rtlwifi/rtl8192se/trx.h | 0
4635 .../{ => realtek}/rtlwifi/rtl8723ae/Makefile | 0
4636 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/btc.h | 0
4637 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/def.h | 0
4638 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.c | 0
4639 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.h | 0
4640 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.c | 0
4641 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.h | 0
4642 .../rtlwifi/rtl8723ae/hal_bt_coexist.c | 0
4643 .../rtlwifi/rtl8723ae/hal_bt_coexist.h | 0
4644 .../{ => realtek}/rtlwifi/rtl8723ae/hal_btc.c | 0
4645 .../{ => realtek}/rtlwifi/rtl8723ae/hal_btc.h | 0
4646 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.c | 0
4647 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.h | 0
4648 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/led.c | 0
4649 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/led.h | 0
4650 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.c | 0
4651 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.h | 0
4652 .../{ => realtek}/rtlwifi/rtl8723ae/pwrseq.c | 0
4653 .../{ => realtek}/rtlwifi/rtl8723ae/pwrseq.h | 0
4654 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/reg.h | 0
4655 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.c | 0
4656 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.h | 0
4657 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.c | 0
4658 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.h | 0
4659 .../{ => realtek}/rtlwifi/rtl8723ae/table.c | 0
4660 .../{ => realtek}/rtlwifi/rtl8723ae/table.h | 0
4661 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.c | 0
4662 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.h | 0
4663 .../{ => realtek}/rtlwifi/rtl8723be/Makefile | 0
4664 .../wireless/{ => realtek}/rtlwifi/rtl8723be/def.h | 0
4665 .../wireless/{ => realtek}/rtlwifi/rtl8723be/dm.c | 0
4666 .../wireless/{ => realtek}/rtlwifi/rtl8723be/dm.h | 0
4667 .../wireless/{ => realtek}/rtlwifi/rtl8723be/fw.c | 0
4668 .../wireless/{ => realtek}/rtlwifi/rtl8723be/fw.h | 0
4669 .../wireless/{ => realtek}/rtlwifi/rtl8723be/hw.c | 0
4670 .../wireless/{ => realtek}/rtlwifi/rtl8723be/hw.h | 0
4671 .../wireless/{ => realtek}/rtlwifi/rtl8723be/led.c | 0
4672 .../wireless/{ => realtek}/rtlwifi/rtl8723be/led.h | 0
4673 .../wireless/{ => realtek}/rtlwifi/rtl8723be/phy.c | 0
4674 .../wireless/{ => realtek}/rtlwifi/rtl8723be/phy.h | 0
4675 .../{ => realtek}/rtlwifi/rtl8723be/pwrseq.c | 0
4676 .../{ => realtek}/rtlwifi/rtl8723be/pwrseq.h | 0
4677 .../wireless/{ => realtek}/rtlwifi/rtl8723be/reg.h | 0
4678 .../wireless/{ => realtek}/rtlwifi/rtl8723be/rf.c | 0
4679 .../wireless/{ => realtek}/rtlwifi/rtl8723be/rf.h | 0
4680 .../wireless/{ => realtek}/rtlwifi/rtl8723be/sw.c | 0
4681 .../wireless/{ => realtek}/rtlwifi/rtl8723be/sw.h | 0
4682 .../{ => realtek}/rtlwifi/rtl8723be/table.c | 0
4683 .../{ => realtek}/rtlwifi/rtl8723be/table.h | 0
4684 .../wireless/{ => realtek}/rtlwifi/rtl8723be/trx.c | 0
4685 .../wireless/{ => realtek}/rtlwifi/rtl8723be/trx.h | 0
4686 .../{ => realtek}/rtlwifi/rtl8723com/Makefile | 0
4687 .../{ => realtek}/rtlwifi/rtl8723com/dm_common.c | 0
4688 .../{ => realtek}/rtlwifi/rtl8723com/dm_common.h | 0
4689 .../{ => realtek}/rtlwifi/rtl8723com/fw_common.c | 0
4690 .../{ => realtek}/rtlwifi/rtl8723com/fw_common.h | 0
4691 .../{ => realtek}/rtlwifi/rtl8723com/main.c | 0
4692 .../{ => realtek}/rtlwifi/rtl8723com/phy_common.c | 0
4693 .../{ => realtek}/rtlwifi/rtl8723com/phy_common.h | 0
4694 .../{ => realtek}/rtlwifi/rtl8821ae/Makefile | 0
4695 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/def.h | 0
4696 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.c | 0
4697 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.h | 0
4698 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.c | 0
4699 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.h | 0
4700 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.c | 0
4701 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.h | 0
4702 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/led.c | 0
4703 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/led.h | 0
4704 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.c | 0
4705 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.h | 0
4706 .../{ => realtek}/rtlwifi/rtl8821ae/pwrseq.c | 0
4707 .../{ => realtek}/rtlwifi/rtl8821ae/pwrseq.h | 0
4708 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/reg.h | 0
4709 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.c | 0
4710 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.h | 0
4711 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.c | 0
4712 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.h | 0
4713 .../{ => realtek}/rtlwifi/rtl8821ae/table.c | 0
4714 .../{ => realtek}/rtlwifi/rtl8821ae/table.h | 0
4715 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.c | 0
4716 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.h | 0
4717 drivers/net/wireless/{ => realtek}/rtlwifi/stats.c | 0
4718 drivers/net/wireless/{ => realtek}/rtlwifi/stats.h | 0
4719 drivers/net/wireless/{ => realtek}/rtlwifi/usb.c | 0
4720 drivers/net/wireless/{ => realtek}/rtlwifi/usb.h | 0
4721 drivers/net/wireless/{ => realtek}/rtlwifi/wifi.h | 0
4722 drivers/net/wireless/rndis_wlan.c | 2 +-
4723 drivers/net/wireless/rsi/rsi_91x_mac80211.c | 4 +-
4724 drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
4725 drivers/net/wireless/rt2x00/rt2800lib.h | 2 +-
4726 drivers/net/wireless/rt2x00/rt2x00config.c | 2 +-
4727 drivers/net/wireless/ti/wl12xx/scan.c | 3 +-
4728 drivers/net/wireless/ti/wl18xx/main.c | 1 +
4729 drivers/net/wireless/ti/wl18xx/scan.c | 8 +-
4730 drivers/net/wireless/ti/wlcore/main.c | 2 +-
4731 drivers/net/wireless/ti/wlcore/wlcore.h | 2 +-
4732 drivers/net/xen-netfront.c | 17 +-
4733 drivers/nfc/Kconfig | 1 +
4734 drivers/nfc/Makefile | 1 +
4735 drivers/nfc/fdp/Kconfig | 23 +
4736 drivers/nfc/fdp/Makefile | 9 +
4737 drivers/nfc/fdp/fdp.c | 817 +++
4738 drivers/nfc/fdp/fdp.h | 38 +
4739 drivers/nfc/fdp/i2c.c | 388 ++
4740 drivers/nfc/microread/Kconfig | 18 +-
4741 drivers/nfc/nfcmrvl/Kconfig | 34 +-
4742 drivers/nfc/nfcmrvl/Makefile | 8 +-
4743 drivers/nfc/nfcmrvl/fw_dnld.c | 553 ++
4744 drivers/nfc/nfcmrvl/fw_dnld.h | 98 +
4745 drivers/nfc/nfcmrvl/i2c.c | 290 +
4746 drivers/nfc/nfcmrvl/main.c | 75 +-
4747 drivers/nfc/nfcmrvl/nfcmrvl.h | 23 +-
4748 drivers/nfc/nfcmrvl/spi.c | 228 +
4749 drivers/nfc/nfcmrvl/uart.c | 26 +-
4750 drivers/nfc/nfcmrvl/usb.c | 10 +-
4751 drivers/nfc/nfcsim.c | 2 +-
4752 drivers/nfc/nfcwilink.c | 2 +-
4753 drivers/nfc/nxp-nci/core.c | 3 +-
4754 drivers/nfc/nxp-nci/i2c.c | 2 +-
4755 drivers/nfc/nxp-nci/nxp-nci.h | 5 +-
4756 drivers/nfc/pn533.c | 2 +-
4757 drivers/nfc/pn544/Kconfig | 18 +-
4758 drivers/nfc/s3fwrn5/Kconfig | 1 +
4759 drivers/nfc/s3fwrn5/Makefile | 2 -
4760 drivers/nfc/s3fwrn5/i2c.c | 2 +-
4761 drivers/nfc/s3fwrn5/nci.c | 4 +-
4762 drivers/nfc/s3fwrn5/nci.h | 2 +-
4763 drivers/nfc/st-nci/Makefile | 4 +-
4764 drivers/nfc/st-nci/core.c | 20 +-
4765 drivers/nfc/st-nci/i2c.c | 35 +-
4766 drivers/nfc/st-nci/ndlc.c | 7 +-
4767 drivers/nfc/st-nci/ndlc.h | 5 +-
4768 drivers/nfc/st-nci/{st-nci_se.c => se.c} | 166 +-
4769 drivers/nfc/st-nci/spi.c | 37 +-
4770 drivers/nfc/st-nci/st-nci.h | 117 +-
4771 drivers/nfc/st-nci/st-nci_se.h | 61 -
4772 drivers/nfc/st-nci/vendor_cmds.c | 516 ++
4773 drivers/nfc/st21nfca/Makefile | 2 +-
4774 drivers/nfc/st21nfca/{st21nfca.c => core.c} | 48 +-
4775 drivers/nfc/st21nfca/{st21nfca_dep.c => dep.c} | 2 +-
4776 drivers/nfc/st21nfca/i2c.c | 1 +
4777 drivers/nfc/st21nfca/{st21nfca_se.c => se.c} | 18 +-
4778 drivers/nfc/st21nfca/st21nfca.h | 148 +-
4779 drivers/nfc/st21nfca/st21nfca_dep.h | 43 -
4780 drivers/nfc/st21nfca/st21nfca_se.h | 63 -
4781 drivers/nfc/st21nfca/vendor_cmds.c | 375 ++
4782 drivers/nfc/trf7970a.c | 7 +
4783 drivers/s390/char/monreader.c | 4 +-
4784 drivers/s390/char/vmlogrdr.c | 8 +-
4785 drivers/s390/cio/qdio_main.c | 4 +-
4786 drivers/s390/net/netiucv.c | 21 +-
4787 drivers/s390/net/qeth_core.h | 30 +-
4788 drivers/s390/net/qeth_core_main.c | 241 +-
4789 drivers/s390/net/qeth_core_sys.c | 43 +-
4790 drivers/s390/net/qeth_l2_main.c | 228 +-
4791 drivers/s390/net/qeth_l2_sys.c | 2 +-
4792 drivers/s390/net/qeth_l3_main.c | 158 +-
4793 drivers/s390/net/smsgiucv.c | 5 +-
4794 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 +-
4795 drivers/ssb/Kconfig | 9 +
4796 drivers/ssb/Makefile | 3 +-
4797 drivers/ssb/bridge_pcmcia_80211.c | 128 +
4798 drivers/ssb/host_soc.c | 173 +
4799 drivers/ssb/main.c | 173 +-
4800 drivers/ssb/pcmcia.c | 3 +-
4801 drivers/ssb/sdio.c | 2 +-
4802 drivers/ssb/ssb_private.h | 34 +-
4803 drivers/tty/hvc/hvc_iucv.c | 10 +-
4804 include/linux/bcma/bcma.h | 2 +
4805 include/linux/bpf.h | 17 +-
4806 include/linux/brcmphy.h | 29 +-
4807 include/linux/can/dev.h | 9 +-
4808 include/linux/can/led.h | 1 +
4809 include/linux/dccp.h | 6 +-
4810 include/linux/filter.h | 48 +-
4811 include/linux/genetlink.h | 2 +-
4812 include/linux/ieee80211.h | 85 +-
4813 include/linux/ieee802154.h | 47 +-
4814 include/linux/if_bridge.h | 6 +
4815 include/linux/if_link.h | 1 +
4816 include/linux/igmp.h | 2 +-
4817 include/linux/inetdevice.h | 10 +-
4818 include/linux/ipv6.h | 4 +-
4819 include/linux/leds.h | 7 +
4820 include/linux/mlx4/device.h | 1 +
4821 include/linux/mlx5/device.h | 5 +-
4822 include/linux/mlx5/driver.h | 41 +-
4823 include/linux/net.h | 21 +-
4824 include/linux/netdevice.h | 61 +-
4825 include/linux/netfilter.h | 100 +-
4826 include/linux/netfilter/nfnetlink.h | 6 +-
4827 include/linux/netfilter/x_tables.h | 3 +-
4828 include/linux/netfilter_arp/arp_tables.h | 1 -
4829 include/linux/netfilter_bridge.h | 2 +-
4830 include/linux/netfilter_bridge/ebtables.h | 6 +-
4831 include/linux/netfilter_ingress.h | 2 +-
4832 include/linux/netfilter_ipv4.h | 2 +-
4833 include/linux/netfilter_ipv4/ip_tables.h | 1 -
4834 include/linux/netfilter_ipv6.h | 6 +-
4835 include/linux/netfilter_ipv6/ip6_tables.h | 1 -
4836 include/linux/once.h | 57 +
4837 include/linux/phy.h | 3 +
4838 include/linux/platform_data/atmel.h | 5 -
4839 include/linux/{ => platform_data}/mdio-gpio.h | 0
4840 include/linux/platform_data/nfcmrvl.h | 8 +
4841 include/linux/platform_data/st-nci.h | 2 +
4842 include/linux/qed/common_hsi.h | 607 ++
4843 include/linux/qed/eth_common.h | 279 +
4844 include/linux/qed/qed_chain.h | 539 ++
4845 include/linux/qed/qed_eth_if.h | 165 +
4846 include/linux/qed/qed_if.h | 498 ++
4847 include/linux/random.h | 6 +
4848 include/linux/regmap.h | 3 +
4849 include/linux/rtnetlink.h | 6 +-
4850 include/linux/sched.h | 2 +-
4851 include/linux/seccomp.h | 11 +
4852 include/linux/skbuff.h | 9 +
4853 include/linux/tcp.h | 41 +-
4854 include/linux/usb/cdc.h | 51 +
4855 include/net/6lowpan.h | 360 +-
4856 include/net/addrconf.h | 3 +-
4857 include/net/af_ieee802154.h | 2 +-
4858 include/net/af_vsock.h | 3 +
4859 include/net/bluetooth/bluetooth.h | 30 +-
4860 include/net/bluetooth/hci.h | 14 +
4861 include/net/bluetooth/hci_core.h | 37 +-
4862 include/net/bluetooth/hci_mon.h | 10 +
4863 include/net/cfg80211.h | 138 +-
4864 include/net/cfg802154.h | 164 +
4865 include/net/dn_neigh.h | 6 +-
4866 include/net/dsa.h | 31 +-
4867 include/net/dst.h | 23 +-
4868 include/net/dst_ops.h | 3 +-
4869 include/net/ethoc.h | 1 +
4870 include/net/flow.h | 2 +-
4871 include/net/genetlink.h | 5 +-
4872 include/net/ieee802154_netdev.h | 86 +-
4873 include/net/inet6_connection_sock.h | 13 +-
4874 include/net/inet_connection_sock.h | 35 +-
4875 include/net/inet_hashtables.h | 5 +-
4876 include/net/inet_sock.h | 3 +-
4877 include/net/inet_timewait_sock.h | 2 +-
4878 include/net/ip.h | 41 +-
4879 include/net/ip6_route.h | 4 +-
4880 include/net/ip6_tunnel.h | 2 +-
4881 include/net/ip_fib.h | 16 +-
4882 include/net/ip_vs.h | 299 +-
4883 include/net/ipv6.h | 13 +-
4884 include/net/iucv/iucv.h | 20 +-
4885 include/net/l3mdev.h | 222 +
4886 include/net/lwtunnel.h | 8 +-
4887 include/net/mac80211.h | 39 +-
4888 include/net/mac802154.h | 33 +-
4889 include/net/mpls_iptunnel.h | 2 +-
4890 include/net/ndisc.h | 6 +-
4891 include/net/netfilter/br_netfilter.h | 8 +-
4892 include/net/netfilter/ipv4/nf_dup_ipv4.h | 2 +-
4893 include/net/netfilter/ipv4/nf_reject.h | 2 +-
4894 include/net/netfilter/ipv6/nf_defrag_ipv6.h | 2 +-
4895 include/net/netfilter/ipv6/nf_dup_ipv6.h | 2 +-
4896 include/net/netfilter/nf_conntrack.h | 7 +-
4897 include/net/netfilter/nf_conntrack_core.h | 1 +
4898 include/net/netfilter/nf_conntrack_l4proto.h | 2 +-
4899 include/net/netfilter/nf_conntrack_timeout.h | 25 +-
4900 include/net/netfilter/nf_nat_core.h | 2 +-
4901 include/net/netfilter/nf_nat_l3proto.h | 32 +-
4902 include/net/netfilter/nf_queue.h | 2 +-
4903 include/net/netfilter/nf_tables.h | 14 +-
4904 include/net/netfilter/nf_tables_ipv4.h | 3 +-
4905 include/net/netfilter/nf_tables_ipv6.h | 3 +-
4906 include/net/netfilter/nfnetlink_queue.h | 51 -
4907 include/net/netlink.h | 18 +
4908 include/net/nfc/nci.h | 8 +
4909 include/net/nfc/nci_core.h | 24 +-
4910 include/net/nfc/nfc.h | 2 +-
4911 include/net/nl802154.h | 191 +
4912 include/net/request_sock.h | 186 +-
4913 include/net/route.h | 23 +-
4914 include/net/rtnetlink.h | 6 +-
4915 include/net/sch_generic.h | 3 +-
4916 include/net/sock.h | 70 +-
4917 include/net/switchdev.h | 161 +-
4918 include/net/tc_act/tc_connmark.h | 1 +
4919 include/net/tcp.h | 94 +-
4920 include/net/tso.h | 1 +
4921 include/net/vrf.h | 178 -
4922 include/net/vxlan.h | 14 +-
4923 include/net/xfrm.h | 8 +-
4924 include/uapi/linux/Kbuild | 1 +
4925 include/uapi/linux/atm_zatm.h | 6 -
4926 include/uapi/linux/bpf.h | 27 +
4927 include/uapi/linux/can/bcm.h | 7 +-
4928 include/uapi/linux/if_arcnet.h | 55 +-
4929 include/uapi/linux/if_bridge.h | 1 +
4930 include/uapi/linux/if_link.h | 56 +
4931 include/uapi/linux/netfilter/nfnetlink_log.h | 3 +
4932 include/uapi/linux/netlink.h | 1 +
4933 include/uapi/linux/nfc.h | 2 +
4934 include/uapi/linux/nl80211.h | 57 +-
4935 include/uapi/linux/openvswitch.h | 2 +
4936 include/uapi/linux/perf_event.h | 1 +
4937 include/uapi/linux/pkt_cls.h | 4 +
4938 include/uapi/linux/ptrace.h | 2 +
4939 include/uapi/linux/rtnetlink.h | 2 +
4940 include/uapi/linux/usb/cdc.h | 6 +-
4941 kernel/bpf/arraymap.c | 26 +-
4942 kernel/bpf/core.c | 30 +
4943 kernel/bpf/hashtab.c | 4 +
4944 kernel/bpf/helpers.c | 7 +-
4945 kernel/bpf/syscall.c | 83 +-
4946 kernel/bpf/verifier.c | 111 +-
4947 kernel/events/core.c | 15 +-
4948 kernel/irq/manage.c | 9 +-
4949 kernel/ptrace.c | 5 +
4950 kernel/seccomp.c | 78 +-
4951 kernel/sysctl.c | 13 +
4952 kernel/trace/bpf_trace.c | 55 +-
4955 lib/random32.c | 37 +-
4956 net/6lowpan/core.c | 5 +
4957 net/6lowpan/iphc.c | 690 ++-
4958 net/6lowpan/nhc.c | 16 +-
4959 net/6lowpan/nhc.h | 14 +-
4960 net/6lowpan/nhc_udp.c | 35 +-
4963 net/bluetooth/6lowpan.c | 162 +-
4964 net/bluetooth/af_bluetooth.c | 4 +-
4965 net/bluetooth/hci_conn.c | 167 +-
4966 net/bluetooth/hci_core.c | 228 +-
4967 net/bluetooth/hci_event.c | 28 +-
4968 net/bluetooth/hci_request.c | 103 +-
4969 net/bluetooth/hci_request.h | 4 +
4970 net/bluetooth/hci_sock.c | 109 +-
4971 net/bluetooth/hidp/core.c | 14 +
4972 net/bluetooth/l2cap_sock.c | 71 +-
4973 net/bluetooth/lib.c | 32 +
4974 net/bluetooth/mgmt.c | 178 +-
4975 net/bluetooth/sco.c | 44 +-
4976 net/bluetooth/smp.c | 62 +-
4977 net/bluetooth/smp.h | 1 +
4978 net/bridge/br_device.c | 4 +-
4979 net/bridge/br_fdb.c | 216 +-
4980 net/bridge/br_forward.c | 33 +-
4981 net/bridge/br_if.c | 3 +
4982 net/bridge/br_input.c | 35 +-
4983 net/bridge/br_ioctl.c | 3 +-
4984 net/bridge/br_mdb.c | 24 +-
4985 net/bridge/br_multicast.c | 4 +-
4986 net/bridge/br_netfilter_hooks.c | 107 +-
4987 net/bridge/br_netfilter_ipv6.c | 21 +-
4988 net/bridge/br_netlink.c | 522 +-
4989 net/bridge/br_private.h | 208 +-
4990 net/bridge/br_stp.c | 41 +-
4991 net/bridge/br_stp_bpdu.c | 12 +-
4992 net/bridge/br_stp_if.c | 12 +
4993 net/bridge/br_sysfs_br.c | 11 +-
4994 net/bridge/br_vlan.c | 772 ++-
4995 net/bridge/netfilter/ebt_log.c | 2 +-
4996 net/bridge/netfilter/ebt_nflog.c | 2 +-
4997 net/bridge/netfilter/ebtable_broute.c | 8 +-
4998 net/bridge/netfilter/ebtable_filter.c | 13 +-
4999 net/bridge/netfilter/ebtable_nat.c | 13 +-
5000 net/bridge/netfilter/ebtables.c | 14 +-
5001 net/bridge/netfilter/nf_tables_bridge.c | 20 +-
5002 net/bridge/netfilter/nft_reject_bridge.c | 19 +-
5003 net/can/bcm.c | 15 +-
5004 net/core/dev.c | 45 +-
5005 net/core/dst.c | 14 +-
5006 net/core/filter.c | 135 +-
5007 net/core/lwtunnel.c | 4 +-
5008 net/core/neighbour.c | 45 +-
5009 net/core/net-sysfs.c | 11 +-
5010 net/core/netpoll.c | 23 +-
5011 net/core/request_sock.c | 88 +-
5012 net/core/rtnetlink.c | 38 +-
5013 net/core/sock.c | 53 +-
5014 net/core/sock_diag.c | 14 +-
5015 net/core/tso.c | 18 +-
5016 net/core/utils.c | 49 -
5017 net/dcb/dcbnl.c | 30 +-
5018 net/dccp/dccp.h | 16 +-
5019 net/dccp/ipv4.c | 94 +-
5020 net/dccp/ipv6.c | 122 +-
5021 net/dccp/minisocks.c | 18 +-
5022 net/dccp/output.c | 17 +-
5023 net/decnet/dn_neigh.c | 23 +-
5024 net/decnet/dn_nsp_in.c | 7 +-
5025 net/decnet/dn_nsp_out.c | 4 +-
5026 net/decnet/dn_route.c | 38 +-
5027 net/decnet/netfilter/dn_rtmsg.c | 2 +-
5028 net/dsa/dsa.c | 4 +-
5029 net/dsa/slave.c | 184 +-
5030 net/ethernet/eth.c | 2 +-
5031 net/ieee802154/6lowpan/6lowpan_i.h | 14 +-
5032 net/ieee802154/6lowpan/core.c | 126 +-
5033 net/ieee802154/6lowpan/reassembly.c | 157 +-
5034 net/ieee802154/6lowpan/rx.c | 357 +-
5035 net/ieee802154/6lowpan/tx.c | 95 +-
5036 net/ieee802154/Kconfig | 5 +
5037 net/ieee802154/core.c | 12 +
5038 net/ieee802154/core.h | 1 +
5039 net/ieee802154/header_ops.c | 20 +-
5040 net/ieee802154/nl802154.c | 1321 ++++-
5041 net/ieee802154/rdev-ops.h | 109 +
5042 net/ieee802154/socket.c | 8 +-
5043 net/ipv4/Makefile | 1 +
5044 net/ipv4/af_inet.c | 30 +-
5045 net/ipv4/arp.c | 20 +-
5046 net/ipv4/devinet.c | 7 +-
5047 net/ipv4/fib_frontend.c | 26 +-
5048 net/ipv4/fib_semantics.c | 161 +-
5049 net/ipv4/icmp.c | 27 +-
5050 net/ipv4/igmp.c | 6 +-
5051 net/ipv4/inet_connection_sock.c | 271 +-
5052 net/ipv4/inet_diag.c | 96 +-
5053 net/ipv4/inet_hashtables.c | 53 +-
5054 net/ipv4/ip_forward.c | 19 +-
5055 net/ipv4/ip_fragment.c | 13 +-
5056 net/ipv4/ip_input.c | 47 +-
5057 net/ipv4/ip_output.c | 148 +-
5058 net/ipv4/ip_tunnel_core.c | 6 +-
5059 net/ipv4/ip_vti.c | 2 +-
5060 net/ipv4/ipconfig.c | 32 +-
5061 net/ipv4/ipmr.c | 15 +-
5062 net/ipv4/netfilter.c | 7 +-
5063 net/ipv4/netfilter/arp_tables.c | 15 +-
5064 net/ipv4/netfilter/arptable_filter.c | 7 +-
5065 net/ipv4/netfilter/ip_tables.c | 31 +-
5066 net/ipv4/netfilter/ipt_CLUSTERIP.c | 12 +-
5067 net/ipv4/netfilter/ipt_REJECT.c | 2 +-
5068 net/ipv4/netfilter/ipt_SYNPROXY.c | 32 +-
5069 net/ipv4/netfilter/ipt_ah.c | 2 +-
5070 net/ipv4/netfilter/ipt_rpfilter.c | 5 +-
5071 net/ipv4/netfilter/iptable_filter.c | 9 +-
5072 net/ipv4/netfilter/iptable_mangle.c | 19 +-
5073 net/ipv4/netfilter/iptable_nat.c | 26 +-
5074 net/ipv4/netfilter/iptable_raw.c | 9 +-
5075 net/ipv4/netfilter/iptable_security.c | 12 +-
5076 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 18 +-
5077 net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +-
5078 net/ipv4/netfilter/nf_defrag_ipv4.c | 13 +-
5079 net/ipv4/netfilter/nf_dup_ipv4.c | 25 +-
5080 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 44 +-
5081 net/ipv4/netfilter/nf_nat_snmp_basic.c | 2 +-
5082 net/ipv4/netfilter/nf_reject_ipv4.c | 6 +-
5083 net/ipv4/netfilter/nf_tables_arp.c | 6 +-
5084 net/ipv4/netfilter/nf_tables_ipv4.c | 10 +-
5085 net/ipv4/netfilter/nft_chain_nat_ipv4.c | 22 +-
5086 net/ipv4/netfilter/nft_chain_route_ipv4.c | 8 +-
5087 net/ipv4/netfilter/nft_dup_ipv4.c | 2 +-
5088 net/ipv4/netfilter/nft_masq_ipv4.c | 2 +-
5089 net/ipv4/netfilter/nft_redir_ipv4.c | 2 +-
5090 net/ipv4/netfilter/nft_reject_ipv4.c | 5 +-
5091 net/ipv4/raw.c | 13 +-
5092 net/ipv4/route.c | 216 +-
5093 net/ipv4/syncookies.c | 23 +-
5094 net/ipv4/sysctl_net_ipv4.c | 14 +
5095 net/ipv4/tcp.c | 39 +-
5096 net/ipv4/tcp_cong.c | 12 +-
5097 net/ipv4/tcp_fastopen.c | 75 +-
5098 net/ipv4/tcp_input.c | 280 +-
5099 net/ipv4/tcp_ipv4.c | 203 +-
5100 net/ipv4/tcp_minisocks.c | 68 +-
5101 net/ipv4/tcp_output.c | 86 +-
5102 net/ipv4/tcp_recovery.c | 109 +
5103 net/ipv4/tcp_timer.c | 6 +-
5104 net/ipv4/udp.c | 28 +-
5105 net/ipv4/xfrm4_input.c | 7 +-
5106 net/ipv4/xfrm4_output.c | 11 +-
5107 net/ipv4/xfrm4_policy.c | 59 +-
5108 net/ipv6/addrconf.c | 76 +-
5109 net/ipv6/datagram.c | 2 +-
5110 net/ipv6/icmp.c | 18 +-
5111 net/ipv6/ila.c | 4 +-
5112 net/ipv6/inet6_connection_sock.c | 77 +-
5113 net/ipv6/inet6_hashtables.c | 2 +
5114 net/ipv6/ip6_fib.c | 1 +
5115 net/ipv6/ip6_input.c | 15 +-
5116 net/ipv6/ip6_offload.c | 12 +
5117 net/ipv6/ip6_output.c | 164 +-
5118 net/ipv6/ip6_vti.c | 2 +-
5119 net/ipv6/ip6mr.c | 12 +-
5120 net/ipv6/mcast.c | 9 +-
5121 net/ipv6/mip6.c | 16 +-
5122 net/ipv6/ndisc.c | 50 +-
5123 net/ipv6/netfilter.c | 7 +-
5124 net/ipv6/netfilter/ip6_tables.c | 33 +-
5125 net/ipv6/netfilter/ip6t_REJECT.c | 2 +-
5126 net/ipv6/netfilter/ip6t_SYNPROXY.c | 12 +-
5127 net/ipv6/netfilter/ip6t_rpfilter.c | 6 +-
5128 net/ipv6/netfilter/ip6table_filter.c | 6 +-
5129 net/ipv6/netfilter/ip6table_mangle.c | 18 +-
5130 net/ipv6/netfilter/ip6table_nat.c | 26 +-
5131 net/ipv6/netfilter/ip6table_raw.c | 6 +-
5132 net/ipv6/netfilter/ip6table_security.c | 7 +-
5133 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 +-
5134 net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 7 +-
5135 net/ipv6/netfilter/nf_conntrack_reasm.c | 8 +-
5136 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 9 +-
5137 net/ipv6/netfilter/nf_dup_ipv6.c | 25 +-
5138 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 44 +-
5139 net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 2 +-
5140 net/ipv6/netfilter/nf_reject_ipv6.c | 6 +-
5141 net/ipv6/netfilter/nf_tables_ipv6.c | 10 +-
5142 net/ipv6/netfilter/nft_chain_nat_ipv6.c | 22 +-
5143 net/ipv6/netfilter/nft_chain_route_ipv6.c | 14 +-
5144 net/ipv6/netfilter/nft_dup_ipv6.c | 2 +-
5145 net/ipv6/netfilter/nft_redir_ipv6.c | 3 +-
5146 net/ipv6/netfilter/nft_reject_ipv6.c | 7 +-
5147 net/ipv6/output_core.c | 24 +-
5148 net/ipv6/raw.c | 9 +-
5149 net/ipv6/route.c | 104 +-
5150 net/ipv6/syncookies.c | 13 +-
5151 net/ipv6/tcp_ipv6.c | 187 +-
5152 net/ipv6/udp.c | 11 +-
5153 net/ipv6/xfrm6_input.c | 4 +-
5154 net/ipv6/xfrm6_output.c | 22 +-
5155 net/ipv6/xfrm6_policy.c | 10 +-
5156 net/iucv/af_iucv.c | 9 +-
5157 net/iucv/iucv.c | 12 +-
5158 net/l2tp/l2tp_core.h | 3 +
5159 net/l2tp/l2tp_eth.c | 1 +
5160 net/l2tp/l2tp_ip.c | 1 +
5161 net/l2tp/l2tp_ip6.c | 1 +
5162 net/l2tp/l2tp_netlink.c | 7 +
5163 net/l2tp/l2tp_ppp.c | 1 +
5164 net/l3mdev/Kconfig | 10 +
5165 net/l3mdev/Makefile | 5 +
5166 net/l3mdev/l3mdev.c | 92 +
5167 net/mac80211/Makefile | 1 -
5168 net/mac80211/agg-rx.c | 8 +-
5169 net/mac80211/agg-tx.c | 15 +-
5170 net/mac80211/cfg.c | 101 +-
5171 net/mac80211/cfg.h | 9 -
5172 net/mac80211/debugfs.c | 2 +
5173 net/mac80211/debugfs_key.c | 51 +-
5174 net/mac80211/debugfs_netdev.c | 41 +-
5175 net/mac80211/debugfs_sta.c | 8 +-
5176 net/mac80211/driver-ops.c | 222 +
5177 net/mac80211/driver-ops.h | 259 +-
5178 net/mac80211/ethtool.c | 29 +-
5179 net/mac80211/event.c | 27 -
5180 net/mac80211/ibss.c | 24 +-
5181 net/mac80211/ieee80211_i.h | 32 +-
5182 net/mac80211/iface.c | 6 +-
5183 net/mac80211/main.c | 17 +-
5184 net/mac80211/mesh.c | 82 +-
5185 net/mac80211/mesh.h | 10 +-
5186 net/mac80211/mesh_hwmp.c | 2 +-
5187 net/mac80211/mesh_plink.c | 15 +-
5188 net/mac80211/mlme.c | 240 +-
5189 net/mac80211/ocb.c | 2 +-
5190 net/mac80211/offchannel.c | 6 +-
5191 net/mac80211/pm.c | 3 +-
5192 net/mac80211/rate.c | 5 +-
5193 net/mac80211/rc80211_minstrel_debugfs.c | 12 +-
5194 net/mac80211/rc80211_minstrel_ht_debugfs.c | 12 +-
5195 net/mac80211/rx.c | 81 +-
5196 net/mac80211/scan.c | 20 +-
5197 net/mac80211/sta_info.c | 109 +-
5198 net/mac80211/sta_info.h | 105 +-
5199 net/mac80211/status.c | 161 +-
5200 net/mac80211/tdls.c | 8 +-
5201 net/mac80211/trace.h | 42 +-
5202 net/mac80211/tx.c | 42 +-
5203 net/mac80211/util.c | 23 +-
5204 net/mac80211/wpa.c | 9 +-
5205 net/mac802154/cfg.c | 205 +
5206 net/mac802154/iface.c | 118 +-
5207 net/mac802154/llsec.c | 21 +-
5208 net/mac802154/rx.c | 4 +
5209 net/mac802154/tx.c | 7 +-
5210 net/mpls/af_mpls.c | 636 ++-
5211 net/mpls/internal.h | 74 +-
5212 net/mpls/mpls_iptunnel.c | 2 +-
5213 net/netfilter/Kconfig | 15 +-
5214 net/netfilter/Makefile | 2 -
5215 net/netfilter/core.c | 13 +-
5216 net/netfilter/ipset/ip_set_core.c | 9 +-
5217 net/netfilter/ipvs/ip_vs_app.c | 36 +-
5218 net/netfilter/ipvs/ip_vs_conn.c | 91 +-
5219 net/netfilter/ipvs/ip_vs_core.c | 534 +-
5220 net/netfilter/ipvs/ip_vs_ctl.c | 291 +-
5221 net/netfilter/ipvs/ip_vs_est.c | 20 +-
5222 net/netfilter/ipvs/ip_vs_ftp.c | 27 +-
5223 net/netfilter/ipvs/ip_vs_lblc.c | 3 +-
5224 net/netfilter/ipvs/ip_vs_lblcr.c | 3 +-
5225 net/netfilter/ipvs/ip_vs_nfct.c | 5 +-
5226 net/netfilter/ipvs/ip_vs_pe_sip.c | 2 +-
5227 net/netfilter/ipvs/ip_vs_proto.c | 33 +-
5228 net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 32 +-
5229 net/netfilter/ipvs/ip_vs_proto_sctp.c | 58 +-
5230 net/netfilter/ipvs/ip_vs_proto_tcp.c | 61 +-
5231 net/netfilter/ipvs/ip_vs_proto_udp.c | 49 +-
5232 net/netfilter/ipvs/ip_vs_sh.c | 45 +-
5233 net/netfilter/ipvs/ip_vs_sync.c | 87 +-
5234 net/netfilter/ipvs/ip_vs_xmit.c | 85 +-
5235 net/netfilter/nf_conntrack_core.c | 22 +-
5236 net/netfilter/nf_conntrack_netlink.c | 98 +-
5237 net/netfilter/nf_conntrack_proto_dccp.c | 2 +-
5238 net/netfilter/nf_conntrack_proto_generic.c | 2 +-
5239 net/netfilter/nf_conntrack_proto_gre.c | 3 +-
5240 net/netfilter/nf_conntrack_proto_sctp.c | 2 +-
5241 net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
5242 net/netfilter/nf_conntrack_proto_udp.c | 1 +
5243 net/netfilter/nf_conntrack_proto_udplite.c | 1 +
5244 net/netfilter/nf_nat_core.c | 4 +-
5245 net/netfilter/nf_queue.c | 42 +-
5246 net/netfilter/nf_tables_api.c | 1 -
5247 net/netfilter/nf_tables_core.c | 10 +-
5248 net/netfilter/nf_tables_netdev.c | 20 +-
5249 net/netfilter/nfnetlink.c | 2 +-
5250 net/netfilter/nfnetlink_cttimeout.c | 34 +
5251 net/netfilter/nfnetlink_log.c | 89 +-
5252 .../{nfnetlink_queue_core.c => nfnetlink_queue.c} | 73 +-
5253 net/netfilter/nfnetlink_queue_ct.c | 113 -
5254 net/netfilter/nft_log.c | 3 +-
5255 net/netfilter/nft_meta.c | 4 +-
5256 net/netfilter/nft_queue.c | 2 +-
5257 net/netfilter/nft_reject_inet.c | 19 +-
5258 net/netfilter/x_tables.c | 1 -
5259 net/netfilter/xt_CT.c | 7 +-
5260 net/netfilter/xt_LOG.c | 2 +-
5261 net/netfilter/xt_NFLOG.c | 2 +-
5262 net/netfilter/xt_TCPMSS.c | 2 +-
5263 net/netfilter/xt_TEE.c | 4 +-
5264 net/netfilter/xt_TPROXY.c | 24 +-
5265 net/netfilter/xt_addrtype.c | 4 +-
5266 net/netfilter/xt_connlimit.c | 4 +-
5267 net/netfilter/xt_ipvs.c | 5 +-
5268 net/netfilter/xt_osf.c | 2 +-
5269 net/netfilter/xt_recent.c | 2 +-
5270 net/netfilter/xt_socket.c | 14 +-
5271 net/netlink/genetlink.c | 14 +-
5272 net/nfc/core.c | 4 +-
5273 net/nfc/digital_core.c | 3 +-
5274 net/nfc/hci/core.c | 3 +-
5275 net/nfc/hci/llc.c | 2 +
5276 net/nfc/nci/Kconfig | 2 +-
5277 net/nfc/nci/Makefile | 3 +-
5278 net/nfc/nci/core.c | 150 +-
5279 net/nfc/nci/data.c | 13 +
5280 net/nfc/nci/hci.c | 167 +-
5281 net/nfc/nci/ntf.c | 3 +-
5282 net/nfc/nci/rsp.c | 1 +
5283 net/nfc/nci/spi.c | 11 +-
5284 net/nfc/netlink.c | 8 +-
5285 net/nfc/nfc.h | 5 +-
5286 net/nfc/rawsock.c | 3 +-
5287 net/openvswitch/actions.c | 13 +-
5288 net/openvswitch/conntrack.c | 6 +-
5289 net/openvswitch/datapath.c | 3 +-
5290 net/openvswitch/flow.c | 4 +-
5291 net/openvswitch/flow.h | 1 +
5292 net/openvswitch/flow_netlink.c | 126 +-
5293 net/openvswitch/flow_table.c | 2 +-
5294 net/openvswitch/vport-geneve.c | 2 +-
5295 net/openvswitch/vport-gre.c | 2 +-
5296 net/openvswitch/vport-internal_dev.c | 8 +-
5297 net/openvswitch/vport-netdev.c | 33 +-
5298 net/openvswitch/vport-netdev.h | 1 -
5299 net/openvswitch/vport-vxlan.c | 2 +-
5300 net/openvswitch/vport.c | 30 +
5301 net/openvswitch/vport.h | 22 +-
5302 net/packet/af_packet.c | 34 +-
5303 net/rds/af_rds.c | 8 +-
5304 net/rds/bind.c | 85 +-
5305 net/rds/connection.c | 22 +-
5306 net/rds/ib.c | 47 +-
5307 net/rds/ib.h | 78 +-
5308 net/rds/ib_cm.c | 114 +-
5309 net/rds/ib_rdma.c | 116 +-
5310 net/rds/ib_recv.c | 136 +-
5311 net/rds/ib_send.c | 110 +-
5312 net/rds/ib_stats.c | 22 +-
5313 net/rds/rds.h | 5 +-
5314 net/rds/send.c | 19 +-
5315 net/rds/tcp.c | 16 +-
5316 net/rds/tcp_listen.c | 25 +-
5317 net/rds/tcp_send.c | 8 +-
5318 net/rds/threads.c | 2 +
5319 net/rxrpc/ar-connection.c | 4 +-
5320 net/rxrpc/ar-internal.h | 4 +-
5321 net/rxrpc/ar-transport.c | 4 +-
5322 net/sched/act_bpf.c | 1 +
5323 net/sched/act_connmark.c | 5 +-
5324 net/sched/act_ipt.c | 1 +
5325 net/sched/cls_bpf.c | 82 +-
5326 net/sched/em_ipset.c | 1 +
5327 net/sched/sch_blackhole.c | 15 +-
5328 net/sched/sch_dsmark.c | 63 +-
5329 net/sched/sch_fq.c | 13 +-
5330 net/sctp/sm_make_chunk.c | 2 +-
5331 net/sctp/sm_statefuns.c | 2 +-
5332 net/switchdev/switchdev.c | 637 ++-
5333 net/tipc/bcast.c | 988 +---
5334 net/tipc/bcast.h | 122 +-
5335 net/tipc/bearer.c | 102 +-
5336 net/tipc/bearer.h | 9 +-
5337 net/tipc/core.c | 9 +
5338 net/tipc/core.h | 12 +-
5339 net/tipc/discover.c | 28 +-
5340 net/tipc/link.c | 933 +--
5341 net/tipc/link.h | 81 +-
5342 net/tipc/msg.c | 51 +-
5343 net/tipc/msg.h | 42 +-
5344 net/tipc/name_distr.c | 4 +-
5345 net/tipc/net.c | 6 +-
5346 net/tipc/node.c | 227 +-
5347 net/tipc/node.h | 41 +-
5348 net/tipc/socket.c | 4 +-
5349 net/tipc/udp_media.c | 13 +-
5350 net/unix/af_unix.c | 5 +-
5351 net/vmw_vsock/af_vsock.c | 37 +-
5352 net/vmw_vsock/vmci_transport.c | 4 +-
5353 net/wireless/Kconfig | 10 +
5354 net/wireless/core.c | 6 +-
5355 net/wireless/core.h | 1 +
5356 net/wireless/nl80211.c | 497 +-
5357 net/wireless/reg.c | 295 +-
5358 net/wireless/scan.c | 61 +-
5359 net/wireless/trace.h | 22 +-
5360 net/xfrm/xfrm_input.c | 4 +-
5361 net/xfrm/xfrm_output.c | 20 +-
5362 net/xfrm/xfrm_policy.c | 19 +-
5363 net/xfrm/xfrm_user.c | 5 +-
5364 samples/bpf/Makefile | 7 +
5365 samples/bpf/bpf_helpers.h | 6 +
5366 samples/bpf/libbpf.h | 8 +
5367 samples/bpf/tcbpf1_kern.c | 24 +-
5368 samples/bpf/test_verifier.c | 357 +-
5369 samples/bpf/trace_output_kern.c | 31 +
5370 samples/bpf/trace_output_user.c | 196 +
5371 security/selinux/hooks.c | 27 +-
5372 security/smack/smack_netfilter.c | 6 +-
5373 tools/net/bpf_jit_disasm.c | 4 +-
5374 1560 files changed, 113326 insertions(+), 23307 deletions(-)
5375 create mode 100644 Documentation/devicetree/bindings/net/brcm,iproc-mdio.txt
5376 create mode 100644 Documentation/devicetree/bindings/net/can/sun4i_can.txt
5377 create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt
5378 create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt
5379 create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt
5380 create mode 100644 Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
5381 create mode 100644 arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi
5382 rename {include/linux => drivers/net/arcnet}/arcdevice.h (75%)
5383 rename {include/linux => drivers/net/arcnet}/com20020.h (61%)
5384 create mode 100644 drivers/net/arcnet/com9026.h
5385 create mode 100644 drivers/net/can/sun4i_can.c
5386 create mode 100644 drivers/net/ethernet/broadcom/bnxt/Makefile
5387 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt.c
5388 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt.h
5389 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
5390 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
5391 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_fw_hdr.h
5392 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h
5393 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h
5394 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
5395 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h
5396 delete mode 100644 drivers/net/ethernet/hisilicon/hip04_mdio.c
5397 create mode 100644 drivers/net/ethernet/hisilicon/hns/Makefile
5398 create mode 100644 drivers/net/ethernet/hisilicon/hns/hnae.c
5399 create mode 100644 drivers/net/ethernet/hisilicon/hns/hnae.h
5400 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
5401 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
5402 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h
5403 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
5404 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
5405 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
5406 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
5407 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
5408 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h
5409 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
5410 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h
5411 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
5412 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
5413 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
5414 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
5415 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h
5416 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_enet.c
5417 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_enet.h
5418 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
5419 create mode 100644 drivers/net/ethernet/hisilicon/hns_mdio.c
5420 create mode 100644 drivers/net/ethernet/intel/i40e/i40e_devids.h
5421 create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_devids.h
5422 create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum.c
5423 create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum.h
5424 create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
5425 create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
5426 create mode 100644 drivers/net/ethernet/microchip/encx24j600-regmap.c
5427 create mode 100644 drivers/net/ethernet/microchip/encx24j600.c
5428 create mode 100644 drivers/net/ethernet/microchip/encx24j600_hw.h
5429 create mode 100644 drivers/net/ethernet/qlogic/qed/Makefile
5430 create mode 100644 drivers/net/ethernet/qlogic/qed/qed.h
5431 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_cxt.c
5432 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_cxt.h
5433 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_dev.c
5434 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_dev_api.h
5435 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_hsi.h
5436 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_hw.c
5437 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_hw.h
5438 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c
5439 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_init_ops.c
5440 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_init_ops.h
5441 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_int.c
5442 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_int.h
5443 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_l2.c
5444 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_main.c
5445 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_mcp.c
5446 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_mcp.h
5447 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_reg_addr.h
5448 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_sp.h
5449 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
5450 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_spq.c
5451 create mode 100644 drivers/net/ethernet/qlogic/qede/Makefile
5452 create mode 100644 drivers/net/ethernet/qlogic/qede/qede.h
5453 create mode 100644 drivers/net/ethernet/qlogic/qede/qede_ethtool.c
5454 create mode 100644 drivers/net/ethernet/qlogic/qede/qede_main.c
5455 create mode 100644 drivers/net/phy/bcm-cygnus.c
5456 create mode 100644 drivers/net/phy/bcm-phy-lib.c
5457 create mode 100644 drivers/net/phy/bcm-phy-lib.h
5458 create mode 100644 drivers/net/phy/mdio-bcm-iproc.c
5459 create mode 100644 drivers/net/wireless/ath/wil6210/wil_crash_dump.c
5460 delete mode 100644 drivers/net/wireless/b43/pcmcia.c
5461 delete mode 100644 drivers/net/wireless/b43/pcmcia.h
5462 create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h
5463 create mode 100644 drivers/net/wireless/realtek/Makefile
5464 rename drivers/net/wireless/{ => realtek}/rtl818x/Kconfig (100%)
5465 rename drivers/net/wireless/{ => realtek}/rtl818x/Makefile (100%)
5466 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/Makefile (69%)
5467 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/dev.c (100%)
5468 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/grf5101.c (100%)
5469 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/grf5101.h (100%)
5470 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/max2820.c (100%)
5471 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/max2820.h (100%)
5472 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8180.h (100%)
5473 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225.c (100%)
5474 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225.h (100%)
5475 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225se.c (100%)
5476 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225se.h (100%)
5477 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/sa2400.c (100%)
5478 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/sa2400.h (100%)
5479 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/Makefile (62%)
5480 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/dev.c (100%)
5481 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/leds.c (100%)
5482 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/leds.h (100%)
5483 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rfkill.c (100%)
5484 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rfkill.h (100%)
5485 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rtl8187.h (100%)
5486 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rtl8225.c (100%)
5487 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rtl8225.h (100%)
5488 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl818x.h (100%)
5489 create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/Kconfig
5490 create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/Makefile
5491 create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
5492 create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
5493 create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
5494 rename drivers/net/wireless/{ => realtek}/rtlwifi/Kconfig (100%)
5495 rename drivers/net/wireless/{ => realtek}/rtlwifi/Makefile (100%)
5496 rename drivers/net/wireless/{ => realtek}/rtlwifi/base.c (100%)
5497 rename drivers/net/wireless/{ => realtek}/rtlwifi/base.h (100%)
5498 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/Makefile (100%)
5499 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbt_precomp.h (100%)
5500 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8192e2ant.c (100%)
5501 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8192e2ant.h (100%)
5502 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b1ant.c (100%)
5503 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b1ant.h (100%)
5504 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b2ant.c (100%)
5505 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b2ant.h (100%)
5506 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a1ant.c (100%)
5507 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a1ant.h (100%)
5508 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a2ant.c (100%)
5509 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a2ant.h (100%)
5510 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.c (100%)
5511 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.h (100%)
5512 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/rtl_btc.c (100%)
5513 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/rtl_btc.h (100%)
5514 rename drivers/net/wireless/{ => realtek}/rtlwifi/cam.c (100%)
5515 rename drivers/net/wireless/{ => realtek}/rtlwifi/cam.h (100%)
5516 rename drivers/net/wireless/{ => realtek}/rtlwifi/core.c (99%)
5517 rename drivers/net/wireless/{ => realtek}/rtlwifi/core.h (100%)
5518 rename drivers/net/wireless/{ => realtek}/rtlwifi/debug.c (100%)
5519 rename drivers/net/wireless/{ => realtek}/rtlwifi/debug.h (100%)
5520 rename drivers/net/wireless/{ => realtek}/rtlwifi/efuse.c (100%)
5521 rename drivers/net/wireless/{ => realtek}/rtlwifi/efuse.h (100%)
5522 rename drivers/net/wireless/{ => realtek}/rtlwifi/pci.c (100%)
5523 rename drivers/net/wireless/{ => realtek}/rtlwifi/pci.h (100%)
5524 rename drivers/net/wireless/{ => realtek}/rtlwifi/ps.c (100%)
5525 rename drivers/net/wireless/{ => realtek}/rtlwifi/ps.h (100%)
5526 rename drivers/net/wireless/{ => realtek}/rtlwifi/pwrseqcmd.h (100%)
5527 rename drivers/net/wireless/{ => realtek}/rtlwifi/rc.c (100%)
5528 rename drivers/net/wireless/{ => realtek}/rtlwifi/rc.h (100%)
5529 rename drivers/net/wireless/{ => realtek}/rtlwifi/regd.c (100%)
5530 rename drivers/net/wireless/{ => realtek}/rtlwifi/regd.h (100%)
5531 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/Makefile (100%)
5532 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/def.h (100%)
5533 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.c (100%)
5534 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.h (100%)
5535 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.c (100%)
5536 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.h (100%)
5537 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.c (100%)
5538 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.h (100%)
5539 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/led.c (100%)
5540 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/led.h (100%)
5541 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.c (100%)
5542 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.h (100%)
5543 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/pwrseq.c (100%)
5544 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/pwrseq.h (100%)
5545 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/reg.h (100%)
5546 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.c (100%)
5547 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.h (100%)
5548 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.c (100%)
5549 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.h (100%)
5550 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/table.c (100%)
5551 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/table.h (100%)
5552 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.c (100%)
5553 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.h (100%)
5554 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/Makefile (100%)
5555 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/dm_common.c (100%)
5556 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/dm_common.h (100%)
5557 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/fw_common.c (100%)
5558 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/fw_common.h (100%)
5559 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/main.c (100%)
5560 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/phy_common.c (100%)
5561 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/phy_common.h (100%)
5562 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/Makefile (100%)
5563 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/def.h (100%)
5564 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.c (100%)
5565 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.h (100%)
5566 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.c (100%)
5567 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.h (100%)
5568 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/led.c (100%)
5569 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/led.h (100%)
5570 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.c (100%)
5571 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.h (100%)
5572 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/reg.h (100%)
5573 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.c (100%)
5574 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.h (100%)
5575 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.c (100%)
5576 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.h (100%)
5577 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/table.c (100%)
5578 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/table.h (100%)
5579 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.c (100%)
5580 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.h (100%)
5581 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/Makefile (100%)
5582 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/def.h (100%)
5583 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.c (100%)
5584 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.h (100%)
5585 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.c (99%)
5586 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.h (100%)
5587 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/led.c (100%)
5588 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/led.h (100%)
5589 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.c (100%)
5590 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.h (100%)
5591 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.c (100%)
5592 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.h (100%)
5593 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/reg.h (100%)
5594 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.c (100%)
5595 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.h (100%)
5596 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.c (100%)
5597 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.h (100%)
5598 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/table.c (100%)
5599 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/table.h (100%)
5600 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.c (100%)
5601 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.h (100%)
5602 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/Makefile (100%)
5603 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/def.h (100%)
5604 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/dm.c (100%)
5605 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/dm.h (100%)
5606 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/fw.c (100%)
5607 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/fw.h (100%)
5608 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/hw.c (100%)
5609 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/hw.h (100%)
5610 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/led.c (100%)
5611 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/led.h (100%)
5612 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/phy.c (100%)
5613 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/phy.h (100%)
5614 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/reg.h (100%)
5615 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/rf.c (100%)
5616 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/rf.h (100%)
5617 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/sw.c (100%)
5618 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/sw.h (100%)
5619 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/table.c (100%)
5620 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/table.h (100%)
5621 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/trx.c (100%)
5622 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/trx.h (100%)
5623 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/Makefile (100%)
5624 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/def.h (100%)
5625 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.c (100%)
5626 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.h (100%)
5627 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.c (100%)
5628 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.h (100%)
5629 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.c (100%)
5630 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.h (100%)
5631 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/led.c (100%)
5632 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/led.h (100%)
5633 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.c (100%)
5634 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.h (100%)
5635 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/pwrseq.c (100%)
5636 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/pwrseq.h (100%)
5637 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/reg.h (100%)
5638 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.c (100%)
5639 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.h (100%)
5640 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.c (100%)
5641 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.h (100%)
5642 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/table.c (100%)
5643 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/table.h (100%)
5644 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.c (100%)
5645 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.h (100%)
5646 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/Makefile (100%)
5647 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/def.h (100%)
5648 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/dm.c (100%)
5649 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/dm.h (100%)
5650 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/fw.c (100%)
5651 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/fw.h (100%)
5652 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/hw.c (100%)
5653 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/hw.h (100%)
5654 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/led.c (100%)
5655 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/led.h (100%)
5656 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/phy.c (100%)
5657 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/phy.h (100%)
5658 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/reg.h (100%)
5659 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/rf.c (100%)
5660 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/rf.h (100%)
5661 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/sw.c (100%)
5662 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/sw.h (100%)
5663 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/table.c (100%)
5664 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/table.h (100%)
5665 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/trx.c (100%)
5666 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/trx.h (100%)
5667 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/Makefile (100%)
5668 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/btc.h (100%)
5669 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/def.h (100%)
5670 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.c (100%)
5671 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.h (100%)
5672 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.c (100%)
5673 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.h (100%)
5674 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_bt_coexist.c (100%)
5675 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_bt_coexist.h (100%)
5676 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_btc.c (100%)
5677 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_btc.h (100%)
5678 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.c (100%)
5679 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.h (100%)
5680 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/led.c (100%)
5681 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/led.h (100%)
5682 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.c (100%)
5683 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.h (100%)
5684 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/pwrseq.c (100%)
5685 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/pwrseq.h (100%)
5686 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/reg.h (100%)
5687 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.c (100%)
5688 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.h (100%)
5689 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.c (100%)
5690 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.h (100%)
5691 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/table.c (100%)
5692 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/table.h (100%)
5693 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.c (100%)
5694 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.h (100%)
5695 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/Makefile (100%)
5696 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/def.h (100%)
5697 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/dm.c (100%)
5698 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/dm.h (100%)
5699 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/fw.c (100%)
5700 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/fw.h (100%)
5701 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/hw.c (100%)
5702 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/hw.h (100%)
5703 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/led.c (100%)
5704 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/led.h (100%)
5705 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/phy.c (100%)
5706 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/phy.h (100%)
5707 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/pwrseq.c (100%)
5708 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/pwrseq.h (100%)
5709 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/reg.h (100%)
5710 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/rf.c (100%)
5711 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/rf.h (100%)
5712 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/sw.c (100%)
5713 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/sw.h (100%)
5714 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/table.c (100%)
5715 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/table.h (100%)
5716 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/trx.c (100%)
5717 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/trx.h (100%)
5718 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/Makefile (100%)
5719 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/dm_common.c (100%)
5720 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/dm_common.h (100%)
5721 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/fw_common.c (100%)
5722 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/fw_common.h (100%)
5723 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/main.c (100%)
5724 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/phy_common.c (100%)
5725 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/phy_common.h (100%)
5726 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/Makefile (100%)
5727 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/def.h (100%)
5728 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.c (100%)
5729 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.h (100%)
5730 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.c (100%)
5731 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.h (100%)
5732 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.c (100%)
5733 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.h (100%)
5734 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/led.c (100%)
5735 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/led.h (100%)
5736 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.c (100%)
5737 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.h (100%)
5738 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/pwrseq.c (100%)
5739 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/pwrseq.h (100%)
5740 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/reg.h (100%)
5741 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.c (100%)
5742 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.h (100%)
5743 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.c (100%)
5744 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.h (100%)
5745 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/table.c (100%)
5746 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/table.h (100%)
5747 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.c (100%)
5748 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.h (100%)
5749 rename drivers/net/wireless/{ => realtek}/rtlwifi/stats.c (100%)
5750 rename drivers/net/wireless/{ => realtek}/rtlwifi/stats.h (100%)
5751 rename drivers/net/wireless/{ => realtek}/rtlwifi/usb.c (100%)
5752 rename drivers/net/wireless/{ => realtek}/rtlwifi/usb.h (100%)
5753 rename drivers/net/wireless/{ => realtek}/rtlwifi/wifi.h (100%)
5754 create mode 100644 drivers/nfc/fdp/Kconfig
5755 create mode 100644 drivers/nfc/fdp/Makefile
5756 create mode 100644 drivers/nfc/fdp/fdp.c
5757 create mode 100644 drivers/nfc/fdp/fdp.h
5758 create mode 100644 drivers/nfc/fdp/i2c.c
5759 create mode 100644 drivers/nfc/nfcmrvl/fw_dnld.c
5760 create mode 100644 drivers/nfc/nfcmrvl/fw_dnld.h
5761 create mode 100644 drivers/nfc/nfcmrvl/i2c.c
5762 create mode 100644 drivers/nfc/nfcmrvl/spi.c
5763 rename drivers/nfc/st-nci/{st-nci_se.c => se.c} (82%)
5764 delete mode 100644 drivers/nfc/st-nci/st-nci_se.h
5765 create mode 100644 drivers/nfc/st-nci/vendor_cmds.c
5766 rename drivers/nfc/st21nfca/{st21nfca.c => core.c} (97%)
5767 rename drivers/nfc/st21nfca/{st21nfca_dep.c => dep.c} (99%)
5768 rename drivers/nfc/st21nfca/{st21nfca_se.c => se.c} (96%)
5769 delete mode 100644 drivers/nfc/st21nfca/st21nfca_dep.h
5770 delete mode 100644 drivers/nfc/st21nfca/st21nfca_se.h
5771 create mode 100644 drivers/nfc/st21nfca/vendor_cmds.c
5772 create mode 100644 drivers/ssb/bridge_pcmcia_80211.c
5773 create mode 100644 drivers/ssb/host_soc.c
5774 create mode 100644 include/linux/once.h
5775 rename include/linux/{ => platform_data}/mdio-gpio.h (100%)
5776 create mode 100644 include/linux/qed/common_hsi.h
5777 create mode 100644 include/linux/qed/eth_common.h
5778 create mode 100644 include/linux/qed/qed_chain.h
5779 create mode 100644 include/linux/qed/qed_eth_if.h
5780 create mode 100644 include/linux/qed/qed_if.h
5781 create mode 100644 include/linux/usb/cdc.h
5782 create mode 100644 include/net/l3mdev.h
5783 delete mode 100644 include/net/netfilter/nfnetlink_queue.h
5784 delete mode 100644 include/net/vrf.h
5785 create mode 100644 lib/once.c
5786 create mode 100644 net/ipv4/tcp_recovery.c
5787 create mode 100644 net/l3mdev/Kconfig
5788 create mode 100644 net/l3mdev/Makefile
5789 create mode 100644 net/l3mdev/l3mdev.c
5790 delete mode 100644 net/mac80211/cfg.h
5791 delete mode 100644 net/mac80211/event.c
5792 rename net/netfilter/{nfnetlink_queue_core.c => nfnetlink_queue.c} (95%)
5793 delete mode 100644 net/netfilter/nfnetlink_queue_ct.c
5794 create mode 100644 samples/bpf/trace_output_kern.c
5795 create mode 100644 samples/bpf/trace_output_user.c
5796 Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
5797 $ git merge ipsec-next/master
5799 Merging ipvs-next/master (92240e8dc0d1 ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup})
5800 $ git merge ipvs-next/master
5802 Merging wireless-drivers-next/master (8aaa878de83a Merge ath-next from ath.git)
5803 $ git merge wireless-drivers-next/master
5805 Merging bluetooth/master (58ef0dee40a9 Bluetooth: Fix issue with HCI_QUIRK_FIXUP_INQUIRY_MODE and event mask)
5806 $ git merge bluetooth/master
5807 Merge made by the 'recursive' strategy.
5808 drivers/bluetooth/btusb.c | 6 +++--
5809 net/bluetooth/hci_core.c | 61 +++++++++++++++++++++++++++++++++++++----------
5810 2 files changed, 53 insertions(+), 14 deletions(-)
5811 Merging rdma/for-next (39bfc271bd68 IB/core: Remove old fast registration API)
5812 $ git merge rdma/for-next
5813 Resolved 'net/sunrpc/xprtrdma/svc_rdma_recvfrom.c' using previous resolution.
5814 Auto-merging net/sunrpc/xprtrdma/verbs.c
5815 Auto-merging net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
5816 CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
5817 Auto-merging net/rds/ib_send.c
5818 Auto-merging net/rds/ib_cm.c
5819 Auto-merging net/rds/ib.h
5820 Auto-merging net/rds/ib.c
5821 Auto-merging include/linux/mlx4/device.h
5822 Auto-merging drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
5823 Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
5824 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
5825 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
5826 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
5827 Auto-merging drivers/infiniband/hw/mlx5/main.c
5828 Auto-merging MAINTAINERS
5829 Automatic merge failed; fix conflicts and then commit the result.
5831 [master 71ccd7bf956d] Merge remote-tracking branch 'rdma/for-next'
5832 $ git diff -M --stat --summary HEAD^..
5834 drivers/infiniband/core/addr.c | 20 +-
5835 drivers/infiniband/core/agent.c | 2 +-
5836 drivers/infiniband/core/cache.c | 112 +++++-
5837 drivers/infiniband/core/cm.c | 40 +-
5838 drivers/infiniband/core/cma.c | 171 ++++++---
5839 drivers/infiniband/core/core_priv.h | 9 +-
5840 drivers/infiniband/core/device.c | 19 +-
5841 drivers/infiniband/core/mad.c | 42 +--
5842 drivers/infiniband/core/mad_priv.h | 2 +-
5843 drivers/infiniband/core/multicast.c | 3 +-
5844 drivers/infiniband/core/sa_query.c | 19 +-
5845 drivers/infiniband/core/sysfs.c | 2 +-
5846 drivers/infiniband/core/ucma.c | 5 +-
5847 drivers/infiniband/core/uverbs.h | 1 +
5848 drivers/infiniband/core/uverbs_cmd.c | 402 ++++++++++++++-------
5849 drivers/infiniband/core/uverbs_main.c | 1 +
5850 drivers/infiniband/core/uverbs_marshall.c | 4 +-
5851 drivers/infiniband/core/verbs.c | 291 ++++++++++-----
5852 drivers/infiniband/hw/cxgb3/iwch_cq.c | 2 +-
5853 drivers/infiniband/hw/cxgb3/iwch_provider.c | 39 +-
5854 drivers/infiniband/hw/cxgb3/iwch_provider.h | 2 +
5855 drivers/infiniband/hw/cxgb3/iwch_qp.c | 43 +--
5856 drivers/infiniband/hw/cxgb4/cm.c | 331 ++++++++++-------
5857 drivers/infiniband/hw/cxgb4/cq.c | 2 +-
5858 drivers/infiniband/hw/cxgb4/device.c | 10 +-
5859 drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 25 +-
5860 drivers/infiniband/hw/cxgb4/mem.c | 63 ++--
5861 drivers/infiniband/hw/cxgb4/provider.c | 5 +-
5862 drivers/infiniband/hw/cxgb4/qp.c | 73 ++--
5863 drivers/infiniband/hw/cxgb4/t4.h | 5 +-
5864 drivers/infiniband/hw/mlx4/ah.c | 17 +-
5865 drivers/infiniband/hw/mlx4/cq.c | 2 +-
5866 drivers/infiniband/hw/mlx4/mad.c | 91 +++--
5867 drivers/infiniband/hw/mlx4/main.c | 75 +++-
5868 drivers/infiniband/hw/mlx4/mcg.c | 2 +-
5869 drivers/infiniband/hw/mlx4/mlx4_ib.h | 37 +-
5870 drivers/infiniband/hw/mlx4/mr.c | 169 +++++----
5871 drivers/infiniband/hw/mlx4/qp.c | 330 +++++++++++------
5872 drivers/infiniband/hw/mlx5/cq.c | 4 +-
5873 drivers/infiniband/hw/mlx5/main.c | 3 +-
5874 drivers/infiniband/hw/mlx5/mlx5_ib.h | 54 +--
5875 drivers/infiniband/hw/mlx5/mr.c | 187 ++++++----
5876 drivers/infiniband/hw/mlx5/qp.c | 227 ++++++------
5877 drivers/infiniband/hw/mthca/mthca_av.c | 2 +-
5878 drivers/infiniband/hw/mthca/mthca_qp.c | 84 ++---
5879 drivers/infiniband/hw/nes/nes_hw.h | 6 -
5880 drivers/infiniband/hw/nes/nes_verbs.c | 170 ++++-----
5881 drivers/infiniband/hw/nes/nes_verbs.h | 4 +
5882 drivers/infiniband/hw/ocrdma/ocrdma.h | 5 +-
5883 drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 22 +-
5884 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 60 ++-
5885 drivers/infiniband/hw/ocrdma/ocrdma_main.c | 19 +-
5886 drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 2 +-
5887 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 184 +++++-----
5888 drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 7 +-
5889 drivers/infiniband/hw/qib/qib_keys.c | 41 ++-
5890 drivers/infiniband/hw/qib/qib_mr.c | 46 +--
5891 drivers/infiniband/hw/qib/qib_qp.c | 2 +-
5892 drivers/infiniband/hw/qib/qib_rc.c | 38 +-
5893 drivers/infiniband/hw/qib/qib_ruc.c | 20 +-
5894 drivers/infiniband/hw/qib/qib_uc.c | 4 +-
5895 drivers/infiniband/hw/qib/qib_ud.c | 20 +-
5896 drivers/infiniband/hw/qib/qib_verbs.c | 29 +-
5897 drivers/infiniband/hw/qib/qib_verbs.h | 19 +-
5898 drivers/infiniband/hw/usnic/usnic_ib_main.c | 9 +-
5899 drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 8 +-
5900 drivers/infiniband/ulp/ipoib/ipoib.h | 4 +-
5901 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +-
5902 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 22 +-
5903 drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +-
5904 drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 4 +-
5905 drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 6 +-
5906 drivers/infiniband/ulp/iser/iscsi_iser.c | 20 +-
5907 drivers/infiniband/ulp/iser/iscsi_iser.h | 25 +-
5908 drivers/infiniband/ulp/iser/iser_initiator.c | 51 +--
5909 drivers/infiniband/ulp/iser/iser_memory.c | 370 +++----------------
5910 drivers/infiniband/ulp/iser/iser_verbs.c | 20 +-
5911 drivers/infiniband/ulp/isert/ib_isert.c | 269 +++++---------
5912 drivers/infiniband/ulp/isert/ib_isert.h | 8 +-
5913 drivers/infiniband/ulp/srp/ib_srp.c | 262 ++++++++------
5914 drivers/infiniband/ulp/srp/ib_srp.h | 11 +-
5915 drivers/infiniband/ulp/srpt/ib_srpt.c | 35 +-
5916 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 41 +--
5917 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 22 ++
5918 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 2 +
5919 drivers/net/ethernet/chelsio/cxgb4/t4_chip_type.h | 85 +++++
5920 drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 48 +++
5921 drivers/net/ethernet/mellanox/mlx4/en_main.c | 22 ++
5922 drivers/net/ethernet/mellanox/mlx4/en_resources.c | 25 ++
5923 drivers/net/ethernet/mellanox/mlx4/fw.c | 6 +
5924 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +-
5925 drivers/net/ethernet/mellanox/mlx4/qp.c | 19 +-
5926 .../net/ethernet/mellanox/mlx4/resource_tracker.c | 30 +-
5927 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 6 +-
5928 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 35 +-
5929 drivers/staging/rdma/amso1100/c2_qp.c | 8 +-
5930 drivers/staging/rdma/ehca/ehca_reqs.c | 53 +--
5931 drivers/staging/rdma/hfi1/keys.c | 55 ---
5932 drivers/staging/rdma/hfi1/mr.c | 33 +-
5933 drivers/staging/rdma/hfi1/qp.c | 2 +-
5934 drivers/staging/rdma/hfi1/rc.c | 24 +-
5935 drivers/staging/rdma/hfi1/ruc.c | 18 +-
5936 drivers/staging/rdma/hfi1/uc.c | 4 +-
5937 drivers/staging/rdma/hfi1/ud.c | 20 +-
5938 drivers/staging/rdma/hfi1/verbs.c | 26 +-
5939 drivers/staging/rdma/hfi1/verbs.h | 14 +-
5940 drivers/staging/rdma/ipath/ipath_rc.c | 24 +-
5941 drivers/staging/rdma/ipath/ipath_ruc.c | 16 +-
5942 drivers/staging/rdma/ipath/ipath_uc.c | 4 +-
5943 drivers/staging/rdma/ipath/ipath_ud.c | 26 +-
5944 drivers/staging/rdma/ipath/ipath_verbs.c | 17 +-
5945 drivers/staging/rdma/ipath/ipath_verbs.h | 8 +-
5946 include/linux/mlx4/device.h | 2 +
5947 include/linux/mlx4/qp.h | 24 +-
5948 include/linux/sunrpc/svc_rdma.h | 6 +-
5949 include/rdma/ib_addr.h | 18 +-
5950 include/rdma/ib_cache.h | 40 +-
5951 include/rdma/ib_pack.h | 2 +-
5952 include/rdma/ib_sa.h | 12 +-
5953 include/rdma/ib_verbs.h | 218 ++++++-----
5954 include/rdma/rdma_cm.h | 6 +-
5955 include/uapi/rdma/ib_user_verbs.h | 26 ++
5956 net/9p/trans_rdma.c | 4 +-
5959 net/rds/ib_cm.c | 2 +-
5960 net/rds/ib_send.c | 71 ++--
5963 net/rds/iw_cm.c | 2 +-
5964 net/rds/iw_rdma.c | 129 +++----
5965 net/rds/iw_send.c | 154 ++++----
5966 net/rds/rdma_transport.c | 4 +-
5967 net/sunrpc/xprtrdma/frwr_ops.c | 119 +++---
5968 net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 123 ++++---
5969 net/sunrpc/xprtrdma/svc_rdma_sendto.c | 18 +-
5970 net/sunrpc/xprtrdma/svc_rdma_transport.c | 38 +-
5971 net/sunrpc/xprtrdma/verbs.c | 3 +-
5972 net/sunrpc/xprtrdma/xprt_rdma.h | 3 +-
5973 140 files changed, 3594 insertions(+), 3009 deletions(-)
5974 create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4_chip_type.h
5975 Merging mtd/master (e5a5d92d9dc3 mxc_nand: fix copy_spare)
5976 $ git merge mtd/master
5978 Merging l2-mtd/master (f3c63795e90f mtd: blkdevs: fix potential deadlock + lockdep warnings)
5979 $ git merge l2-mtd/master
5980 Auto-merging MAINTAINERS
5981 Merge made by the 'recursive' strategy.
5982 .../devicetree/bindings/mtd/fsmc-nand.txt | 6 +
5983 .../devicetree/bindings/mtd/partition.txt | 71 +-
5984 .../devicetree/bindings/mtd/vf610-nfc.txt | 59 ++
5986 arch/sh/boards/mach-rsk/setup.c | 3 -
5987 drivers/mtd/cmdlinepart.c | 28 +-
5988 drivers/mtd/devices/bcm47xxsflash.c | 7 +-
5989 drivers/mtd/devices/docg3.c | 24 +-
5990 drivers/mtd/devices/m25p80.c | 15 +-
5991 drivers/mtd/devices/mtd_dataflash.c | 1 -
5992 drivers/mtd/devices/mtdram.c | 21 +
5993 drivers/mtd/devices/spear_smi.c | 1 +
5994 drivers/mtd/devices/sst25l.c | 3 +-
5995 drivers/mtd/lpddr/lpddr2_nvm.c | 1 +
5996 drivers/mtd/maps/gpio-addr-flash.c | 2 +-
5997 drivers/mtd/maps/intel_vr_nor.c | 2 +-
5998 drivers/mtd/maps/ixp4xx.c | 2 +-
5999 drivers/mtd/maps/lantiq-flash.c | 2 +-
6000 drivers/mtd/maps/latch-addr-flash.c | 2 +-
6001 drivers/mtd/maps/pcmciamtd.c | 1 +
6002 drivers/mtd/maps/physmap.c | 1 -
6003 drivers/mtd/maps/physmap_of.c | 1 -
6004 drivers/mtd/maps/plat-ram.c | 1 -
6005 drivers/mtd/maps/pxa2xx-flash.c | 8 +-
6006 drivers/mtd/maps/rbtx4939-flash.c | 2 +-
6007 drivers/mtd/maps/sa1100-flash.c | 2 +-
6008 drivers/mtd/mtd_blkdevs.c | 12 +-
6009 drivers/mtd/mtdchar.c | 42 +-
6010 drivers/mtd/mtdcore.c | 34 +-
6011 drivers/mtd/mtdpart.c | 23 +-
6012 drivers/mtd/nand/Kconfig | 13 +-
6013 drivers/mtd/nand/Makefile | 1 +
6014 drivers/mtd/nand/atmel_nand.c | 8 +-
6015 drivers/mtd/nand/au1550nd.c | 2 +-
6016 drivers/mtd/nand/bcm47xxnflash/main.c | 2 +-
6017 drivers/mtd/nand/bf5xx_nand.c | 5 +-
6018 drivers/mtd/nand/brcmnand/bcm63138_nand.c | 18 +-
6019 drivers/mtd/nand/brcmnand/brcmnand.c | 61 +-
6020 drivers/mtd/nand/brcmnand/brcmnand.h | 2 -
6021 drivers/mtd/nand/brcmnand/iproc_nand.c | 22 +-
6022 drivers/mtd/nand/cafe_nand.c | 4 +-
6023 drivers/mtd/nand/davinci_nand.c | 3 -
6024 drivers/mtd/nand/denali.c | 19 +-
6025 drivers/mtd/nand/denali.h | 2 +
6026 drivers/mtd/nand/docg4.c | 8 +-
6027 drivers/mtd/nand/fsl_elbc_nand.c | 7 +-
6028 drivers/mtd/nand/fsl_ifc_nand.c | 5 +-
6029 drivers/mtd/nand/fsl_upm.c | 2 +-
6030 drivers/mtd/nand/fsmc_nand.c | 67 +-
6031 drivers/mtd/nand/gpio.c | 2 +-
6032 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 10 +-
6033 drivers/mtd/nand/hisi504_nand.c | 4 +-
6034 drivers/mtd/nand/jz4740_nand.c | 2 +-
6035 drivers/mtd/nand/lpc32xx_mlc.c | 14 +-
6036 drivers/mtd/nand/lpc32xx_slc.c | 42 +-
6037 drivers/mtd/nand/mpc5121_nfc.c | 2 +
6038 drivers/mtd/nand/mxc_nand.c | 2 +-
6039 drivers/mtd/nand/nand_base.c | 201 ++++-
6040 drivers/mtd/nand/nand_bbt.c | 2 +-
6041 drivers/mtd/nand/nandsim.c | 3 +-
6042 drivers/mtd/nand/ndfc.c | 2 +-
6043 drivers/mtd/nand/nuc900_nand.c | 2 +-
6044 drivers/mtd/nand/omap2.c | 6 +-
6045 drivers/mtd/nand/orion_nand.c | 3 +-
6046 drivers/mtd/nand/pasemi_nand.c | 2 +-
6047 drivers/mtd/nand/plat_nand.c | 3 +-
6048 drivers/mtd/nand/pxa3xx_nand.c | 570 +++++++------
6049 drivers/mtd/nand/r852.c | 1 -
6050 drivers/mtd/nand/s3c2410.c | 2 +-
6051 drivers/mtd/nand/sh_flctl.c | 4 +-
6052 drivers/mtd/nand/sharpsl.c | 2 +-
6053 drivers/mtd/nand/socrates_nand.c | 1 -
6054 drivers/mtd/nand/sunxi_nand.c | 540 +++++++------
6055 drivers/mtd/nand/tmio_nand.c | 1 +
6056 drivers/mtd/nand/txx9ndfmc.c | 2 +-
6057 drivers/mtd/nand/vf610_nfc.c | 878 +++++++++++++++++++++
6058 drivers/mtd/ofpart.c | 63 +-
6059 drivers/mtd/onenand/generic.c | 3 +-
6060 drivers/mtd/onenand/omap2.c | 2 -
6061 drivers/mtd/onenand/samsung.c | 1 -
6062 drivers/mtd/spi-nor/Kconfig | 3 +-
6063 drivers/mtd/spi-nor/fsl-quadspi.c | 46 +-
6064 drivers/mtd/spi-nor/nxp-spifi.c | 11 +-
6065 drivers/mtd/spi-nor/spi-nor.c | 319 ++++++--
6066 drivers/mtd/tests/speedtest.c | 10 +-
6067 drivers/mtd/tests/torturetest.c | 10 +-
6068 drivers/staging/mt29f_spinand/mt29f_spinand.c | 6 +-
6069 fs/jffs2/dir.c | 3 -
6070 fs/jffs2/malloc.c | 27 +-
6071 fs/jffs2/readinode.c | 6 +-
6072 fs/jffs2/wbuf.c | 1 -
6073 include/linux/blkpg.h | 21 +
6074 include/linux/mtd/nand.h | 21 +-
6075 include/linux/mtd/spi-nor.h | 88 +--
6076 include/linux/platform_data/mtd-nand-pxa3xx.h | 27 -
6077 include/uapi/linux/blkpg.h | 6 +-
6078 include/uapi/mtd/mtd-user.h | 2 -
6079 97 files changed, 2566 insertions(+), 1047 deletions(-)
6080 create mode 100644 Documentation/devicetree/bindings/mtd/vf610-nfc.txt
6081 create mode 100644 drivers/mtd/nand/vf610_nfc.c
6082 create mode 100644 include/linux/blkpg.h
6083 Merging crypto/master (271817a3e92c crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params())
6084 $ git merge crypto/master
6085 Auto-merging lib/mpi/mpicoder.c
6086 Removing drivers/crypto/qat/qat_common/qat_rsakey.asn1
6087 Auto-merging drivers/crypto/marvell/hash.c
6088 Auto-merging drivers/crypto/marvell/cipher.c
6089 Auto-merging drivers/crypto/marvell/cesa.h
6090 Removing crypto/rsakey.asn1
6091 Auto-merging crypto/asymmetric_keys/x509_public_key.c
6092 Auto-merging arch/arm/boot/dts/stih407-family.dtsi
6093 Auto-merging MAINTAINERS
6094 Merge made by the 'recursive' strategy.
6095 .../bindings/rng/samsung,exynos-rng4.txt | 17 +
6096 Documentation/devicetree/bindings/rng/st,rng.txt | 15 +
6097 .../devicetree/bindings/rng/st,stm32-rng.txt | 21 +
6098 Documentation/hw_random.txt | 8 +-
6100 arch/arm/boot/dts/stih407-family.dtsi | 14 +
6101 arch/arm/boot/dts/stm32f429.dtsi | 7 +
6102 arch/s390/crypto/sha.h | 2 +-
6103 arch/x86/Makefile | 6 +-
6104 arch/x86/crypto/Makefile | 8 +
6105 arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 2 +-
6106 arch/x86/crypto/sha1_ni_asm.S | 302 +++++++++++++
6107 arch/x86/crypto/sha1_ssse3_glue.c | 314 +++++++++++---
6108 arch/x86/crypto/sha256_ni_asm.S | 353 +++++++++++++++
6109 arch/x86/crypto/sha256_ssse3_glue.c | 329 ++++++++++++--
6110 arch/x86/crypto/sha512_ssse3_glue.c | 249 +++++++++--
6111 crypto/Kconfig | 17 +-
6112 crypto/Makefile | 10 +-
6113 crypto/akcipher.c | 1 -
6114 crypto/asymmetric_keys/pkcs7_verify.c | 5 +-
6115 crypto/asymmetric_keys/x509_cert_parser.c | 6 +-
6116 crypto/asymmetric_keys/x509_public_key.c | 5 +-
6117 crypto/jitterentropy-kcapi.c | 4 -
6118 crypto/keywrap.c | 419 ++++++++++++++++++
6119 crypto/rsa.c | 83 ++--
6120 crypto/rsa_helper.c | 42 +-
6121 crypto/rsakey.asn1 | 5 -
6122 crypto/rsaprivkey.asn1 | 11 +
6123 crypto/rsapubkey.asn1 | 4 +
6124 crypto/skcipher.c | 4 +-
6125 crypto/tcrypt.c | 17 +-
6126 crypto/testmgr.c | 83 ++--
6127 crypto/testmgr.h | 77 +++-
6128 drivers/char/hw_random/Kconfig | 24 +-
6129 drivers/char/hw_random/Makefile | 2 +
6130 drivers/char/hw_random/core.c | 2 +-
6131 drivers/char/hw_random/exynos-rng.c | 58 ++-
6132 drivers/char/hw_random/mxc-rnga.c | 14 +-
6133 drivers/char/hw_random/octeon-rng.c | 12 +-
6134 drivers/char/hw_random/pasemi-rng.c | 1 +
6135 drivers/char/hw_random/ppc4xx-rng.c | 1 +
6136 drivers/char/hw_random/st-rng.c | 151 +++++++
6137 drivers/char/hw_random/stm32-rng.c | 202 +++++++++
6138 drivers/crypto/Kconfig | 5 +-
6139 drivers/crypto/amcc/crypto4xx_core.c | 23 +-
6140 drivers/crypto/atmel-aes.c | 44 +-
6141 drivers/crypto/atmel-sha.c | 33 +-
6142 drivers/crypto/atmel-tdes.c | 35 +-
6143 drivers/crypto/bfin_crc.c | 25 +-
6144 drivers/crypto/caam/caamalg.c | 232 +++++++---
6145 drivers/crypto/caam/caamhash.c | 131 +++---
6146 drivers/crypto/caam/desc.h | 1 -
6147 drivers/crypto/caam/sg_sw_sec4.h | 72 +---
6148 drivers/crypto/ccp/Kconfig | 13 +-
6149 drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 20 +-
6150 drivers/crypto/ccp/ccp-crypto-main.c | 6 +-
6151 drivers/crypto/ccp/ccp-crypto-sha.c | 13 +
6152 drivers/crypto/ccp/ccp-ops.c | 108 +++--
6153 drivers/crypto/ccp/ccp-pci.c | 2 +-
6154 drivers/crypto/ccp/ccp-platform.c | 6 +-
6155 drivers/crypto/marvell/cesa.h | 55 +--
6156 drivers/crypto/marvell/cipher.c | 13 +-
6157 drivers/crypto/marvell/hash.c | 471 ++++++++++-----------
6158 drivers/crypto/marvell/tdma.c | 42 +-
6159 drivers/crypto/n2_core.c | 2 +-
6160 drivers/crypto/nx/nx-842-powernv.c | 4 +-
6161 drivers/crypto/nx/nx-842-pseries.c | 8 +-
6162 drivers/crypto/picoxcell_crypto.c | 1 +
6163 drivers/crypto/qat/qat_common/Makefile | 12 +-
6164 drivers/crypto/qat/qat_common/adf_common_drv.h | 4 +-
6165 drivers/crypto/qat/qat_common/adf_ctl_drv.c | 6 -
6166 drivers/crypto/qat/qat_common/adf_init.c | 8 +-
6167 drivers/crypto/qat/qat_common/adf_sriov.c | 7 +-
6168 drivers/crypto/qat/qat_common/qat_algs.c | 178 +++++---
6169 drivers/crypto/qat/qat_common/qat_asym_algs.c | 213 +++++++---
6170 drivers/crypto/qat/qat_common/qat_crypto.c | 79 ++--
6171 drivers/crypto/qat/qat_common/qat_hal.c | 5 +-
6172 drivers/crypto/qat/qat_common/qat_rsakey.asn1 | 5 -
6173 drivers/crypto/qat/qat_common/qat_rsaprivkey.asn1 | 11 +
6174 drivers/crypto/qat/qat_common/qat_rsapubkey.asn1 | 4 +
6175 drivers/crypto/qce/ablkcipher.c | 30 +-
6176 drivers/crypto/qce/cipher.h | 4 -
6177 drivers/crypto/qce/dma.c | 52 ---
6178 drivers/crypto/qce/dma.h | 5 -
6179 drivers/crypto/qce/sha.c | 18 +-
6180 drivers/crypto/qce/sha.h | 2 -
6181 drivers/crypto/sahara.c | 108 +----
6182 drivers/crypto/talitos.c | 104 +----
6183 drivers/crypto/ux500/cryp/cryp_core.c | 71 +---
6184 drivers/crypto/ux500/hash/hash_core.c | 50 +--
6185 include/crypto/akcipher.h | 90 +++-
6186 include/crypto/hash.h | 14 +
6187 include/crypto/internal/rsa.h | 7 +-
6188 include/linux/mpi.h | 10 +-
6190 lib/842/842_compress.c | 13 +
6191 lib/842/842_decompress.c | 17 +
6192 lib/mpi/mpicoder.c | 199 +++++++++
6193 98 files changed, 4070 insertions(+), 1538 deletions(-)
6194 create mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos-rng4.txt
6195 create mode 100644 Documentation/devicetree/bindings/rng/st,rng.txt
6196 create mode 100644 Documentation/devicetree/bindings/rng/st,stm32-rng.txt
6197 create mode 100644 arch/x86/crypto/sha1_ni_asm.S
6198 create mode 100644 arch/x86/crypto/sha256_ni_asm.S
6199 create mode 100644 crypto/keywrap.c
6200 delete mode 100644 crypto/rsakey.asn1
6201 create mode 100644 crypto/rsaprivkey.asn1
6202 create mode 100644 crypto/rsapubkey.asn1
6203 create mode 100644 drivers/char/hw_random/st-rng.c
6204 create mode 100644 drivers/char/hw_random/stm32-rng.c
6205 delete mode 100644 drivers/crypto/qat/qat_common/qat_rsakey.asn1
6206 create mode 100644 drivers/crypto/qat/qat_common/qat_rsaprivkey.asn1
6207 create mode 100644 drivers/crypto/qat/qat_common/qat_rsapubkey.asn1
6208 Merging drm/drm-next (a76edb8cec0c Merge tag 'topic/drm-misc-2015-10-22' of git://anongit.freedesktop.org/drm-intel into drm-next)
6209 $ git merge drm/drm-next
6210 Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v10_0.c' using previous resolution.
6211 Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v11_0.c' using previous resolution.
6212 Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v8_0.c' using previous resolution.
6213 Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution.
6214 Auto-merging sound/pci/hda/hda_intel.c
6215 Auto-merging drivers/gpu/drm/virtio/virtgpu_fence.c
6216 Auto-merging drivers/gpu/drm/radeon/radeon_pm.c
6217 Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
6218 Auto-merging drivers/gpu/drm/i915/intel_pm.c
6219 Auto-merging drivers/gpu/drm/i915/intel_lrc.c
6220 Auto-merging drivers/gpu/drm/i915/intel_display.c
6221 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
6222 Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c
6223 Auto-merging drivers/gpu/drm/i915/i915_gem_shrinker.c
6224 Auto-merging drivers/gpu/drm/drm_crtc.c
6225 Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
6226 CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
6227 Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
6228 CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
6229 Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
6230 CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
6231 Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
6232 Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
6233 Auto-merging MAINTAINERS
6234 Auto-merging Documentation/kernel-parameters.txt
6235 Auto-merging Documentation/DocBook/gpu.tmpl
6236 Automatic merge failed; fix conflicts and then commit the result.
6238 [master 8bbe9cc5bdd8] Merge remote-tracking branch 'drm/drm-next'
6239 $ git diff -M --stat --summary HEAD^..
6240 Documentation/DocBook/Makefile | 2 +-
6241 Documentation/DocBook/{drm.tmpl => gpu.tmpl} | 209 +++--
6242 .../devicetree/bindings/display/brcm,bcm-vc4.txt | 65 ++
6243 Documentation/devicetree/bindings/drm/msm/hdmi.txt | 3 +
6244 Documentation/devicetree/bindings/drm/msm/mdp.txt | 3 +-
6245 .../devicetree/bindings/video/renesas,du.txt | 14 +-
6246 Documentation/kernel-parameters.txt | 15 +-
6248 drivers/gpu/drm/Kconfig | 2 +
6249 drivers/gpu/drm/Makefile | 6 +-
6250 drivers/gpu/drm/amd/amdgpu/amdgpu.h | 48 +-
6251 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 1 -
6252 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 4 +-
6253 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +-
6254 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +-
6255 drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 1 -
6256 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 42 +-
6257 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 47 +-
6258 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 25 +-
6259 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 22 +-
6260 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 64 +-
6261 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 29 +-
6262 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 1 -
6263 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 72 +-
6264 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 12 +-
6265 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +
6266 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 47 +-
6267 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +-
6268 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 12 +-
6269 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +
6270 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 +
6271 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 5 +
6272 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 47 +-
6273 drivers/gpu/drm/amd/amdgpu/atom.c | 53 +-
6274 drivers/gpu/drm/amd/amdgpu/atom.h | 2 +-
6275 drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 149 ++--
6276 drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 21 +-
6277 drivers/gpu/drm/amd/amdgpu/cz_smc.c | 60 +-
6278 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 235 +++--
6279 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 256 +++---
6280 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 235 +++--
6281 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 20 -
6282 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 861 ++++++++++++------
6283 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 40 +-
6284 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 48 +
6285 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 175 ++--
6286 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 213 ++---
6287 drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 1 -
6288 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 1 -
6289 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 -
6290 drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 1 -
6291 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 6 +-
6292 drivers/gpu/drm/amd/amdgpu/vi.c | 36 +-
6293 drivers/gpu/drm/amd/include/amd_shared.h | 1 +
6294 drivers/gpu/drm/amd/include/atombios.h | 2 +-
6295 drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 43 +-
6296 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 7 +-
6297 drivers/gpu/drm/armada/armada_drv.c | 87 +-
6298 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 8 +-
6299 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 6 +-
6300 drivers/gpu/drm/drm_agpsupport.c | 4 -
6301 drivers/gpu/drm/drm_atomic.c | 28 +-
6302 drivers/gpu/drm/drm_atomic_helper.c | 325 +++++--
6303 drivers/gpu/drm/drm_bufs.c | 6 +-
6304 drivers/gpu/drm/drm_crtc.c | 148 ++--
6305 drivers/gpu/drm/drm_dp_helper.c | 44 +-
6306 drivers/gpu/drm/drm_drv.c | 67 +-
6307 drivers/gpu/drm/drm_edid.c | 60 +-
6308 drivers/gpu/drm/drm_edid_load.c | 43 +-
6309 drivers/gpu/drm/drm_fb_helper.c | 212 ++++-
6310 drivers/gpu/drm/drm_gem.c | 47 +-
6311 drivers/gpu/drm/drm_gem_cma_helper.c | 2 -
6312 drivers/gpu/drm/drm_internal.h | 2 +-
6313 drivers/gpu/drm/drm_ioc32.c | 6 +-
6314 drivers/gpu/drm/drm_ioctl.c | 93 +-
6315 drivers/gpu/drm/drm_irq.c | 367 ++++----
6316 drivers/gpu/drm/drm_memory.c | 6 +-
6317 drivers/gpu/drm/drm_mm.c | 6 +-
6318 drivers/gpu/drm/drm_modeset_lock.c | 2 +
6319 drivers/gpu/drm/drm_of.c | 88 ++
6320 drivers/gpu/drm/drm_pci.c | 11 +
6321 drivers/gpu/drm/drm_plane_helper.c | 6 +-
6322 drivers/gpu/drm/drm_platform.c | 3 +
6323 drivers/gpu/drm/drm_rect.c | 4 +-
6324 drivers/gpu/drm/drm_sysfs.c | 49 +-
6325 drivers/gpu/drm/drm_vm.c | 8 +-
6326 drivers/gpu/drm/drm_vma_manager.c | 40 +-
6327 drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 +-
6328 drivers/gpu/drm/exynos/exynos_drm_crtc.h | 4 +-
6329 drivers/gpu/drm/exynos/exynos_drm_drv.c | 24 +-
6330 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 7 +-
6331 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 -
6332 drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 -
6333 drivers/gpu/drm/gma500/psb_drv.h | 6 +-
6334 drivers/gpu/drm/gma500/psb_irq.c | 8 +-
6335 drivers/gpu/drm/gma500/psb_irq.h | 6 +-
6336 drivers/gpu/drm/i2c/ch7006_drv.c | 6 +-
6337 drivers/gpu/drm/i2c/ch7006_mode.c | 26 +-
6338 drivers/gpu/drm/i2c/ch7006_priv.h | 12 +-
6339 drivers/gpu/drm/i915/Makefile | 4 +
6340 drivers/gpu/drm/i915/dvo.h | 4 +-
6341 drivers/gpu/drm/i915/dvo_ch7017.c | 4 +-
6342 drivers/gpu/drm/i915/dvo_ch7xxx.c | 4 +-
6343 drivers/gpu/drm/i915/dvo_ivch.c | 12 +-
6344 drivers/gpu/drm/i915/dvo_ns2501.c | 4 +-
6345 drivers/gpu/drm/i915/dvo_sil164.c | 4 +-
6346 drivers/gpu/drm/i915/dvo_tfp410.c | 4 +-
6347 drivers/gpu/drm/i915/i915_cmd_parser.c | 17 +-
6348 drivers/gpu/drm/i915/i915_debugfs.c | 264 +++++-
6349 drivers/gpu/drm/i915/i915_dma.c | 251 ++++--
6350 drivers/gpu/drm/i915/i915_drv.c | 83 +-
6351 drivers/gpu/drm/i915/i915_drv.h | 154 ++--
6352 drivers/gpu/drm/i915/i915_gem.c | 272 ++++--
6353 drivers/gpu/drm/i915/i915_gem_context.c | 31 +
6354 drivers/gpu/drm/i915/i915_gem_evict.c | 45 -
6355 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 167 +---
6356 drivers/gpu/drm/i915/i915_gem_fence.c | 47 +-
6357 drivers/gpu/drm/i915/i915_gem_gtt.c | 878 +++++++++++++++----
6358 drivers/gpu/drm/i915/i915_gem_gtt.h | 77 +-
6359 drivers/gpu/drm/i915/i915_gem_shrinker.c | 19 +-
6360 drivers/gpu/drm/i915/i915_gem_stolen.c | 181 +++-
6361 drivers/gpu/drm/i915/i915_gem_userptr.c | 333 +++----
6362 drivers/gpu/drm/i915/i915_gpu_error.c | 78 +-
6363 drivers/gpu/drm/i915/i915_guc_reg.h | 21 +-
6364 drivers/gpu/drm/i915/i915_guc_submission.c | 975 +++++++++++++++++++++
6365 drivers/gpu/drm/i915/i915_irq.c | 683 ++++++++++-----
6366 drivers/gpu/drm/i915/i915_params.c | 38 +-
6367 drivers/gpu/drm/i915/i915_reg.h | 593 ++++++++-----
6368 drivers/gpu/drm/i915/i915_suspend.c | 45 +-
6369 drivers/gpu/drm/i915/i915_sysfs.c | 34 +-
6370 drivers/gpu/drm/i915/i915_trace.h | 78 +-
6371 drivers/gpu/drm/i915/i915_vgpu.h | 34 +-
6372 drivers/gpu/drm/i915/intel_acpi.c | 3 +-
6373 drivers/gpu/drm/i915/intel_atomic.c | 13 +-
6374 drivers/gpu/drm/i915/intel_atomic_plane.c | 6 +-
6375 drivers/gpu/drm/i915/intel_audio.c | 220 ++++-
6376 drivers/gpu/drm/i915/intel_bios.c | 43 +-
6377 drivers/gpu/drm/i915/intel_bios.h | 3 -
6378 drivers/gpu/drm/i915/intel_crt.c | 15 +-
6379 drivers/gpu/drm/i915/intel_csr.c | 41 +-
6380 drivers/gpu/drm/i915/intel_ddi.c | 182 ++--
6381 drivers/gpu/drm/i915/intel_display.c | 890 ++++++++++---------
6382 drivers/gpu/drm/i915/intel_dp.c | 838 +++++++++++-------
6383 drivers/gpu/drm/i915/intel_dp_mst.c | 26 +-
6384 drivers/gpu/drm/i915/intel_drv.h | 101 ++-
6385 drivers/gpu/drm/i915/intel_dsi.c | 323 ++++---
6386 drivers/gpu/drm/i915/intel_dsi.h | 7 +-
6387 drivers/gpu/drm/i915/intel_dsi_pll.c | 243 ++++-
6388 drivers/gpu/drm/i915/intel_dvo.c | 64 +-
6389 drivers/gpu/drm/i915/intel_fbc.c | 264 +++++-
6390 drivers/gpu/drm/i915/intel_fbdev.c | 23 +-
6391 drivers/gpu/drm/i915/intel_guc.h | 124 +++
6392 drivers/gpu/drm/i915/intel_guc_fwif.h | 31 +-
6393 drivers/gpu/drm/i915/intel_guc_loader.c | 606 +++++++++++++
6394 drivers/gpu/drm/i915/intel_hdmi.c | 306 ++++---
6395 drivers/gpu/drm/i915/intel_i2c.c | 54 +-
6396 drivers/gpu/drm/i915/intel_lrc.c | 427 +++++----
6397 drivers/gpu/drm/i915/intel_lrc.h | 18 +-
6398 drivers/gpu/drm/i915/intel_lvds.c | 50 +-
6399 drivers/gpu/drm/i915/intel_modes.c | 9 +
6400 drivers/gpu/drm/i915/intel_opregion.c | 92 +-
6401 drivers/gpu/drm/i915/intel_panel.c | 511 ++++++++---
6402 drivers/gpu/drm/i915/intel_pm.c | 562 ++++++------
6403 drivers/gpu/drm/i915/intel_psr.c | 18 +-
6404 drivers/gpu/drm/i915/intel_ringbuffer.c | 262 +++---
6405 drivers/gpu/drm/i915/intel_ringbuffer.h | 15 +-
6406 drivers/gpu/drm/i915/intel_runtime_pm.c | 474 ++++++++--
6407 drivers/gpu/drm/i915/intel_sdvo.c | 51 +-
6408 drivers/gpu/drm/i915/intel_sprite.c | 59 +-
6409 drivers/gpu/drm/i915/intel_tv.c | 14 +-
6410 drivers/gpu/drm/i915/intel_uncore.c | 38 +-
6411 drivers/gpu/drm/imx/imx-drm-core.c | 65 +-
6412 drivers/gpu/drm/mga/mga_dma.c | 4 +-
6413 drivers/gpu/drm/mga/mga_drv.h | 6 +-
6414 drivers/gpu/drm/mga/mga_irq.c | 20 +-
6415 drivers/gpu/drm/msm/Kconfig | 14 -
6416 drivers/gpu/drm/msm/Makefile | 2 +-
6417 drivers/gpu/drm/msm/adreno/a2xx.xml.h | 9 +-
6418 drivers/gpu/drm/msm/adreno/a3xx.xml.h | 27 +-
6419 drivers/gpu/drm/msm/adreno/a4xx.xml.h | 15 +-
6420 drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 13 +-
6421 drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 9 +-
6422 drivers/gpu/drm/msm/dsi/dsi.xml.h | 238 +++--
6423 drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +-
6424 drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 8 +-
6425 drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +-
6426 drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 6 +-
6427 drivers/gpu/drm/msm/dsi/sfpb.xml.h | 21 +-
6428 drivers/gpu/drm/msm/edp/edp.xml.h | 8 +-
6429 drivers/gpu/drm/msm/hdmi/hdmi.c | 17 +-
6430 drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 8 +-
6431 drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 8 +-
6432 drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 8 +-
6433 drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 10 +-
6434 drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 86 +-
6435 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 95 +-
6436 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 11 +-
6437 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 46 +-
6438 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 2 +
6439 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 211 +++--
6440 drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 8 +-
6441 drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 15 +-
6442 drivers/gpu/drm/msm/mdp/mdp_kms.h | 6 +
6443 drivers/gpu/drm/msm/msm_atomic.c | 2 +-
6444 drivers/gpu/drm/msm/msm_drv.c | 36 +-
6445 drivers/gpu/drm/msm/msm_fbdev.c | 5 -
6446 drivers/gpu/drm/msm/msm_gem_prime.c | 2 -
6447 drivers/gpu/drm/msm/msm_gpu.c | 8 +
6448 drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c | 2 +-
6449 drivers/gpu/drm/nouveau/dispnv04/tvnv17.h | 2 +-
6450 drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +-
6451 drivers/gpu/drm/nouveau/nouveau_bo.c | 8 +-
6452 drivers/gpu/drm/nouveau/nouveau_display.c | 27 +-
6453 drivers/gpu/drm/nouveau/nouveau_display.h | 11 +-
6454 drivers/gpu/drm/nouveau/nouveau_drm.c | 26 +-
6455 drivers/gpu/drm/omapdrm/omap_crtc.c | 3 -
6456 drivers/gpu/drm/omapdrm/omap_drv.c | 18 +-
6457 drivers/gpu/drm/omapdrm/omap_drv.h | 4 +-
6458 drivers/gpu/drm/omapdrm/omap_fb.c | 4 +-
6459 drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 -
6460 drivers/gpu/drm/omapdrm/omap_irq.c | 16 +-
6461 drivers/gpu/drm/omapdrm/omap_plane.c | 12 +-
6462 drivers/gpu/drm/qxl/qxl_drv.c | 7 +-
6463 drivers/gpu/drm/qxl/qxl_ioctl.c | 14 +-
6464 drivers/gpu/drm/r128/r128_cce.c | 12 +-
6465 drivers/gpu/drm/r128/r128_drv.h | 6 +-
6466 drivers/gpu/drm/r128/r128_irq.c | 16 +-
6467 drivers/gpu/drm/radeon/atombios_dp.c | 1 +
6468 drivers/gpu/drm/radeon/cayman_blit_shaders.c | 2 +-
6469 drivers/gpu/drm/radeon/evergreen_blit_shaders.c | 2 +-
6470 drivers/gpu/drm/radeon/evergreen_cs.c | 104 +--
6471 drivers/gpu/drm/radeon/r600_blit_shaders.c | 2 +-
6472 drivers/gpu/drm/radeon/r600_cp.c | 14 +-
6473 drivers/gpu/drm/radeon/radeon_acpi.c | 1 -
6474 drivers/gpu/drm/radeon/radeon_agp.c | 8 +-
6475 drivers/gpu/drm/radeon/radeon_asic.c | 1 -
6476 drivers/gpu/drm/radeon/radeon_atpx_handler.c | 4 +-
6477 drivers/gpu/drm/radeon/radeon_bios.c | 1 -
6478 drivers/gpu/drm/radeon/radeon_cp.c | 16 +-
6479 drivers/gpu/drm/radeon/radeon_device.c | 2 +-
6480 drivers/gpu/drm/radeon/radeon_display.c | 37 +-
6481 drivers/gpu/drm/radeon/radeon_drv.c | 16 +-
6482 drivers/gpu/drm/radeon/radeon_drv.h | 6 +-
6483 drivers/gpu/drm/radeon/radeon_irq.c | 38 +-
6484 drivers/gpu/drm/radeon/radeon_kms.c | 138 ++-
6485 drivers/gpu/drm/radeon/radeon_mode.h | 8 +-
6486 drivers/gpu/drm/radeon/radeon_pm.c | 4 +-
6487 drivers/gpu/drm/radeon/radeon_ttm.c | 10 +-
6488 drivers/gpu/drm/rcar-du/Kconfig | 2 +-
6489 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 48 +-
6490 drivers/gpu/drm/rcar-du/rcar_du_group.c | 5 +-
6491 drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +-
6492 drivers/gpu/drm/rcar-du/rcar_du_plane.c | 45 +-
6493 drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 89 +-
6494 drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 3 -
6495 drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +-
6496 drivers/gpu/drm/sis/sis_drv.h | 4 +
6497 drivers/gpu/drm/sti/sti_crtc.c | 16 +-
6498 drivers/gpu/drm/sti/sti_crtc.h | 4 +-
6499 drivers/gpu/drm/sti/sti_drv.c | 4 +-
6500 drivers/gpu/drm/tegra/dc.c | 2 -
6501 drivers/gpu/drm/tegra/dpaux.c | 3 +-
6502 drivers/gpu/drm/tegra/drm.c | 37 +-
6503 drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 +-
6504 drivers/gpu/drm/vc4/Kconfig | 13 +
6505 drivers/gpu/drm/vc4/Makefile | 17 +
6506 drivers/gpu/drm/vc4/vc4_bo.c | 52 ++
6507 drivers/gpu/drm/vc4/vc4_crtc.c | 672 ++++++++++++++
6508 drivers/gpu/drm/vc4/vc4_debugfs.c | 39 +
6509 drivers/gpu/drm/vc4/vc4_drv.c | 298 +++++++
6510 drivers/gpu/drm/vc4/vc4_drv.h | 145 +++
6511 drivers/gpu/drm/vc4/vc4_hdmi.c | 590 +++++++++++++
6512 drivers/gpu/drm/vc4/vc4_hvs.c | 163 ++++
6513 drivers/gpu/drm/vc4/vc4_kms.c | 67 ++
6514 drivers/gpu/drm/vc4/vc4_plane.c | 320 +++++++
6515 drivers/gpu/drm/vc4/vc4_regs.h | 570 ++++++++++++
6516 drivers/gpu/drm/vgem/vgem_drv.c | 55 +-
6517 drivers/gpu/drm/via/via_drv.h | 10 +-
6518 drivers/gpu/drm/via/via_irq.c | 17 +-
6519 drivers/gpu/drm/virtio/Makefile | 3 +-
6520 drivers/gpu/drm/virtio/virtgpu_display.c | 57 +-
6521 drivers/gpu/drm/virtio/virtgpu_drv.c | 28 +-
6522 drivers/gpu/drm/virtio/virtgpu_drv.h | 72 ++
6523 drivers/gpu/drm/virtio/virtgpu_fence.c | 2 +-
6524 drivers/gpu/drm/virtio/virtgpu_gem.c | 41 +
6525 drivers/gpu/drm/virtio/virtgpu_ioctl.c | 573 ++++++++++++
6526 drivers/gpu/drm/virtio/virtgpu_kms.c | 133 ++-
6527 drivers/gpu/drm/virtio/virtgpu_object.c | 11 +-
6528 drivers/gpu/drm/virtio/virtgpu_prime.c | 71 ++
6529 drivers/gpu/drm/virtio/virtgpu_ttm.c | 1 +
6530 drivers/gpu/drm/virtio/virtgpu_vq.c | 322 ++++++-
6531 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 62 +-
6532 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +-
6533 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +-
6534 drivers/gpu/vga/vga_switcheroo.c | 384 ++++++--
6535 drivers/gpu/vga/vgaarb.c | 4 +-
6536 drivers/platform/x86/apple-gmux.c | 2 +-
6537 include/drm/drmP.h | 48 +-
6538 include/drm/drm_agpsupport.h | 57 +-
6539 include/drm/drm_atomic_helper.h | 12 +-
6540 include/drm/drm_crtc.h | 18 +-
6541 include/drm/drm_dp_helper.h | 9 +-
6542 include/drm/drm_edid.h | 5 +-
6543 include/drm/drm_fb_helper.h | 31 +-
6544 include/drm/drm_gem.h | 5 +-
6545 include/drm/drm_modeset_lock.h | 10 +-
6546 include/drm/drm_of.h | 13 +
6547 include/drm/drm_plane_helper.h | 2 -
6548 include/drm/drm_vma_manager.h | 24 +-
6549 include/drm/i915_component.h | 64 +-
6550 include/linux/fb.h | 2 +-
6551 include/linux/vga_switcheroo.h | 103 ++-
6552 include/uapi/drm/Kbuild | 1 +
6553 include/uapi/drm/amdgpu_drm.h | 2 +-
6554 include/uapi/drm/drm_mode.h | 42 +-
6555 include/uapi/drm/i810_drm.h | 2 +
6556 include/uapi/drm/i915_drm.h | 3 +-
6557 include/uapi/drm/r128_drm.h | 2 +
6558 include/uapi/drm/savage_drm.h | 2 +
6559 include/uapi/drm/sis_drm.h | 4 -
6560 include/uapi/drm/via_drm.h | 4 -
6561 include/uapi/drm/virtgpu_drm.h | 167 ++++
6562 include/uapi/linux/virtio_gpu.h | 112 ++-
6563 sound/pci/hda/hda_controller.h | 2 +-
6564 sound/pci/hda/hda_intel.c | 15 +-
6565 sound/pci/hda/hda_intel.h | 2 +-
6566 sound/pci/hda/patch_hdmi.c | 19 +
6567 327 files changed, 18365 insertions(+), 6796 deletions(-)
6568 rename Documentation/DocBook/{drm.tmpl => gpu.tmpl} (97%)
6569 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
6570 create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.c
6571 create mode 100644 drivers/gpu/drm/i915/intel_guc.h
6572 create mode 100644 drivers/gpu/drm/i915/intel_guc_loader.c
6573 create mode 100644 drivers/gpu/drm/vc4/Kconfig
6574 create mode 100644 drivers/gpu/drm/vc4/Makefile
6575 create mode 100644 drivers/gpu/drm/vc4/vc4_bo.c
6576 create mode 100644 drivers/gpu/drm/vc4/vc4_crtc.c
6577 create mode 100644 drivers/gpu/drm/vc4/vc4_debugfs.c
6578 create mode 100644 drivers/gpu/drm/vc4/vc4_drv.c
6579 create mode 100644 drivers/gpu/drm/vc4/vc4_drv.h
6580 create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi.c
6581 create mode 100644 drivers/gpu/drm/vc4/vc4_hvs.c
6582 create mode 100644 drivers/gpu/drm/vc4/vc4_kms.c
6583 create mode 100644 drivers/gpu/drm/vc4/vc4_plane.c
6584 create mode 100644 drivers/gpu/drm/vc4/vc4_regs.h
6585 create mode 100644 drivers/gpu/drm/virtio/virtgpu_ioctl.c
6586 create mode 100644 drivers/gpu/drm/virtio/virtgpu_prime.c
6587 create mode 100644 include/uapi/drm/virtgpu_drm.h
6588 Merging drm-panel/drm/panel/for-next (f1811a8a6413 drm/bridge: ptn3460: Fix coccinelle warnings)
6589 $ git merge drm-panel/drm/panel/for-next
6590 Merge made by the 'recursive' strategy.
6591 drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 -
6592 drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
6593 2 files changed, 2 deletions(-)
6594 Merging drm-intel/for-linux-next (6675bce251b6 drm/i915: disable CPU PWM also on LPT/SPT backlight disable)
6595 $ git merge drm-intel/for-linux-next
6596 Auto-merging drivers/gpu/drm/i915/intel_pm.c
6597 Auto-merging drivers/gpu/drm/i915/i915_irq.c
6598 Merge made by the 'recursive' strategy.
6599 drivers/gpu/drm/i915/i915_irq.c | 7 ++++---
6600 drivers/gpu/drm/i915/intel_panel.c | 14 ++++++++++++++
6601 drivers/gpu/drm/i915/intel_pm.c | 2 +-
6602 3 files changed, 19 insertions(+), 4 deletions(-)
6603 Merging drm-tegra/drm/tegra/for-next (2bcdcbfae289 drm/tegra: dc: Request/free syncpoint at init/exit)
6604 $ git merge drm-tegra/drm/tegra/for-next
6605 Auto-merging drivers/gpu/drm/tegra/dc.c
6606 Merge made by the 'recursive' strategy.
6607 drivers/gpu/drm/tegra/dc.c | 14 +++++++-------
6608 drivers/gpu/drm/tegra/fb.c | 1 -
6609 drivers/gpu/host1x/hw/debug_hw.c | 2 +-
6610 drivers/gpu/host1x/hw/hw_host1x01_sync.h | 8 ++++----
6611 drivers/gpu/host1x/hw/hw_host1x02_sync.h | 8 ++++----
6612 drivers/gpu/host1x/hw/hw_host1x04_sync.h | 8 ++++----
6613 6 files changed, 20 insertions(+), 21 deletions(-)
6614 Merging drm-misc/topic/drm-misc (364b19868ecd drm/dp: add eDP DPCD backlight control bit definitions)
6615 $ git merge drm-misc/topic/drm-misc
6616 Auto-merging drivers/gpu/drm/tegra/fb.c
6617 Merge made by the 'recursive' strategy.
6618 Documentation/DocBook/gpu.tmpl | 48 +++++------------
6619 drivers/gpu/drm/drm_gem.c | 35 ++++++++++--
6620 drivers/gpu/drm/imx/Kconfig | 9 ----
6621 drivers/gpu/drm/imx/imx-drm-core.c | 12 ++---
6622 drivers/gpu/drm/sti/Kconfig | 6 ---
6623 drivers/gpu/drm/sti/sti_drv.c | 2 +-
6624 drivers/gpu/drm/tegra/Kconfig | 12 -----
6625 drivers/gpu/drm/tegra/drm.c | 4 +-
6626 drivers/gpu/drm/tegra/drm.h | 6 +--
6627 drivers/gpu/drm/tegra/fb.c | 12 ++---
6628 include/drm/drm_dp_helper.h | 36 +++++++++++++
6629 include/drm/drm_gem.h | 106 ++++++++++++++++++++++++++++++++-----
6630 12 files changed, 187 insertions(+), 101 deletions(-)
6631 Merging drm-exynos/exynos-drm/for-next (7d9071a09502 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
6632 $ git merge drm-exynos/exynos-drm/for-next
6634 Merging drm-msm/msm-next (a9ee34b70e07 drm/msm: Remove local fbdev emulation Kconfig option)
6635 $ git merge drm-msm/msm-next
6637 Merging sound/for-next (d1482fb335b8 ALSA: firewire-digi00x: add another rawmidi character device for MIDI control ports)
6638 $ git merge sound/for-next
6639 Auto-merging sound/soc/sh/rcar/rcar_snd.h
6640 Removing sound/soc/codecs/hdmi.c
6641 Auto-merging sound/pci/hda/patch_realtek.c
6642 Auto-merging sound/firewire/amdtp-stream.h
6643 Auto-merging sound/firewire/amdtp-stream.c
6644 Auto-merging MAINTAINERS
6645 Removing Documentation/sound/alsa/hda_codec.txt
6646 Merge made by the 'recursive' strategy.
6647 Documentation/DocBook/alsa-driver-api.tmpl | 2 +
6648 Documentation/DocBook/writing-an-alsa-driver.tmpl | 19 +-
6649 Documentation/devicetree/bindings/sound/ak4613.txt | 17 +
6650 Documentation/devicetree/bindings/sound/ak4642.txt | 22 +-
6651 .../devicetree/bindings/sound/atmel-classd.txt | 52 +
6652 Documentation/devicetree/bindings/sound/da7213.txt | 41 +
6653 Documentation/devicetree/bindings/sound/da7219.txt | 106 ++
6654 .../devicetree/bindings/sound/fsl-asoc-card.txt | 10 +-
6655 .../devicetree/bindings/sound/nau8825.txt | 102 +
6656 .../devicetree/bindings/sound/renesas,rsnd.txt | 7 +
6657 .../devicetree/bindings/sound/rockchip-i2s.txt | 6 +-
6658 .../devicetree/bindings/sound/rockchip-spdif.txt | 40 +
6659 Documentation/devicetree/bindings/sound/rt5640.txt | 9 +-
6660 .../devicetree/bindings/sound/sun4i-codec.txt | 27 +
6661 .../devicetree/bindings/sound/tdm-slot.txt | 11 +-
6662 Documentation/sound/alsa/hda_codec.txt | 322 ----
6664 drivers/spi/spi-atmel.c | 21 +-
6665 include/linux/mod_devicetable.h | 8 +
6666 include/sound/da7213.h | 3 -
6667 include/sound/da7219-aad.h | 99 +
6668 include/sound/da7219.h | 55 +
6669 include/sound/designware_i2s.h | 2 +
6670 include/sound/hda_regmap.h | 4 +-
6671 include/sound/hdaudio.h | 19 +-
6672 include/sound/hdaudio_ext.h | 7 +
6673 include/sound/pcm.h | 44 +-
6674 include/sound/pxa2xx-lib.h | 1 -
6675 include/sound/rt5640.h | 3 +-
6676 include/sound/rt5645.h | 2 +
6677 include/sound/simple_card.h | 2 +
6678 include/sound/soc-dai.h | 19 +-
6679 include/sound/soc-dapm.h | 3 +
6680 include/sound/soc.h | 27 +-
6681 include/uapi/sound/asoc.h | 76 +-
6682 include/uapi/sound/asound.h | 4 +-
6683 include/uapi/sound/emu10k1.h | 14 +-
6684 include/uapi/sound/firewire.h | 9 +
6685 include/uapi/sound/hdspm.h | 40 +-
6686 scripts/mod/devicetable-offsets.c | 5 +
6687 scripts/mod/file2alias.c | 17 +
6688 sound/arm/pxa2xx-ac97.c | 13 +-
6689 sound/arm/pxa2xx-pcm-lib.c | 201 +-
6690 sound/arm/pxa2xx-pcm.c | 12 +-
6691 sound/arm/pxa2xx-pcm.h | 2 -
6692 sound/core/Kconfig | 13 +-
6693 sound/core/Makefile | 3 +-
6694 sound/core/oss/mixer_oss.c | 3 +-
6695 sound/core/pcm.c | 3 -
6696 sound/core/pcm_lib.c | 24 +-
6697 sound/core/pcm_native.c | 42 +-
6698 sound/core/seq/oss/seq_oss_readq.c | 6 +-
6699 sound/core/seq/oss/seq_oss_writeq.c | 4 +-
6700 sound/firewire/Kconfig | 27 +
6701 sound/firewire/Makefile | 5 +-
6702 sound/firewire/amdtp-am824.c | 465 +++++
6703 sound/firewire/amdtp-am824.h | 52 +
6704 sound/firewire/{amdtp.c => amdtp-stream.c} | 379 +---
6705 sound/firewire/{amdtp.h => amdtp-stream.h} | 116 +-
6706 sound/firewire/bebob/Makefile | 2 +-
6707 sound/firewire/bebob/bebob.c | 9 +-
6708 sound/firewire/bebob/bebob.h | 34 +-
6709 sound/firewire/bebob/bebob_focusrite.c | 26 +-
6710 sound/firewire/bebob/bebob_maudio.c | 34 +-
6711 sound/firewire/bebob/bebob_midi.c | 16 +-
6712 sound/firewire/bebob/bebob_pcm.c | 16 +-
6713 sound/firewire/bebob/bebob_proc.c | 6 +-
6714 sound/firewire/bebob/bebob_stream.c | 40 +-
6715 sound/firewire/bebob/bebob_terratec.c | 10 +-
6716 sound/firewire/bebob/bebob_yamaha.c | 6 +-
6717 sound/firewire/dice/Makefile | 2 +-
6718 sound/firewire/dice/dice-midi.c | 12 +-
6719 sound/firewire/dice/dice-pcm.c | 12 +-
6720 sound/firewire/dice/dice-stream.c | 34 +-
6721 sound/firewire/dice/dice.c | 3 +-
6722 sound/firewire/dice/dice.h | 2 +-
6723 sound/firewire/digi00x/Makefile | 4 +
6724 sound/firewire/digi00x/amdtp-dot.c | 442 +++++
6725 sound/firewire/digi00x/digi00x-hwdep.c | 200 ++
6726 sound/firewire/digi00x/digi00x-midi.c | 223 +++
6727 sound/firewire/digi00x/digi00x-pcm.c | 373 ++++
6728 sound/firewire/digi00x/digi00x-proc.c | 99 +
6729 sound/firewire/digi00x/digi00x-stream.c | 422 +++++
6730 sound/firewire/digi00x/digi00x-transaction.c | 137 ++
6731 sound/firewire/digi00x/digi00x.c | 170 ++
6732 sound/firewire/digi00x/digi00x.h | 157 ++
6733 sound/firewire/fcp.c | 2 +-
6734 sound/firewire/fireworks/Makefile | 2 +-
6735 sound/firewire/fireworks/fireworks.c | 12 +-
6736 sound/firewire/fireworks/fireworks.h | 2 +-
6737 sound/firewire/fireworks/fireworks_command.c | 2 +-
6738 sound/firewire/fireworks/fireworks_midi.c | 12 +-
6739 sound/firewire/fireworks/fireworks_pcm.c | 12 +-
6740 sound/firewire/fireworks/fireworks_stream.c | 8 +-
6741 sound/firewire/lib.c | 142 ++
6742 sound/firewire/lib.h | 56 +
6743 sound/firewire/oxfw/Makefile | 2 +-
6744 sound/firewire/oxfw/oxfw-midi.c | 40 +-
6745 sound/firewire/oxfw/oxfw-pcm.c | 10 +-
6746 sound/firewire/oxfw/oxfw-stream.c | 53 +-
6747 sound/firewire/oxfw/oxfw.c | 46 +
6748 sound/firewire/oxfw/oxfw.h | 3 +-
6749 sound/firewire/tascam/Makefile | 4 +
6750 sound/firewire/tascam/amdtp-tascam.c | 243 +++
6751 sound/firewire/tascam/tascam-hwdep.c | 201 ++
6752 sound/firewire/tascam/tascam-midi.c | 135 ++
6753 sound/firewire/tascam/tascam-pcm.c | 312 ++++
6754 sound/firewire/tascam/tascam-proc.c | 88 +
6755 sound/firewire/tascam/tascam-stream.c | 496 +++++
6756 sound/firewire/tascam/tascam-transaction.c | 302 +++
6757 sound/firewire/tascam/tascam.c | 209 +++
6758 sound/firewire/tascam/tascam.h | 147 ++
6759 sound/hda/ext/hdac_ext_stream.c | 9 +-
6760 sound/hda/hda_bus_type.c | 13 +
6761 sound/hda/hdac_bus.c | 14 +
6762 sound/hda/hdac_device.c | 124 +-
6763 sound/hda/hdac_i915.c | 70 +
6764 sound/hda/hdac_regmap.c | 10 +
6765 sound/hda/hdac_stream.c | 3 +-
6766 sound/hda/hdac_sysfs.c | 8 +
6767 sound/pci/cs46xx/cs46xx_lib.c | 9 +-
6768 sound/pci/hda/hda_bind.c | 69 +-
6769 sound/pci/hda/hda_codec.c | 44 -
6770 sound/pci/hda/hda_codec.h | 44 +-
6771 sound/pci/hda/hda_controller.c | 1 +
6772 sound/pci/hda/hda_generic.c | 7 +-
6773 sound/pci/hda/hda_local.h | 7 +-
6774 sound/pci/hda/hda_sysfs.c | 3 +-
6775 sound/pci/hda/patch_analog.c | 37 +-
6776 sound/pci/hda/patch_ca0110.c | 15 +-
6777 sound/pci/hda/patch_ca0132.c | 15 +-
6778 sound/pci/hda/patch_cirrus.c | 22 +-
6779 sound/pci/hda/patch_cmedia.c | 15 +-
6780 sound/pci/hda/patch_conexant.c | 118 +-
6781 sound/pci/hda/patch_hdmi.c | 201 +-
6782 sound/pci/hda/patch_realtek.c | 134 +-
6783 sound/pci/hda/patch_si3054.c | 39 +-
6784 sound/pci/hda/patch_sigmatel.c | 214 ++-
6785 sound/pci/hda/patch_via.c | 171 +-
6786 sound/pci/korg1212/korg1212.c | 8 +-
6787 sound/pci/lx6464es/lx6464es.c | 4 +-
6788 sound/pci/rme32.c | 4 +-
6789 sound/pci/rme96.c | 8 +-
6790 sound/pci/rme9652/hdsp.c | 1 +
6791 sound/pci/rme9652/hdspm.c | 9 +-
6792 sound/soc/Kconfig | 6 +-
6793 sound/soc/Makefile | 4 +-
6794 sound/soc/atmel/Kconfig | 9 +
6795 sound/soc/atmel/Makefile | 2 +
6796 sound/soc/atmel/atmel-classd.c | 679 +++++++
6797 sound/soc/atmel/atmel-classd.h | 120 ++
6798 sound/soc/atmel/atmel_wm8904.c | 1 +
6799 sound/soc/au1x/db1000.c | 10 +-
6800 sound/soc/au1x/db1200.c | 10 +-
6801 sound/soc/blackfin/bf5xx-ad1836.c | 11 +-
6802 sound/soc/blackfin/bfin-eval-adau1373.c | 12 +-
6803 sound/soc/blackfin/bfin-eval-adau1701.c | 12 +-
6804 sound/soc/blackfin/bfin-eval-adav80x.c | 12 +-
6805 sound/soc/codecs/Kconfig | 23 +-
6806 sound/soc/codecs/Makefile | 10 +-
6807 sound/soc/codecs/ad193x-i2c.c | 8 +-
6808 sound/soc/codecs/ad193x-spi.c | 16 +-
6809 sound/soc/codecs/ad193x.c | 128 +-
6810 sound/soc/codecs/ad193x.h | 9 +-
6811 sound/soc/codecs/adav80x.c | 4 +-
6812 sound/soc/codecs/ak4613.c | 497 +++++
6813 sound/soc/codecs/ak4642.c | 153 +-
6814 sound/soc/codecs/arizona.c | 49 +
6815 sound/soc/codecs/arizona.h | 14 +-
6816 sound/soc/codecs/da7213.c | 190 +-
6817 sound/soc/codecs/da7213.h | 8 +-
6818 sound/soc/codecs/da7219-aad.c | 823 ++++++++
6819 sound/soc/codecs/da7219-aad.h | 212 +++
6820 sound/soc/codecs/da7219.c | 1955 ++++++++++++++++++++
6821 sound/soc/codecs/da7219.h | 820 ++++++++
6822 sound/soc/codecs/es8328.c | 2 +-
6823 sound/soc/codecs/hdmi.c | 109 --
6824 sound/soc/codecs/nau8825.c | 1309 +++++++++++++
6825 sound/soc/codecs/nau8825.h | 341 ++++
6826 sound/soc/codecs/rl6347a.c | 19 +-
6827 sound/soc/codecs/rl6347a.h | 2 +
6828 sound/soc/codecs/rt286.c | 9 +-
6829 sound/soc/codecs/rt298.c | 11 +-
6830 sound/soc/codecs/rt5640.c | 22 +-
6831 sound/soc/codecs/rt5645.c | 172 +-
6832 sound/soc/codecs/rt5645.h | 30 +-
6833 sound/soc/codecs/ssm2518.c | 6 -
6834 sound/soc/codecs/tlv320aic3x.c | 30 +-
6835 sound/soc/codecs/twl4030.c | 13 +-
6836 sound/soc/codecs/uda134x.c | 6 +-
6837 sound/soc/codecs/wl1273.c | 9 +-
6838 sound/soc/codecs/wm2000.c | 4 +-
6839 sound/soc/codecs/wm5110.c | 187 +-
6840 sound/soc/codecs/wm8731.c | 2 +-
6841 sound/soc/codecs/wm8903.c | 2 +-
6842 sound/soc/codecs/wm8904.c | 2 +-
6843 sound/soc/codecs/wm8955.c | 2 +-
6844 sound/soc/codecs/wm8960.c | 2 +-
6845 sound/soc/codecs/wm8998.c | 1430 ++++++++++++++
6846 sound/soc/codecs/wm8998.h | 23 +
6847 sound/soc/davinci/davinci-mcasp.c | 305 +--
6848 sound/soc/dwc/designware_i2s.c | 123 +-
6849 sound/soc/fsl/fsl-asoc-card.c | 141 +-
6850 sound/soc/fsl/fsl_esai.c | 88 +
6851 sound/soc/fsl/fsl_sai.c | 38 +-
6852 sound/soc/fsl/fsl_spdif.c | 73 +
6853 sound/soc/fsl/fsl_ssi.c | 102 +
6854 sound/soc/fsl/imx-spdif.c | 1 +
6855 sound/soc/generic/simple-card.c | 8 +-
6856 sound/soc/intel/Kconfig | 15 +
6857 sound/soc/intel/atom/sst-mfld-platform-pcm.c | 19 +-
6858 sound/soc/intel/boards/Makefile | 2 +
6859 sound/soc/intel/boards/broadwell.c | 9 +-
6860 sound/soc/intel/boards/bytcr_rt5640.c | 14 +-
6861 sound/soc/intel/boards/cht_bsw_max98090_ti.c | 14 +-
6862 sound/soc/intel/boards/cht_bsw_rt5645.c | 14 +-
6863 sound/soc/intel/boards/cht_bsw_rt5672.c | 14 +-
6864 sound/soc/intel/boards/skl_rt286.c | 259 +++
6865 sound/soc/intel/common/Makefile | 6 +-
6866 sound/soc/intel/common/sst-dsp-priv.h | 1 +
6867 sound/soc/intel/common/sst-dsp.c | 2 +
6868 sound/soc/intel/common/sst-dsp.h | 2 +
6869 sound/soc/intel/common/sst-firmware.c | 10 +-
6870 sound/soc/intel/skylake/Makefile | 3 +-
6871 sound/soc/intel/skylake/skl-messages.c | 44 +-
6872 sound/soc/intel/skylake/skl-nhlt.c | 10 +-
6873 sound/soc/intel/skylake/skl-pcm.c | 176 +-
6874 sound/soc/intel/skylake/skl-sst-dsp.c | 7 +-
6875 sound/soc/intel/skylake/skl-sst-ipc.c | 12 +
6876 sound/soc/intel/skylake/skl-sst-ipc.h | 1 +
6877 sound/soc/intel/skylake/skl-sst.c | 56 +-
6878 sound/soc/intel/skylake/skl-topology.c | 1252 +++++++++++++
6879 sound/soc/intel/skylake/skl-topology.h | 36 +-
6880 sound/soc/intel/skylake/skl-tplg-interface.h | 83 +
6881 sound/soc/intel/skylake/skl.c | 32 +-
6882 sound/soc/intel/skylake/skl.h | 17 +-
6883 sound/soc/jz4740/jz4740-i2s.c | 1 +
6884 sound/soc/kirkwood/armada-370-db.c | 1 +
6885 sound/soc/mediatek/mt8173-max98090.c | 11 +-
6886 sound/soc/mediatek/mt8173-rt5650-rt5676.c | 11 +-
6887 sound/soc/mxs/mxs-sgtl5000.c | 6 +-
6888 sound/soc/omap/n810.c | 3 +-
6889 sound/soc/omap/rx51.c | 5 +-
6890 sound/soc/pxa/brownstone.c | 9 +-
6891 sound/soc/pxa/corgi.c | 11 +-
6892 sound/soc/pxa/e740_wm9705.c | 5 +-
6893 sound/soc/pxa/e750_wm9705.c | 5 +-
6894 sound/soc/pxa/e800_wm9712.c | 5 +-
6895 sound/soc/pxa/hx4700.c | 4 +-
6896 sound/soc/pxa/imote2.c | 11 +-
6897 sound/soc/pxa/mioa701_wm9713.c | 11 +-
6898 sound/soc/pxa/palm27x.c | 9 +-
6899 sound/soc/pxa/poodle.c | 11 +-
6900 sound/soc/pxa/pxa-ssp.c | 1 +
6901 sound/soc/pxa/pxa2xx-ac97.c | 49 +-
6902 sound/soc/pxa/pxa2xx-i2s.c | 3 +
6903 sound/soc/pxa/pxa2xx-pcm.c | 33 +-
6904 sound/soc/pxa/spitz.c | 5 +-
6905 sound/soc/pxa/tosa.c | 5 +-
6906 sound/soc/pxa/ttc-dkb.c | 12 +-
6907 sound/soc/qcom/lpass-cpu.c | 3 +-
6908 sound/soc/rockchip/Kconfig | 12 +-
6909 sound/soc/rockchip/Makefile | 6 +-
6910 sound/soc/rockchip/rockchip_i2s.c | 48 +-
6911 sound/soc/rockchip/rockchip_i2s.h | 16 +
6912 sound/soc/rockchip/rockchip_spdif.c | 405 ++++
6913 sound/soc/rockchip/rockchip_spdif.h | 63 +
6914 sound/soc/samsung/h1940_uda1380.c | 5 +-
6915 sound/soc/samsung/rx1950_uda1380.c | 5 +-
6916 sound/soc/sh/Kconfig | 3 +-
6917 sound/soc/sh/rcar/adg.c | 306 ++-
6918 sound/soc/sh/rcar/core.c | 66 +-
6919 sound/soc/sh/rcar/ctu.c | 16 +-
6920 sound/soc/sh/rcar/dma.c | 2 +-
6921 sound/soc/sh/rcar/dvc.c | 16 +-
6922 sound/soc/sh/rcar/gen.c | 14 +-
6923 sound/soc/sh/rcar/mix.c | 16 +-
6924 {include/sound => sound/soc/sh/rcar}/rcar_snd.h | 1 -
6925 sound/soc/sh/rcar/rsnd.h | 29 +-
6926 sound/soc/sh/rcar/src.c | 27 +-
6927 sound/soc/sh/rcar/ssi.c | 113 +-
6928 sound/soc/sh/siu_dai.c | 85 +-
6929 sound/soc/soc-compress.c | 12 +-
6930 sound/soc/soc-core.c | 29 +-
6931 sound/soc/soc-dapm.c | 59 +-
6932 sound/soc/soc-ops.c | 8 +-
6933 sound/soc/soc-pcm.c | 59 +-
6934 sound/soc/soc-topology.c | 4 +-
6935 sound/soc/sunxi/Kconfig | 11 +
6936 sound/soc/sunxi/Makefile | 2 +
6937 sound/soc/sunxi/sun4i-codec.c | 712 +++++++
6938 sound/soc/ux500/mop500.c | 1 +
6939 sound/soc/ux500/ux500_msp_dai.c | 5 +-
6940 sound/usb/card.h | 1 +
6941 sound/usb/endpoint.c | 92 +-
6942 sound/usb/midi.c | 11 +-
6943 sound/usb/mixer_quirks.c | 2 +-
6944 sound/usb/pcm.c | 74 +-
6945 sound/usb/quirks-table.h | 23 +-
6946 sound/usb/quirks.c | 3 +
6947 sound/usb/stream.c | 1 +
6948 sound/usb/usbaudio.h | 1 +
6949 302 files changed, 20961 insertions(+), 3303 deletions(-)
6950 create mode 100644 Documentation/devicetree/bindings/sound/ak4613.txt
6951 create mode 100644 Documentation/devicetree/bindings/sound/atmel-classd.txt
6952 create mode 100644 Documentation/devicetree/bindings/sound/da7213.txt
6953 create mode 100644 Documentation/devicetree/bindings/sound/da7219.txt
6954 create mode 100644 Documentation/devicetree/bindings/sound/nau8825.txt
6955 create mode 100644 Documentation/devicetree/bindings/sound/rockchip-spdif.txt
6956 create mode 100644 Documentation/devicetree/bindings/sound/sun4i-codec.txt
6957 delete mode 100644 Documentation/sound/alsa/hda_codec.txt
6958 create mode 100644 include/sound/da7219-aad.h
6959 create mode 100644 include/sound/da7219.h
6960 create mode 100644 sound/firewire/amdtp-am824.c
6961 create mode 100644 sound/firewire/amdtp-am824.h
6962 rename sound/firewire/{amdtp.c => amdtp-stream.c} (70%)
6963 rename sound/firewire/{amdtp.h => amdtp-stream.h} (78%)
6964 create mode 100644 sound/firewire/digi00x/Makefile
6965 create mode 100644 sound/firewire/digi00x/amdtp-dot.c
6966 create mode 100644 sound/firewire/digi00x/digi00x-hwdep.c
6967 create mode 100644 sound/firewire/digi00x/digi00x-midi.c
6968 create mode 100644 sound/firewire/digi00x/digi00x-pcm.c
6969 create mode 100644 sound/firewire/digi00x/digi00x-proc.c
6970 create mode 100644 sound/firewire/digi00x/digi00x-stream.c
6971 create mode 100644 sound/firewire/digi00x/digi00x-transaction.c
6972 create mode 100644 sound/firewire/digi00x/digi00x.c
6973 create mode 100644 sound/firewire/digi00x/digi00x.h
6974 create mode 100644 sound/firewire/tascam/Makefile
6975 create mode 100644 sound/firewire/tascam/amdtp-tascam.c
6976 create mode 100644 sound/firewire/tascam/tascam-hwdep.c
6977 create mode 100644 sound/firewire/tascam/tascam-midi.c
6978 create mode 100644 sound/firewire/tascam/tascam-pcm.c
6979 create mode 100644 sound/firewire/tascam/tascam-proc.c
6980 create mode 100644 sound/firewire/tascam/tascam-stream.c
6981 create mode 100644 sound/firewire/tascam/tascam-transaction.c
6982 create mode 100644 sound/firewire/tascam/tascam.c
6983 create mode 100644 sound/firewire/tascam/tascam.h
6984 create mode 100644 sound/soc/atmel/atmel-classd.c
6985 create mode 100644 sound/soc/atmel/atmel-classd.h
6986 create mode 100644 sound/soc/codecs/ak4613.c
6987 create mode 100644 sound/soc/codecs/da7219-aad.c
6988 create mode 100644 sound/soc/codecs/da7219-aad.h
6989 create mode 100644 sound/soc/codecs/da7219.c
6990 create mode 100644 sound/soc/codecs/da7219.h
6991 delete mode 100644 sound/soc/codecs/hdmi.c
6992 create mode 100644 sound/soc/codecs/nau8825.c
6993 create mode 100644 sound/soc/codecs/nau8825.h
6994 create mode 100644 sound/soc/codecs/wm8998.c
6995 create mode 100644 sound/soc/codecs/wm8998.h
6996 create mode 100644 sound/soc/intel/boards/skl_rt286.c
6997 create mode 100644 sound/soc/intel/skylake/skl-topology.c
6998 create mode 100644 sound/soc/rockchip/rockchip_spdif.c
6999 create mode 100644 sound/soc/rockchip/rockchip_spdif.h
7000 rename {include/sound => sound/soc/sh/rcar}/rcar_snd.h (98%)
7001 create mode 100644 sound/soc/sunxi/Kconfig
7002 create mode 100644 sound/soc/sunxi/Makefile
7003 create mode 100644 sound/soc/sunxi/sun4i-codec.c
7004 Merging sound-asoc/for-next (053940a66b99 Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next)
7005 $ git merge sound-asoc/for-next
7006 Auto-merging sound/soc/soc-pcm.c
7007 Merge made by the 'recursive' strategy.
7008 .../devicetree/bindings/sound/renesas,rsnd.txt | 2 +
7009 .../bindings/sound/renesas,rsrc-card.txt | 4 +-
7010 Documentation/devicetree/bindings/sound/rt5677.txt | 2 +-
7011 sound/soc/codecs/da7219.c | 2 +-
7012 sound/soc/codecs/rt5677.c | 8 +-
7013 sound/soc/codecs/wm8962.c | 3 +-
7014 sound/soc/fsl/fsl_esai.c | 44 +--
7015 sound/soc/fsl/fsl_sai.c | 23 +-
7016 sound/soc/fsl/fsl_spdif.c | 16 +-
7017 sound/soc/fsl/fsl_ssi.c | 22 +-
7018 sound/soc/intel/boards/skl_rt286.c | 5 +-
7019 sound/soc/intel/skylake/skl-messages.c | 189 ++++-----
7020 sound/soc/intel/skylake/skl-nhlt.c | 19 +-
7021 sound/soc/intel/skylake/skl-pcm.c | 139 ++++---
7022 sound/soc/intel/skylake/skl-sst-ipc.c | 2 +-
7023 sound/soc/intel/skylake/skl-topology.c | 387 ++++++++++---------
7024 sound/soc/intel/skylake/skl-topology.h | 35 +-
7025 sound/soc/intel/skylake/skl-tplg-interface.h | 90 ++++-
7026 sound/soc/intel/skylake/skl.c | 63 +--
7027 sound/soc/intel/skylake/skl.h | 1 -
7028 sound/soc/sh/rcar/Makefile | 2 +-
7029 sound/soc/sh/rcar/adg.c | 2 +-
7030 sound/soc/sh/rcar/cmd.c | 153 ++++++++
7031 sound/soc/sh/rcar/core.c | 155 ++------
7032 sound/soc/sh/rcar/ctu.c | 8 +
7033 sound/soc/sh/rcar/dma.c | 240 +++++++-----
7034 sound/soc/sh/rcar/dvc.c | 18 +-
7035 sound/soc/sh/rcar/mix.c | 10 +-
7036 sound/soc/sh/rcar/rsnd.h | 88 +++--
7037 sound/soc/sh/rcar/src.c | 179 ++-------
7038 sound/soc/sh/rcar/ssi.c | 423 +++++++++++----------
7039 sound/soc/sh/rcar/ssiu.c | 181 +++++++++
7040 sound/soc/soc-ops.c | 2 +-
7041 sound/soc/soc-pcm.c | 3 +-
7042 34 files changed, 1424 insertions(+), 1096 deletions(-)
7043 create mode 100644 sound/soc/sh/rcar/cmd.c
7044 create mode 100644 sound/soc/sh/rcar/ssiu.c
7045 Merging modules/modules-next (d1189c63ea5e scripts: [modpost] add new sections to white list)
7046 $ git merge modules/modules-next
7047 Resolved 'scripts/Makefile.modpost' using previous resolution.
7048 Auto-merging scripts/Makefile.modpost
7049 CONFLICT (content): Merge conflict in scripts/Makefile.modpost
7050 Auto-merging lib/Kconfig.debug
7051 Automatic merge failed; fix conflicts and then commit the result.
7053 [master 69070d4dd486] Merge remote-tracking branch 'modules/modules-next'
7054 $ git diff -M --stat --summary HEAD^..
7055 kernel/params.c | 17 +++++++++--------
7056 lib/Kconfig.debug | 9 +++++++++
7057 scripts/Makefile.modpost | 1 +
7058 scripts/mod/modpost.c | 37 ++++++++++++++++++++++++++++++-------
7059 4 files changed, 49 insertions(+), 15 deletions(-)
7060 Merging input/next (bf5f18d70880 Input: evdev - fix bug in checking duplicate clock change request)
7061 $ git merge input/next
7062 Auto-merging include/uapi/linux/Kbuild
7063 Removing include/linux/input/edt-ft5x06.h
7064 Auto-merging drivers/input/touchscreen/ads7846.c
7065 Auto-merging drivers/input/touchscreen/Kconfig
7066 Auto-merging drivers/hid/Makefile
7067 Auto-merging drivers/hid/Kconfig
7068 Auto-merging arch/arm/boot/dts/am437x-sk-evm.dts
7069 Auto-merging MAINTAINERS
7070 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
7071 Merge made by the 'recursive' strategy.
7072 .../devicetree/bindings/input/da9062-onkey.txt | 32 +
7073 .../devicetree/bindings/input/gpio-keys-polled.txt | 9 +-
7074 .../devicetree/bindings/input/rotary-encoder.txt | 10 +
7075 .../bindings/input/touchscreen/edt-ft5x06.txt | 8 +-
7076 .../input/touchscreen/focaltech-ft6236.txt | 35 +
7077 .../devicetree/bindings/vendor-prefixes.txt | 1 +
7078 Documentation/input/rotary-encoder.txt | 9 +-
7079 Documentation/input/userio.txt | 70 ++
7081 arch/arm/boot/dts/am437x-sk-evm.dts | 2 +-
7082 arch/arm/boot/dts/imx28-tx28.dts | 3 +-
7083 arch/arm/boot/dts/imx53-tx53-x03x.dts | 3 +-
7084 arch/arm/boot/dts/imx6qdl-tx6.dtsi | 3 +-
7085 drivers/hid/Kconfig | 6 +
7086 drivers/hid/Makefile | 1 +
7087 drivers/hid/hid-gfrm.c | 158 +++
7088 drivers/input/evdev.c | 270 ++++-
7089 drivers/input/ff-core.c | 9 +-
7090 drivers/input/input.c | 25 +-
7091 drivers/input/joydev.c | 22 +-
7092 drivers/input/joystick/db9.c | 113 +-
7093 drivers/input/joystick/gamecon.c | 103 +-
7094 drivers/input/joystick/turbografx.c | 104 +-
7095 drivers/input/joystick/walkera0701.c | 64 +-
7096 drivers/input/joystick/xpad.c | 534 +++++----
7097 drivers/input/keyboard/Kconfig | 2 +-
7098 drivers/input/keyboard/gpio_keys.c | 8 +-
7099 drivers/input/keyboard/gpio_keys_polled.c | 88 +-
7100 drivers/input/keyboard/nomadik-ske-keypad.c | 2 +-
7101 drivers/input/keyboard/snvs_pwrkey.c | 3 +-
7102 drivers/input/keyboard/tegra-kbc.c | 5 +-
7103 drivers/input/misc/Kconfig | 12 +-
7104 drivers/input/misc/ad714x-i2c.c | 10 -
7105 drivers/input/misc/ad714x-spi.c | 10 -
7106 drivers/input/misc/ad714x.c | 214 ++--
7107 drivers/input/misc/ad714x.h | 1 -
7108 drivers/input/misc/da9063_onkey.c | 129 ++-
7109 drivers/input/misc/hp_sdc_rtc.c | 52 +-
7110 drivers/input/misc/kxtj9.c | 3 +-
7111 drivers/input/misc/rotary_encoder.c | 129 ++-
7112 drivers/input/misc/xen-kbdfront.c | 10 +-
7113 drivers/input/serio/Kconfig | 14 +
7114 drivers/input/serio/Makefile | 1 +
7115 drivers/input/serio/parkbd.c | 55 +-
7116 drivers/input/serio/userio.c | 285 +++++
7117 drivers/input/touchscreen/Kconfig | 24 +
7118 drivers/input/touchscreen/Makefile | 2 +
7119 drivers/input/touchscreen/ads7846.c | 4 +-
7120 drivers/input/touchscreen/auo-pixcir-ts.c | 7 +-
7121 drivers/input/touchscreen/cyttsp4_i2c.c | 5 +-
7122 drivers/input/touchscreen/edt-ft5x06.c | 246 ++--
7123 drivers/input/touchscreen/ft6236.c | 326 ++++++
7124 drivers/input/touchscreen/pixcir_i2c_ts.c | 12 -
7125 drivers/input/touchscreen/rohm_bu21023.c | 1218 ++++++++++++++++++++
7126 drivers/input/touchscreen/tps6507x-ts.c | 9 +-
7127 drivers/input/touchscreen/zforce_ts.c | 7 +-
7128 include/dt-bindings/input/input.h | 510 +-------
7129 include/dt-bindings/input/linux-event-codes.h | 1 +
7130 include/linux/input.h | 2 +
7131 include/linux/input/edt-ft5x06.h | 24 -
7132 include/linux/miscdevice.h | 1 +
7133 include/linux/rotary_encoder.h | 3 +-
7134 include/uapi/linux/Kbuild | 1 +
7135 include/uapi/linux/input-event-codes.h | 805 +++++++++++++
7136 include/uapi/linux/input.h | 850 ++------------
7137 include/uapi/linux/userio.h | 44 +
7138 66 files changed, 4480 insertions(+), 2254 deletions(-)
7139 create mode 100644 Documentation/devicetree/bindings/input/da9062-onkey.txt
7140 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt
7141 create mode 100644 Documentation/input/userio.txt
7142 create mode 100644 drivers/hid/hid-gfrm.c
7143 create mode 100644 drivers/input/serio/userio.c
7144 create mode 100644 drivers/input/touchscreen/ft6236.c
7145 create mode 100644 drivers/input/touchscreen/rohm_bu21023.c
7146 create mode 120000 include/dt-bindings/input/linux-event-codes.h
7147 delete mode 100644 include/linux/input/edt-ft5x06.h
7148 create mode 100644 include/uapi/linux/input-event-codes.h
7149 create mode 100644 include/uapi/linux/userio.h
7150 Merging block/for-next (7c06c5a6bee7 Merge branch 'for-4.4/core' into for-next)
7151 $ git merge block/for-next
7152 Resolved 'drivers/nvme/host/pci.c' using previous resolution.
7153 Removing include/uapi/linux/nvme.h
7154 Auto-merging fs/mpage.c
7155 Auto-merging drivers/nvme/host/scsi.c
7156 Auto-merging drivers/nvme/host/pci.c
7157 CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
7158 Auto-merging drivers/md/raid10.c
7159 Auto-merging drivers/md/raid1.c
7160 Auto-merging drivers/md/md.c
7161 Auto-merging drivers/md/dm.c
7162 Auto-merging block/blk-sysfs.c
7163 Auto-merging block/blk-mq.c
7164 Auto-merging block/blk-mq-tag.c
7165 Auto-merging block/blk-core.c
7166 Auto-merging MAINTAINERS
7167 Automatic merge failed; fix conflicts and then commit the result.
7169 [master 3486b0477150] Merge remote-tracking branch 'block/for-next'
7170 $ git diff -M --stat --summary HEAD^..
7171 Documentation/ABI/testing/sysfs-block | 7 +
7172 Documentation/block/pr.txt | 119 ++
7173 Documentation/ioctl/ioctl-number.txt | 1 +
7175 block/bio-integrity.c | 17 +-
7176 block/blk-core.c | 106 +-
7177 block/blk-integrity.c | 192 ++--
7178 block/blk-merge.c | 32 +-
7179 block/blk-mq-sysfs.c | 6 -
7180 block/blk-mq-tag.c | 4 +
7181 block/blk-mq.c | 122 +--
7182 block/blk-mq.h | 2 -
7183 block/blk-sysfs.c | 3 +-
7185 block/elevator.c | 2 +-
7187 block/ioctl.c | 330 ++++--
7188 block/partition-generic.c | 1 +
7189 block/t10-pi.c | 16 +-
7190 drivers/Kconfig | 4 +
7191 drivers/Makefile | 2 +
7192 drivers/block/Kconfig | 11 -
7193 drivers/block/Makefile | 2 -
7194 drivers/block/loop.c | 274 ++++-
7195 drivers/block/loop.h | 13 +-
7196 drivers/cdrom/cdrom.c | 1 +
7197 drivers/lightnvm/Kconfig | 42 +
7198 drivers/lightnvm/Makefile | 7 +
7199 drivers/lightnvm/core.c | 826 ++++++++++++++
7200 drivers/lightnvm/gennvm.c | 485 +++++++++
7201 drivers/lightnvm/gennvm.h | 46 +
7202 drivers/lightnvm/rrpc.c | 1324 +++++++++++++++++++++++
7203 drivers/lightnvm/rrpc.h | 239 ++++
7204 drivers/md/dm-table.c | 88 +-
7205 drivers/md/dm.c | 2 -
7206 drivers/md/md.c | 11 +-
7207 drivers/md/multipath.c | 2 +
7208 drivers/md/raid1.c | 2 +
7209 drivers/md/raid10.c | 2 +
7210 drivers/nvdimm/btt.c | 1 -
7211 drivers/nvdimm/core.c | 21 +-
7212 drivers/nvme/Kconfig | 1 +
7213 drivers/nvme/Makefile | 2 +
7214 drivers/nvme/host/Kconfig | 10 +
7215 drivers/nvme/host/Makefile | 4 +
7216 drivers/nvme/host/lightnvm.c | 526 +++++++++
7217 drivers/nvme/host/nvme.h | 143 +++
7218 drivers/{block/nvme-core.c => nvme/host/pci.c} | 379 ++++---
7219 drivers/{block/nvme-scsi.c => nvme/host/scsi.c} | 2 +-
7220 drivers/scsi/sd.c | 97 +-
7221 drivers/scsi/sd_dif.c | 31 +-
7222 drivers/target/target_core_iblock.c | 10 +-
7223 fs/block_dev.c | 2 +-
7224 fs/direct-io.c | 9 +-
7226 include/linux/blk-mq.h | 1 -
7227 include/linux/blkdev.h | 50 +-
7228 include/linux/genhd.h | 26 +-
7229 include/linux/lightnvm.h | 522 +++++++++
7230 include/linux/nvme.h | 624 +++++++++--
7231 include/linux/pr.h | 18 +
7232 include/linux/t10-pi.h | 8 +-
7233 include/uapi/linux/lightnvm.h | 130 +++
7234 include/uapi/linux/loop.h | 2 +
7235 include/uapi/linux/nvme.h | 589 ----------
7236 include/uapi/linux/nvme_ioctl.h | 65 ++
7237 include/uapi/linux/pr.h | 48 +
7238 kernel/trace/blktrace.c | 16 +-
7239 68 files changed, 6346 insertions(+), 1398 deletions(-)
7240 create mode 100644 Documentation/block/pr.txt
7241 create mode 100644 drivers/lightnvm/Kconfig
7242 create mode 100644 drivers/lightnvm/Makefile
7243 create mode 100644 drivers/lightnvm/core.c
7244 create mode 100644 drivers/lightnvm/gennvm.c
7245 create mode 100644 drivers/lightnvm/gennvm.h
7246 create mode 100644 drivers/lightnvm/rrpc.c
7247 create mode 100644 drivers/lightnvm/rrpc.h
7248 create mode 100644 drivers/nvme/Kconfig
7249 create mode 100644 drivers/nvme/Makefile
7250 create mode 100644 drivers/nvme/host/Kconfig
7251 create mode 100644 drivers/nvme/host/Makefile
7252 create mode 100644 drivers/nvme/host/lightnvm.c
7253 create mode 100644 drivers/nvme/host/nvme.h
7254 rename drivers/{block/nvme-core.c => nvme/host/pci.c} (93%)
7255 rename drivers/{block/nvme-scsi.c => nvme/host/scsi.c} (99%)
7256 create mode 100644 include/linux/lightnvm.h
7257 create mode 100644 include/linux/pr.h
7258 create mode 100644 include/uapi/linux/lightnvm.h
7259 delete mode 100644 include/uapi/linux/nvme.h
7260 create mode 100644 include/uapi/linux/nvme_ioctl.h
7261 create mode 100644 include/uapi/linux/pr.h
7262 Merging device-mapper/for-next (aad9ae455075 dm switch: simplify conditional in alloc_region_table())
7263 $ git merge device-mapper/for-next
7264 Auto-merging drivers/md/persistent-data/dm-btree.c
7265 Auto-merging drivers/md/persistent-data/dm-btree-remove.c
7266 Auto-merging drivers/md/dm.c
7267 Auto-merging drivers/md/dm-snap-persistent.c
7268 Auto-merging drivers/md/dm-exception-store.c
7269 Auto-merging drivers/md/dm-cache-policy-cleaner.c
7270 Auto-merging drivers/md/dm-cache-metadata.c
7271 Merge made by the 'recursive' strategy.
7272 Documentation/device-mapper/delay.txt | 1 +
7273 drivers/md/dm-bufio.c | 18 +-
7274 drivers/md/dm-cache-metadata.c | 8 +-
7275 drivers/md/dm-cache-policy-cleaner.c | 2 +-
7276 drivers/md/dm-cache-policy-mq.c | 2 +-
7277 drivers/md/dm-cache-policy-smq.c | 2 +-
7278 drivers/md/dm-cache-target.c | 3 +-
7279 drivers/md/dm-crypt.c | 6 +-
7280 drivers/md/dm-delay.c | 7 +-
7281 drivers/md/dm-era-target.c | 15 +-
7282 drivers/md/dm-exception-store.c | 2 +-
7283 drivers/md/dm-flakey.c | 16 +-
7284 drivers/md/dm-io.c | 3 +-
7285 drivers/md/dm-linear.c | 20 +-
7286 drivers/md/dm-log-userspace-base.c | 3 +-
7287 drivers/md/dm-log-writes.c | 13 +-
7288 drivers/md/dm-mpath.c | 34 ++--
7289 drivers/md/dm-region-hash.c | 6 +-
7290 drivers/md/dm-snap-persistent.c | 2 +-
7291 drivers/md/dm-switch.c | 25 ++-
7292 drivers/md/dm-thin-metadata.c | 16 +-
7293 drivers/md/dm-verity.c | 15 +-
7294 drivers/md/dm.c | 209 ++++++++++++++++++---
7295 drivers/md/persistent-data/dm-array.c | 4 +-
7296 drivers/md/persistent-data/dm-block-manager.c | 4 +-
7297 drivers/md/persistent-data/dm-block-manager.h | 2 +-
7298 drivers/md/persistent-data/dm-btree-internal.h | 2 +-
7299 drivers/md/persistent-data/dm-btree-remove.c | 36 +---
7300 drivers/md/persistent-data/dm-btree-spine.c | 20 +-
7301 drivers/md/persistent-data/dm-btree.c | 4 +-
7302 drivers/md/persistent-data/dm-space-map-common.c | 32 ++--
7303 .../md/persistent-data/dm-transaction-manager.c | 4 +-
7304 .../md/persistent-data/dm-transaction-manager.h | 2 +-
7305 include/linux/device-mapper.h | 6 +-
7306 include/uapi/linux/dm-ioctl.h | 4 +-
7307 35 files changed, 333 insertions(+), 215 deletions(-)
7308 Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
7309 $ git merge pcmcia/master
7311 Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
7312 $ git merge mmc/mmc-next
7314 Merging mmc-uh/next (7cc8d580228c mmc: dw_mmc: fix the wrong setting for UHS-DDR50 mode)
7315 $ git merge mmc-uh/next
7316 Auto-merging drivers/mmc/host/sdhci-pci-core.c
7317 Auto-merging arch/arm/configs/lpc18xx_defconfig
7318 Auto-merging arch/arm/configs/exynos_defconfig
7319 Auto-merging arch/arm/boot/dts/rk3288.dtsi
7320 Auto-merging arch/arm/boot/dts/rk3288-veyron.dtsi
7321 Merge made by the 'recursive' strategy.
7322 .../devicetree/bindings/mmc/fsl-esdhc.txt | 2 +
7323 Documentation/devicetree/bindings/mmc/mmc.txt | 1 +
7324 Documentation/devicetree/bindings/mmc/mtk-sd.txt | 11 +-
7325 .../devicetree/bindings/mmc/renesas,mmcif.txt | 5 +-
7326 .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 13 +
7327 .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 25 ++
7328 Documentation/mmc/mmc-dev-attrs.txt | 10 -
7329 arch/arc/configs/axs101_defconfig | 1 -
7330 arch/arc/configs/axs103_defconfig | 1 -
7331 arch/arc/configs/axs103_smp_defconfig | 1 -
7332 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 7 +-
7333 arch/arm/boot/dts/rk3288-veyron.dtsi | 6 +
7334 arch/arm/boot/dts/rk3288.dtsi | 20 +-
7335 arch/arm/configs/exynos_defconfig | 1 -
7336 arch/arm/configs/hisi_defconfig | 1 -
7337 arch/arm/configs/lpc18xx_defconfig | 1 -
7338 arch/mips/configs/pistachio_defconfig | 1 -
7339 drivers/clk/rockchip/clk-mmc-phase.c | 54 ++-
7340 drivers/mmc/card/block.c | 199 ++++++---
7341 drivers/mmc/core/Kconfig | 10 -
7342 drivers/mmc/core/core.c | 291 ++++++-------
7343 drivers/mmc/core/core.h | 3 -
7344 drivers/mmc/core/debugfs.c | 30 +-
7345 drivers/mmc/core/host.c | 247 +----------
7346 drivers/mmc/core/mmc.c | 5 +-
7347 drivers/mmc/core/mmc_ops.c | 9 +-
7348 drivers/mmc/core/mmc_ops.h | 3 +
7349 drivers/mmc/core/pwrseq_emmc.c | 8 +-
7350 drivers/mmc/core/pwrseq_simple.c | 45 +-
7351 drivers/mmc/core/quirks.c | 18 -
7352 drivers/mmc/core/sd.c | 27 +-
7353 drivers/mmc/core/sdio.c | 27 +-
7354 drivers/mmc/core/sdio_irq.c | 14 +-
7355 drivers/mmc/core/sdio_ops.h | 7 +
7356 drivers/mmc/host/Kconfig | 21 +-
7357 drivers/mmc/host/Makefile | 2 +-
7358 drivers/mmc/host/dw_mmc-exynos.c | 4 +-
7359 drivers/mmc/host/dw_mmc-pltfm.c | 2 +
7360 drivers/mmc/host/dw_mmc-rockchip.c | 162 +++++++
7361 drivers/mmc/host/dw_mmc.c | 290 ++++++++++---
7362 drivers/mmc/host/dw_mmc.h | 13 +-
7363 drivers/mmc/host/mmc_spi.c | 1 +
7364 drivers/mmc/host/moxart-mmc.c | 1 +
7365 drivers/mmc/host/mtk-sd.c | 306 ++++++++++++--
7366 drivers/mmc/host/omap.c | 1 +
7367 drivers/mmc/host/sdhci-acpi.c | 11 +-
7368 drivers/mmc/host/sdhci-bcm-kona.c | 2 +-
7369 drivers/mmc/host/sdhci-esdhc-imx.c | 6 +-
7370 drivers/mmc/host/sdhci-esdhc.h | 2 +
7371 drivers/mmc/host/sdhci-msm.c | 2 +-
7372 drivers/mmc/host/sdhci-of-at91.c | 1 -
7373 drivers/mmc/host/sdhci-of-esdhc.c | 463 ++++++++++++++++-----
7374 drivers/mmc/host/{sdhci-pci.c => sdhci-pci-core.c} | 62 ++-
7375 drivers/mmc/host/sdhci-pci-o2micro.c | 6 +-
7376 drivers/mmc/host/sdhci-pci-o2micro.h | 2 -
7377 drivers/mmc/host/sdhci-pci.h | 7 +
7378 drivers/mmc/host/sdhci-pltfm.c | 6 +-
7379 drivers/mmc/host/sdhci-sirf.c | 5 +-
7380 drivers/mmc/host/sdhci.c | 29 +-
7381 drivers/mmc/host/sunxi-mmc.c | 8 +
7382 drivers/mmc/host/vub300.c | 6 +-
7383 drivers/mmc/host/wbsd.c | 2 +-
7384 include/linux/mmc/card.h | 1 -
7385 include/linux/mmc/core.h | 4 +-
7386 include/linux/mmc/dw_mmc.h | 23 +-
7387 include/linux/mmc/host.h | 39 +-
7388 include/uapi/linux/mmc/ioctl.h | 19 +-
7389 67 files changed, 1703 insertions(+), 910 deletions(-)
7390 rename drivers/mmc/host/{sdhci-pci.c => sdhci-pci-core.c} (96%)
7391 Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
7392 $ git merge kgdb/kgdb-next
7393 Merge made by the 'recursive' strategy.
7394 kernel/debug/kdb/kdb_io.c | 2 +-
7395 1 file changed, 1 insertion(+), 1 deletion(-)
7396 Merging md/for-next (339421def582 MD: when RAID journal is missing/faulty, block RESTART_ARRAY_RW)
7397 $ git merge md/for-next
7398 Auto-merging drivers/md/raid5.c
7399 Auto-merging drivers/md/raid10.c
7400 Auto-merging drivers/md/raid1.c
7401 Auto-merging drivers/md/md.c
7402 Merge made by the 'recursive' strategy.
7403 drivers/md/Makefile | 2 +-
7404 drivers/md/bitmap.c | 14 +-
7405 drivers/md/bitmap.h | 4 +-
7406 drivers/md/md-cluster.c | 228 ++++----
7407 drivers/md/md-cluster.h | 12 +-
7408 drivers/md/md.c | 495 ++++++++++++-----
7409 drivers/md/md.h | 17 +-
7410 drivers/md/raid1.c | 41 +-
7411 drivers/md/raid1.h | 7 +
7412 drivers/md/raid10.c | 2 +-
7413 drivers/md/raid5-cache.c | 1191 ++++++++++++++++++++++++++++++++++++++++
7414 drivers/md/raid5.c | 189 +++++--
7415 drivers/md/raid5.h | 24 +
7416 include/uapi/linux/raid/md_p.h | 73 ++-
7417 14 files changed, 1989 insertions(+), 310 deletions(-)
7418 create mode 100644 drivers/md/raid5-cache.c
7419 Merging mfd/for-mfd-next (0b8431c65b01 mfd: sec-core: Remove unused s2mpu02-rtc and s2mpu02-clk children)
7420 $ git merge mfd/for-mfd-next
7421 Resolved 'Documentation/devicetree/bindings/mfd/s2mps11.txt' using previous resolution.
7422 Auto-merging include/linux/regmap.h
7423 Auto-merging MAINTAINERS
7424 Auto-merging Documentation/devicetree/bindings/mfd/s2mps11.txt
7425 CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/s2mps11.txt
7426 Automatic merge failed; fix conflicts and then commit the result.
7428 [master ec4e1e59a9b5] Merge remote-tracking branch 'mfd/for-mfd-next'
7429 $ git diff -M --stat --summary HEAD^..
7430 .../devicetree/bindings/extcon/extcon-arizona.txt | 15 +
7431 Documentation/devicetree/bindings/mfd/arizona.txt | 15 +-
7432 .../devicetree/bindings/mfd/atmel-flexcom.txt | 63 +++
7433 Documentation/devicetree/bindings/mfd/cros-ec.txt | 4 +
7434 Documentation/devicetree/bindings/mfd/da9150.txt | 33 +-
7435 Documentation/devicetree/bindings/mfd/s2mps11.txt | 3 +
7436 .../devicetree/bindings/power/da9150-fg.txt | 23 +
7438 drivers/extcon/extcon-arizona.c | 106 +++-
7439 drivers/mfd/88pm80x.c | 2 +
7440 drivers/mfd/Kconfig | 21 +-
7441 drivers/mfd/Makefile | 2 +
7442 drivers/mfd/arizona-core.c | 300 ++++++-----
7443 drivers/mfd/arizona-i2c.c | 33 +-
7444 drivers/mfd/arizona-irq.c | 2 +-
7445 drivers/mfd/arizona-spi.c | 23 +-
7446 drivers/mfd/atmel-flexcom.c | 104 ++++
7447 drivers/mfd/atmel-hlcdc.c | 1 +
7448 drivers/mfd/axp20x.c | 20 +
7449 drivers/mfd/bcm590xx.c | 1 -
7450 drivers/mfd/cros_ec_i2c.c | 7 +
7451 drivers/mfd/da903x.c | 6 +-
7452 drivers/mfd/da9052-core.c | 6 +
7453 drivers/mfd/da9052-i2c.c | 6 +-
7454 drivers/mfd/da9052-spi.c | 6 +-
7455 drivers/mfd/da9062-core.c | 4 +-
7456 drivers/mfd/da9150-core.c | 191 +++++--
7457 drivers/mfd/hi6421-pmic-core.c | 1 +
7458 drivers/mfd/htc-i2cpld.c | 3 +-
7459 drivers/mfd/intel-lpss-acpi.c | 16 +
7460 drivers/mfd/intel-lpss-pci.c | 45 ++
7461 drivers/mfd/intel-lpss.c | 12 +-
7462 drivers/mfd/intel_soc_pmic_bxtwc.c | 477 +++++++++++++++++
7463 drivers/mfd/kempld-core.c | 14 +-
7464 drivers/mfd/lm3533-core.c | 13 +-
7465 drivers/mfd/lpc_ich.c | 42 +-
7466 drivers/mfd/max8997.c | 1 +
7467 drivers/mfd/pcf50633-irq.c | 4 +-
7468 drivers/mfd/qcom_rpm.c | 2 +-
7469 drivers/mfd/rt5033.c | 4 +-
7470 drivers/mfd/rts5209.c | 6 +-
7471 drivers/mfd/rts5227.c | 83 ++-
7472 drivers/mfd/rts5229.c | 6 +-
7473 drivers/mfd/rts5249.c | 6 +-
7474 drivers/mfd/rtsx_pcr.c | 11 +-
7475 drivers/mfd/rtsx_pcr.h | 3 +
7476 drivers/mfd/sec-core.c | 73 ++-
7477 drivers/mfd/sm501.c | 1 +
7478 drivers/mfd/stmpe.c | 1 +
7479 drivers/mfd/tps6105x.c | 150 ++----
7480 drivers/mfd/tps65217.c | 4 +
7481 drivers/mfd/twl6040.c | 2 +
7482 drivers/mfd/wm5110-tables.c | 194 ++++++-
7483 drivers/mfd/wm831x-core.c | 4 +-
7484 drivers/mfd/wm8998-tables.c | 10 +-
7485 drivers/platform/x86/Kconfig | 1 +
7486 drivers/power/Kconfig | 10 +
7487 drivers/power/Makefile | 1 +
7488 drivers/power/da9150-fg.c | 579 +++++++++++++++++++++
7489 drivers/regulator/tps6105x-regulator.c | 16 +-
7490 include/dt-bindings/mfd/arizona.h | 2 +
7491 include/dt-bindings/mfd/atmel-flexcom.h | 26 +
7492 include/linux/mfd/88pm80x.h | 1 +
7493 include/linux/mfd/arizona/pdata.h | 6 +
7494 include/linux/mfd/arizona/registers.h | 84 ++-
7495 include/linux/mfd/da9052/reg.h | 3 +
7496 include/linux/mfd/da9150/core.h | 19 +-
7497 include/linux/mfd/intel_bxtwc.h | 69 +++
7498 include/linux/mfd/intel_soc_pmic.h | 2 +
7499 include/linux/mfd/rtsx_pci.h | 6 +
7500 include/linux/mfd/samsung/core.h | 4 +
7501 include/linux/mfd/samsung/s2mps11.h | 1 +
7502 include/linux/mfd/samsung/s2mps13.h | 1 +
7503 include/linux/mfd/tps6105x.h | 10 +-
7504 include/linux/regmap.h | 3 +
7505 75 files changed, 2563 insertions(+), 470 deletions(-)
7506 create mode 100644 Documentation/devicetree/bindings/extcon/extcon-arizona.txt
7507 create mode 100644 Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
7508 create mode 100644 Documentation/devicetree/bindings/power/da9150-fg.txt
7509 create mode 100644 drivers/mfd/atmel-flexcom.c
7510 create mode 100644 drivers/mfd/intel_soc_pmic_bxtwc.c
7511 create mode 100644 drivers/power/da9150-fg.c
7512 create mode 100644 include/dt-bindings/mfd/atmel-flexcom.h
7513 create mode 100644 include/linux/mfd/intel_bxtwc.h
7514 Merging backlight/for-backlight-next (9d6c243502b7 backlight: pm8941-wled: Add default-brightness property)
7515 $ git merge backlight/for-backlight-next
7516 Merge made by the 'recursive' strategy.
7517 .../bindings/video/backlight/pm8941-wled.txt | 2 ++
7518 drivers/video/backlight/88pm860x_bl.c | 1 +
7519 drivers/video/backlight/adp8860_bl.c | 1 -
7520 drivers/video/backlight/adp8870_bl.c | 1 -
7521 drivers/video/backlight/lp855x_bl.c | 1 +
7522 drivers/video/backlight/pm8941-wled.c | 13 +++++++++----
7523 drivers/video/backlight/pwm_bl.c | 19 +++++++++----------
7524 7 files changed, 22 insertions(+), 16 deletions(-)
7525 Merging battery/master (6bd03ce3c12a power: bq27xxx_battery: Remove unneeded dependency in Kconfig)
7526 $ git merge battery/master
7527 Removing include/linux/power/bq27x00_battery.h
7528 Removing drivers/power/bq27x00_battery.c
7529 Auto-merging drivers/power/Makefile
7530 Auto-merging drivers/power/Kconfig
7531 Auto-merging arch/arm/configs/omap2plus_defconfig
7532 Auto-merging MAINTAINERS
7533 Merge made by the 'recursive' strategy.
7534 Documentation/ABI/testing/sysfs-class-power | 58 +
7535 .../devicetree/bindings/power/bq24257.txt | 53 +-
7536 .../bindings/power_supply/axp20x_usb_power.txt | 34 +
7537 .../bindings/power_supply/tps65217_charger.txt | 12 +
7539 arch/arm/boot/dts/twl4030.dtsi | 2 +
7540 arch/arm/configs/omap2plus_defconfig | 2 +-
7541 arch/unicore32/Kconfig | 2 +-
7542 drivers/power/88pm860x_battery.c | 37 +-
7543 drivers/power/Kconfig | 56 +-
7544 drivers/power/Makefile | 5 +-
7545 drivers/power/axp20x_usb_power.c | 248 ++++
7546 drivers/power/bq2415x_charger.c | 2 +-
7547 drivers/power/bq24190_charger.c | 1 -
7548 drivers/power/bq24257_charger.c | 492 +++++--
7549 drivers/power/bq27x00_battery.c | 1129 ----------------
7550 drivers/power/bq27xxx_battery.c | 1375 ++++++++++++++++++++
7551 drivers/power/charger-manager.c | 4 +-
7552 drivers/power/lp8727_charger.c | 31 +-
7553 drivers/power/max17042_battery.c | 26 +-
7554 drivers/power/max8903_charger.c | 93 +-
7555 drivers/power/max8998_charger.c | 29 +-
7556 drivers/power/pm2301_charger.c | 1 -
7557 drivers/power/qcom_smbb.c | 951 ++++++++++++++
7558 drivers/power/reset/Kconfig | 4 +-
7559 drivers/power/reset/at91-poweroff.c | 33 +-
7560 drivers/power/reset/at91-reset.c | 69 +-
7561 drivers/power/rt9455_charger.c | 1 -
7562 drivers/power/smb347-charger.c | 1 -
7563 drivers/power/tps65090-charger.c | 1 +
7564 drivers/power/tps65217_charger.c | 264 ++++
7565 drivers/power/twl4030_charger.c | 39 +-
7566 drivers/power/wm831x_power.c | 15 +-
7567 drivers/w1/slaves/w1_bq27000.c | 5 +-
7568 include/linux/mfd/axp20x.h | 24 +
7569 include/linux/power/bq27x00_battery.h | 19 -
7570 include/linux/power/bq27xxx_battery.h | 31 +
7571 include/linux/power/charger-manager.h | 8 +-
7572 38 files changed, 3687 insertions(+), 1474 deletions(-)
7573 create mode 100644 Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt
7574 create mode 100644 Documentation/devicetree/bindings/power_supply/tps65217_charger.txt
7575 create mode 100644 drivers/power/axp20x_usb_power.c
7576 delete mode 100644 drivers/power/bq27x00_battery.c
7577 create mode 100644 drivers/power/bq27xxx_battery.c
7578 create mode 100644 drivers/power/qcom_smbb.c
7579 create mode 100644 drivers/power/tps65217_charger.c
7580 delete mode 100644 include/linux/power/bq27x00_battery.h
7581 create mode 100644 include/linux/power/bq27xxx_battery.h
7582 $ git reset --hard HEAD^
7583 HEAD is now at 26fc8e25d5ad Merge remote-tracking branch 'backlight/for-backlight-next'
7584 Merging next-20150925 version of battery
7585 $ git merge -m next-20150925/battery 3636859b280ca595da4556274a509223f47e9a39
7586 Removing include/linux/power/bq27x00_battery.h
7587 Removing drivers/power/bq27x00_battery.c
7588 Auto-merging drivers/power/Makefile
7589 Auto-merging drivers/power/Kconfig
7590 Auto-merging arch/arm/configs/omap2plus_defconfig
7591 Auto-merging MAINTAINERS
7592 Merge made by the 'recursive' strategy.
7593 .../bindings/power_supply/axp20x_usb_power.txt | 34 +
7594 .../bindings/power_supply/tps65217_charger.txt | 12 +
7596 arch/arm/configs/omap2plus_defconfig | 2 +-
7597 arch/unicore32/Kconfig | 2 +-
7598 drivers/power/88pm860x_battery.c | 37 +-
7599 drivers/power/Kconfig | 48 +-
7600 drivers/power/Makefile | 5 +-
7601 drivers/power/axp20x_usb_power.c | 248 ++++
7602 drivers/power/bq2415x_charger.c | 2 +-
7603 drivers/power/bq24190_charger.c | 1 -
7604 drivers/power/bq27x00_battery.c | 1129 ----------------
7605 drivers/power/bq27xxx_battery.c | 1374 ++++++++++++++++++++
7606 drivers/power/lp8727_charger.c | 31 +-
7607 drivers/power/max17042_battery.c | 26 +-
7608 drivers/power/max8903_charger.c | 93 +-
7609 drivers/power/max8998_charger.c | 29 +-
7610 drivers/power/pm2301_charger.c | 1 -
7611 drivers/power/qcom_smbb.c | 951 ++++++++++++++
7612 drivers/power/reset/Kconfig | 4 +-
7613 drivers/power/reset/at91-poweroff.c | 33 +-
7614 drivers/power/reset/at91-reset.c | 69 +-
7615 drivers/power/rt9455_charger.c | 1 -
7616 drivers/power/smb347-charger.c | 1 -
7617 drivers/power/tps65090-charger.c | 1 +
7618 drivers/power/tps65217_charger.c | 264 ++++
7619 drivers/power/wm831x_power.c | 9 +-
7620 drivers/w1/slaves/w1_bq27000.c | 5 +-
7621 include/linux/mfd/axp20x.h | 24 +
7622 include/linux/power/bq27x00_battery.h | 19 -
7623 include/linux/power/bq27xxx_battery.h | 31 +
7624 include/linux/power/charger-manager.h | 8 +-
7625 32 files changed, 3126 insertions(+), 1372 deletions(-)
7626 create mode 100644 Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt
7627 create mode 100644 Documentation/devicetree/bindings/power_supply/tps65217_charger.txt
7628 create mode 100644 drivers/power/axp20x_usb_power.c
7629 delete mode 100644 drivers/power/bq27x00_battery.c
7630 create mode 100644 drivers/power/bq27xxx_battery.c
7631 create mode 100644 drivers/power/qcom_smbb.c
7632 create mode 100644 drivers/power/tps65217_charger.c
7633 delete mode 100644 include/linux/power/bq27x00_battery.h
7634 create mode 100644 include/linux/power/bq27xxx_battery.h
7635 Merging omap_dss2/for-next (08bfb453f045 radeonfb: Deinline large functions)
7636 $ git merge omap_dss2/for-next
7637 Auto-merging drivers/video/fbdev/tridentfb.c
7638 Merge made by the 'recursive' strategy.
7639 .../devicetree/bindings/video/ssd1307fb.txt | 3 +-
7640 drivers/video/fbdev/Kconfig | 7 +-
7641 drivers/video/fbdev/aty/radeon_base.c | 133 ++++++++++++++-
7642 drivers/video/fbdev/aty/radeonfb.h | 144 ++--------------
7643 drivers/video/fbdev/core/fb_ddc.c | 28 ++--
7644 drivers/video/fbdev/gxt4500.c | 25 ++-
7645 drivers/video/fbdev/omap/omapfb_main.c | 5 -
7646 drivers/video/fbdev/omap2/dss/hdmi.h | 9 +-
7647 drivers/video/fbdev/omap2/dss/hdmi4.c | 66 ++++++--
7648 drivers/video/fbdev/omap2/dss/hdmi5.c | 75 +++++++--
7649 drivers/video/fbdev/ssd1307fb.c | 21 ++-
7650 drivers/video/fbdev/tridentfb.c | 182 ++++++++++++++++++++-
7651 12 files changed, 506 insertions(+), 192 deletions(-)
7652 Merging regulator/for-next (fa75190bb576 Merge remote-tracking branches 'regulator/topic/supply', 'regulator/topic/tps6105x' and 'regulator/topic/tps65023' into regulator-next)
7653 $ git merge regulator/for-next
7654 Merge made by the 'recursive' strategy.
7655 Documentation/devicetree/bindings/mfd/axp20x.txt | 4 +-
7656 .../bindings/regulator/act8865-regulator.txt | 3 +
7657 .../bindings/regulator/anatop-regulator.txt | 1 +
7658 .../bindings/regulator/arizona-regulator.txt | 17 +
7659 .../devicetree/bindings/regulator/max77802.txt | 25 +-
7660 .../devicetree/bindings/regulator/regulator.txt | 1 +
7661 .../devicetree/bindings/regulator/tps65023.txt | 60 +++
7662 drivers/regulator/Kconfig | 2 +-
7663 drivers/regulator/act8865-regulator.c | 24 +-
7664 drivers/regulator/anatop-regulator.c | 3 +
7665 drivers/regulator/arizona-ldo1.c | 20 +-
7666 drivers/regulator/axp20x-regulator.c | 54 ++-
7667 drivers/regulator/bcm590xx-regulator.c | 2 +-
7668 drivers/regulator/core.c | 506 ++++++++++++++-------
7669 drivers/regulator/da9052-regulator.c | 1 +
7670 drivers/regulator/da9063-regulator.c | 2 +-
7671 drivers/regulator/of_regulator.c | 3 +
7672 drivers/regulator/pwm-regulator.c | 35 +-
7673 drivers/regulator/qcom_smd-regulator.c | 28 +-
7674 drivers/regulator/tps65023-regulator.c | 282 +++++-------
7675 include/linux/regulator/driver.h | 2 +
7676 21 files changed, 702 insertions(+), 373 deletions(-)
7677 create mode 100644 Documentation/devicetree/bindings/regulator/arizona-regulator.txt
7678 create mode 100644 Documentation/devicetree/bindings/regulator/tps65023.txt
7679 Merging security/next (ba94c3ff20c9 Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
7680 $ git merge security/next
7681 Resolved 'fs/ext4/crypto_key.c' using previous resolution.
7682 Auto-merging security/selinux/hooks.c
7683 Auto-merging security/keys/request_key.c
7684 Auto-merging fs/ext4/crypto_key.c
7685 CONFLICT (content): Merge conflict in fs/ext4/crypto_key.c
7686 Auto-merging fs/cifs/smb2pdu.c
7687 Auto-merging fs/cifs/connect.c
7688 Auto-merging crypto/asymmetric_keys/x509_public_key.c
7689 Auto-merging MAINTAINERS
7690 Automatic merge failed; fix conflicts and then commit the result.
7692 [master f91d70babe61] Merge remote-tracking branch 'security/next'
7693 $ git diff -M --stat --summary HEAD^..
7694 Documentation/ABI/testing/sysfs-driver-ppi | 19 +-
7695 Documentation/crypto/asymmetric-keys.txt | 27 +--
7696 Documentation/security/Smack.txt | 10 +
7697 Documentation/security/keys.txt | 41 ++--
7699 arch/powerpc/kernel/prom_init.c | 40 +++-
7700 certs/.gitignore | 4 +
7701 crypto/asymmetric_keys/asymmetric_keys.h | 5 -
7702 crypto/asymmetric_keys/asymmetric_type.c | 44 ++--
7703 crypto/asymmetric_keys/public_key.c | 4 +-
7704 crypto/asymmetric_keys/signature.c | 2 +-
7705 crypto/asymmetric_keys/x509_parser.h | 1 +
7706 crypto/asymmetric_keys/x509_public_key.c | 9 +-
7707 drivers/char/tpm/st33zp24/Kconfig | 2 +-
7708 drivers/char/tpm/st33zp24/i2c.c | 1 -
7709 drivers/char/tpm/tpm-chip.c | 24 ++-
7710 drivers/char/tpm/tpm-interface.c | 76 +++++++
7711 drivers/char/tpm/tpm.h | 134 +++++++++++-
7712 drivers/char/tpm/tpm2-cmd.c | 250 ++++++++++++++++++++++-
7713 drivers/char/tpm/tpm_crb.c | 39 ++--
7714 drivers/char/tpm/tpm_eventlog.c | 78 +++++--
7715 drivers/char/tpm/tpm_eventlog.h | 6 +
7716 drivers/char/tpm/tpm_i2c_atmel.c | 1 -
7717 drivers/char/tpm/tpm_i2c_infineon.c | 1 -
7718 drivers/char/tpm/tpm_i2c_nuvoton.c | 1 -
7719 drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
7720 drivers/char/tpm/tpm_of.c | 6 +-
7721 drivers/char/tpm/tpm_ppi.c | 34 +--
7722 drivers/char/tpm/tpm_tis.c | 192 ++++++++++++++---
7723 fs/cifs/cifs_spnego.c | 6 +-
7724 fs/cifs/cifsacl.c | 25 ++-
7725 fs/cifs/connect.c | 9 +-
7726 fs/cifs/sess.c | 2 +-
7727 fs/cifs/smb2pdu.c | 2 +-
7728 fs/ecryptfs/ecryptfs_kernel.h | 5 +-
7729 fs/ext4/crypto_key.c | 4 +-
7730 fs/f2fs/crypto_key.c | 4 +-
7731 fs/fscache/object-list.c | 4 +-
7732 fs/nfs/nfs4idmap.c | 4 +-
7733 fs/sysfs/group.c | 44 ++++
7734 include/crypto/public_key.h | 1 -
7735 include/keys/asymmetric-subtype.h | 2 +-
7736 include/keys/asymmetric-type.h | 15 ++
7737 include/keys/trusted-type.h | 14 +-
7738 include/keys/user-type.h | 8 +
7739 include/linux/key-type.h | 3 +-
7740 include/linux/key.h | 33 ++-
7741 include/linux/sysfs.h | 11 +
7742 include/linux/tpm.h | 26 +++
7743 kernel/.gitignore | 1 -
7744 kernel/module_signing.c | 1 +
7746 net/ceph/ceph_common.c | 2 +-
7747 net/ceph/crypto.c | 6 +-
7748 net/dns_resolver/dns_key.c | 20 +-
7749 net/dns_resolver/dns_query.c | 7 +-
7750 net/dns_resolver/internal.h | 8 +
7751 net/rxrpc/af_rxrpc.c | 2 +-
7752 net/rxrpc/ar-key.c | 32 +--
7753 net/rxrpc/ar-output.c | 2 +-
7754 net/rxrpc/ar-security.c | 4 +-
7755 net/rxrpc/rxkad.c | 16 +-
7756 scripts/extract-module-sig.pl | 136 ++++++++++++
7757 scripts/extract-sys-certs.pl | 144 +++++++++++++
7758 security/apparmor/Kconfig | 2 +-
7759 security/integrity/digsig.c | 2 +-
7760 security/integrity/evm/evm_crypto.c | 2 +-
7761 security/keys/big_key.c | 47 +++--
7762 security/keys/encrypted-keys/encrypted.c | 18 +-
7763 security/keys/encrypted-keys/encrypted.h | 4 +-
7764 security/keys/encrypted-keys/masterkey_trusted.c | 4 +-
7765 security/keys/key.c | 20 +-
7766 security/keys/keyctl.c | 12 +-
7767 security/keys/keyring.c | 12 +-
7768 security/keys/process_keys.c | 4 +-
7769 security/keys/request_key.c | 4 +-
7770 security/keys/request_key_auth.c | 12 +-
7771 security/keys/trusted.c | 42 +++-
7772 security/keys/trusted.h | 11 -
7773 security/keys/user_defined.c | 14 +-
7774 security/selinux/Kconfig | 4 +-
7775 security/selinux/hooks.c | 27 +--
7776 security/selinux/include/security.h | 2 +
7777 security/selinux/selinuxfs.c | 26 +--
7778 security/selinux/ss/services.c | 22 +-
7779 security/smack/smack.h | 4 +-
7780 security/smack/smack_access.c | 6 +-
7781 security/smack/smack_lsm.c | 67 +++++-
7782 security/smack/smackfs.c | 208 +++++++++++++++----
7783 89 files changed, 1748 insertions(+), 492 deletions(-)
7784 create mode 100644 certs/.gitignore
7785 create mode 100755 scripts/extract-module-sig.pl
7786 create mode 100755 scripts/extract-sys-certs.pl
7787 Merging integrity/next (72e1eed8abb1 integrity: prevent loading untrusted certificates on the IMA trusted keyring)
7788 $ git merge integrity/next
7790 Merging selinux/next (63205654c0e0 selinux: Use a kmem_cache for allocation struct file_security_struct)
7791 $ git merge selinux/next
7793 Merging lblnet/next (b2776bf7149b Linux 3.18)
7794 $ git merge lblnet/next
7796 Merging watchdog/master (20b1b6d67176 watchdog: core: propagate ping error code to the user space)
7797 $ git merge watchdog/master
7798 Merge made by the 'recursive' strategy.
7799 .../bindings/watchdog/brcm,bcm7038-wdt.txt | 19 ++
7800 drivers/watchdog/Kconfig | 8 +
7801 drivers/watchdog/Makefile | 1 +
7802 drivers/watchdog/bcm7038_wdt.c | 237 +++++++++++++++++++++
7803 drivers/watchdog/imx2_wdt.c | 6 +-
7804 drivers/watchdog/intel-mid_wdt.c | 2 +-
7805 drivers/watchdog/watchdog_core.c | 15 +-
7806 drivers/watchdog/watchdog_dev.c | 163 +++++++-------
7807 include/linux/watchdog.h | 11 +-
7808 9 files changed, 374 insertions(+), 88 deletions(-)
7809 create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt
7810 create mode 100644 drivers/watchdog/bcm7038_wdt.c
7811 Merging iommu/next (593d50b2087e Merge branches 'x86/amd', 'x86/vt-d', 'arm/omap', 'arm/smmu', 'arm/renesas', 's390', 'core' and 'iommu/fixes' into next)
7812 $ git merge iommu/next
7813 Auto-merging arch/s390/Kconfig
7814 Auto-merging arch/arm64/Kconfig
7815 Auto-merging MAINTAINERS
7816 Merge made by the 'recursive' strategy.
7817 .../devicetree/bindings/iommu/arm,smmu-v3.txt | 19 +
7818 .../devicetree/bindings/iommu/ti,omap-iommu.txt | 27 ++
7820 arch/arm64/Kconfig | 1 +
7821 arch/arm64/include/asm/dma-mapping.h | 15 +-
7822 arch/arm64/mm/dma-mapping.c | 457 ++++++++++++++++++
7823 arch/s390/Kconfig | 1 +
7824 arch/s390/include/asm/pci.h | 4 +
7825 arch/s390/include/asm/pci_dma.h | 5 +-
7826 arch/s390/pci/pci_dma.c | 37 +-
7827 drivers/iommu/Kconfig | 15 +
7828 drivers/iommu/Makefile | 2 +
7829 drivers/iommu/amd_iommu.c | 173 ++-----
7830 drivers/iommu/amd_iommu_init.c | 120 ++---
7831 drivers/iommu/amd_iommu_types.h | 13 +-
7832 drivers/iommu/arm-smmu-v3.c | 155 ++++--
7833 drivers/iommu/arm-smmu.c | 132 +++---
7834 drivers/iommu/dma-iommu.c | 524 +++++++++++++++++++++
7835 drivers/iommu/fsl_pamu_domain.c | 41 +-
7836 drivers/iommu/intel-iommu.c | 83 ++--
7837 drivers/iommu/intel_irq_remapping.c | 64 ++-
7838 drivers/iommu/iommu.c | 46 +-
7839 drivers/iommu/omap-iommu.c | 58 +++
7840 drivers/iommu/omap-iommu.h | 9 +
7841 drivers/iommu/s390-iommu.c | 337 +++++++++++++
7842 include/linux/dma-iommu.h | 85 ++++
7843 include/linux/iommu.h | 8 +-
7844 27 files changed, 1995 insertions(+), 443 deletions(-)
7845 create mode 100644 drivers/iommu/dma-iommu.c
7846 create mode 100644 drivers/iommu/s390-iommu.c
7847 create mode 100644 include/linux/dma-iommu.h
7848 Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback)
7849 $ git merge dwmw2-iommu/master
7850 Auto-merging drivers/iommu/intel-iommu.c
7851 Auto-merging drivers/iommu/Makefile
7852 Auto-merging drivers/iommu/Kconfig
7853 Merge made by the 'recursive' strategy.
7854 drivers/iommu/Kconfig | 10 +
7855 drivers/iommu/Makefile | 1 +
7856 drivers/iommu/dmar.c | 42 ++-
7857 drivers/iommu/intel-iommu.c | 303 +++++++++++++++++----
7858 drivers/iommu/intel-svm.c | 602 ++++++++++++++++++++++++++++++++++++++++++
7859 include/linux/dma_remapping.h | 8 +
7860 include/linux/intel-iommu.h | 139 ++++++++--
7861 include/linux/intel-svm.h | 121 +++++++++
7862 8 files changed, 1152 insertions(+), 74 deletions(-)
7863 create mode 100644 drivers/iommu/intel-svm.c
7864 create mode 100644 include/linux/intel-svm.h
7865 Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer)
7866 $ git merge vfio/next
7868 Merging jc_docs/docs-next (334bb79c18eb doc: Clarify that nmi_watchdog param is for hardlockups)
7869 $ git merge jc_docs/docs-next
7870 Resolved 'Documentation/Changes' using previous resolution.
7871 Auto-merging scripts/kernel-doc
7872 Auto-merging Makefile
7873 Auto-merging MAINTAINERS
7874 Auto-merging Documentation/kernel-parameters.txt
7875 Auto-merging Documentation/DocBook/Makefile
7876 Auto-merging Documentation/Changes
7877 CONFLICT (content): Merge conflict in Documentation/Changes
7878 Automatic merge failed; fix conflicts and then commit the result.
7880 [master d999b3aef288] Merge remote-tracking branch 'jc_docs/docs-next'
7881 $ git diff -M --stat --summary HEAD^..
7882 Documentation/Changes | 1 +
7883 Documentation/DMA-API-HOWTO.txt | 5 ++
7884 Documentation/DMA-API.txt | 6 +-
7885 Documentation/DocBook/.gitignore | 2 +
7886 Documentation/DocBook/Makefile | 6 ++
7887 Documentation/SubmittingPatches | 8 +-
7888 Documentation/blockdev/zram.txt | 44 +++++++++-
7889 Documentation/cgroups/blkio-controller.txt | 2 +-
7890 Documentation/cgroups/freezer-subsystem.txt | 2 +-
7891 Documentation/cgroups/unified-hierarchy.txt | 2 +-
7892 Documentation/email-clients.txt | 2 +-
7893 Documentation/filesystems/sysfs-tagging.txt | 14 ++--
7894 Documentation/filesystems/sysfs.txt | 9 ++-
7895 Documentation/gpio/board.txt | 10 ++-
7896 Documentation/gpio/sysfs.txt | 6 +-
7897 Documentation/kernel-docs.txt | 14 ++--
7898 Documentation/kernel-parameters.txt | 17 ++--
7899 Documentation/kselftest.txt | 16 ++++
7900 Documentation/locking/lockstat.txt | 2 +-
7901 Documentation/misc-devices/apds990x.txt | 2 +-
7902 Documentation/misc-devices/isl29003 | 2 +-
7903 Documentation/misc-devices/max6875 | 2 +-
7904 Documentation/networking/can.txt | 97 ++++++++++++++++++-----
7905 Documentation/rbtree.txt | 2 +-
7906 Documentation/virtual/kvm/api.txt | 4 +-
7907 Documentation/virtual/kvm/devices/vm.txt | 2 +-
7908 Documentation/virtual/kvm/ppc-pv.txt | 2 +-
7909 Documentation/zh_CN/filesystems/sysfs.txt | 2 +-
7913 scripts/.gitignore | 1 +
7914 scripts/Makefile | 7 +-
7915 scripts/check-lc_ctype.c | 11 +++
7916 scripts/kernel-doc | 119 ++++++++++++++++------------
7917 35 files changed, 299 insertions(+), 130 deletions(-)
7918 create mode 100644 scripts/check-lc_ctype.c
7919 Merging trivial/for-next (0c6cac7ab444 hwmon: applesmc: fix comment typos)
7920 $ git merge trivial/for-next
7921 Auto-merging net/openvswitch/datapath.c
7922 Auto-merging mm/huge_memory.c
7923 Auto-merging fs/namei.c
7924 Auto-merging fs/ext4/namei.c
7925 Auto-merging fs/ext4/extents.c
7926 Auto-merging drivers/scsi/Kconfig
7927 Auto-merging drivers/net/ethernet/ti/netcp_core.c
7928 Auto-merging drivers/block/pktcdvd.c
7929 Merge made by the 'recursive' strategy.
7930 drivers/base/class.c | 2 +-
7931 drivers/block/pktcdvd.c | 3 +--
7932 drivers/hwmon/applesmc.c | 4 ++--
7933 drivers/misc/c2port/core.c | 2 +-
7934 drivers/net/ethernet/ti/netcp_core.c | 4 ++--
7935 drivers/scsi/Kconfig | 7 -------
7936 fs/cifs/readdir.c | 2 +-
7937 fs/debugfs/inode.c | 6 ++++--
7938 fs/ecryptfs/inode.c | 2 +-
7939 fs/ext4/extents.c | 6 +++---
7940 fs/ext4/namei.c | 2 +-
7942 fs/ncpfs/dir.c | 2 +-
7943 fs/nfs/objlayout/objio_osd.c | 2 +-
7944 fs/proc/proc_sysctl.c | 2 +-
7945 mm/huge_memory.c | 2 +-
7946 net/openvswitch/datapath.c | 2 +-
7947 net/sctp/socket.c | 2 +-
7948 net/socket.c | 6 +++---
7949 19 files changed, 28 insertions(+), 34 deletions(-)
7950 Merging audit/next (a4416687e957 audit: make audit_log_common_recv_msg() a void function)
7951 $ git merge audit/next
7952 Auto-merging kernel/audit_tree.c
7953 Auto-merging kernel/audit.h
7954 Auto-merging kernel/audit.c
7955 Merge made by the 'recursive' strategy.
7956 include/linux/audit.h | 8 ++++----
7957 kernel/audit.c | 42 ++++++++++++++++++++++++++++--------------
7958 kernel/audit.h | 2 +-
7959 kernel/audit_tree.c | 6 +++---
7960 kernel/auditfilter.c | 14 +++++++-------
7961 5 files changed, 43 insertions(+), 29 deletions(-)
7962 Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
7963 $ git merge devicetree/devicetree/next
7965 Merging dt-rh/for-next (25fff6aa3213 Merge branch 'all-dtbs-v2' into for-next)
7966 $ git merge dt-rh/for-next
7967 Auto-merging drivers/of/of_pci.c
7968 Auto-merging arch/arm64/boot/dts/Makefile
7969 Auto-merging arch/arm/boot/dts/Makefile
7970 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
7971 Removing Documentation/devicetree/bindings/usb/samsung-usbphy.txt
7972 Removing Documentation/devicetree/bindings/hwmon/ina209.txt
7973 Auto-merging Documentation/devicetree/bindings/display/tilcdc/panel.txt
7974 Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap5-dss.txt
7975 Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap4-dss.txt
7976 Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt
7977 Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap2-dss.txt
7978 Auto-merging Documentation/devicetree/bindings/display/ti/ti,dra7-dss.txt
7979 Auto-merging Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
7980 Auto-merging Documentation/devicetree/bindings/display/st,stih4xx.txt
7981 Auto-merging Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt
7982 Auto-merging Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt
7983 Auto-merging Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt
7984 Auto-merging Documentation/devicetree/bindings/display/panel/panel-dpi.txt
7985 Auto-merging Documentation/devicetree/bindings/display/msm/dsi.txt
7986 Auto-merging Documentation/devicetree/bindings/display/imx/ldb.txt
7987 Auto-merging Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt
7988 Auto-merging Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt
7989 Auto-merging Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt
7990 Auto-merging Documentation/devicetree/bindings/display/exynos/exynos_dp.txt
7991 Auto-merging Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt
7992 Auto-merging Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt
7993 Auto-merging Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt
7994 Merge made by the 'recursive' strategy.
7995 .../bindings/{nvec => arm/tegra}/nvidia,nvec.txt | 0
7996 .../bindings/{video => display}/arm,pl11x.txt | 0
7997 .../{drm => display}/armada/marvell,dove-lcd.txt | 0
7998 .../bindings/{video => display}/atmel,lcdc.txt | 0
7999 .../bindings/{drm => display}/atmel/hlcdc-dc.txt | 0
8000 .../{video => display/bridge}/adi,adv7123.txt | 0
8001 .../{video => display/bridge}/adi,adv7511.txt | 0
8002 .../bindings/{drm => display}/bridge/dw_hdmi.txt | 4 +-
8003 .../bindings/{video => display}/bridge/ps8622.txt | 0
8004 .../bindings/{video => display}/bridge/ptn3460.txt | 0
8005 .../{drm/i2c => display/bridge}/tda998x.txt | 0
8006 .../bridge/thine,thc63lvdm83d.txt} | 0
8007 .../{video => display}/cirrus,clps711x-fb.txt | 2 +-
8008 .../connector}/analog-tv-connector.txt | 0
8009 .../{video => display/connector}/dvi-connector.txt | 0
8010 .../connector}/hdmi-connector.txt | 0
8011 .../{video => display/connector}/vga-connector.txt | 0
8012 .../{video => display/exynos}/exynos-mic.txt | 0
8013 .../{video => display/exynos}/exynos5433-decon.txt | 0
8014 .../{video => display/exynos}/exynos7-decon.txt | 2 +-
8015 .../{video => display/exynos}/exynos_dp.txt | 2 +-
8016 .../{video => display/exynos}/exynos_dsim.txt | 2 +-
8017 .../{video => display/exynos}/exynos_hdmi.txt | 0
8018 .../{video => display/exynos}/exynos_hdmiddc.txt | 0
8019 .../{video => display/exynos}/exynos_hdmiphy.txt | 0
8020 .../{video => display/exynos}/exynos_mixer.txt | 0
8021 .../{video => display/exynos}/samsung-fimd.txt | 2 +-
8022 .../bindings/{video => display}/fsl,dcu.txt | 0
8023 .../bindings/{video => display/imx}/fsl,imx-fb.txt | 2 +-
8024 .../bindings/{drm => display}/imx/fsl-imx-drm.txt | 0
8025 .../bindings/{drm => display}/imx/hdmi.txt | 0
8026 .../bindings/{drm => display}/imx/ldb.txt | 2 +-
8027 .../bindings/display/marvell,pxa2xx-lcdc.txt | 34 ++++++
8028 .../{mipi/dsi => display}/mipi-dsi-bus.txt | 0
8029 .../bindings/{drm => display}/msm/dsi.txt | 2 +-
8030 .../bindings/{drm => display}/msm/edp.txt | 0
8031 .../bindings/{drm => display}/msm/gpu.txt | 0
8032 .../bindings/{drm => display}/msm/hdmi.txt | 0
8033 .../bindings/{drm => display}/msm/mdp.txt | 0
8034 .../devicetree/bindings/{fb => display}/mxsfb.txt | 0
8035 .../panel/ampire,am800480r3tmqwa1h.txt | 0
8036 .../bindings/{ => display}/panel/auo,b080uan01.txt | 0
8037 .../bindings/{ => display}/panel/auo,b101aw03.txt | 0
8038 .../bindings/{ => display}/panel/auo,b101ean01.txt | 0
8039 .../bindings/{ => display}/panel/auo,b101xtn01.txt | 0
8040 .../bindings/{ => display}/panel/auo,b116xw03.txt | 0
8041 .../bindings/{ => display}/panel/auo,b133htn01.txt | 0
8042 .../bindings/{ => display}/panel/auo,b133xtn01.txt | 0
8043 .../{ => display}/panel/avic,tm070ddh03.txt | 0
8044 .../{ => display}/panel/chunghwa,claa101wa01a.txt | 0
8045 .../{ => display}/panel/chunghwa,claa101wb03.txt | 0
8046 .../{video => display/panel}/display-timing.txt | 0
8047 .../{ => display}/panel/edt,et057090dhu.txt | 0
8048 .../{ => display}/panel/edt,et070080dh6.txt | 0
8049 .../{ => display}/panel/edt,etm0700g0dh6.txt | 0
8050 .../{ => display}/panel/foxlink,fl500wvr00-a0t.txt | 0
8051 .../{ => display}/panel/giantplus,gpg482739qs5.txt | 0
8052 .../{ => display}/panel/hannstar,hsd070pww1.txt | 0
8053 .../{ => display}/panel/hannstar,hsd100pxn1.txt | 0
8054 .../{ => display}/panel/hit,tx23d38vm0caa.txt | 0
8055 .../{ => display}/panel/innolux,at043tn24.txt | 0
8056 .../{ => display}/panel/innolux,g121i1-l01.txt | 0
8057 .../{ => display}/panel/innolux,n116bge.txt | 0
8058 .../{ => display}/panel/innolux,n156bge-l21.txt | 0
8059 .../{ => display}/panel/innolux,zj070na-01p.txt | 0
8060 .../bindings/{ => display}/panel/lg,lb070wv8.txt | 0
8061 .../{ => display}/panel/lg,ld070wx3-sl01.txt | 0
8062 .../bindings/{ => display}/panel/lg,lg4573.txt | 0
8063 .../{ => display}/panel/lg,lh500wx1-sd03.txt | 0
8064 .../bindings/{ => display}/panel/lg,lp129qe.txt | 0
8065 .../panel}/lgphilips,lb035q02.txt | 0
8066 .../{ => display}/panel/nec,nl4827hc19-05b.txt | 0
8067 .../{ => display}/panel/okaya,rs800480t-7x0gp.txt | 0
8068 .../panel/ortustech,com43h4m85ulc.txt | 0
8069 .../{ => display}/panel/panasonic,vvx10f004b00.txt | 0
8070 .../{video => display/panel}/panel-dpi.txt | 2 +-
8071 .../{video => display/panel}/panel-dsi-cm.txt | 0
8072 .../{ => display}/panel/samsung,ld9040.txt | 2 +-
8073 .../{ => display}/panel/samsung,ltn101nt05.txt | 0
8074 .../{ => display}/panel/samsung,ltn140at29-301.txt | 0
8075 .../{ => display}/panel/samsung,s6e8aa0.txt | 2 +-
8076 .../{ => display}/panel/sharp,lq101r1sx01.txt | 0
8077 .../{video => display/panel}/sharp,ls037v7dw01.txt | 0
8078 .../panel/shelly,sca07010-bfn-lnn.txt | 0
8079 .../bindings/{ => display}/panel/simple-panel.txt | 0
8080 .../{video => display/panel}/sony,acx565akm.txt | 0
8081 .../panel}/toppoly,td028ttec1.txt | 0
8082 .../{video => display/panel}/tpo,td043mtea1.txt | 0
8083 .../bindings/{video => display}/renesas,du.txt | 0
8084 .../rockchip}/dw_hdmi-rockchip.txt | 0
8085 .../{video => display/rockchip}/rockchip-drm.txt | 2 +-
8086 .../{video => display/rockchip}/rockchip-vop.txt | 0
8087 .../simple-framebuffer-sunxi.txt | 0
8088 .../{video => display}/simple-framebuffer.txt | 0
8089 .../bindings/{fb => display}/sm501fb.txt | 0
8090 .../bindings/{video => display}/ssd1289fb.txt | 0
8091 .../bindings/{video => display}/ssd1307fb.txt | 0
8092 .../bindings/{gpu => display}/st,stih4xx.txt | 4 +-
8093 .../tegra}/nvidia,tegra114-mipi.txt | 0
8094 .../tegra}/nvidia,tegra20-host1x.txt | 2 +-
8095 .../bindings/{video => display/ti}/ti,dra7-dss.txt | 2 +-
8096 .../bindings/{video => display/ti}/ti,omap-dss.txt | 0
8097 .../{video => display/ti}/ti,omap2-dss.txt | 2 +-
8098 .../{video => display/ti}/ti,omap3-dss.txt | 2 +-
8099 .../{video => display/ti}/ti,omap4-dss.txt | 2 +-
8100 .../{video => display/ti}/ti,omap5-dss.txt | 2 +-
8101 .../bindings/{video => display/ti}/ti,opa362.txt | 0
8102 .../bindings/{video => display/ti}/ti,tfp410.txt | 0
8103 .../{video => display/ti}/ti,tpd12s015.txt | 0
8104 .../bindings/{drm => display}/tilcdc/panel.txt | 2 +-
8105 .../bindings/{drm => display}/tilcdc/tfp410.txt | 0
8106 .../bindings/{drm => display}/tilcdc/tilcdc.txt | 0
8107 .../bindings/{video => display}/via,vt8500-fb.txt | 0
8108 .../{video => display}/wm,prizm-ge-rops.txt | 0
8109 .../bindings/{video => display}/wm,wm8505-fb.txt | 0
8110 .../devicetree/bindings/{misc => eeprom}/at25.txt | 0
8111 .../devicetree/bindings/{ => eeprom}/eeprom.txt | 0
8112 Documentation/devicetree/bindings/hwmon/ina209.txt | 18 ----
8113 Documentation/devicetree/bindings/hwmon/ina2xx.txt | 1 +
8114 .../bindings/{misc => iio/accel}/lis302.txt | 0
8115 .../bindings/{misc => iio/dac}/ti,dac7512.txt | 0
8116 .../bindings/{misc => iio/pressure}/bmp085.txt | 0
8117 .../bindings/{hid => input}/hid-over-i2c.txt | 0
8118 .../arm,gic-v3.txt} | 0
8119 .../gic.txt => interrupt-controller/arm,gic.txt} | 0
8120 .../arm,versatile-fpga-irq.txt} | 0
8121 .../vic.txt => interrupt-controller/arm,vic.txt} | 0
8122 .../axis,crisv32-intc.txt} | 0
8123 .../img,meta-intc.txt} | 0
8124 .../img,pdc-intc.txt} | 0
8125 .../intel,ce4100-ioapic.txt} | 0
8126 .../mediatek,sysirq.txt | 0
8127 .../mrvl,intc.txt} | 0
8128 .../nxp,lpc3220-mic.txt} | 0
8129 .../{ => interrupt-controller}/open-pic.txt | 0
8130 .../samsung,exynos4210-combiner.txt} | 0
8131 .../snps,arc700-intc.txt} | 0
8132 .../snps,archs-idu-intc.txt} | 0
8133 .../snps,archs-intc.txt} | 0
8134 .../st,spear3xx-shirq.txt} | 0
8135 .../ti,c64x+megamod-pic.txt} | 0
8136 .../ti,cp-intc.txt} | 0
8137 .../ti,omap2-intc.txt} | 0
8138 .../via,vt8500-intc.txt | 0
8139 .../{video => leds}/backlight/88pm860x.txt | 0
8140 .../{video => leds}/backlight/gpio-backlight.txt | 0
8141 .../bindings/{video => leds}/backlight/lp855x.txt | 0
8142 .../backlight/max8925-backlight.txt | 0
8143 .../{video => leds}/backlight/pm8941-wled.txt | 0
8144 .../{video => leds}/backlight/pwm-backlight.txt | 0
8145 .../backlight/sky81452-backlight.txt | 0
8146 .../backlight/tps65217-backlight.txt | 0
8147 .../calxeda-ddr-ctrlr.txt} | 0
8148 .../devicetree/bindings/mfd/atmel-hlcdc.txt | 2 +-
8149 Documentation/devicetree/bindings/mfd/sky81452.txt | 2 +-
8150 Documentation/devicetree/bindings/pci/pci.txt | 4 +-
8151 .../combophy.txt => phy/calxeda-combophy.txt} | 0
8152 .../keystone-phy.txt => phy/keystone-usb-phy.txt} | 0
8153 .../{usb/mxs-phy.txt => phy/mxs-usb-phy.txt} | 0
8154 .../{usb => phy}/nvidia,tegra20-usb-phy.txt | 0
8155 .../bindings/{usb => phy}/qcom,usb-8x16-phy.txt | 0
8156 .../bindings/{hwrng => rng}/atmel-trng.txt | 0
8157 .../bindings/{hwrng => rng}/brcm,iproc-rng200.txt | 0
8158 .../bindings/{hwrng => rng}/omap_rng.txt | 0
8159 .../bindings/{hwrng => rng}/timeriomem_rng.txt | 0
8160 .../devicetree/bindings/serial/mrvl,pxa-ssp.txt | 1 -
8161 Documentation/devicetree/bindings/serial/pl011.txt | 2 +-
8162 .../devicetree/bindings/usb/samsung-usbphy.txt | 117 ---------------------
8163 .../devicetree/bindings/vendor-prefixes.txt | 1 +
8164 arch/arc/Makefile | 2 +-
8165 arch/arc/boot/dts/Makefile | 6 +-
8166 arch/arm/boot/dts/Makefile | 3 +
8167 arch/arm64/boot/dts/Makefile | 6 ++
8168 arch/h8300/boot/dts/Makefile | 3 +
8169 arch/metag/Makefile | 2 +-
8170 arch/metag/boot/dts/Makefile | 7 +-
8171 arch/mips/boot/dts/Makefile | 3 +
8172 arch/xtensa/Makefile | 4 +
8173 arch/xtensa/boot/dts/Makefile | 7 +-
8174 drivers/base/core.c | 2 +-
8175 drivers/of/Kconfig | 10 ++
8176 drivers/of/address.c | 6 ++
8177 drivers/of/device.c | 11 +-
8178 drivers/of/fdt.c | 10 +-
8179 drivers/of/irq.c | 9 +-
8180 drivers/of/of_pci.c | 6 +-
8181 drivers/of/of_reserved_mem.c | 43 +++++++-
8182 drivers/of/overlay.c | 5 +-
8183 drivers/of/platform.c | 8 +-
8184 drivers/of/unittest.c | 8 +-
8185 include/linux/of_irq.h | 15 ++-
8186 191 files changed, 202 insertions(+), 202 deletions(-)
8187 rename Documentation/devicetree/bindings/{nvec => arm/tegra}/nvidia,nvec.txt (100%)
8188 rename Documentation/devicetree/bindings/{video => display}/arm,pl11x.txt (100%)
8189 rename Documentation/devicetree/bindings/{drm => display}/armada/marvell,dove-lcd.txt (100%)
8190 rename Documentation/devicetree/bindings/{video => display}/atmel,lcdc.txt (100%)
8191 rename Documentation/devicetree/bindings/{drm => display}/atmel/hlcdc-dc.txt (100%)
8192 rename Documentation/devicetree/bindings/{video => display/bridge}/adi,adv7123.txt (100%)
8193 rename Documentation/devicetree/bindings/{video => display/bridge}/adi,adv7511.txt (100%)
8194 rename Documentation/devicetree/bindings/{drm => display}/bridge/dw_hdmi.txt (91%)
8195 rename Documentation/devicetree/bindings/{video => display}/bridge/ps8622.txt (100%)
8196 rename Documentation/devicetree/bindings/{video => display}/bridge/ptn3460.txt (100%)
8197 rename Documentation/devicetree/bindings/{drm/i2c => display/bridge}/tda998x.txt (100%)
8198 rename Documentation/devicetree/bindings/{video/thine,thc63lvdm83d => display/bridge/thine,thc63lvdm83d.txt} (100%)
8199 rename Documentation/devicetree/bindings/{video => display}/cirrus,clps711x-fb.txt (94%)
8200 rename Documentation/devicetree/bindings/{video => display/connector}/analog-tv-connector.txt (100%)
8201 rename Documentation/devicetree/bindings/{video => display/connector}/dvi-connector.txt (100%)
8202 rename Documentation/devicetree/bindings/{video => display/connector}/hdmi-connector.txt (100%)
8203 rename Documentation/devicetree/bindings/{video => display/connector}/vga-connector.txt (100%)
8204 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos-mic.txt (100%)
8205 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos5433-decon.txt (100%)
8206 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos7-decon.txt (97%)
8207 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_dp.txt (98%)
8208 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_dsim.txt (98%)
8209 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmi.txt (100%)
8210 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmiddc.txt (100%)
8211 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmiphy.txt (100%)
8212 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_mixer.txt (100%)
8213 rename Documentation/devicetree/bindings/{video => display/exynos}/samsung-fimd.txt (98%)
8214 rename Documentation/devicetree/bindings/{video => display}/fsl,dcu.txt (100%)
8215 rename Documentation/devicetree/bindings/{video => display/imx}/fsl,imx-fb.txt (96%)
8216 rename Documentation/devicetree/bindings/{drm => display}/imx/fsl-imx-drm.txt (100%)
8217 rename Documentation/devicetree/bindings/{drm => display}/imx/hdmi.txt (100%)
8218 rename Documentation/devicetree/bindings/{drm => display}/imx/ldb.txt (98%)
8219 create mode 100644 Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt
8220 rename Documentation/devicetree/bindings/{mipi/dsi => display}/mipi-dsi-bus.txt (100%)
8221 rename Documentation/devicetree/bindings/{drm => display}/msm/dsi.txt (98%)
8222 rename Documentation/devicetree/bindings/{drm => display}/msm/edp.txt (100%)
8223 rename Documentation/devicetree/bindings/{drm => display}/msm/gpu.txt (100%)
8224 rename Documentation/devicetree/bindings/{drm => display}/msm/hdmi.txt (100%)
8225 rename Documentation/devicetree/bindings/{drm => display}/msm/mdp.txt (100%)
8226 rename Documentation/devicetree/bindings/{fb => display}/mxsfb.txt (100%)
8227 rename Documentation/devicetree/bindings/{ => display}/panel/ampire,am800480r3tmqwa1h.txt (100%)
8228 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b080uan01.txt (100%)
8229 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101aw03.txt (100%)
8230 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101ean01.txt (100%)
8231 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101xtn01.txt (100%)
8232 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b116xw03.txt (100%)
8233 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b133htn01.txt (100%)
8234 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b133xtn01.txt (100%)
8235 rename Documentation/devicetree/bindings/{ => display}/panel/avic,tm070ddh03.txt (100%)
8236 rename Documentation/devicetree/bindings/{ => display}/panel/chunghwa,claa101wa01a.txt (100%)
8237 rename Documentation/devicetree/bindings/{ => display}/panel/chunghwa,claa101wb03.txt (100%)
8238 rename Documentation/devicetree/bindings/{video => display/panel}/display-timing.txt (100%)
8239 rename Documentation/devicetree/bindings/{ => display}/panel/edt,et057090dhu.txt (100%)
8240 rename Documentation/devicetree/bindings/{ => display}/panel/edt,et070080dh6.txt (100%)
8241 rename Documentation/devicetree/bindings/{ => display}/panel/edt,etm0700g0dh6.txt (100%)
8242 rename Documentation/devicetree/bindings/{ => display}/panel/foxlink,fl500wvr00-a0t.txt (100%)
8243 rename Documentation/devicetree/bindings/{ => display}/panel/giantplus,gpg482739qs5.txt (100%)
8244 rename Documentation/devicetree/bindings/{ => display}/panel/hannstar,hsd070pww1.txt (100%)
8245 rename Documentation/devicetree/bindings/{ => display}/panel/hannstar,hsd100pxn1.txt (100%)
8246 rename Documentation/devicetree/bindings/{ => display}/panel/hit,tx23d38vm0caa.txt (100%)
8247 rename Documentation/devicetree/bindings/{ => display}/panel/innolux,at043tn24.txt (100%)
8248 rename Documentation/devicetree/bindings/{ => display}/panel/innolux,g121i1-l01.txt (100%)
8249 rename Documentation/devicetree/bindings/{ => display}/panel/innolux,n116bge.txt (100%)
8250 rename Documentation/devicetree/bindings/{ => display}/panel/innolux,n156bge-l21.txt (100%)
8251 rename Documentation/devicetree/bindings/{ => display}/panel/innolux,zj070na-01p.txt (100%)
8252 rename Documentation/devicetree/bindings/{ => display}/panel/lg,lb070wv8.txt (100%)
8253 rename Documentation/devicetree/bindings/{ => display}/panel/lg,ld070wx3-sl01.txt (100%)
8254 rename Documentation/devicetree/bindings/{ => display}/panel/lg,lg4573.txt (100%)
8255 rename Documentation/devicetree/bindings/{ => display}/panel/lg,lh500wx1-sd03.txt (100%)
8256 rename Documentation/devicetree/bindings/{ => display}/panel/lg,lp129qe.txt (100%)
8257 rename Documentation/devicetree/bindings/{video => display/panel}/lgphilips,lb035q02.txt (100%)
8258 rename Documentation/devicetree/bindings/{ => display}/panel/nec,nl4827hc19-05b.txt (100%)
8259 rename Documentation/devicetree/bindings/{ => display}/panel/okaya,rs800480t-7x0gp.txt (100%)
8260 rename Documentation/devicetree/bindings/{ => display}/panel/ortustech,com43h4m85ulc.txt (100%)
8261 rename Documentation/devicetree/bindings/{ => display}/panel/panasonic,vvx10f004b00.txt (100%)
8262 rename Documentation/devicetree/bindings/{video => display/panel}/panel-dpi.txt (94%)
8263 rename Documentation/devicetree/bindings/{video => display/panel}/panel-dsi-cm.txt (100%)
8264 rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ld9040.txt (96%)
8265 rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ltn101nt05.txt (100%)
8266 rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ltn140at29-301.txt (100%)
8267 rename Documentation/devicetree/bindings/{ => display}/panel/samsung,s6e8aa0.txt (95%)
8268 rename Documentation/devicetree/bindings/{ => display}/panel/sharp,lq101r1sx01.txt (100%)
8269 rename Documentation/devicetree/bindings/{video => display/panel}/sharp,ls037v7dw01.txt (100%)
8270 rename Documentation/devicetree/bindings/{ => display}/panel/shelly,sca07010-bfn-lnn.txt (100%)
8271 rename Documentation/devicetree/bindings/{ => display}/panel/simple-panel.txt (100%)
8272 rename Documentation/devicetree/bindings/{video => display/panel}/sony,acx565akm.txt (100%)
8273 rename Documentation/devicetree/bindings/{video => display/panel}/toppoly,td028ttec1.txt (100%)
8274 rename Documentation/devicetree/bindings/{video => display/panel}/tpo,td043mtea1.txt (100%)
8275 rename Documentation/devicetree/bindings/{video => display}/renesas,du.txt (100%)
8276 rename Documentation/devicetree/bindings/{video => display/rockchip}/dw_hdmi-rockchip.txt (100%)
8277 rename Documentation/devicetree/bindings/{video => display/rockchip}/rockchip-drm.txt (88%)
8278 rename Documentation/devicetree/bindings/{video => display/rockchip}/rockchip-vop.txt (100%)
8279 rename Documentation/devicetree/bindings/{video => display}/simple-framebuffer-sunxi.txt (100%)
8280 rename Documentation/devicetree/bindings/{video => display}/simple-framebuffer.txt (100%)
8281 rename Documentation/devicetree/bindings/{fb => display}/sm501fb.txt (100%)
8282 rename Documentation/devicetree/bindings/{video => display}/ssd1289fb.txt (100%)
8283 rename Documentation/devicetree/bindings/{video => display}/ssd1307fb.txt (100%)
8284 rename Documentation/devicetree/bindings/{gpu => display}/st,stih4xx.txt (98%)
8285 rename Documentation/devicetree/bindings/{mipi => display/tegra}/nvidia,tegra114-mipi.txt (100%)
8286 rename Documentation/devicetree/bindings/{gpu => display/tegra}/nvidia,tegra20-host1x.txt (99%)
8287 rename Documentation/devicetree/bindings/{video => display/ti}/ti,dra7-dss.txt (95%)
8288 rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap-dss.txt (100%)
8289 rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap2-dss.txt (93%)
8290 rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap3-dss.txt (95%)
8291 rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap4-dss.txt (97%)
8292 rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap5-dss.txt (96%)
8293 rename Documentation/devicetree/bindings/{video => display/ti}/ti,opa362.txt (100%)
8294 rename Documentation/devicetree/bindings/{video => display/ti}/ti,tfp410.txt (100%)
8295 rename Documentation/devicetree/bindings/{video => display/ti}/ti,tpd12s015.txt (100%)
8296 rename Documentation/devicetree/bindings/{drm => display}/tilcdc/panel.txt (96%)
8297 rename Documentation/devicetree/bindings/{drm => display}/tilcdc/tfp410.txt (100%)
8298 rename Documentation/devicetree/bindings/{drm => display}/tilcdc/tilcdc.txt (100%)
8299 rename Documentation/devicetree/bindings/{video => display}/via,vt8500-fb.txt (100%)
8300 rename Documentation/devicetree/bindings/{video => display}/wm,prizm-ge-rops.txt (100%)
8301 rename Documentation/devicetree/bindings/{video => display}/wm,wm8505-fb.txt (100%)
8302 rename Documentation/devicetree/bindings/{misc => eeprom}/at25.txt (100%)
8303 rename Documentation/devicetree/bindings/{ => eeprom}/eeprom.txt (100%)
8304 delete mode 100644 Documentation/devicetree/bindings/hwmon/ina209.txt
8305 rename Documentation/devicetree/bindings/{misc => iio/accel}/lis302.txt (100%)
8306 rename Documentation/devicetree/bindings/{misc => iio/dac}/ti,dac7512.txt (100%)
8307 rename Documentation/devicetree/bindings/{misc => iio/pressure}/bmp085.txt (100%)
8308 rename Documentation/devicetree/bindings/{hid => input}/hid-over-i2c.txt (100%)
8309 rename Documentation/devicetree/bindings/{arm/gic-v3.txt => interrupt-controller/arm,gic-v3.txt} (100%)
8310 rename Documentation/devicetree/bindings/{arm/gic.txt => interrupt-controller/arm,gic.txt} (100%)
8311 rename Documentation/devicetree/bindings/{arm/versatile-fpga-irq.txt => interrupt-controller/arm,versatile-fpga-irq.txt} (100%)
8312 rename Documentation/devicetree/bindings/{arm/vic.txt => interrupt-controller/arm,vic.txt} (100%)
8313 rename Documentation/devicetree/bindings/{cris/interrupts.txt => interrupt-controller/axis,crisv32-intc.txt} (100%)
8314 rename Documentation/devicetree/bindings/{metag/meta-intc.txt => interrupt-controller/img,meta-intc.txt} (100%)
8315 rename Documentation/devicetree/bindings/{metag/pdc-intc.txt => interrupt-controller/img,pdc-intc.txt} (100%)
8316 rename Documentation/devicetree/bindings/{x86/interrupt.txt => interrupt-controller/intel,ce4100-ioapic.txt} (100%)
8317 rename Documentation/devicetree/bindings/{arm/mediatek => interrupt-controller}/mediatek,sysirq.txt (100%)
8318 rename Documentation/devicetree/bindings/{arm/mrvl/intc.txt => interrupt-controller/mrvl,intc.txt} (100%)
8319 rename Documentation/devicetree/bindings/{arm/lpc32xx-mic.txt => interrupt-controller/nxp,lpc3220-mic.txt} (100%)
8320 rename Documentation/devicetree/bindings/{ => interrupt-controller}/open-pic.txt (100%)
8321 rename Documentation/devicetree/bindings/{arm/samsung/interrupt-combiner.txt => interrupt-controller/samsung,exynos4210-combiner.txt} (100%)
8322 rename Documentation/devicetree/bindings/{arc/interrupts.txt => interrupt-controller/snps,arc700-intc.txt} (100%)
8323 rename Documentation/devicetree/bindings/{arc/archs-idu-intc.txt => interrupt-controller/snps,archs-idu-intc.txt} (100%)
8324 rename Documentation/devicetree/bindings/{arc/archs-intc.txt => interrupt-controller/snps,archs-intc.txt} (100%)
8325 rename Documentation/devicetree/bindings/{arm/spear/shirq.txt => interrupt-controller/st,spear3xx-shirq.txt} (100%)
8326 rename Documentation/devicetree/bindings/{c6x/interrupt.txt => interrupt-controller/ti,c64x+megamod-pic.txt} (100%)
8327 rename Documentation/devicetree/bindings/{arm/davinci/cp-intc.txt => interrupt-controller/ti,cp-intc.txt} (100%)
8328 rename Documentation/devicetree/bindings/{arm/omap/intc.txt => interrupt-controller/ti,omap2-intc.txt} (100%)
8329 rename Documentation/devicetree/bindings/{arm/vt8500 => interrupt-controller}/via,vt8500-intc.txt (100%)
8330 rename Documentation/devicetree/bindings/{video => leds}/backlight/88pm860x.txt (100%)
8331 rename Documentation/devicetree/bindings/{video => leds}/backlight/gpio-backlight.txt (100%)
8332 rename Documentation/devicetree/bindings/{video => leds}/backlight/lp855x.txt (100%)
8333 rename Documentation/devicetree/bindings/{video => leds}/backlight/max8925-backlight.txt (100%)
8334 rename Documentation/devicetree/bindings/{video => leds}/backlight/pm8941-wled.txt (100%)
8335 rename Documentation/devicetree/bindings/{video => leds}/backlight/pwm-backlight.txt (100%)
8336 rename Documentation/devicetree/bindings/{video => leds}/backlight/sky81452-backlight.txt (100%)
8337 rename Documentation/devicetree/bindings/{video => leds}/backlight/tps65217-backlight.txt (100%)
8338 rename Documentation/devicetree/bindings/{arm/calxeda/mem-ctrlr.txt => memory-controllers/calxeda-ddr-ctrlr.txt} (100%)
8339 rename Documentation/devicetree/bindings/{arm/calxeda/combophy.txt => phy/calxeda-combophy.txt} (100%)
8340 rename Documentation/devicetree/bindings/{usb/keystone-phy.txt => phy/keystone-usb-phy.txt} (100%)
8341 rename Documentation/devicetree/bindings/{usb/mxs-phy.txt => phy/mxs-usb-phy.txt} (100%)
8342 rename Documentation/devicetree/bindings/{usb => phy}/nvidia,tegra20-usb-phy.txt (100%)
8343 rename Documentation/devicetree/bindings/{usb => phy}/qcom,usb-8x16-phy.txt (100%)
8344 rename Documentation/devicetree/bindings/{hwrng => rng}/atmel-trng.txt (100%)
8345 rename Documentation/devicetree/bindings/{hwrng => rng}/brcm,iproc-rng200.txt (100%)
8346 rename Documentation/devicetree/bindings/{hwrng => rng}/omap_rng.txt (100%)
8347 rename Documentation/devicetree/bindings/{hwrng => rng}/timeriomem_rng.txt (100%)
8348 delete mode 100644 Documentation/devicetree/bindings/usb/samsung-usbphy.txt
8349 Merging mailbox/mailbox-for-next (8e3c5952144f mailbox/omap: Add ti,mbox-send-noirq quirk to fix AM33xx CPU Idle)
8350 $ git merge mailbox/mailbox-for-next
8351 Merge made by the 'recursive' strategy.
8352 .../devicetree/bindings/mailbox/omap-mailbox.txt | 8 +
8353 .../devicetree/bindings/mailbox/sti-mailbox.txt | 51 ++
8354 drivers/mailbox/Kconfig | 14 +
8355 drivers/mailbox/Makefile | 4 +
8356 drivers/mailbox/mailbox-sti.c | 513 +++++++++++++++++++++
8357 drivers/mailbox/mailbox-test.c | 362 +++++++++++++++
8358 drivers/mailbox/omap-mailbox.c | 49 +-
8359 drivers/mailbox/pcc.c | 2 +-
8360 8 files changed, 998 insertions(+), 5 deletions(-)
8361 create mode 100644 Documentation/devicetree/bindings/mailbox/sti-mailbox.txt
8362 create mode 100644 drivers/mailbox/mailbox-sti.c
8363 create mode 100644 drivers/mailbox/mailbox-test.c
8364 $ git reset --hard HEAD^
8365 HEAD is now at 6b2a0c58dde3 Merge remote-tracking branch 'dt-rh/for-next'
8366 Merging next-20151022 version of mailbox
8367 $ git merge -m next-20151022/mailbox 6c03663f98b91cdd04fce2c9fb7a2cc5d164eded
8368 Merge made by the 'recursive' strategy.
8369 .../devicetree/bindings/mailbox/sti-mailbox.txt | 51 ++
8370 drivers/mailbox/Kconfig | 14 +
8371 drivers/mailbox/Makefile | 4 +
8372 drivers/mailbox/mailbox-sti.c | 513 +++++++++++++++++++++
8373 drivers/mailbox/mailbox-test.c | 361 +++++++++++++++
8374 drivers/mailbox/pcc.c | 2 +-
8375 6 files changed, 944 insertions(+), 1 deletion(-)
8376 create mode 100644 Documentation/devicetree/bindings/mailbox/sti-mailbox.txt
8377 create mode 100644 drivers/mailbox/mailbox-sti.c
8378 create mode 100644 drivers/mailbox/mailbox-test.c
8379 Merging spi/for-next (9de608970f32 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/ti-qspi' and 'spi/topic/txx9' into spi-next)
8380 $ git merge spi/for-next
8381 Resolved 'drivers/nfc/trf7970a.c' using previous resolution.
8382 Auto-merging sound/soc/codecs/wm8731.c
8383 Auto-merging sound/soc/codecs/ad193x-spi.c
8384 Auto-merging drivers/staging/mt29f_spinand/mt29f_spinand.c
8385 Auto-merging drivers/spi/spi-atmel.c
8386 Auto-merging drivers/nfc/trf7970a.c
8387 CONFLICT (content): Merge conflict in drivers/nfc/trf7970a.c
8388 Auto-merging drivers/nfc/st-nci/spi.c
8389 Auto-merging drivers/net/ieee802154/mrf24j40.c
8390 Auto-merging drivers/net/ieee802154/at86rf230.c
8391 Auto-merging drivers/mtd/devices/sst25l.c
8392 Auto-merging drivers/mtd/devices/mtd_dataflash.c
8393 Auto-merging drivers/mtd/devices/m25p80.c
8394 Auto-merging drivers/mmc/host/mmc_spi.c
8395 Auto-merging drivers/mfd/da9052-spi.c
8396 Auto-merging drivers/mfd/arizona-spi.c
8397 Auto-merging drivers/media/i2c/s5c73m3/s5c73m3-spi.c
8398 Auto-merging drivers/input/touchscreen/ads7846.c
8399 Auto-merging drivers/input/misc/ad714x-spi.c
8400 Automatic merge failed; fix conflicts and then commit the result.
8402 [master 7d6c360af39a] Merge remote-tracking branch 'spi/for-next'
8403 $ git diff -M --stat --summary HEAD^..
8404 .../bindings/spi/brcm,bcm2835-aux-spi.txt | 38 ++
8405 .../devicetree/bindings/spi/spi-mt65xx.txt | 9 +-
8406 arch/arm/mach-u300/dummyspichip.c | 1 -
8407 arch/mips/bcm63xx/dev-spi.c | 42 +-
8408 .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 44 --
8409 arch/mips/txx9/generic/spi_eeprom.c | 1 -
8410 drivers/char/tpm/st33zp24/spi.c | 1 -
8411 drivers/gpio/gpio-74x164.c | 1 -
8412 drivers/gpio/gpio-max7301.c | 1 -
8413 drivers/gpio/gpio-mc33880.c | 1 -
8414 drivers/gpio/gpio-mcp23s08.c | 2 -
8415 drivers/gpu/drm/panel/panel-lg-lg4573.c | 1 -
8416 drivers/gpu/drm/panel/panel-samsung-ld9040.c | 1 -
8417 drivers/hwmon/ad7314.c | 1 -
8418 drivers/hwmon/adcxx.c | 1 -
8419 drivers/hwmon/ads7871.c | 1 -
8420 drivers/hwmon/adt7310.c | 1 -
8421 drivers/hwmon/lm70.c | 1 -
8422 drivers/hwmon/max1111.c | 1 -
8423 drivers/iio/accel/kxsd9.c | 1 -
8424 drivers/iio/accel/st_accel_spi.c | 1 -
8425 drivers/iio/adc/ad7266.c | 1 -
8426 drivers/iio/adc/ad7298.c | 1 -
8427 drivers/iio/adc/ad7476.c | 1 -
8428 drivers/iio/adc/ad7791.c | 1 -
8429 drivers/iio/adc/ad7793.c | 1 -
8430 drivers/iio/adc/ad7887.c | 1 -
8431 drivers/iio/adc/ad7923.c | 1 -
8432 drivers/iio/adc/max1027.c | 1 -
8433 drivers/iio/adc/mcp320x.c | 1 -
8434 drivers/iio/adc/ti-adc128s052.c | 1 -
8435 drivers/iio/amplifiers/ad8366.c | 1 -
8436 drivers/iio/common/ssp_sensors/ssp_dev.c | 1 -
8437 drivers/iio/dac/ad5064.c | 1 -
8438 drivers/iio/dac/ad5360.c | 1 -
8439 drivers/iio/dac/ad5380.c | 1 -
8440 drivers/iio/dac/ad5421.c | 1 -
8441 drivers/iio/dac/ad5446.c | 1 -
8442 drivers/iio/dac/ad5449.c | 1 -
8443 drivers/iio/dac/ad5504.c | 1 -
8444 drivers/iio/dac/ad5624r_spi.c | 1 -
8445 drivers/iio/dac/ad5686.c | 1 -
8446 drivers/iio/dac/ad5755.c | 1 -
8447 drivers/iio/dac/ad5764.c | 1 -
8448 drivers/iio/dac/ad5791.c | 1 -
8449 drivers/iio/dac/ad7303.c | 1 -
8450 drivers/iio/dac/mcp4922.c | 1 -
8451 drivers/iio/frequency/ad9523.c | 1 -
8452 drivers/iio/frequency/adf4350.c | 1 -
8453 drivers/iio/gyro/adis16080.c | 1 -
8454 drivers/iio/gyro/adis16130.c | 1 -
8455 drivers/iio/gyro/adis16136.c | 1 -
8456 drivers/iio/gyro/adis16260.c | 1 -
8457 drivers/iio/gyro/adxrs450.c | 1 -
8458 drivers/iio/gyro/st_gyro_spi.c | 1 -
8459 drivers/iio/imu/adis16400_core.c | 1 -
8460 drivers/iio/imu/adis16480.c | 1 -
8461 drivers/iio/magnetometer/st_magn_spi.c | 1 -
8462 drivers/iio/pressure/ms5611_spi.c | 1 -
8463 drivers/iio/pressure/st_pressure_spi.c | 1 -
8464 drivers/iio/proximity/as3935.c | 1 -
8465 drivers/input/misc/ad714x-spi.c | 1 -
8466 drivers/input/misc/adxl34x-spi.c | 1 -
8467 drivers/input/touchscreen/ad7877.c | 1 -
8468 drivers/input/touchscreen/ad7879-spi.c | 1 -
8469 drivers/input/touchscreen/ads7846.c | 1 -
8470 drivers/input/touchscreen/cyttsp4_spi.c | 1 -
8471 drivers/input/touchscreen/cyttsp_spi.c | 1 -
8472 drivers/input/touchscreen/tsc2005.c | 1 -
8473 drivers/leds/leds-dac124s085.c | 1 -
8474 drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 -
8475 drivers/media/tuners/msi001.c | 1 -
8476 drivers/mfd/arizona-spi.c | 1 -
8477 drivers/mfd/cros_ec_spi.c | 1 -
8478 drivers/mfd/da9052-spi.c | 1 -
8479 drivers/mfd/ezx-pcap.c | 1 -
8480 drivers/mfd/mc13xxx-spi.c | 1 -
8481 drivers/mfd/stmpe-spi.c | 1 -
8482 drivers/mfd/tps65912-spi.c | 1 -
8483 drivers/mfd/wm831x-spi.c | 1 -
8484 drivers/misc/ad525x_dpot-spi.c | 1 -
8485 drivers/misc/bmp085-spi.c | 1 -
8486 drivers/misc/eeprom/at25.c | 1 -
8487 drivers/misc/eeprom/eeprom_93xx46.c | 1 -
8488 drivers/misc/lattice-ecp3-config.c | 1 -
8489 drivers/misc/lis3lv02d/lis3lv02d_spi.c | 1 -
8490 drivers/misc/ti_dac7512.c | 1 -
8491 drivers/mmc/host/mmc_spi.c | 1 -
8492 drivers/mtd/devices/m25p80.c | 1 -
8493 drivers/mtd/devices/mtd_dataflash.c | 1 -
8494 drivers/mtd/devices/sst25l.c | 1 -
8495 drivers/net/can/spi/mcp251x.c | 1 -
8496 drivers/net/ethernet/micrel/ks8851.c | 1 -
8497 drivers/net/ethernet/microchip/enc28j60.c | 1 -
8498 drivers/net/ethernet/qualcomm/qca_spi.c | 1 -
8499 drivers/net/ieee802154/at86rf230.c | 1 -
8500 drivers/net/ieee802154/cc2520.c | 1 -
8501 drivers/net/ieee802154/mrf24j40.c | 1 -
8502 drivers/net/phy/spi_ks8995.c | 1 -
8503 drivers/net/wireless/cw1200/cw1200_spi.c | 1 -
8504 drivers/net/wireless/libertas/if_spi.c | 1 -
8505 drivers/net/wireless/p54/p54spi.c | 1 -
8506 drivers/net/wireless/ti/wl1251/spi.c | 1 -
8507 drivers/net/wireless/ti/wlcore/spi.c | 1 -
8508 drivers/nfc/st-nci/spi.c | 1 -
8509 drivers/nfc/trf7970a.c | 1 -
8510 drivers/regulator/tps6524x-regulator.c | 1 -
8511 drivers/rtc/rtc-ds1305.c | 1 -
8512 drivers/rtc/rtc-ds1343.c | 1 -
8513 drivers/rtc/rtc-ds1347.c | 1 -
8514 drivers/rtc/rtc-ds1390.c | 1 -
8515 drivers/rtc/rtc-ds3234.c | 1 -
8516 drivers/rtc/rtc-m41t93.c | 1 -
8517 drivers/rtc/rtc-m41t94.c | 1 -
8518 drivers/rtc/rtc-max6902.c | 1 -
8519 drivers/rtc/rtc-mcp795.c | 1 -
8520 drivers/rtc/rtc-pcf2123.c | 1 -
8521 drivers/rtc/rtc-r9701.c | 1 -
8522 drivers/rtc/rtc-rs5c348.c | 1 -
8523 drivers/rtc/rtc-rx4581.c | 1 -
8524 drivers/spi/Kconfig | 15 +-
8525 drivers/spi/Makefile | 1 +
8526 drivers/spi/spi-ath79.c | 11 +-
8527 drivers/spi/spi-atmel.c | 3 +-
8528 drivers/spi/spi-au1550.c | 11 +-
8529 drivers/spi/spi-bcm2835.c | 14 +-
8530 drivers/spi/spi-bcm2835aux.c | 512 +++++++++++++++++++++
8531 drivers/spi/spi-bcm53xx.c | 13 +-
8532 drivers/spi/spi-bcm63xx.c | 210 ++++++++-
8533 drivers/spi/spi-bfin-sport.c | 5 +-
8534 drivers/spi/spi-bfin5xx.c | 6 +-
8535 drivers/spi/spi-bitbang.c | 152 ++----
8536 drivers/spi/spi-coldfire-qspi.c | 3 +-
8537 drivers/spi/spi-davinci.c | 15 +-
8538 drivers/spi/spi-dw-mmio.c | 7 +-
8539 drivers/spi/spi-dw-pci.c | 29 +-
8540 drivers/spi/spi-dw.c | 108 ++---
8541 drivers/spi/spi-dw.h | 6 +
8542 drivers/spi/spi-fsl-dspi.c | 3 -
8543 drivers/spi/spi-imx.c | 7 +
8544 drivers/spi/spi-mpc512x-psc.c | 8 +-
8545 drivers/spi/spi-mt65xx.c | 129 ++++--
8546 drivers/spi/spi-oc-tiny.c | 14 +-
8547 drivers/spi/spi-octeon.c | 2 +-
8548 drivers/spi/spi-omap-100k.c | 26 +-
8549 drivers/spi/spi-omap-uwire.c | 7 +-
8550 drivers/spi/spi-omap2-mcspi.c | 28 ++
8551 drivers/spi/spi-ppc4xx.c | 4 +-
8552 drivers/spi/spi-pxa2xx-dma.c | 4 -
8553 drivers/spi/spi-pxa2xx.c | 257 +++++++----
8554 drivers/spi/spi-pxa2xx.h | 9 -
8555 drivers/spi/spi-s3c24xx.c | 4 +-
8556 drivers/spi/spi-s3c64xx.c | 46 +-
8557 drivers/spi/spi-ti-qspi.c | 88 +---
8558 drivers/spi/spi-tle62x0.c | 1 -
8559 drivers/spi/spi-txx9.c | 2 +-
8560 drivers/spi/spi-xilinx.c | 38 +-
8561 drivers/spi/spi.c | 136 +++++-
8562 drivers/spi/spidev.c | 1 -
8563 drivers/staging/fbtft/fbtft.h | 1 -
8564 drivers/staging/fbtft/flexfb.c | 1 -
8565 drivers/staging/iio/accel/adis16201_core.c | 1 -
8566 drivers/staging/iio/accel/adis16203_core.c | 1 -
8567 drivers/staging/iio/accel/adis16204_core.c | 1 -
8568 drivers/staging/iio/accel/adis16209_core.c | 1 -
8569 drivers/staging/iio/accel/adis16220_core.c | 1 -
8570 drivers/staging/iio/accel/adis16240_core.c | 1 -
8571 drivers/staging/iio/accel/lis3l02dq_core.c | 1 -
8572 drivers/staging/iio/accel/sca3000_core.c | 1 -
8573 drivers/staging/iio/adc/ad7192.c | 1 -
8574 drivers/staging/iio/adc/ad7280a.c | 1 -
8575 drivers/staging/iio/adc/ad7606_spi.c | 1 -
8576 drivers/staging/iio/adc/ad7780.c | 1 -
8577 drivers/staging/iio/adc/ad7816.c | 1 -
8578 drivers/staging/iio/addac/adt7316-spi.c | 1 -
8579 drivers/staging/iio/frequency/ad9832.c | 1 -
8580 drivers/staging/iio/frequency/ad9834.c | 1 -
8581 drivers/staging/iio/gyro/adis16060_core.c | 2 -
8582 drivers/staging/iio/magnetometer/hmc5843_spi.c | 1 -
8583 drivers/staging/iio/meter/ade7753.c | 1 -
8584 drivers/staging/iio/meter/ade7754.c | 1 -
8585 drivers/staging/iio/meter/ade7758_core.c | 1 -
8586 drivers/staging/iio/meter/ade7759.c | 1 -
8587 drivers/staging/iio/meter/ade7854-spi.c | 1 -
8588 drivers/staging/iio/resolver/ad2s1200.c | 1 -
8589 drivers/staging/iio/resolver/ad2s1210.c | 1 -
8590 drivers/staging/iio/resolver/ad2s90.c | 1 -
8591 drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 -
8592 drivers/tty/serial/ifx6x60.c | 2 +-
8593 drivers/tty/serial/max3100.c | 1 -
8594 drivers/tty/serial/max310x.c | 1 -
8595 drivers/tty/serial/sc16is7xx.c | 1 -
8596 drivers/usb/host/max3421-hcd.c | 1 -
8597 drivers/video/backlight/ams369fg06.c | 1 -
8598 drivers/video/backlight/corgi_lcd.c | 1 -
8599 drivers/video/backlight/ili922x.c | 1 -
8600 drivers/video/backlight/l4f00242t03.c | 1 -
8601 drivers/video/backlight/ld9040.c | 1 -
8602 drivers/video/backlight/lms283gf05.c | 1 -
8603 drivers/video/backlight/lms501kf03.c | 1 -
8604 drivers/video/backlight/ltv350qv.c | 1 -
8605 drivers/video/backlight/s6e63m0.c | 1 -
8606 drivers/video/backlight/tdo24m.c | 1 -
8607 drivers/video/backlight/tosa_lcd.c | 1 -
8608 drivers/video/backlight/vgg2432a4.c | 1 -
8609 drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c | 1 -
8610 drivers/video/fbdev/omap/lcd_mipid.c | 1 -
8611 .../omap2/displays-new/panel-lgphilips-lb035q02.c | 1 -
8612 .../omap2/displays-new/panel-nec-nl8048hl11.c | 1 -
8613 .../omap2/displays-new/panel-sony-acx565akm.c | 1 -
8614 .../omap2/displays-new/panel-tpo-td028ttec1.c | 1 -
8615 .../omap2/displays-new/panel-tpo-td043mtea1.c | 1 -
8616 include/linux/pxa2xx_ssp.h | 1 +
8617 include/linux/spi/spi.h | 44 +-
8618 include/linux/spi/spi_bitbang.h | 2 +-
8619 sound/soc/codecs/ad1836.c | 1 -
8620 sound/soc/codecs/ad193x-spi.c | 1 -
8621 sound/soc/codecs/adau1761-spi.c | 1 -
8622 sound/soc/codecs/adau1781-spi.c | 1 -
8623 sound/soc/codecs/adau1977-spi.c | 1 -
8624 sound/soc/codecs/adav801.c | 1 -
8625 sound/soc/codecs/ak4104.c | 1 -
8626 sound/soc/codecs/cs4271-spi.c | 1 -
8627 sound/soc/codecs/da7210.c | 1 -
8628 sound/soc/codecs/pcm1792a.c | 1 -
8629 sound/soc/codecs/pcm512x-spi.c | 1 -
8630 sound/soc/codecs/rt5677-spi.c | 1 -
8631 sound/soc/codecs/ssm2602-spi.c | 1 -
8632 sound/soc/codecs/tlv320aic23-spi.c | 1 -
8633 sound/soc/codecs/tlv320aic26.c | 1 -
8634 sound/soc/codecs/wm0010.c | 1 -
8635 sound/soc/codecs/wm8510.c | 1 -
8636 sound/soc/codecs/wm8711.c | 1 -
8637 sound/soc/codecs/wm8728.c | 1 -
8638 sound/soc/codecs/wm8731.c | 1 -
8639 sound/soc/codecs/wm8737.c | 1 -
8640 sound/soc/codecs/wm8741.c | 1 -
8641 sound/soc/codecs/wm8750.c | 1 -
8642 sound/soc/codecs/wm8753.c | 1 -
8643 sound/soc/codecs/wm8770.c | 1 -
8644 sound/soc/codecs/wm8776.c | 1 -
8645 sound/soc/codecs/wm8804-spi.c | 1 -
8646 sound/soc/codecs/wm8900.c | 1 -
8647 sound/soc/codecs/wm8983.c | 1 -
8648 sound/soc/codecs/wm8985.c | 1 -
8649 sound/soc/codecs/wm8988.c | 1 -
8650 sound/soc/codecs/wm8995.c | 1 -
8651 247 files changed, 1403 insertions(+), 916 deletions(-)
8652 create mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm2835-aux-spi.txt
8653 create mode 100644 drivers/spi/spi-bcm2835aux.c
8654 Merging tip/auto-latest (90939cc5352f Merge branch 'x86/urgent')
8655 $ git merge tip/auto-latest
8656 Resolved 'Documentation/arm/uefi.txt' using previous resolution.
8657 Resolved 'arch/arm64/include/asm/atomic.h' using previous resolution.
8658 Resolved 'arch/arm64/kernel/acpi.c' using previous resolution.
8659 Resolved 'arch/arm64/kernel/cpufeature.c' using previous resolution.
8660 Resolved 'arch/x86/Makefile' using previous resolution.
8661 Resolved 'include/linux/of_irq.h' using previous resolution.
8662 Removing tools/perf/bench/mem-memcpy.c
8663 Auto-merging tools/perf/arch/x86/tests/rdpmc.c
8664 Auto-merging tools/perf/arch/x86/tests/perf-time-to-tsc.c
8665 Removing tools/lib/api/fs/tracefs.h
8666 Removing tools/lib/api/fs/tracefs.c
8667 Removing tools/lib/api/fs/findfs.h
8668 Removing tools/lib/api/fs/findfs.c
8669 Removing tools/lib/api/fs/debugfs.h
8670 Removing tools/lib/api/fs/debugfs.c
8671 Auto-merging kernel/irq/manage.c
8672 Auto-merging kernel/events/core.c
8673 Auto-merging include/uapi/linux/perf_event.h
8674 Auto-merging include/linux/sched.h
8675 Auto-merging include/linux/of_irq.h
8676 CONFLICT (content): Merge conflict in include/linux/of_irq.h
8677 Auto-merging include/linux/msi.h
8678 Auto-merging include/linux/fwnode.h
8679 Auto-merging include/linux/acpi.h
8680 Auto-merging drivers/pci/probe.c
8681 Auto-merging drivers/pci/msi.c
8682 Auto-merging drivers/of/irq.c
8683 Auto-merging drivers/net/ethernet/sfc/mcdi.c
8684 Auto-merging drivers/irqchip/irq-gic.c
8685 Auto-merging drivers/firmware/efi/Makefile
8686 Auto-merging drivers/clocksource/h8300_timer8.c
8687 Auto-merging drivers/clocksource/Makefile
8688 Auto-merging drivers/clocksource/Kconfig
8689 Removing arch/x86/kernel/cpu/microcode/intel_early.c
8690 Removing arch/x86/kernel/cpu/microcode/core_early.c
8691 Removing arch/x86/kernel/cpu/microcode/amd_early.c
8692 Auto-merging arch/x86/include/asm/pgtable.h
8693 Removing arch/x86/entry/vdso/vdso32/sysenter.S
8694 Removing arch/x86/entry/vdso/vdso32/syscall.S
8695 Removing arch/x86/entry/vdso/vdso32/int80.S
8696 Auto-merging arch/x86/crypto/sha512_ssse3_glue.c
8697 Auto-merging arch/x86/crypto/sha256_ssse3_glue.c
8698 Auto-merging arch/x86/crypto/sha1_ssse3_glue.c
8699 Auto-merging arch/x86/Makefile
8700 CONFLICT (content): Merge conflict in arch/x86/Makefile
8701 Auto-merging arch/x86/Kconfig
8702 Auto-merging arch/powerpc/sysdev/mpic.c
8703 Auto-merging arch/mips/include/asm/atomic.h
8704 Auto-merging arch/arm64/mm/proc.S
8705 Auto-merging arch/arm64/kvm/Kconfig
8706 Auto-merging arch/arm64/kernel/head.S
8707 Auto-merging arch/arm64/kernel/efi.c
8708 Auto-merging arch/arm64/kernel/cpufeature.c
8709 CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
8710 Auto-merging arch/arm64/kernel/cpu_errata.c
8711 Auto-merging arch/arm64/kernel/acpi.c
8712 CONFLICT (content): Merge conflict in arch/arm64/kernel/acpi.c
8713 Auto-merging arch/arm64/include/asm/pgtable.h
8714 Auto-merging arch/arm64/include/asm/memory.h
8715 Auto-merging arch/arm64/include/asm/cputype.h
8716 Auto-merging arch/arm64/include/asm/cpufeature.h
8717 Auto-merging arch/arm64/include/asm/atomic.h
8718 CONFLICT (content): Merge conflict in arch/arm64/include/asm/atomic.h
8719 Auto-merging arch/arm64/include/asm/acpi.h
8720 Auto-merging arch/arm64/Kconfig
8721 Auto-merging arch/arm/mach-omap2/omap-wakeupgen.c
8722 Auto-merging arch/arm/mach-imx/gpc.c
8723 Auto-merging arch/arm/mach-exynos/suspend.c
8724 Auto-merging arch/arm/Kconfig
8725 Auto-merging MAINTAINERS
8726 Auto-merging Documentation/kernel-parameters.txt
8727 Auto-merging Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt
8728 Auto-merging Documentation/arm64/booting.txt
8729 Auto-merging Documentation/arm/uefi.txt
8730 CONFLICT (content): Merge conflict in Documentation/arm/uefi.txt
8731 Automatic merge failed; fix conflicts and then commit the result.
8733 [master b666f39d08a7] Merge remote-tracking branch 'tip/auto-latest'
8734 $ git diff -M --stat --summary HEAD^..
8735 Documentation/IRQ-domain.txt | 8 +-
8736 Documentation/RCU/stallwarn.txt | 7 +
8737 Documentation/RCU/torture.txt | 39 +-
8738 Documentation/RCU/trace.txt | 32 +-
8739 Documentation/RCU/whatisRCU.txt | 6 +-
8740 Documentation/arm/uefi.txt | 2 -
8741 Documentation/arm64/booting.txt | 11 +-
8742 Documentation/atomic_ops.txt | 4 +
8743 .../bindings/interrupt-controller/arm,gic.txt | 24 +-
8744 .../bindings/interrupt-controller/renesas,irqc.txt | 1 +
8745 Documentation/devicetree/bindings/pci/pci-msi.txt | 220 ++++++
8746 Documentation/filesystems/proc.txt | 5 +-
8747 Documentation/kernel-parameters.txt | 24 +-
8748 Documentation/locking/locktorture.txt | 3 +
8749 Documentation/memory-barriers.txt | 29 +-
8751 arch/alpha/include/asm/atomic.h | 8 +-
8752 arch/arc/include/asm/atomic.h | 8 +-
8753 arch/arm/Kconfig | 1 +
8754 arch/arm/include/asm/arch_gicv3.h | 188 +++++
8755 arch/arm/include/asm/atomic.h | 12 +-
8756 arch/arm/mach-exynos/suspend.c | 55 +-
8757 arch/arm/mach-imx/gpc.c | 55 +-
8758 arch/arm/mach-omap2/omap-wakeupgen.c | 55 +-
8759 arch/arm64/Kconfig | 27 +
8760 arch/arm64/include/asm/acpi.h | 5 +
8761 arch/arm64/include/asm/arch_gicv3.h | 170 ++++
8762 arch/arm64/include/asm/atomic.h | 2 +-
8763 arch/arm64/include/asm/cpufeature.h | 3 +-
8764 arch/arm64/include/asm/cputype.h | 17 +-
8765 arch/arm64/include/asm/memory.h | 1 +
8766 arch/arm64/include/asm/pgtable.h | 2 +
8767 arch/arm64/kernel/acpi.c | 29 +
8768 arch/arm64/kernel/cpu_errata.c | 9 +
8769 arch/arm64/kernel/cpufeature.c | 18 +-
8770 arch/arm64/kernel/efi.c | 23 +-
8771 arch/arm64/kernel/head.S | 2 +
8772 arch/arm64/kvm/Kconfig | 4 +
8773 arch/arm64/mm/proc.S | 4 +-
8774 arch/avr32/include/asm/atomic.h | 4 +-
8775 arch/c6x/platforms/megamod-pic.c | 2 +-
8776 arch/frv/include/asm/atomic.h | 4 +-
8777 arch/h8300/include/asm/atomic.h | 4 +-
8778 arch/hexagon/include/asm/atomic.h | 2 +-
8779 arch/ia64/include/asm/atomic.h | 8 +-
8780 arch/m32r/include/asm/atomic.h | 4 +-
8781 arch/m68k/include/asm/atomic.h | 4 +-
8782 arch/metag/include/asm/atomic_lnkget.h | 2 +-
8783 arch/metag/include/asm/atomic_lock1.h | 2 +-
8784 arch/mips/cavium-octeon/octeon-irq.c | 4 +-
8785 arch/mips/include/asm/atomic.h | 8 +-
8786 arch/mn10300/include/asm/atomic.h | 4 +-
8787 arch/parisc/include/asm/atomic.h | 2 +-
8788 arch/powerpc/perf/core-book3s.c | 36 +-
8789 arch/powerpc/perf/hv-24x7.c | 166 +++-
8790 arch/powerpc/perf/power8-pmu.c | 3 +
8791 arch/powerpc/platforms/cell/axon_msi.c | 2 +-
8792 arch/powerpc/platforms/cell/spider-pic.c | 9 +-
8793 arch/powerpc/platforms/pasemi/msi.c | 6 +-
8794 arch/powerpc/platforms/powernv/opal-irqchip.c | 2 +-
8795 arch/powerpc/sysdev/ehv_pic.c | 3 +-
8796 arch/powerpc/sysdev/fsl_msi.c | 2 +-
8797 arch/powerpc/sysdev/i8259.c | 3 +-
8798 arch/powerpc/sysdev/ipic.c | 3 +-
8799 arch/powerpc/sysdev/mpic.c | 3 +-
8800 arch/powerpc/sysdev/mpic_msi.c | 2 +-
8801 arch/powerpc/sysdev/qe_lib/qe_ic.c | 3 +-
8802 arch/s390/kernel/perf_cpum_cf.c | 35 +-
8803 arch/sh/include/asm/atomic.h | 4 +-
8804 arch/sparc/include/asm/atomic_64.h | 8 +-
8805 arch/sparc/kernel/perf_event.c | 32 +-
8806 arch/tile/include/asm/atomic.h | 2 +-
8807 arch/tile/include/asm/atomic_64.h | 6 +-
8808 arch/x86/Kconfig | 71 +-
8809 arch/x86/Kconfig.cpu | 24 +-
8810 arch/x86/Kconfig.debug | 36 +-
8811 arch/x86/Makefile | 10 +-
8812 arch/x86/boot/compressed/eboot.c | 28 +-
8813 arch/x86/boot/header.S | 2 +-
8814 arch/x86/crypto/camellia_aesni_avx2_glue.c | 3 +-
8815 arch/x86/crypto/camellia_aesni_avx_glue.c | 2 +-
8816 arch/x86/crypto/cast5_avx_glue.c | 3 +-
8817 arch/x86/crypto/cast6_avx_glue.c | 3 +-
8818 arch/x86/crypto/chacha20_glue.c | 2 +-
8819 arch/x86/crypto/poly1305_glue.c | 2 +-
8820 arch/x86/crypto/serpent_avx2_glue.c | 3 +-
8821 arch/x86/crypto/serpent_avx_glue.c | 3 +-
8822 arch/x86/crypto/sha1_ssse3_glue.c | 2 +-
8823 arch/x86/crypto/sha256_ssse3_glue.c | 2 +-
8824 arch/x86/crypto/sha512_ssse3_glue.c | 2 +-
8825 arch/x86/crypto/twofish_avx_glue.c | 2 +-
8826 arch/x86/entry/common.c | 264 +++++--
8827 arch/x86/entry/entry_32.S | 182 ++---
8828 arch/x86/entry/entry_64.S | 9 +-
8829 arch/x86/entry/entry_64_compat.S | 547 ++++---------
8830 arch/x86/entry/syscall_32.c | 9 +-
8831 arch/x86/entry/syscall_64.c | 4 +-
8832 arch/x86/entry/syscalls/syscall_32.tbl | 12 +-
8833 arch/x86/entry/vdso/Makefile | 39 +-
8834 arch/x86/entry/vdso/vdso2c.c | 2 +-
8835 arch/x86/entry/vdso/vdso32-setup.c | 28 +-
8836 arch/x86/entry/vdso/vdso32/int80.S | 56 --
8837 arch/x86/entry/vdso/vdso32/syscall.S | 75 --
8838 arch/x86/entry/vdso/vdso32/sysenter.S | 116 ---
8839 arch/x86/entry/vdso/vdso32/system_call.S | 57 ++
8840 arch/x86/entry/vdso/vdso32/vclock_gettime.c | 2 +
8841 arch/x86/entry/vdso/vma.c | 13 +-
8842 arch/x86/entry/vsyscall/vsyscall_64.c | 9 +-
8843 arch/x86/ia32/ia32_signal.c | 12 +-
8844 arch/x86/include/asm/acpi.h | 23 +
8845 arch/x86/include/asm/amd_nb.h | 2 +-
8846 arch/x86/include/asm/apic.h | 110 +--
8847 arch/x86/include/asm/atomic.h | 4 +-
8848 arch/x86/include/asm/atomic64_64.h | 4 +-
8849 arch/x86/include/asm/dwarf2.h | 84 ++
8850 arch/x86/include/asm/efi.h | 1 +
8851 arch/x86/include/asm/elf.h | 10 +-
8852 arch/x86/include/asm/fpu/signal.h | 2 +-
8853 arch/x86/include/asm/fpu/types.h | 148 ++--
8854 arch/x86/include/asm/fpu/xstate.h | 15 +-
8855 arch/x86/include/asm/hpet.h | 6 +-
8856 arch/x86/include/asm/ia32.h | 4 +-
8857 arch/x86/include/asm/kdebug.h | 6 -
8858 arch/x86/include/asm/microcode.h | 26 +-
8859 arch/x86/include/asm/microcode_amd.h | 3 +-
8860 arch/x86/include/asm/microcode_intel.h | 10 +-
8861 arch/x86/include/asm/numachip/numachip.h | 1 +
8862 arch/x86/include/asm/numachip/numachip_csr.h | 153 +---
8863 arch/x86/include/asm/page_64_types.h | 3 -
8864 arch/x86/include/asm/page_types.h | 3 +
8865 arch/x86/include/asm/pgtable.h | 25 +-
8866 arch/x86/include/asm/pgtable_types.h | 40 +-
8867 arch/x86/include/asm/preempt.h | 5 +-
8868 arch/x86/include/asm/processor.h | 6 +-
8869 arch/x86/include/asm/sigcontext.h | 75 +-
8870 arch/x86/include/asm/sigframe.h | 8 +-
8871 arch/x86/include/asm/signal.h | 2 +-
8872 arch/x86/include/asm/switch_to.h | 12 +-
8873 arch/x86/include/asm/syscall.h | 14 +-
8874 arch/x86/include/asm/thread_info.h | 3 -
8875 arch/x86/include/asm/trace/mpx.h | 7 +-
8876 arch/x86/include/asm/uaccess.h | 14 +-
8877 arch/x86/include/asm/uv/uv_hub.h | 2 +-
8878 arch/x86/include/asm/vdso.h | 10 +-
8879 arch/x86/include/uapi/asm/mce.h | 2 +-
8880 arch/x86/include/uapi/asm/sigcontext.h | 475 +++++++----
8881 arch/x86/include/uapi/asm/sigcontext32.h | 73 +-
8882 arch/x86/kernel/apic/apic.c | 8 +-
8883 arch/x86/kernel/apic/apic_numachip.c | 220 ++++--
8884 arch/x86/kernel/apic/io_apic.c | 2 +-
8885 arch/x86/kernel/asm-offsets.c | 21 +-
8886 arch/x86/kernel/cpu/Makefile | 1 +
8887 arch/x86/kernel/cpu/intel.c | 1 +
8888 arch/x86/kernel/cpu/intel_cacheinfo.c | 8 +-
8889 arch/x86/kernel/cpu/mcheck/mce.c | 30 +-
8890 arch/x86/kernel/cpu/mcheck/therm_throt.c | 8 -
8891 arch/x86/kernel/cpu/microcode/Makefile | 3 -
8892 arch/x86/kernel/cpu/microcode/amd.c | 509 +++++++++++-
8893 arch/x86/kernel/cpu/microcode/amd_early.c | 440 -----------
8894 arch/x86/kernel/cpu/microcode/core.c | 232 ++++--
8895 arch/x86/kernel/cpu/microcode/core_early.c | 170 ----
8896 arch/x86/kernel/cpu/microcode/intel.c | 791 ++++++++++++++++++-
8897 arch/x86/kernel/cpu/microcode/intel_early.c | 808 -------------------
8898 arch/x86/kernel/cpu/microcode/intel_lib.c | 1 -
8899 arch/x86/kernel/cpu/perf_event.c | 39 +-
8900 arch/x86/kernel/cpu/perf_event.h | 2 +-
8901 arch/x86/kernel/cpu/perf_event_intel_bts.c | 13 +
8902 arch/x86/kernel/cpu/perf_event_intel_cstate.c | 694 ++++++++++++++++
8903 arch/x86/kernel/cpu/perf_event_intel_ds.c | 40 +-
8904 arch/x86/kernel/cpu/perf_event_intel_lbr.c | 8 +-
8905 arch/x86/kernel/cpu/perf_event_intel_pt.c | 7 +-
8906 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 61 +-
8907 arch/x86/kernel/cpu/perf_event_intel_uncore.h | 12 +-
8908 arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 16 +-
8909 .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 34 +-
8910 arch/x86/kernel/crash.c | 3 -
8911 arch/x86/kernel/e820.c | 2 +-
8912 arch/x86/kernel/early-quirks.c | 2 +-
8913 arch/x86/kernel/early_printk.c | 6 +-
8914 arch/x86/kernel/fpu/init.c | 18 +-
8915 arch/x86/kernel/fpu/regset.c | 4 +-
8916 arch/x86/kernel/fpu/signal.c | 10 +-
8917 arch/x86/kernel/fpu/xstate.c | 398 ++++++++--
8918 arch/x86/kernel/head_32.S | 5 +-
8919 arch/x86/kernel/hpet.c | 29 +-
8920 arch/x86/kernel/irq_64.c | 2 +-
8921 arch/x86/kernel/kgdb.c | 17 +-
8922 arch/x86/kernel/process_32.c | 8 -
8923 arch/x86/kernel/process_64.c | 10 +-
8924 arch/x86/kernel/quirks.c | 2 +-
8925 arch/x86/kernel/setup.c | 106 +--
8926 arch/x86/kernel/signal.c | 10 +-
8927 arch/x86/kernel/traps.c | 4 +-
8928 arch/x86/kernel/tsc.c | 35 +-
8929 arch/x86/kvm/cpuid.c | 4 +-
8930 arch/x86/kvm/x86.c | 27 +-
8931 arch/x86/kvm/x86.h | 6 +-
8932 arch/x86/lib/x86-opcode-map.txt | 24 +-
8933 arch/x86/math-emu/fpu_aux.c | 70 ++
8934 arch/x86/math-emu/fpu_emu.h | 2 +-
8935 arch/x86/math-emu/fpu_entry.c | 96 +--
8936 arch/x86/math-emu/fpu_proto.h | 12 +
8937 arch/x86/math-emu/load_store.c | 63 +-
8938 arch/x86/math-emu/reg_compare.c | 128 +++
8939 arch/x86/mm/Makefile | 2 +-
8940 arch/x86/mm/dump_pagetables.c | 81 +-
8941 arch/x86/mm/gup.c | 18 +-
8942 arch/x86/mm/init.c | 2 -
8943 arch/x86/mm/init_32.c | 2 +
8944 arch/x86/mm/init_64.c | 2 +
8945 arch/x86/mm/mpx.c | 15 +-
8946 arch/x86/mm/pageattr.c | 88 ++-
8947 arch/x86/platform/efi/efi-bgrt.c | 9 +-
8948 arch/x86/platform/efi/efi.c | 28 +-
8949 arch/x86/platform/intel-mid/intel-mid.c | 2 +-
8950 arch/x86/platform/intel-mid/sfi.c | 3 +-
8951 arch/x86/platform/uv/uv_nmi.c | 53 +-
8952 arch/x86/ras/Kconfig | 4 +-
8953 arch/x86/ras/mce_amd_inj.c | 103 ++-
8954 arch/x86/um/asm/syscall.h | 4 +
8955 arch/x86/um/sys_call_table_32.c | 7 +-
8956 arch/x86/um/sys_call_table_64.c | 7 +-
8957 arch/x86/xen/setup.c | 13 +-
8958 arch/xtensa/include/asm/atomic.h | 4 +-
8959 drivers/acpi/apei/ghes.c | 10 +-
8960 drivers/acpi/gsi.c | 54 +-
8961 drivers/base/platform-msi.c | 6 +-
8962 drivers/clocksource/Kconfig | 4 +
8963 drivers/clocksource/Makefile | 2 +
8964 drivers/clocksource/em_sti.c | 2 -
8965 drivers/clocksource/exynos_mct.c | 12 +-
8966 drivers/clocksource/h8300_timer16.c | 1 -
8967 drivers/clocksource/h8300_timer8.c | 1 -
8968 drivers/clocksource/h8300_tpu.c | 1 -
8969 drivers/clocksource/mtk_timer.c | 26 +-
8970 drivers/clocksource/numachip.c | 95 +++
8971 drivers/clocksource/sh_cmt.c | 1 -
8972 drivers/clocksource/tango_xtal.c | 66 ++
8973 drivers/clocksource/time-armada-370-xp.c | 14 +
8974 drivers/clocksource/timer-imx-gpt.c | 3 +-
8975 drivers/edac/amd64_edac.c | 6 +-
8976 drivers/firmware/efi/Kconfig | 22 +
8977 drivers/firmware/efi/Makefile | 1 +
8978 drivers/firmware/efi/efi-pstore.c | 1 +
8979 drivers/firmware/efi/efi.c | 107 ++-
8980 drivers/firmware/efi/esrt.c | 19 +-
8981 drivers/firmware/efi/fake_mem.c | 238 ++++++
8982 drivers/gpio/gpio-sodaville.c | 2 +-
8983 drivers/irqchip/Kconfig | 6 +
8984 drivers/irqchip/Makefile | 2 +-
8985 drivers/irqchip/alphascale_asm9260-icoll.h | 109 +++
8986 drivers/irqchip/exynos-combiner.c | 2 +-
8987 drivers/irqchip/irq-atmel-aic-common.c | 2 +-
8988 drivers/irqchip/irq-atmel-aic5.c | 62 +-
8989 drivers/irqchip/irq-crossbar.c | 62 +-
8990 drivers/irqchip/irq-gic-common.c | 11 +
8991 drivers/irqchip/irq-gic-common.h | 9 +
8992 drivers/irqchip/irq-gic-v2m.c | 163 ++--
8993 drivers/irqchip/irq-gic-v3-its-pci-msi.c | 7 +-
8994 drivers/irqchip/irq-gic-v3-its-platform-msi.c | 21 +-
8995 drivers/irqchip/irq-gic-v3-its.c | 83 +-
8996 drivers/irqchip/irq-gic-v3.c | 161 ++--
8997 drivers/irqchip/irq-gic.c | 110 ++-
8998 drivers/irqchip/irq-hip04.c | 2 +-
8999 drivers/irqchip/irq-i8259.c | 4 +-
9000 drivers/irqchip/irq-imx-gpcv2.c | 64 +-
9001 drivers/irqchip/irq-mtk-sysirq.c | 49 +-
9002 drivers/irqchip/irq-mxs.c | 171 +++-
9003 drivers/irqchip/irq-nvic.c | 18 +-
9004 drivers/irqchip/irq-renesas-intc-irqpin.c | 6 +-
9005 drivers/irqchip/irq-renesas-irqc.c | 86 +-
9006 drivers/irqchip/irq-s3c24xx.c | 4 +-
9007 drivers/irqchip/irq-sunxi-nmi.c | 22 +-
9008 drivers/irqchip/irq-tegra.c | 55 +-
9009 drivers/irqchip/irq-vf610-mscm-ir.c | 45 +-
9010 drivers/net/ethernet/sfc/mcdi.c | 2 +-
9011 drivers/net/ethernet/sfc/ptp.c | 30 +-
9012 drivers/of/irq.c | 185 ++++-
9013 drivers/pci/host/pci-xgene-msi.c | 2 +-
9014 drivers/pci/msi.c | 63 +-
9015 drivers/pci/of.c | 13 +-
9016 drivers/pci/probe.c | 43 +-
9017 drivers/phy/phy-rcar-gen2.c | 3 +-
9018 drivers/pps/kapi.c | 4 +-
9019 drivers/spmi/spmi-pmic-arb.c | 2 +-
9020 drivers/staging/speakup/selection.c | 2 +-
9021 drivers/video/fbdev/efifb.c | 24 +-
9022 fs/fs-writeback.c | 4 +-
9023 fs/proc/array.c | 16 +-
9024 fs/proc/base.c | 9 +-
9025 include/asm-generic/atomic-long.h | 56 +-
9026 include/asm-generic/atomic.h | 4 +-
9027 include/asm-generic/mutex-dec.h | 8 +-
9028 include/asm-generic/mutex-xchg.h | 10 +-
9029 include/asm-generic/preempt.h | 2 +-
9030 include/asm-generic/qrwlock_types.h | 4 +-
9031 include/asm-generic/rwsem.h | 21 +-
9032 include/kvm/arm_vgic.h | 4 +-
9033 include/linux/acpi.h | 3 +
9034 include/linux/atomic.h | 118 ++-
9035 include/linux/cpu.h | 2 -
9036 include/linux/efi.h | 25 +-
9037 include/linux/fwnode.h | 1 +
9038 include/linux/init_task.h | 3 +-
9039 include/linux/interrupt.h | 2 +
9040 include/linux/irq.h | 21 +-
9041 include/linux/irqchip/arm-gic-v3.h | 105 +--
9042 include/linux/irqchip/arm-gic.h | 9 +-
9043 include/linux/irqdomain.h | 106 ++-
9044 include/linux/irqreturn.h | 2 +-
9045 include/linux/list.h | 5 +-
9046 include/linux/list_bl.h | 5 +-
9047 include/linux/list_nulls.h | 3 +-
9048 include/linux/msi.h | 16 +-
9049 include/linux/of_irq.h | 23 +
9050 include/linux/percpu-rwsem.h | 3 +-
9051 include/linux/perf_event.h | 120 ++-
9052 include/linux/pps_kernel.h | 16 +-
9053 include/linux/preempt.h | 20 +-
9054 include/linux/rcu_sync.h | 86 ++
9055 include/linux/rculist.h | 5 +-
9056 include/linux/rcupdate.h | 59 +-
9057 include/linux/rcutiny.h | 3 +-
9058 include/linux/rcutree.h | 2 +-
9059 include/linux/sched.h | 55 +-
9060 include/linux/sched/deadline.h | 5 +
9061 include/linux/smpboot.h | 4 -
9062 include/linux/srcu.h | 5 +-
9063 include/linux/stop_machine.h | 2 +
9064 include/linux/timekeeping.h | 4 +-
9065 include/linux/timex.h | 2 +-
9066 include/trace/events/sched.h | 22 +-
9067 include/uapi/linux/perf_event.h | 6 +-
9068 include/uapi/linux/screen_info.h | 5 +-
9069 kernel/cpu.c | 23 +-
9070 kernel/events/core.c | 224 ++++--
9071 kernel/exit.c | 6 +-
9072 kernel/fork.c | 2 +-
9073 kernel/futex.c | 13 +-
9074 kernel/irq/chip.c | 28 +-
9075 kernel/irq/handle.c | 7 +-
9076 kernel/irq/internals.h | 4 +-
9077 kernel/irq/irqdomain.c | 177 ++++-
9078 kernel/irq/manage.c | 221 ++++--
9079 kernel/irq/msi.c | 8 +-
9080 kernel/irq/proc.c | 2 +-
9081 kernel/irq/settings.h | 12 +
9082 kernel/kexec_core.c | 6 +-
9083 kernel/locking/locktorture.c | 164 +++-
9084 kernel/locking/mcs_spinlock.h | 4 +-
9085 kernel/locking/mutex.c | 9 +-
9086 kernel/locking/osq_lock.c | 11 +-
9087 kernel/locking/percpu-rwsem.c | 90 +--
9088 kernel/locking/qrwlock.c | 8 +-
9089 kernel/locking/qspinlock_paravirt.h | 6 +-
9090 kernel/locking/rtmutex.c | 33 +-
9091 kernel/locking/rwsem-xadd.c | 5 +-
9092 kernel/rcu/Makefile | 2 +-
9093 kernel/rcu/rcutorture.c | 16 +-
9094 kernel/rcu/srcu.c | 4 +-
9095 kernel/rcu/sync.c | 223 ++++++
9096 kernel/rcu/tiny.c | 8 +-
9097 kernel/rcu/tree.c | 512 +++++++++---
9098 kernel/rcu/tree.h | 69 +-
9099 kernel/rcu/tree_plugin.h | 437 +++++-----
9100 kernel/rcu/tree_trace.c | 10 +-
9101 kernel/rcu/update.c | 2 +-
9102 kernel/sched/core.c | 204 ++---
9103 kernel/sched/cpudeadline.c | 5 -
9104 kernel/sched/cpudeadline.h | 1 +
9105 kernel/sched/fair.c | 419 +++++-----
9106 kernel/sched/features.h | 21 +-
9107 kernel/sched/rt.c | 22 +-
9108 kernel/sched/sched.h | 55 +-
9109 kernel/smpboot.c | 5 +-
9110 kernel/stop_machine.c | 90 ++-
9111 kernel/time/clocksource.c | 7 +-
9112 kernel/time/hrtimer.c | 2 +-
9113 kernel/time/ntp.c | 16 +-
9114 kernel/time/ntp_internal.h | 2 +-
9115 kernel/time/posix-cpu-timers.c | 63 +-
9116 kernel/time/timeconst.bc | 2 +-
9117 kernel/time/timekeeping.c | 18 +-
9118 kernel/time/timer.c | 13 +-
9119 kernel/torture.c | 1 +
9120 kernel/trace/ftrace.c | 2 +-
9121 kernel/trace/trace_sched_switch.c | 3 +-
9122 kernel/trace/trace_sched_wakeup.c | 2 +-
9123 tools/build/.gitignore | 1 +
9124 tools/build/Build | 1 +
9125 tools/build/Build.include | 17 +-
9126 tools/build/Documentation/Build.txt | 52 +-
9127 tools/build/Makefile | 43 +
9128 tools/build/Makefile.build | 7 +
9129 tools/build/Makefile.feature | 15 +-
9130 tools/build/Makefile.include | 10 +
9131 tools/build/feature/Makefile | 4 +-
9132 tools/build/fixdep.c | 168 ++++
9133 tools/build/tests/ex/Build | 1 +
9134 tools/build/tests/ex/Makefile | 13 +-
9135 tools/build/tests/ex/ex.c | 2 +
9136 tools/build/tests/ex/inc.c | 8 +
9137 tools/build/tests/run.sh | 27 +
9138 tools/include/linux/compiler.h | 32 +-
9139 tools/include/linux/err.h | 49 ++
9140 tools/include/linux/filter.h | 231 ++++++
9141 tools/lib/api/Build | 1 +
9142 tools/lib/api/Makefile | 6 +-
9143 tools/lib/api/cpu.c | 18 +
9144 tools/lib/api/cpu.h | 6 +
9145 tools/lib/api/fs/Build | 4 +-
9146 tools/lib/api/fs/debugfs.c | 129 ---
9147 tools/lib/api/fs/debugfs.h | 23 -
9148 tools/lib/api/fs/findfs.c | 63 --
9149 tools/lib/api/fs/findfs.h | 23 -
9150 tools/lib/api/fs/fs.c | 165 +++-
9151 tools/lib/api/fs/fs.h | 30 +-
9152 tools/lib/api/fs/tracefs.c | 78 --
9153 tools/lib/api/fs/tracefs.h | 21 -
9154 tools/lib/api/fs/tracing_path.c | 135 ++++
9155 tools/lib/api/fs/tracing_path.h | 16 +
9156 tools/lib/bpf/Makefile | 11 +-
9157 tools/lib/lockdep/Makefile | 6 +-
9158 tools/lib/symbol/kallsyms.c | 6 +
9159 tools/lib/symbol/kallsyms.h | 4 +-
9160 tools/lib/traceevent/event-parse.c | 60 +-
9161 tools/lib/traceevent/event-parse.h | 1 +
9162 tools/lib/traceevent/plugin_kvm.c | 25 +-
9163 tools/perf/Documentation/intel-pt.txt | 44 ++
9164 tools/perf/Documentation/itrace.txt | 4 +
9165 tools/perf/Documentation/perf-bench.txt | 54 +-
9166 tools/perf/Documentation/perf-inject.txt | 3 +
9167 tools/perf/Documentation/perf-list.txt | 3 +
9168 tools/perf/Documentation/perf-record.txt | 16 +-
9169 tools/perf/Documentation/perf-report.txt | 48 +-
9170 tools/perf/Documentation/perf-script.txt | 17 +-
9171 tools/perf/Documentation/perf-stat.txt | 5 +-
9172 tools/perf/Documentation/perf-top.txt | 5 +-
9173 tools/perf/Documentation/perf.txt | 8 +
9174 tools/perf/MANIFEST | 5 +
9175 tools/perf/Makefile.perf | 53 +-
9176 tools/perf/arch/common.c | 10 +-
9177 tools/perf/arch/common.h | 4 +-
9178 tools/perf/arch/x86/Build | 2 +-
9179 tools/perf/arch/x86/Makefile | 1 +
9180 tools/perf/arch/x86/include/arch-tests.h | 19 +
9181 tools/perf/arch/x86/tests/Build | 10 +-
9182 tools/perf/arch/x86/tests/arch-tests.c | 34 +
9183 tools/perf/arch/x86/tests/dwarf-unwind.c | 1 +
9184 tools/perf/arch/x86/tests/gen-insn-x86-dat.awk | 75 ++
9185 tools/perf/arch/x86/tests/gen-insn-x86-dat.sh | 43 +
9186 tools/perf/arch/x86/tests/insn-x86-dat-32.c | 658 ++++++++++++++++
9187 tools/perf/arch/x86/tests/insn-x86-dat-64.c | 768 ++++++++++++++++++
9188 tools/perf/arch/x86/tests/insn-x86-dat-src.c | 877 +++++++++++++++++++++
9189 tools/perf/arch/x86/tests/insn-x86.c | 185 +++++
9190 tools/perf/arch/x86/tests/intel-cqm.c | 124 +++
9191 tools/perf/{ => arch/x86}/tests/perf-time-to-tsc.c | 4 +-
9192 tools/perf/{ => arch/x86}/tests/rdpmc.c | 7 +-
9193 tools/perf/arch/x86/util/dwarf-regs.c | 122 ++-
9194 tools/perf/arch/x86/util/intel-pt.c | 55 +-
9195 tools/perf/bench/Build | 2 +-
9196 tools/perf/bench/mem-functions.c | 379 +++++++++
9197 tools/perf/bench/mem-memcpy.c | 434 ----------
9198 tools/perf/bench/numa.c | 4 +-
9199 tools/perf/bench/sched-messaging.c | 10 +-
9200 tools/perf/builtin-annotate.c | 2 +-
9201 tools/perf/builtin-bench.c | 14 +-
9202 tools/perf/builtin-evlist.c | 4 +-
9203 tools/perf/builtin-help.c | 2 +-
9204 tools/perf/builtin-inject.c | 127 ++-
9205 tools/perf/builtin-kmem.c | 2 +-
9206 tools/perf/builtin-kvm.c | 1 -
9207 tools/perf/builtin-list.c | 20 +-
9208 tools/perf/builtin-probe.c | 147 +++-
9209 tools/perf/builtin-record.c | 56 +-
9210 tools/perf/builtin-report.c | 65 +-
9211 tools/perf/builtin-sched.c | 4 +-
9212 tools/perf/builtin-script.c | 113 ++-
9213 tools/perf/builtin-stat.c | 93 ++-
9214 tools/perf/builtin-top.c | 59 +-
9215 tools/perf/builtin-trace.c | 31 +-
9216 tools/perf/config/Makefile | 23 +-
9217 tools/perf/perf.c | 30 +-
9218 tools/perf/python/twatch.py | 23 +-
9219 tools/perf/scripts/python/export-to-postgresql.py | 221 ++++++
9220 tools/perf/tests/Build | 4 +-
9221 tools/perf/tests/bpf-script-example.c | 44 ++
9222 tools/perf/tests/builtin-test.c | 76 +-
9223 tools/perf/tests/code-reading.c | 76 +-
9224 tools/perf/tests/dwarf-unwind.c | 4 +
9225 tools/perf/tests/evsel-tp-sched.c | 10 +-
9226 tools/perf/tests/hists_filter.c | 55 +-
9227 tools/perf/tests/make | 4 +-
9228 tools/perf/tests/mmap-basic.c | 3 +-
9229 tools/perf/tests/openat-syscall-all-cpus.c | 13 +-
9230 tools/perf/tests/openat-syscall-tp-fields.c | 5 +-
9231 tools/perf/tests/openat-syscall.c | 13 +-
9232 tools/perf/tests/parse-events.c | 49 +-
9233 tools/perf/tests/tests.h | 10 +-
9234 tools/perf/tests/topology.c | 115 +++
9235 tools/perf/tests/vmlinux-kallsyms.c | 4 +-
9236 tools/perf/trace/strace/groups/file | 2 +
9237 tools/perf/ui/browser.c | 14 +
9238 tools/perf/ui/browser.h | 2 +-
9239 tools/perf/ui/browsers/annotate.c | 14 +-
9240 tools/perf/ui/browsers/hists.c | 120 ++-
9241 tools/perf/ui/browsers/map.c | 2 +-
9242 tools/perf/ui/browsers/scripts.c | 2 +-
9243 tools/perf/ui/hist.c | 16 +-
9244 tools/perf/ui/tui/setup.c | 8 +-
9245 tools/perf/util/Build | 2 +
9246 tools/perf/util/annotate.c | 5 +-
9247 tools/perf/util/annotate.h | 2 +-
9248 tools/perf/util/auxtrace.c | 24 +-
9249 tools/perf/util/auxtrace.h | 4 +
9250 tools/perf/util/bpf-loader.c | 352 +++++++++
9251 tools/perf/util/bpf-loader.h | 85 ++
9252 tools/perf/util/callchain.c | 42 +-
9253 tools/perf/util/callchain.h | 26 +
9254 tools/perf/util/cpumap.c | 97 +--
9255 tools/perf/util/cpumap.h | 10 +-
9256 tools/perf/util/env.c | 86 ++
9257 tools/perf/util/env.h | 44 ++
9258 tools/perf/util/event.c | 22 +-
9259 tools/perf/util/event.h | 6 +
9260 tools/perf/util/evlist.c | 47 +-
9261 tools/perf/util/evlist.h | 5 +
9262 tools/perf/util/evsel.c | 50 +-
9263 tools/perf/util/evsel.h | 10 +-
9264 tools/perf/util/header.c | 136 +++-
9265 tools/perf/util/header.h | 27 +-
9266 tools/perf/util/hist.c | 59 +-
9267 tools/perf/util/hist.h | 8 +-
9268 tools/perf/util/include/dwarf-regs.h | 8 +
9269 tools/perf/util/intel-pt-decoder/Build | 13 +-
9270 .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 4 +-
9271 tools/perf/util/intel-pt-decoder/intel-pt-log.c | 21 +-
9272 tools/perf/util/intel-pt-decoder/intel-pt-log.h | 38 +-
9273 .../perf/util/intel-pt-decoder/x86-opcode-map.txt | 24 +-
9274 tools/perf/util/intel-pt.c | 266 ++++++-
9275 tools/perf/util/machine.c | 29 +-
9276 tools/perf/util/machine.h | 9 +-
9277 tools/perf/util/map.c | 21 +-
9278 tools/perf/util/map.h | 2 +
9279 tools/perf/util/parse-branch-options.c | 1 +
9280 tools/perf/util/parse-events.c | 374 ++++++++-
9281 tools/perf/util/parse-events.h | 16 +-
9282 tools/perf/util/parse-events.l | 12 +-
9283 tools/perf/util/parse-events.y | 82 +-
9284 tools/perf/util/parse-options.c | 156 +++-
9285 tools/perf/util/parse-options.h | 5 +
9286 tools/perf/util/pmu.c | 42 +-
9287 tools/perf/util/probe-event.c | 234 +++---
9288 tools/perf/util/probe-event.h | 11 +
9289 tools/perf/util/probe-file.c | 56 +-
9290 tools/perf/util/probe-file.h | 4 +
9291 tools/perf/util/probe-finder.c | 58 +-
9292 tools/perf/util/python.c | 59 +-
9293 .../perf/util/scripting-engines/trace-event-perl.c | 1 +
9294 .../util/scripting-engines/trace-event-python.c | 3 +-
9295 tools/perf/util/session.c | 37 +-
9296 tools/perf/util/session.h | 2 +
9297 tools/perf/util/sort.c | 74 +-
9298 tools/perf/util/sort.h | 6 +
9299 tools/perf/util/srcline.c | 29 +-
9300 tools/perf/util/stat.c | 13 +-
9301 tools/perf/util/stat.h | 3 +-
9302 tools/perf/util/strbuf.c | 22 +-
9303 tools/perf/util/strbuf.h | 2 +
9304 tools/perf/util/symbol-minimal.c | 2 +-
9305 tools/perf/util/symbol.c | 31 +-
9306 tools/perf/util/symbol.h | 1 +
9307 tools/perf/util/trace-event-info.c | 2 +-
9308 tools/perf/util/trace-event.c | 16 +-
9309 tools/perf/util/trace-event.h | 2 +
9310 tools/perf/util/unwind-libunwind.c | 19 +-
9311 tools/perf/util/usage.c | 5 +
9312 tools/perf/util/util.c | 72 +-
9313 tools/perf/util/util.h | 12 +-
9314 tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +-
9315 .../selftests/rcutorture/configs/lock/CFLIST | 4 +-
9316 .../selftests/rcutorture/configs/lock/LOCK05 | 6 +
9317 .../selftests/rcutorture/configs/lock/LOCK05.boot | 1 +
9318 .../selftests/rcutorture/configs/lock/LOCK06 | 6 +
9319 .../selftests/rcutorture/configs/lock/LOCK06.boot | 1 +
9320 tools/testing/selftests/timers/Makefile | 3 +-
9321 tools/testing/selftests/timers/adjtick.c | 221 ++++++
9322 tools/testing/selftests/x86/Makefile | 9 +-
9323 tools/testing/selftests/x86/ptrace_syscall.c | 294 +++++++
9324 .../testing/selftests/x86/raw_syscall_helper_32.S | 46 ++
9325 tools/testing/selftests/x86/test_FCMOV.c | 93 +++
9326 tools/testing/selftests/x86/test_FCOMI.c | 331 ++++++++
9327 tools/testing/selftests/x86/test_FISTTP.c | 137 ++++
9328 tools/testing/selftests/x86/test_syscall_vdso.c | 401 ++++++++++
9329 tools/testing/selftests/x86/thunks_32.S | 55 ++
9330 tools/testing/selftests/x86/unwind_vdso.c | 211 +++++
9331 tools/vm/page-types.c | 6 +-
9332 virt/kvm/arm/vgic.c | 4 +-
9333 598 files changed, 21302 insertions(+), 7870 deletions(-)
9334 create mode 100644 Documentation/devicetree/bindings/pci/pci-msi.txt
9335 create mode 100644 arch/arm/include/asm/arch_gicv3.h
9336 create mode 100644 arch/arm64/include/asm/arch_gicv3.h
9337 delete mode 100644 arch/x86/entry/vdso/vdso32/int80.S
9338 delete mode 100644 arch/x86/entry/vdso/vdso32/syscall.S
9339 delete mode 100644 arch/x86/entry/vdso/vdso32/sysenter.S
9340 create mode 100644 arch/x86/entry/vdso/vdso32/system_call.S
9341 create mode 100644 arch/x86/include/asm/dwarf2.h
9342 delete mode 100644 arch/x86/kernel/cpu/microcode/amd_early.c
9343 delete mode 100644 arch/x86/kernel/cpu/microcode/core_early.c
9344 delete mode 100644 arch/x86/kernel/cpu/microcode/intel_early.c
9345 create mode 100644 arch/x86/kernel/cpu/perf_event_intel_cstate.c
9346 create mode 100644 drivers/clocksource/numachip.c
9347 create mode 100644 drivers/clocksource/tango_xtal.c
9348 create mode 100644 drivers/firmware/efi/fake_mem.c
9349 create mode 100644 drivers/irqchip/alphascale_asm9260-icoll.h
9350 create mode 100644 include/linux/rcu_sync.h
9351 create mode 100644 kernel/rcu/sync.c
9352 create mode 100644 tools/build/.gitignore
9353 create mode 100644 tools/build/Build
9354 create mode 100644 tools/build/Makefile
9355 create mode 100644 tools/build/Makefile.include
9356 create mode 100644 tools/build/fixdep.c
9357 create mode 100644 tools/build/tests/ex/inc.c
9358 create mode 100644 tools/include/linux/err.h
9359 create mode 100644 tools/include/linux/filter.h
9360 create mode 100644 tools/lib/api/cpu.c
9361 create mode 100644 tools/lib/api/cpu.h
9362 delete mode 100644 tools/lib/api/fs/debugfs.c
9363 delete mode 100644 tools/lib/api/fs/debugfs.h
9364 delete mode 100644 tools/lib/api/fs/findfs.c
9365 delete mode 100644 tools/lib/api/fs/findfs.h
9366 delete mode 100644 tools/lib/api/fs/tracefs.c
9367 delete mode 100644 tools/lib/api/fs/tracefs.h
9368 create mode 100644 tools/lib/api/fs/tracing_path.c
9369 create mode 100644 tools/lib/api/fs/tracing_path.h
9370 create mode 100644 tools/perf/arch/x86/include/arch-tests.h
9371 create mode 100644 tools/perf/arch/x86/tests/arch-tests.c
9372 create mode 100644 tools/perf/arch/x86/tests/gen-insn-x86-dat.awk
9373 create mode 100755 tools/perf/arch/x86/tests/gen-insn-x86-dat.sh
9374 create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-32.c
9375 create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-64.c
9376 create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-src.c
9377 create mode 100644 tools/perf/arch/x86/tests/insn-x86.c
9378 create mode 100644 tools/perf/arch/x86/tests/intel-cqm.c
9379 rename tools/perf/{ => arch/x86}/tests/perf-time-to-tsc.c (98%)
9380 rename tools/perf/{ => arch/x86}/tests/rdpmc.c (97%)
9381 create mode 100644 tools/perf/bench/mem-functions.c
9382 delete mode 100644 tools/perf/bench/mem-memcpy.c
9383 create mode 100644 tools/perf/tests/bpf-script-example.c
9384 create mode 100644 tools/perf/tests/topology.c
9385 create mode 100644 tools/perf/util/bpf-loader.c
9386 create mode 100644 tools/perf/util/bpf-loader.h
9387 create mode 100644 tools/perf/util/env.c
9388 create mode 100644 tools/perf/util/env.h
9389 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK05
9390 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK05.boot
9391 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK06
9392 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK06.boot
9393 create mode 100644 tools/testing/selftests/timers/adjtick.c
9394 create mode 100644 tools/testing/selftests/x86/ptrace_syscall.c
9395 create mode 100644 tools/testing/selftests/x86/raw_syscall_helper_32.S
9396 create mode 100644 tools/testing/selftests/x86/test_FCMOV.c
9397 create mode 100644 tools/testing/selftests/x86/test_FCOMI.c
9398 create mode 100644 tools/testing/selftests/x86/test_FISTTP.c
9399 create mode 100644 tools/testing/selftests/x86/test_syscall_vdso.c
9400 create mode 100644 tools/testing/selftests/x86/thunks_32.S
9401 create mode 100644 tools/testing/selftests/x86/unwind_vdso.c
9402 Merging clockevents/clockevents/next (0e4baaa9a11b clocksource/drivers/exynos_mct: Use container_of() instead of this_cpu_ptr())
9403 $ git merge clockevents/clockevents/next
9404 Merge made by the 'recursive' strategy.
9405 Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
9406 $ git merge edac/linux_next
9408 Merging edac-amd/for-next (990995bad13c EDAC: Fix PAGES_TO_MiB macro misuse)
9409 $ git merge edac-amd/for-next
9410 Auto-merging drivers/edac/amd64_edac.c
9411 Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
9412 Merge made by the 'recursive' strategy.
9413 .../devicetree/bindings/edac/apm-xgene-edac.txt | 23 +
9414 Documentation/edac.txt | 46 +
9415 arch/arm64/boot/dts/apm/apm-storm.dtsi | 10 +
9416 drivers/edac/Makefile | 2 +
9417 drivers/edac/altera_edac.c | 20 +-
9418 drivers/edac/altera_edac.h | 5 +-
9419 drivers/edac/amd64_edac.c | 35 +-
9420 drivers/edac/amd64_edac.h | 58 +-
9421 drivers/edac/debugfs.c | 163 +++
9422 drivers/edac/edac_core.h | 2 +
9423 drivers/edac/edac_mc.c | 2 +-
9424 drivers/edac/edac_mc_sysfs.c | 150 +--
9425 drivers/edac/edac_module.h | 34 +-
9426 drivers/edac/ghes_edac.c | 24 +-
9427 drivers/edac/i5100_edac.c | 37 +-
9428 drivers/edac/ppc4xx_edac.c | 1 +
9429 drivers/edac/sb_edac.c | 8 +-
9430 drivers/edac/xgene_edac.c | 1193 ++++++++++++++++----
9431 include/linux/edac.h | 2 -
9432 19 files changed, 1352 insertions(+), 463 deletions(-)
9433 create mode 100644 drivers/edac/debugfs.c
9434 Merging irqchip/irqchip/for-next (29bade08fb07 irqchip: armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN)
9435 $ git merge irqchip/irqchip/for-next
9436 Merge made by the 'recursive' strategy.
9437 Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
9438 $ git merge tiny/tiny/next
9440 Merging ftrace/for-next (fb662288284e tracing: Fix sparse RCU warning)
9441 $ git merge ftrace/for-next
9442 Auto-merging kernel/trace/trace_sched_wakeup.c
9443 Auto-merging kernel/trace/ftrace.c
9444 Auto-merging kernel/trace/blktrace.c
9445 Merge made by the 'recursive' strategy.
9446 Documentation/trace/ftrace.txt | 17 ++
9447 arch/x86/kernel/ftrace.c | 4 +
9448 include/linux/trace_events.h | 20 +-
9449 include/linux/tracepoint.h | 30 ++-
9450 include/trace/define_trace.h | 2 +-
9451 include/trace/events/gpio.h | 4 +
9452 include/trace/perf.h | 258 ------------------
9453 include/trace/trace_events.h | 258 ++++++++++++++++++
9454 kernel/trace/Kconfig | 7 +
9455 kernel/trace/blktrace.c | 11 +-
9456 kernel/trace/ftrace.c | 197 +++++++-------
9457 kernel/trace/trace.c | 403 ++++++++++++++++++-----------
9458 kernel/trace/trace.h | 163 ++++++++----
9459 kernel/trace/trace_branch.c | 15 +-
9460 kernel/trace/trace_events.c | 489 +++++++++++++++++++++++++++++++++--
9461 kernel/trace/trace_functions_graph.c | 63 +++--
9462 kernel/trace/trace_irqsoff.c | 98 +++----
9463 kernel/trace/trace_kdb.c | 8 +-
9464 kernel/trace/trace_mmiotrace.c | 4 +-
9465 kernel/trace/trace_output.c | 97 ++++---
9466 kernel/trace/trace_output.h | 4 -
9467 kernel/trace/trace_printk.c | 14 +-
9468 kernel/trace/trace_probe.h | 8 +-
9469 kernel/trace/trace_sched_wakeup.c | 112 ++++----
9470 kernel/trace/trace_syscalls.c | 3 +-
9471 kernel/tracepoint.c | 61 ++++-
9472 26 files changed, 1545 insertions(+), 805 deletions(-)
9473 Merging rcu/rcu/next (39cd2dd39a8b Merge branches 'doc.2015.10.06a', 'percpu-rwsem.2015.10.06a' and 'torture.2015.10.06a' into HEAD)
9474 $ git merge rcu/rcu/next
9476 Merging kvm/linux-next (8c85ac1c0a1b KVM: x86: MMU: Initialize force_pt_level before calling mapping_level())
9477 $ git merge kvm/linux-next
9478 Auto-merging arch/x86/kvm/x86.c
9479 Auto-merging arch/x86/kvm/cpuid.c
9480 Auto-merging arch/s390/kvm/kvm-s390.c
9481 Auto-merging Makefile
9482 Auto-merging MAINTAINERS
9483 Auto-merging Documentation/virtual/kvm/api.txt
9484 Auto-merging Documentation/kernel-parameters.txt
9485 Merge made by the 'recursive' strategy.
9486 Documentation/kernel-parameters.txt | 1 +
9487 Documentation/virtual/kvm/api.txt | 52 ++-
9488 Documentation/virtual/kvm/locking.txt | 12 +
9491 arch/s390/kvm/interrupt.c | 116 ++----
9492 arch/s390/kvm/kvm-s390.c | 46 +--
9493 arch/s390/kvm/kvm-s390.h | 35 +-
9494 arch/s390/kvm/priv.c | 19 +-
9495 arch/x86/include/asm/irq_remapping.h | 10 +-
9496 arch/x86/include/asm/kvm_host.h | 34 +-
9497 arch/x86/include/asm/vmx.h | 3 +-
9498 arch/x86/include/uapi/asm/hyperv.h | 6 +
9499 arch/x86/include/uapi/asm/vmx.h | 4 +-
9500 arch/x86/kernel/kvmclock.c | 46 ++-
9501 arch/x86/kvm/Kconfig | 2 +
9502 arch/x86/kvm/cpuid.c | 2 +-
9503 arch/x86/kvm/cpuid.h | 37 ++
9504 arch/x86/kvm/hyperv.c | 31 +-
9505 arch/x86/kvm/i8254.c | 4 +-
9506 arch/x86/kvm/ioapic.c | 29 +-
9507 arch/x86/kvm/ioapic.h | 15 +-
9508 arch/x86/kvm/irq.c | 40 +-
9509 arch/x86/kvm/irq.h | 27 +-
9510 arch/x86/kvm/irq_comm.c | 85 +++-
9511 arch/x86/kvm/lapic.c | 125 ++++--
9512 arch/x86/kvm/lapic.h | 7 +-
9513 arch/x86/kvm/mmu.c | 91 +++--
9514 arch/x86/kvm/paging_tmpl.h | 19 +-
9515 arch/x86/kvm/svm.c | 43 +-
9516 arch/x86/kvm/trace.h | 51 +++
9517 arch/x86/kvm/vmx.c | 711 ++++++++++++++++++++++++++++------
9518 arch/x86/kvm/x86.c | 226 ++++++++---
9519 drivers/iommu/irq_remapping.c | 12 +-
9520 drivers/vfio/Kconfig | 1 +
9521 drivers/vfio/pci/Kconfig | 1 +
9522 drivers/vfio/pci/vfio_pci_intrs.c | 9 +
9523 drivers/vfio/pci/vfio_pci_private.h | 2 +
9524 include/linux/irqbypass.h | 90 +++++
9525 include/linux/kvm_host.h | 40 +-
9526 include/linux/kvm_irqfd.h | 71 ++++
9527 include/uapi/linux/kvm.h | 7 +
9528 kernel/sched/cputime.c | 2 +
9530 virt/kvm/Kconfig | 3 +
9531 virt/kvm/async_pf.c | 4 +
9532 virt/kvm/eventfd.c | 187 ++++-----
9533 virt/kvm/irqchip.c | 18 +-
9534 virt/kvm/kvm_main.c | 8 +-
9535 virt/lib/Kconfig | 2 +
9536 virt/lib/Makefile | 1 +
9537 virt/lib/irqbypass.c | 257 ++++++++++++
9538 52 files changed, 2086 insertions(+), 576 deletions(-)
9539 create mode 100644 include/linux/irqbypass.h
9540 create mode 100644 include/linux/kvm_irqfd.h
9541 create mode 100644 virt/Makefile
9542 create mode 100644 virt/lib/Kconfig
9543 create mode 100644 virt/lib/Makefile
9544 create mode 100644 virt/lib/irqbypass.c
9545 Merging kvm-arm/next (5fdf876d30ce KVM: arm: Do not indent the arguments of DECLARE_BITMAP)
9546 $ git merge kvm-arm/next
9547 Resolved 'arch/x86/include/asm/kvm_host.h' using previous resolution.
9548 Auto-merging virt/kvm/kvm_main.c
9549 Auto-merging virt/kvm/arm/vgic.c
9550 Auto-merging include/linux/kvm_host.h
9551 Auto-merging include/kvm/arm_vgic.h
9552 Auto-merging arch/x86/include/asm/kvm_host.h
9553 CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_host.h
9554 Auto-merging arch/s390/include/asm/kvm_host.h
9555 Auto-merging arch/powerpc/include/asm/kvm_host.h
9556 Auto-merging arch/arm64/kvm/Kconfig
9557 Automatic merge failed; fix conflicts and then commit the result.
9559 [master 98a8d6efcb91] Merge remote-tracking branch 'kvm-arm/next'
9560 $ git diff -M --stat --summary HEAD^..
9561 Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt | 187 ++++++++++++++++++
9562 Documentation/virtual/kvm/devices/arm-vgic.txt | 18 +-
9563 arch/arm/include/asm/kvm_arm.h | 20 ++
9564 arch/arm/include/asm/kvm_host.h | 5 +-
9565 arch/arm/kvm/Kconfig | 2 +
9566 arch/arm/kvm/arm.c | 76 ++++++--
9567 arch/arm/kvm/psci.c | 10 +-
9568 arch/arm/kvm/trace.h | 10 +-
9569 arch/arm64/include/asm/kvm_arm.h | 16 ++
9570 arch/arm64/include/asm/kvm_host.h | 5 +-
9571 arch/arm64/kvm/Kconfig | 2 +
9572 arch/arm64/kvm/hyp.S | 8 +
9573 arch/mips/include/asm/kvm_host.h | 2 +
9574 arch/powerpc/include/asm/kvm_host.h | 2 +
9575 arch/s390/include/asm/kvm_host.h | 2 +
9576 arch/x86/include/asm/kvm_host.h | 4 +
9577 include/kvm/arm_arch_timer.h | 4 +-
9578 include/kvm/arm_vgic.h | 11 +-
9579 include/linux/kvm_host.h | 2 +
9580 virt/kvm/arm/arch_timer.c | 173 +++++++++++------
9581 virt/kvm/arm/trace.h | 63 ++++++
9582 virt/kvm/arm/vgic.c | 212 ++++++++++-----------
9583 virt/kvm/kvm_main.c | 3 +
9584 23 files changed, 623 insertions(+), 214 deletions(-)
9585 create mode 100644 Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt
9586 create mode 100644 virt/kvm/arm/trace.h
9587 Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
9588 $ git merge kvm-ppc/kvm-ppc-next
9590 Merging kvm-ppc-paulus/kvm-ppc-next (70aa3961a196 KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path)
9591 $ git merge kvm-ppc-paulus/kvm-ppc-next
9592 Auto-merging arch/powerpc/kvm/e500_mmu_host.c
9593 Auto-merging arch/powerpc/kvm/book3s_hv_rm_mmu.c
9594 Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c
9595 Merge made by the 'recursive' strategy.
9596 arch/powerpc/include/asm/disassemble.h | 5 +++++
9597 arch/powerpc/include/asm/reg_booke.h | 6 ++++++
9598 arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 ++-
9599 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 ++
9600 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 29 ++++++++++++++++++++++-------
9601 arch/powerpc/kvm/e500.c | 3 ++-
9602 arch/powerpc/kvm/e500_emulate.c | 19 +++++++++++++++++++
9603 arch/powerpc/kvm/e500_mmu_host.c | 4 ++--
9604 arch/powerpc/kvm/powerpc.c | 3 +++
9605 9 files changed, 63 insertions(+), 11 deletions(-)
9606 Merging kvms390/next (46b708ea875f KVM: s390: use simple switch statement as multiplexer)
9607 $ git merge kvms390/next
9608 Auto-merging arch/s390/kvm/kvm-s390.c
9609 Merge made by the 'recursive' strategy.
9610 arch/s390/kvm/intercept.c | 42 +++++++++++++++++++++---------------------
9611 arch/s390/kvm/kvm-s390.c | 12 +++++++-----
9612 2 files changed, 28 insertions(+), 26 deletions(-)
9613 Merging xen-tip/linux-next (914beb9fc26d x86/xen: add reschedule point when mapping foreign GFNs)
9614 $ git merge xen-tip/linux-next
9615 Auto-merging drivers/net/xen-netfront.c
9616 Auto-merging drivers/block/xen-blkfront.c
9617 Auto-merging arch/x86/xen/setup.c
9618 Merge made by the 'recursive' strategy.
9619 arch/arm/include/asm/xen/hypervisor.h | 10 +
9620 arch/arm/include/asm/xen/page-coherent.h | 26 +-
9621 arch/arm/include/asm/xen/page.h | 22 +-
9622 arch/arm/xen/enlighten.c | 20 +-
9623 arch/arm/xen/mm.c | 39 ++-
9624 arch/arm/xen/p2m.c | 6 +-
9625 arch/x86/include/asm/xen/hypervisor.h | 5 +
9626 arch/x86/include/asm/xen/page.h | 8 +-
9627 arch/x86/xen/enlighten.c | 15 +
9628 arch/x86/xen/grant-table.c | 2 +-
9629 arch/x86/xen/mmu.c | 1 +
9630 arch/x86/xen/p2m.c | 19 +-
9631 arch/x86/xen/setup.c | 7 +-
9632 drivers/block/xen-blkback/blkback.c | 13 +-
9633 drivers/block/xen-blkback/common.h | 17 +-
9634 drivers/block/xen-blkback/xenbus.c | 11 +-
9635 drivers/block/xen-blkfront.c | 560 ++++++++++++++++++++-----------
9636 drivers/net/xen-netback/common.h | 16 +-
9637 drivers/net/xen-netback/netback.c | 167 +++++----
9638 drivers/net/xen-netfront.c | 122 +++++--
9639 drivers/tty/hvc/hvc_xen.c | 4 +-
9640 drivers/xen/Makefile | 2 -
9641 drivers/xen/balloon.c | 341 ++++++++++++-------
9642 drivers/xen/biomerge.c | 8 +
9643 drivers/xen/cpu_hotplug.c | 14 +-
9644 drivers/xen/events/events_base.c | 2 +-
9645 drivers/xen/events/events_fifo.c | 2 +-
9646 drivers/xen/grant-table.c | 56 +++-
9647 drivers/xen/privcmd.c | 10 +-
9648 drivers/xen/swiotlb-xen.c | 43 ++-
9649 drivers/xen/xenbus/xenbus_client.c | 128 ++++---
9650 drivers/xen/xenbus/xenbus_probe.c | 3 +-
9651 drivers/xen/xlate_mmu.c | 124 ++++---
9652 include/linux/memory_hotplug.h | 2 +
9653 include/uapi/xen/gntalloc.h | 22 +-
9654 include/uapi/xen/gntdev.h | 34 +-
9655 include/xen/balloon.h | 12 +-
9656 include/xen/grant_table.h | 57 ++++
9657 include/xen/page.h | 27 +-
9658 include/xen/xenbus.h | 4 +-
9659 mm/memory_hotplug.c | 29 +-
9660 41 files changed, 1364 insertions(+), 646 deletions(-)
9661 Merging percpu/for-next (5a928541585b kernel: Remove unneeded return from void function)
9662 $ git merge percpu/for-next
9663 Merge made by the 'recursive' strategy.
9664 include/linux/percpu-refcount.h | 2 +-
9665 1 file changed, 1 insertion(+), 1 deletion(-)
9666 Merging workqueues/for-next (4fcfc3013144 Merge branch 'for-4.4' into for-next)
9667 $ git merge workqueues/for-next
9668 Merge made by the 'recursive' strategy.
9669 kernel/workqueue.c | 26 ++++++++++++++------------
9670 1 file changed, 14 insertions(+), 12 deletions(-)
9671 Merging drivers-x86/for-next (9d1d459bf52b intel_scu_ipc: Protect dev member assignment on ->remove())
9672 $ git merge drivers-x86/for-next
9673 Auto-merging drivers/platform/x86/asus-wmi.c
9674 Auto-merging drivers/platform/x86/Kconfig
9675 Auto-merging MAINTAINERS
9676 Merge made by the 'recursive' strategy.
9678 drivers/platform/olpc/olpc-ec.c | 13 +-
9679 drivers/platform/x86/Kconfig | 22 +++-
9680 drivers/platform/x86/Makefile | 1 +
9681 drivers/platform/x86/acer-wmi.c | 92 ---------------
9682 drivers/platform/x86/asus-wmi.c | 19 ++-
9683 drivers/platform/x86/compal-laptop.c | 43 ++++++-
9684 drivers/platform/x86/intel_mid_powerbtn.c | 10 +-
9685 drivers/platform/x86/intel_scu_ipc.c | 189 ++++++++++++++----------------
9686 drivers/platform/x86/sony-laptop.c | 13 +-
9687 drivers/platform/x86/toshiba-wmi.c | 138 ++++++++++++++++++++++
9688 drivers/platform/x86/toshiba_acpi.c | 62 ++++------
9689 12 files changed, 357 insertions(+), 252 deletions(-)
9690 create mode 100644 drivers/platform/x86/toshiba-wmi.c
9691 Merging chrome-platform/for-next (18800fc7a04e platform/chrome: Support reading/writing the vboot context)
9692 $ git merge chrome-platform/for-next
9693 Auto-merging include/linux/sysfs.h
9694 Auto-merging fs/sysfs/group.c
9695 Merge made by the 'recursive' strategy.
9696 drivers/platform/chrome/Kconfig | 5 +-
9697 drivers/platform/chrome/Makefile | 3 +-
9698 drivers/platform/chrome/cros_ec_dev.c | 7 ++
9699 drivers/platform/chrome/cros_ec_lightbar.c | 31 ++++---
9700 drivers/platform/chrome/cros_ec_lpc.c | 21 ++---
9701 drivers/platform/chrome/cros_ec_vbc.c | 137 +++++++++++++++++++++++++++++
9702 fs/sysfs/group.c | 17 +++-
9703 include/linux/mfd/cros_ec.h | 1 +
9704 include/linux/sysfs.h | 18 +++-
9705 9 files changed, 205 insertions(+), 35 deletions(-)
9706 create mode 100644 drivers/platform/chrome/cros_ec_vbc.c
9707 Merging regmap/for-next (231e7cb81625 Merge remote-tracking branches 'regmap/topic/rbtree' and 'regmap/topic/update-offload' into regmap-next)
9708 $ git merge regmap/for-next
9709 Merge made by the 'recursive' strategy.
9710 arch/mips/boot/dts/brcm/bcm6328.dtsi | 1 -
9711 arch/mips/boot/dts/brcm/bcm7125.dtsi | 1 -
9712 arch/mips/boot/dts/brcm/bcm7346.dtsi | 1 -
9713 arch/mips/boot/dts/brcm/bcm7358.dtsi | 1 -
9714 arch/mips/boot/dts/brcm/bcm7360.dtsi | 1 -
9715 arch/mips/boot/dts/brcm/bcm7362.dtsi | 1 -
9716 arch/mips/boot/dts/brcm/bcm7420.dtsi | 1 -
9717 arch/mips/boot/dts/brcm/bcm7425.dtsi | 1 -
9718 arch/mips/boot/dts/brcm/bcm7435.dtsi | 1 -
9719 drivers/base/regmap/internal.h | 1 +
9720 drivers/base/regmap/regcache-rbtree.c | 9 ++++++--
9721 drivers/base/regmap/regmap-debugfs.c | 23 ++++++++-----------
9722 drivers/base/regmap/regmap-irq.c | 43 +++++++++++++++++++++++++++++++----
9723 drivers/base/regmap/regmap-mmio.c | 16 ++++++-------
9724 drivers/base/regmap/regmap.c | 12 +++++++++-
9725 include/linux/regmap.h | 5 ++++
9726 16 files changed, 80 insertions(+), 38 deletions(-)
9727 Merging hsi/for-next (16bd5865cdb3 hsi: controllers:remove redundant code)
9728 $ git merge hsi/for-next
9729 Merge made by the 'recursive' strategy.
9730 drivers/hsi/clients/ssi_protocol.c | 2 +-
9731 drivers/hsi/controllers/omap_ssi.c | 21 ++++-----------------
9732 drivers/hsi/controllers/omap_ssi_port.c | 2 +-
9733 drivers/hsi/hsi.c | 13 +++++++++++--
9734 4 files changed, 17 insertions(+), 21 deletions(-)
9735 Merging leds/for-next (861497527cda leds: 88pm860x: add missing of_node_put)
9736 $ git merge leds/for-next
9737 Auto-merging drivers/leds/leds-sead3.c
9738 Removing arch/arm/mach-mvebu/netxbig.c
9739 Removing arch/arm/mach-mvebu/board.h
9740 Merge made by the 'recursive' strategy.
9741 .../devicetree/bindings/gpio/netxbig-gpio-ext.txt | 22 ++
9742 .../devicetree/bindings/leds/leds-aat1290.txt | 8 +-
9743 .../devicetree/bindings/leds/leds-bcm6328.txt | 10 +
9744 .../devicetree/bindings/leds/leds-netxbig.txt | 92 ++++++
9745 arch/arm/boot/dts/kirkwood-net5big.dts | 60 ++++
9746 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 80 +++++
9747 arch/arm/mach-mvebu/Kconfig | 7 -
9748 arch/arm/mach-mvebu/Makefile | 1 -
9749 arch/arm/mach-mvebu/board.h | 21 --
9750 arch/arm/mach-mvebu/kirkwood.c | 4 -
9751 arch/arm/mach-mvebu/netxbig.c | 191 ------------
9752 arch/mips/mti-sead3/Makefile | 2 -
9753 drivers/leds/Kconfig | 10 +
9754 drivers/leds/Makefile | 1 +
9755 drivers/leds/led-class.c | 69 +----
9756 drivers/leds/led-core.c | 73 +++++
9757 drivers/leds/leds-88pm860x.c | 1 +
9758 drivers/leds/leds-bcm6328.c | 45 ++-
9759 drivers/leds/leds-bcm6358.c | 4 +-
9760 drivers/leds/leds-cobalt-qube.c | 23 +-
9761 drivers/leds/leds-gpio.c | 13 +
9762 drivers/leds/leds-hp6xx.c | 17 +-
9763 drivers/leds/leds-ipaq-micro.c | 27 +-
9764 drivers/leds/leds-locomo.c | 15 +-
9765 drivers/leds/leds-menf21bmc.c | 26 +-
9766 drivers/leds/leds-net48xx.c | 9 +-
9767 drivers/leds/leds-netxbig.c | 336 ++++++++++++++++-----
9768 drivers/leds/leds-ot200.c | 21 +-
9769 drivers/leds/leds-powernv.c | 8 +-
9770 {arch/mips/mti-sead3 => drivers/leds}/leds-sead3.c | 1 +
9771 drivers/leds/leds-wrap.c | 28 +-
9772 drivers/leds/leds.h | 1 +
9773 drivers/leds/trigger/ledtrig-heartbeat.c | 47 ++-
9774 include/dt-bindings/leds/leds-netxbig.h | 18 ++
9775 .../linux/platform_data/leds-kirkwood-netxbig.h | 1 +
9776 35 files changed, 760 insertions(+), 532 deletions(-)
9777 create mode 100644 Documentation/devicetree/bindings/gpio/netxbig-gpio-ext.txt
9778 create mode 100644 Documentation/devicetree/bindings/leds/leds-netxbig.txt
9779 delete mode 100644 arch/arm/mach-mvebu/board.h
9780 delete mode 100644 arch/arm/mach-mvebu/netxbig.c
9781 rename {arch/mips/mti-sead3 => drivers/leds}/leds-sead3.c (99%)
9782 create mode 100644 include/dt-bindings/leds/leds-netxbig.h
9783 Merging ipmi/for-next (d503e2fbbfea char: ipmi: ipmi_ssif: Replace timeval with timespec64)
9784 $ git merge ipmi/for-next
9785 Merge made by the 'recursive' strategy.
9786 Documentation/IPMI.txt | 7 +++-
9787 drivers/char/ipmi/ipmi_si_intf.c | 82 +++++++++++++++++++++++++--------------
9788 drivers/char/ipmi/ipmi_ssif.c | 9 +++--
9789 drivers/char/ipmi/ipmi_watchdog.c | 8 +++-
9790 4 files changed, 69 insertions(+), 37 deletions(-)
9791 Merging driver-core/driver-core-next (c23fe83138ed debugfs: Add debugfs_create_ulong())
9792 $ git merge driver-core/driver-core-next
9793 Auto-merging kernel/futex.c
9794 Auto-merging include/linux/edac.h
9795 Auto-merging drivers/net/wireless/iwlwifi/mvm/mvm.h
9796 Auto-merging drivers/net/wireless/ath/ath9k/hw.h
9797 Auto-merging drivers/net/wireless/ath/ath9k/hw.c
9798 Auto-merging drivers/net/wireless/ath/ath10k/core.h
9799 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
9800 Auto-merging drivers/iommu/amd_iommu_types.h
9801 Auto-merging drivers/iommu/amd_iommu_init.c
9802 Auto-merging drivers/bluetooth/hci_qca.c
9803 Auto-merging drivers/base/regmap/internal.h
9804 Auto-merging drivers/base/dma-contiguous.c
9805 Auto-merging drivers/acpi/internal.h
9806 Auto-merging arch/arm64/kernel/debug-monitors.c
9807 Merge made by the 'recursive' strategy.
9808 Documentation/driver-model/platform.txt | 14 +++
9809 Documentation/filesystems/debugfs.txt | 2 +-
9810 arch/arm64/kernel/debug-monitors.c | 4 +-
9811 drivers/acpi/ec_sys.c | 2 +-
9812 drivers/acpi/internal.h | 2 +-
9813 drivers/base/dma-contiguous.c | 2 +-
9814 drivers/base/platform.c | 80 +++++++++++--
9815 drivers/base/regmap/internal.h | 6 +-
9816 drivers/base/regmap/regcache-lzo.c | 4 +-
9817 drivers/base/regmap/regcache.c | 24 ++--
9818 drivers/base/soc.c | 21 +---
9819 drivers/bluetooth/hci_qca.c | 4 +-
9820 drivers/iommu/amd_iommu_init.c | 2 +-
9821 drivers/iommu/amd_iommu_types.h | 2 +-
9822 drivers/misc/mei/mei_dev.h | 2 +-
9823 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 4 +-
9824 drivers/net/wireless/ath/ath10k/core.h | 2 +-
9825 drivers/net/wireless/ath/ath5k/ath5k.h | 2 +-
9826 drivers/net/wireless/ath/ath9k/hw.c | 2 +-
9827 drivers/net/wireless/ath/ath9k/hw.h | 4 +-
9828 drivers/net/wireless/b43/debugfs.c | 18 +--
9829 drivers/net/wireless/b43/debugfs.h | 2 +-
9830 drivers/net/wireless/b43legacy/debugfs.c | 10 +-
9831 drivers/net/wireless/b43legacy/debugfs.h | 2 +-
9832 drivers/net/wireless/iwlegacy/common.h | 6 +-
9833 drivers/net/wireless/iwlwifi/mvm/mvm.h | 6 +-
9834 drivers/scsi/snic/snic_trc.c | 4 +-
9835 drivers/scsi/snic/snic_trc.h | 2 +-
9836 drivers/uwb/uwb-debug.c | 2 +-
9837 fs/debugfs/file.c | 177 +++++++++++++++++------------
9838 fs/sysfs/file.c | 4 +-
9839 include/linux/debugfs.h | 6 +-
9840 include/linux/edac.h | 2 +-
9841 include/linux/fault-inject.h | 2 +-
9842 include/linux/kobject.h | 2 +-
9843 include/linux/platform_device.h | 8 ++
9844 kernel/futex.c | 4 +-
9846 lib/dma-debug.c | 2 +-
9847 lib/kobject.c | 12 +-
9848 mm/failslab.c | 8 +-
9849 mm/page_alloc.c | 8 +-
9850 sound/soc/codecs/wm_adsp.h | 2 +-
9851 43 files changed, 291 insertions(+), 185 deletions(-)
9852 Merging tty/tty-next (e052c6d15c61 tty: Use unbound workqueue for all input workers)
9853 $ git merge tty/tty-next
9854 Auto-merging include/linux/platform_data/atmel.h
9855 Auto-merging drivers/tty/serial/sc16is7xx.c
9856 Auto-merging drivers/tty/serial/8250/8250_dma.c
9857 Auto-merging Documentation/kernel-parameters.txt
9858 Merge made by the 'recursive' strategy.
9859 .../devicetree/bindings/serial/ingenic,uart.txt | 3 +-
9860 .../devicetree/bindings/serial/qcom,msm-uartdm.txt | 6 +
9861 .../bindings/serial/renesas,sci-serial.txt | 2 +
9862 .../bindings/serial/snps-dw-apb-uart.txt | 3 +
9863 Documentation/kernel-parameters.txt | 7 +
9864 Documentation/serial/driver | 10 +-
9865 Documentation/serial/tty.txt | 60 +-
9866 arch/arm64/include/asm/dcc.h | 55 +
9867 drivers/char/pcmcia/synclink_cs.c | 9 -
9868 drivers/dma/hsu/Kconfig | 9 +-
9869 drivers/dma/hsu/hsu.c | 24 +-
9870 drivers/dma/hsu/hsu.h | 1 +
9871 drivers/dma/hsu/pci.c | 2 +-
9872 drivers/isdn/i4l/isdn_tty.c | 2 +-
9873 drivers/tty/cyclades.c | 9 -
9874 drivers/tty/hvc/Kconfig | 2 +-
9875 drivers/tty/hvc/hvc_console.c | 20 +-
9876 drivers/tty/hvc/hvc_dcc.c | 15 +-
9877 drivers/tty/hvc/hvcs.c | 2 +-
9878 drivers/tty/mips_ejtag_fdc.c | 39 +-
9879 drivers/tty/n_r3964.c | 28 +-
9880 drivers/tty/n_tty.c | 32 +-
9881 drivers/tty/pty.c | 7 +-
9882 drivers/tty/rocket.c | 13 -
9883 drivers/tty/serial/68328serial.c | 5 +-
9884 drivers/tty/serial/8250/8250_core.c | 26 +-
9885 drivers/tty/serial/8250/8250_dma.c | 6 -
9886 drivers/tty/serial/8250/8250_dw.c | 288 ++--
9887 drivers/tty/serial/8250/8250_early.c | 4 +
9888 drivers/tty/serial/8250/8250_ingenic.c | 88 +-
9889 drivers/tty/serial/8250/8250_mid.c | 326 +++++
9890 drivers/tty/serial/8250/8250_omap.c | 8 +-
9891 drivers/tty/serial/8250/8250_pci.c | 229 +--
9892 drivers/tty/serial/8250/8250_port.c | 86 +-
9893 drivers/tty/serial/8250/Kconfig | 25 +-
9894 drivers/tty/serial/8250/Makefile | 1 +
9895 drivers/tty/serial/Kconfig | 12 +-
9896 drivers/tty/serial/altera_uart.c | 26 +-
9897 drivers/tty/serial/amba-pl011.c | 4 +-
9898 drivers/tty/serial/apbuart.c | 1 +
9899 drivers/tty/serial/atmel_serial.c | 27 +-
9900 drivers/tty/serial/clps711x.c | 2 +-
9901 drivers/tty/serial/cpm_uart/cpm_uart_core.c | 1 +
9902 drivers/tty/serial/crisv10.c | 34 +-
9903 drivers/tty/serial/fsl_lpuart.c | 39 +
9904 drivers/tty/serial/imx.c | 175 ++-
9905 drivers/tty/serial/lpc32xx_hs.c | 7 +-
9906 drivers/tty/serial/men_z135_uart.c | 23 +-
9907 drivers/tty/serial/mpc52xx_uart.c | 7 +
9908 drivers/tty/serial/mpsc.c | 41 +-
9909 drivers/tty/serial/msm_serial.c | 622 ++++++++-
9910 drivers/tty/serial/msm_serial.h | 53 +-
9911 drivers/tty/serial/mxs-auart.c | 2 +-
9912 drivers/tty/serial/of_serial.c | 10 +
9913 drivers/tty/serial/omap-serial.c | 2 +
9914 drivers/tty/serial/samsung.c | 66 +-
9915 drivers/tty/serial/sc16is7xx.c | 7 +-
9916 drivers/tty/serial/serial-tegra.c | 94 +-
9917 drivers/tty/serial/serial_core.c | 9 +-
9918 drivers/tty/serial/serial_mctrl_gpio.c | 133 +-
9919 drivers/tty/serial/serial_mctrl_gpio.h | 40 +-
9920 drivers/tty/serial/sh-sci.c | 1460 ++++++++++----------
9921 drivers/tty/serial/sh-sci.h | 49 +-
9922 drivers/tty/serial/sprd_serial.c | 1 +
9923 drivers/tty/serial/st-asc.c | 2 +-
9924 drivers/tty/serial/stm32-usart.c | 3 +-
9925 drivers/tty/synclink.c | 20 +-
9926 drivers/tty/synclink_gt.c | 14 +-
9927 drivers/tty/synclinkmp.c | 14 +-
9928 drivers/tty/sysrq.c | 6 +-
9929 drivers/tty/tty_buffer.c | 12 +-
9930 drivers/tty/tty_io.c | 59 +-
9931 drivers/tty/tty_ldisc.c | 2 +-
9932 drivers/tty/tty_port.c | 28 +-
9933 drivers/usb/gadget/function/u_serial.c | 6 +-
9934 include/linux/dma/hsu.h | 11 +-
9935 include/linux/n_r3964.h | 8 +-
9936 include/linux/platform_data/atmel.h | 6 -
9937 include/linux/platform_data/dma-hsu.h | 4 -
9938 include/linux/tty.h | 48 +-
9939 net/irda/ircomm/ircomm_tty.c | 31 +-
9940 81 files changed, 2733 insertions(+), 1940 deletions(-)
9941 create mode 100644 arch/arm64/include/asm/dcc.h
9942 create mode 100644 drivers/tty/serial/8250/8250_mid.c
9943 Merging usb/usb-next (0bbc367e21bf Merge 4.3-rc7 into usb-next)
9944 $ git merge usb/usb-next
9945 Auto-merging include/linux/platform_data/atmel.h
9946 Removing drivers/usb/host/fusbh200.h
9947 Removing drivers/usb/host/fusbh200-hcd.c
9948 Auto-merging drivers/usb/gadget/function/u_serial.c
9949 Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
9950 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
9951 Auto-merging arch/arm/mach-s3c64xx/mach-smartq.c
9952 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
9953 Auto-merging MAINTAINERS
9954 Auto-merging Documentation/devicetree/bindings/usb/dwc3.txt
9955 Merge made by the 'recursive' strategy.
9956 Documentation/ABI/testing/sysfs-bus-usb | 20 +
9957 .../bindings/phy/brcm,cygnus-pcie-phy.txt | 47 +
9958 .../devicetree/bindings/phy/phy-mt65xx-usb.txt | 68 +
9959 .../devicetree/bindings/phy/samsung-phy.txt | 3 +
9960 .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 27 +-
9961 Documentation/devicetree/bindings/usb/dwc3.txt | 5 +
9962 Documentation/usb/authorization.txt | 31 +
9964 arch/arm/mach-s3c64xx/mach-crag6410.c | 4 +-
9965 arch/arm/mach-s3c64xx/mach-smartq.c | 4 +-
9966 arch/arm/mach-s3c64xx/mach-smdk6410.c | 4 +-
9967 arch/arm/plat-samsung/devs.c | 6 +-
9968 drivers/phy/Kconfig | 18 +
9969 drivers/phy/Makefile | 2 +
9970 drivers/phy/phy-bcm-cygnus-pcie.c | 213 +
9971 drivers/phy/phy-mt65xx-usb3.c | 506 ++
9972 drivers/phy/phy-samsung-usb2.c | 25 +-
9973 drivers/phy/phy-samsung-usb2.h | 2 +
9974 drivers/phy/phy-sun4i-usb.c | 22 +-
9975 drivers/usb/Makefile | 1 -
9976 drivers/usb/chipidea/Kconfig | 1 +
9977 drivers/usb/chipidea/ci_hdrc_imx.c | 11 +
9978 drivers/usb/chipidea/ci_hdrc_pci.c | 6 +-
9979 drivers/usb/chipidea/core.c | 136 +-
9980 drivers/usb/chipidea/otg.c | 48 +-
9981 drivers/usb/chipidea/usbmisc_imx.c | 66 +
9982 drivers/usb/common/common.c | 59 +-
9983 drivers/usb/core/config.c | 4 +
9984 drivers/usb/core/driver.c | 14 +-
9985 drivers/usb/core/hcd.c | 110 +-
9986 drivers/usb/core/hub.c | 87 +-
9987 drivers/usb/core/message.c | 41 +-
9988 drivers/usb/core/sysfs.c | 36 +
9989 drivers/usb/core/urb.c | 3 +-
9990 drivers/usb/core/usb.c | 2 +-
9991 drivers/usb/core/usb.h | 2 +
9992 drivers/usb/dwc2/core.c | 478 +-
9993 drivers/usb/dwc2/core.h | 107 +-
9994 drivers/usb/dwc2/core_intr.c | 106 +-
9995 drivers/usb/dwc2/debugfs.c | 72 +-
9996 drivers/usb/dwc2/gadget.c | 1422 +++--
9997 drivers/usb/dwc2/hcd.c | 346 +-
9998 drivers/usb/dwc2/hcd.h | 15 +-
9999 drivers/usb/dwc2/hcd_ddma.c | 10 +-
10000 drivers/usb/dwc2/hcd_intr.c | 152 +-
10001 drivers/usb/dwc2/hcd_queue.c | 21 +-
10002 drivers/usb/dwc2/hw.h | 1 +
10003 drivers/usb/dwc2/platform.c | 236 +-
10004 drivers/usb/dwc3/core.c | 104 +-
10005 drivers/usb/dwc3/core.h | 27 +
10006 drivers/usb/dwc3/dwc3-pci.c | 39 +-
10007 drivers/usb/dwc3/dwc3-st.c | 12 +-
10008 drivers/usb/dwc3/gadget.c | 100 +-
10009 drivers/usb/dwc3/platform_data.h | 3 +
10010 drivers/usb/gadget/Kconfig | 2 +-
10011 drivers/usb/gadget/composite.c | 6 +-
10012 drivers/usb/gadget/epautoconf.c | 25 +-
10013 drivers/usb/gadget/function/f_acm.c | 23 +-
10014 drivers/usb/gadget/function/f_ecm.c | 31 +-
10015 drivers/usb/gadget/function/f_eem.c | 16 +-
10016 drivers/usb/gadget/function/f_hid.c | 12 +-
10017 drivers/usb/gadget/function/f_loopback.c | 162 +-
10018 drivers/usb/gadget/function/f_mass_storage.c | 10 +-
10019 drivers/usb/gadget/function/f_midi.c | 26 +-
10020 drivers/usb/gadget/function/f_ncm.c | 29 +-
10021 drivers/usb/gadget/function/f_obex.c | 10 +-
10022 drivers/usb/gadget/function/f_phonet.c | 8 +-
10023 drivers/usb/gadget/function/f_printer.c | 2 -
10024 drivers/usb/gadget/function/f_rndis.c | 24 +-
10025 drivers/usb/gadget/function/f_serial.c | 10 +-
10026 drivers/usb/gadget/function/f_sourcesink.c | 167 +-
10027 drivers/usb/gadget/function/f_subset.c | 10 +-
10028 drivers/usb/gadget/function/f_uac1.c | 4 -
10029 drivers/usb/gadget/function/f_uac2.c | 11 -
10030 drivers/usb/gadget/function/f_uvc.c | 42 +-
10031 drivers/usb/gadget/function/u_ether.c | 11 +-
10032 drivers/usb/gadget/function/u_serial.c | 5 -
10033 drivers/usb/gadget/legacy/dbgp.c | 18 +-
10034 drivers/usb/gadget/legacy/tcm_usb_gadget.c | 18 -
10035 drivers/usb/gadget/udc/Kconfig | 2 +-
10036 drivers/usb/gadget/udc/amd5536udc.c | 609 +-
10037 drivers/usb/gadget/udc/amd5536udc.h | 5 +-
10038 drivers/usb/gadget/udc/at91_udc.h | 8 +
10039 drivers/usb/gadget/udc/dummy_hcd.c | 6 +-
10040 drivers/usb/gadget/udc/net2280.c | 2 +-
10041 drivers/usb/gadget/udc/pch_udc.c | 10 +-
10042 drivers/usb/host/Kconfig | 10 -
10043 drivers/usb/host/Makefile | 6 +-
10044 drivers/usb/host/ehci-msm.c | 6 +-
10045 drivers/usb/host/ehci-orion.c | 3 +-
10046 drivers/usb/host/ehci-platform.c | 12 +-
10047 drivers/usb/host/ehci-spear.c | 1 +
10048 drivers/usb/host/fotg210-hcd.c | 1960 +++----
10049 drivers/usb/host/fotg210.h | 36 +-
10050 drivers/usb/host/fsl-mph-dr-of.c | 1 +
10051 drivers/usb/host/fusbh200-hcd.c | 5894 --------------------
10052 drivers/usb/host/fusbh200.h | 675 ---
10053 drivers/usb/host/ohci-nxp.c | 18 +-
10054 drivers/usb/host/ohci-spear.c | 1 +
10055 drivers/usb/host/u132-hcd.c | 3 +-
10056 drivers/usb/host/uhci-platform.c | 1 +
10057 drivers/usb/host/whci/init.c | 3 +-
10058 drivers/usb/host/xhci-dbg.c | 17 +-
10059 drivers/usb/host/xhci-hub.c | 185 +-
10060 drivers/usb/host/xhci-mem.c | 50 +-
10061 drivers/usb/host/xhci-pci.c | 6 +-
10062 drivers/usb/host/xhci-plat.c | 29 +-
10063 drivers/usb/host/xhci-ring.c | 122 +-
10064 drivers/usb/host/xhci.c | 27 +-
10065 drivers/usb/host/xhci.h | 72 +-
10066 drivers/usb/misc/usb3503.c | 2 +-
10067 drivers/usb/misc/usbtest.c | 156 +-
10068 drivers/usb/musb/musb_core.c | 29 +-
10069 drivers/usb/musb/musb_core.h | 2 +-
10070 drivers/usb/musb/musb_dsps.c | 15 +-
10071 drivers/usb/musb/sunxi.c | 14 +-
10072 drivers/usb/phy/phy-msm-usb.c | 2 +-
10073 drivers/usb/phy/phy-qcom-8x16-usb.c | 21 +-
10074 drivers/usb/phy/phy-tegra-usb.c | 2 +-
10075 drivers/usb/serial/io_ti.c | 530 +-
10076 drivers/usb/serial/option.c | 64 +-
10077 drivers/usb/serial/qcserial.c | 15 +
10078 drivers/usb/serial/usb-wwan.h | 2 +-
10079 drivers/usb/serial/usb_wwan.c | 42 +-
10080 drivers/usb/storage/isd200.c | 30 +-
10081 drivers/usb/storage/uas.c | 16 +-
10082 drivers/usb/usbip/vhci_hcd.c | 8 +-
10083 drivers/uwb/drp.c | 4 +-
10084 drivers/uwb/neh.c | 4 +-
10085 drivers/uwb/rsv.c | 9 +-
10086 include/linux/platform_data/atmel.h | 9 -
10087 include/linux/platform_data/s3c-hsotg.h | 10 +-
10088 include/linux/usb.h | 4 +
10089 include/linux/usb/ch9.h | 11 +-
10090 include/linux/usb/chipidea.h | 24 +
10091 include/linux/usb/gadget.h | 29 +-
10092 include/linux/usb/hcd.h | 26 +-
10093 include/linux/usb/musb.h | 2 +-
10094 include/linux/usb/of.h | 12 -
10095 include/linux/usb/otg.h | 9 +
10096 include/linux/usb/phy.h | 8 +-
10097 include/uapi/linux/usb/ch9.h | 29 +
10098 tools/usb/testusb.c | 10 +-
10099 tools/usb/usbip/src/usbip_detach.c | 4 +-
10100 144 files changed, 5964 insertions(+), 10544 deletions(-)
10101 create mode 100644 Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt
10102 create mode 100644 Documentation/devicetree/bindings/phy/phy-mt65xx-usb.txt
10103 create mode 100644 drivers/phy/phy-bcm-cygnus-pcie.c
10104 create mode 100644 drivers/phy/phy-mt65xx-usb3.c
10105 delete mode 100644 drivers/usb/host/fusbh200-hcd.c
10106 delete mode 100644 drivers/usb/host/fusbh200.h
10107 Merging usb-gadget/next (81e9d14a53eb usb: gadget: net2280: restore ep_cfg after defect7374 workaround)
10108 $ git merge usb-gadget/next
10109 Already up-to-date.
10110 Merging usb-serial/usb-next (92944c4520ed USB: qcserial: update comment for Sierra Wireless MC7304/MC7354)
10111 $ git merge usb-serial/usb-next
10112 Already up-to-date.
10113 Merging usb-chipidea-next/ci-for-usb-next (2fb2884ed856 usb: chipidea: delete static debug support)
10114 $ git merge usb-chipidea-next/ci-for-usb-next
10115 Auto-merging drivers/usb/chipidea/udc.c
10116 Removing drivers/usb/chipidea/debug.h
10117 Auto-merging drivers/usb/chipidea/debug.c
10118 Merge made by the 'recursive' strategy.
10119 drivers/usb/chipidea/Kconfig | 5 -----
10120 drivers/usb/chipidea/Makefile | 5 +----
10121 drivers/usb/chipidea/ci.h | 3 +++
10122 drivers/usb/chipidea/core.c | 1 -
10123 drivers/usb/chipidea/debug.c | 1 -
10124 drivers/usb/chipidea/debug.h | 30 ------------------------------
10125 drivers/usb/chipidea/udc.c | 28 ++++++++++++++++++++--------
10126 7 files changed, 24 insertions(+), 49 deletions(-)
10127 delete mode 100644 drivers/usb/chipidea/debug.h
10128 Merging staging/staging-next (e3cc3136df33 Staging: rtl8192u: ieee80211: added missing blank lines)
10129 $ git merge staging/staging-next
10130 Resolved 'drivers/iio/adc/max1027.c' using previous resolution.
10131 Resolved 'drivers/iio/adc/mcp320x.c' using previous resolution.
10132 Resolved 'drivers/iio/adc/ti-adc128s052.c' using previous resolution.
10133 Resolved 'drivers/iio/dac/ad7303.c' using previous resolution.
10134 Resolved 'drivers/iio/frequency/adf4350.c' using previous resolution.
10135 Resolved 'drivers/iio/proximity/as3935.c' using previous resolution.
10136 Resolved 'drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h' using previous resolution.
10137 Resolved 'drivers/staging/mt29f_spinand/mt29f_spinand.c' using previous resolution.
10138 Auto-merging include/linux/fb.h
10139 Removing drivers/staging/wlan-ng/p80211meta.h
10140 Removing drivers/staging/wilc1000/wilc_platform.h
10141 Removing drivers/staging/wilc1000/wilc_oswrapper.h
10142 Removing drivers/staging/wilc1000/wilc_memory.h
10143 Removing drivers/staging/wilc1000/wilc_memory.c
10144 Removing drivers/staging/wilc1000/wilc_exported_buf.c
10145 Removing drivers/staging/wilc1000/wilc_errorsupport.h
10146 Removing drivers/staging/sm750fb/sm750_hw.h
10147 Auto-merging drivers/staging/rdma/ipath/ipath_verbs.c
10148 Auto-merging drivers/staging/rdma/ipath/ipath_ud.c
10149 Auto-merging drivers/staging/rdma/ipath/ipath_ruc.c
10150 Auto-merging drivers/staging/rdma/hfi1/verbs.h
10151 Auto-merging drivers/staging/rdma/hfi1/verbs.c
10152 Auto-merging drivers/staging/rdma/hfi1/ruc.c
10153 Auto-merging drivers/staging/rdma/hfi1/rc.c
10154 Auto-merging drivers/staging/rdma/hfi1/mr.c
10155 Auto-merging drivers/staging/rdma/amso1100/c2_qp.c
10156 Removing drivers/staging/octeon/ethernet-xaui.c
10157 Auto-merging drivers/staging/mt29f_spinand/mt29f_spinand.c
10158 CONFLICT (content): Merge conflict in drivers/staging/mt29f_spinand/mt29f_spinand.c
10159 Auto-merging drivers/staging/media/omap4iss/iss_video.c
10160 Auto-merging drivers/staging/media/omap4iss/iss.c
10161 Auto-merging drivers/staging/media/lirc/lirc_sasem.c
10162 Removing drivers/staging/lustre/lustre/obdclass/dt_object.c
10163 Removing drivers/staging/lustre/lustre/obdclass/capa.c
10164 Removing drivers/staging/lustre/lustre/llite/llite_capa.c
10165 Auto-merging drivers/staging/lustre/lustre/llite/file.c
10166 Removing drivers/staging/lustre/lustre/libcfs/nidstrings.c
10167 Removing drivers/staging/lustre/lustre/include/obd_cache.h
10168 Removing drivers/staging/lustre/lustre/include/lustre_capa.h
10169 Removing drivers/staging/lustre/lustre/include/lustre/lustre_lfsck_user.h
10170 Removing drivers/staging/lustre/lustre/include/lustre/libiam.h
10171 Removing drivers/staging/lustre/lustre/include/dt_object.h
10172 Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
10173 Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
10174 CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
10175 Auto-merging drivers/staging/iio/resolver/ad2s90.c
10176 Auto-merging drivers/staging/iio/resolver/ad2s1210.c
10177 Auto-merging drivers/staging/iio/meter/ade7854-spi.c
10178 Auto-merging drivers/staging/iio/meter/ade7759.c
10179 Auto-merging drivers/staging/iio/meter/ade7758_core.c
10180 Auto-merging drivers/staging/iio/meter/ade7754.c
10181 Auto-merging drivers/staging/iio/meter/ade7753.c
10182 Auto-merging drivers/staging/iio/magnetometer/hmc5843_spi.c
10183 Auto-merging drivers/staging/iio/gyro/adis16060_core.c
10184 Auto-merging drivers/staging/iio/frequency/ad9834.c
10185 Auto-merging drivers/staging/iio/adc/ad7816.c
10186 Auto-merging drivers/staging/iio/adc/ad7780.c
10187 Auto-merging drivers/staging/iio/adc/ad7606_spi.c
10188 Auto-merging drivers/staging/iio/adc/ad7280a.c
10189 Auto-merging drivers/staging/iio/adc/ad7192.c
10190 Auto-merging drivers/staging/iio/accel/sca3000_core.c
10191 Auto-merging drivers/staging/iio/accel/lis3l02dq_core.c
10192 Removing drivers/staging/ft1000/ft1000.h
10193 Removing drivers/staging/ft1000/ft1000-usb/ft3000.img
10194 Removing drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
10195 Removing drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
10196 Removing drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h
10197 Removing drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
10198 Removing drivers/staging/ft1000/ft1000-usb/ft1000_download.c
10199 Removing drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
10200 Removing drivers/staging/ft1000/ft1000-usb/Makefile
10201 Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
10202 Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
10203 Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
10204 Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000.img
10205 Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
10206 Removing drivers/staging/ft1000/ft1000-pcmcia/boot.h
10207 Removing drivers/staging/ft1000/ft1000-pcmcia/Makefile
10208 Removing drivers/staging/ft1000/TODO
10209 Removing drivers/staging/ft1000/Makefile
10210 Removing drivers/staging/ft1000/Kconfig
10211 Auto-merging drivers/staging/fbtft/flexfb.c
10212 Auto-merging drivers/staging/fbtft/fbtft.h
10213 Removing drivers/staging/comedi/drivers/unioxx5.c
10214 Auto-merging drivers/iio/proximity/as3935.c
10215 CONFLICT (content): Merge conflict in drivers/iio/proximity/as3935.c
10216 Auto-merging drivers/iio/gyro/bmg160_core.c
10217 Auto-merging drivers/iio/frequency/adf4350.c
10218 CONFLICT (content): Merge conflict in drivers/iio/frequency/adf4350.c
10219 Auto-merging drivers/iio/dac/ad7303.c
10220 CONFLICT (content): Merge conflict in drivers/iio/dac/ad7303.c
10221 Auto-merging drivers/iio/dac/ad5504.c
10222 Auto-merging drivers/iio/buffer/industrialio-buffer-cb.c
10223 Auto-merging drivers/iio/amplifiers/ad8366.c
10224 Auto-merging drivers/iio/adc/ti-adc128s052.c
10225 CONFLICT (content): Merge conflict in drivers/iio/adc/ti-adc128s052.c
10226 Auto-merging drivers/iio/adc/mcp320x.c
10227 CONFLICT (content): Merge conflict in drivers/iio/adc/mcp320x.c
10228 Auto-merging drivers/iio/adc/max1027.c
10229 CONFLICT (content): Merge conflict in drivers/iio/adc/max1027.c
10230 Auto-merging drivers/iio/accel/bmc150-accel-core.c
10231 Auto-merging MAINTAINERS
10232 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
10233 Automatic merge failed; fix conflicts and then commit the result.
10235 [master 59e56dd24246] Merge remote-tracking branch 'staging/staging-next'
10236 $ git diff -M --stat --summary HEAD^..
10237 Documentation/ABI/testing/sysfs-bus-iio | 32 +
10238 Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435 | 43 +
10239 .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 7 +
10240 .../ABI/testing/sysfs-bus-iio-humidity-hdc100x | 9 +
10241 Documentation/ABI/testing/sysfs-bus-iio-meas-spec | 8 +
10242 .../ABI/testing/sysfs-bus-iio-trigger-sysfs | 22 +
10243 Documentation/DocBook/iio.tmpl | 2 +-
10244 .../devicetree/bindings/i2c/trivial-devices.txt | 3 +-
10245 .../devicetree/bindings/iio/accel/mma8452.txt | 24 +
10246 .../devicetree/bindings/iio/adc/hi8435.txt | 21 +
10247 .../devicetree/bindings/iio/light/apds9960.txt | 22 +
10248 .../devicetree/bindings/iio/light/us5182d.txt | 34 +
10249 .../devicetree/bindings/vendor-prefixes.txt | 4 +
10250 MAINTAINERS | 19 +-
10251 drivers/iio/Kconfig | 30 +-
10252 drivers/iio/Makefile | 7 +-
10253 drivers/iio/accel/Kconfig | 33 +-
10254 drivers/iio/accel/Makefile | 6 +-
10255 .../accel/{bmc150-accel.c => bmc150-accel-core.c} | 407 +-
10256 drivers/iio/accel/bmc150-accel-i2c.c | 102 +
10257 drivers/iio/accel/bmc150-accel-spi.c | 91 +
10258 drivers/iio/accel/bmc150-accel.h | 20 +
10259 drivers/iio/accel/kxcjk-1013.c | 34 +-
10260 drivers/iio/accel/mma8452.c | 356 +-
10261 drivers/iio/accel/mma9553.c | 29 -
10262 drivers/iio/accel/mxc4005.c | 567 ++
10263 drivers/iio/accel/st_accel_core.c | 1 +
10264 drivers/iio/accel/stk8312.c | 30 +-
10265 drivers/iio/accel/stk8ba50.c | 30 +-
10266 drivers/iio/adc/Kconfig | 35 +-
10267 drivers/iio/adc/Makefile | 3 +-
10268 drivers/iio/adc/ad799x.c | 1 -
10269 drivers/iio/adc/berlin2-adc.c | 91 +-
10270 drivers/iio/adc/hi8435.c | 534 ++
10271 drivers/iio/adc/max1027.c | 1 +
10272 drivers/iio/adc/max1363.c | 1 -
10273 drivers/iio/adc/mcp320x.c | 1 +
10274 drivers/iio/adc/ti-adc128s052.c | 8 +
10275 drivers/iio/adc/twl6030-gpadc.c | 1 +
10276 drivers/iio/adc/vf610_adc.c | 101 +-
10277 drivers/iio/adc/xilinx-xadc-core.c | 37 +-
10278 drivers/iio/adc/xilinx-xadc.h | 2 -
10279 drivers/iio/amplifiers/ad8366.c | 1 +
10280 drivers/iio/buffer/Kconfig | 24 +
10281 drivers/iio/buffer/Makefile | 8 +
10282 .../industrialio-buffer-cb.c} | 12 +
10283 .../{ => buffer}/industrialio-triggered-buffer.c | 0
10284 drivers/iio/{ => buffer}/kfifo_buf.c | 0
10285 drivers/iio/chemical/Kconfig | 15 +
10286 drivers/iio/chemical/Makefile | 6 +
10287 drivers/iio/chemical/vz89x.c | 256 +
10288 drivers/iio/common/Kconfig | 1 +
10289 drivers/iio/common/Makefile | 1 +
10290 drivers/iio/common/ms_sensors/Kconfig | 6 +
10291 drivers/iio/common/ms_sensors/Makefile | 5 +
10292 drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 652 ++
10293 drivers/iio/common/ms_sensors/ms_sensors_i2c.h | 66 +
10294 drivers/iio/common/st_sensors/st_sensors_core.c | 22 +
10295 drivers/iio/dac/ad5504.c | 1 -
10296 drivers/iio/dac/ad7303.c | 7 +
10297 drivers/iio/dac/m62332.c | 63 +-
10298 drivers/iio/dac/max5821.c | 1 +
10299 drivers/iio/frequency/adf4350.c | 9 +
10300 drivers/iio/gyro/Kconfig | 19 +-
10301 drivers/iio/gyro/Makefile | 4 +-
10302 drivers/iio/gyro/bmg160.h | 10 +
10303 drivers/iio/gyro/{bmg160.c => bmg160_core.c} | 361 +-
10304 drivers/iio/gyro/bmg160_i2c.c | 71 +
10305 drivers/iio/gyro/bmg160_spi.c | 57 +
10306 drivers/iio/gyro/st_gyro_core.c | 1 +
10307 drivers/iio/humidity/Kconfig | 23 +
10308 drivers/iio/humidity/Makefile | 2 +
10309 drivers/iio/humidity/hdc100x.c | 320 +
10310 drivers/iio/humidity/htu21.c | 253 +
10311 drivers/iio/humidity/si7020.c | 6 +-
10312 drivers/iio/imu/kmx61.c | 28 -
10313 drivers/iio/industrialio-core.c | 10 +-
10314 drivers/iio/industrialio-trigger.c | 12 +-
10315 drivers/iio/industrialio-triggered-event.c | 68 +
10316 drivers/iio/light/Kconfig | 23 +
10317 drivers/iio/light/Makefile | 2 +
10318 drivers/iio/light/apds9960.c | 1130 +++
10319 drivers/iio/light/opt3001.c | 1 -
10320 drivers/iio/light/stk3310.c | 98 +-
10321 drivers/iio/light/tsl4531.c | 9 +-
10322 drivers/iio/light/us5182d.c | 507 ++
10323 drivers/iio/magnetometer/Kconfig | 33 +-
10324 drivers/iio/magnetometer/Makefile | 3 +-
10325 drivers/iio/magnetometer/bmc150_magn.c | 29 -
10326 drivers/iio/magnetometer/st_magn_core.c | 1 +
10327 drivers/iio/potentiometer/Kconfig | 20 +
10328 drivers/iio/potentiometer/Makefile | 6 +
10329 drivers/iio/potentiometer/mcp4531.c | 231 +
10330 drivers/iio/pressure/Kconfig | 13 +
10331 drivers/iio/pressure/Makefile | 1 +
10332 drivers/iio/pressure/ms5637.c | 190 +
10333 drivers/iio/pressure/st_pressure_core.c | 1 +
10334 drivers/iio/proximity/Kconfig | 12 +
10335 drivers/iio/proximity/Makefile | 1 +
10336 drivers/iio/proximity/as3935.c | 7 +
10337 drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 289 +
10338 drivers/iio/proximity/sx9500.c | 9 -
10339 drivers/iio/temperature/Kconfig | 22 +
10340 drivers/iio/temperature/Makefile | 2 +
10341 drivers/iio/temperature/mlx90614.c | 92 +-
10342 drivers/iio/temperature/tsys01.c | 230 +
10343 drivers/iio/temperature/tsys02d.c | 191 +
10344 drivers/staging/Kconfig | 2 -
10345 drivers/staging/Makefile | 1 -
10346 drivers/staging/android/Kconfig | 2 +-
10347 drivers/staging/android/ashmem.c | 44 +-
10348 drivers/staging/android/ion/compat_ion.h | 1 -
10349 drivers/staging/android/ion/ion.c | 49 +-
10350 drivers/staging/android/ion/ion.h | 10 +-
10351 drivers/staging/android/ion/ion_cma_heap.c | 6 +-
10352 drivers/staging/android/ion/ion_heap.c | 4 +-
10353 drivers/staging/android/ion/ion_page_pool.c | 10 +-
10354 drivers/staging/android/ion/ion_priv.h | 3 +-
10355 drivers/staging/android/ion/ion_system_heap.c | 7 +-
10356 drivers/staging/android/ion/tegra/Makefile | 2 +-
10357 drivers/staging/android/lowmemorykiller.c | 30 +-
10358 drivers/staging/android/sw_sync.c | 17 +-
10359 drivers/staging/android/timed_output.c | 16 +-
10360 drivers/staging/android/uapi/ion.h | 25 +-
10361 drivers/staging/board/board.c | 6 +-
10362 drivers/staging/comedi/Kconfig | 10 +-
10363 drivers/staging/comedi/comedi_buf.c | 125 +-
10364 drivers/staging/comedi/comedi_fops.c | 180 +-
10365 drivers/staging/comedi/comedi_internal.h | 1 +
10366 drivers/staging/comedi/comedi_pci.c | 108 +-
10367 drivers/staging/comedi/comedi_pcmcia.c | 104 +-
10368 drivers/staging/comedi/comedi_usb.c | 75 +-
10369 drivers/staging/comedi/comedidev.h | 635 +-
10370 drivers/staging/comedi/drivers.c | 407 +-
10371 drivers/staging/comedi/drivers/8255.h | 12 +-
10372 drivers/staging/comedi/drivers/8255_pci.c | 4 +-
10373 drivers/staging/comedi/drivers/Makefile | 1 -
10374 drivers/staging/comedi/drivers/addi_apci_1032.c | 7 +-
10375 drivers/staging/comedi/drivers/addi_apci_2032.c | 16 +-
10376 drivers/staging/comedi/drivers/addi_apci_3120.c | 59 +-
10377 drivers/staging/comedi/drivers/addi_apci_3xxx.c | 6 +-
10378 drivers/staging/comedi/drivers/adl_pci6208.c | 2 +-
10379 drivers/staging/comedi/drivers/adl_pci9111.c | 171 +-
10380 drivers/staging/comedi/drivers/adl_pci9118.c | 289 +-
10381 drivers/staging/comedi/drivers/adq12b.c | 136 +-
10382 drivers/staging/comedi/drivers/adv_pci1710.c | 304 +-
10383 drivers/staging/comedi/drivers/adv_pci1723.c | 33 +-
10384 drivers/staging/comedi/drivers/adv_pci1724.c | 15 +-
10385 drivers/staging/comedi/drivers/aio_aio12_8.c | 201 +-
10386 drivers/staging/comedi/drivers/amplc_pci230.c | 2 +-
10387 drivers/staging/comedi/drivers/cb_das16_cs.c | 284 +-
10388 drivers/staging/comedi/drivers/cb_pcidas.c | 1175 ++-
10389 drivers/staging/comedi/drivers/comedi_test.c | 565 +-
10390 drivers/staging/comedi/drivers/daqboard2000.c | 8 +-
10391 drivers/staging/comedi/drivers/dt3000.c | 466 +-
10392 drivers/staging/comedi/drivers/dt9812.c | 66 +-
10393 drivers/staging/comedi/drivers/fl512.c | 2 +-
10394 drivers/staging/comedi/drivers/gsc_hpdi.c | 28 +-
10395 drivers/staging/comedi/drivers/icp_multi.c | 517 +-
10396 drivers/staging/comedi/drivers/ii_pci20kc.c | 84 +-
10397 drivers/staging/comedi/drivers/ke_counter.c | 7 +-
10398 drivers/staging/comedi/drivers/me_daq.c | 315 +-
10399 drivers/staging/comedi/drivers/mf6x4.c | 137 +-
10400 drivers/staging/comedi/drivers/mpc624.c | 411 +-
10401 drivers/staging/comedi/drivers/multiq3.c | 358 +-
10402 drivers/staging/comedi/drivers/ni_tio.c | 6 +-
10403 drivers/staging/comedi/drivers/ni_tiocmd.c | 6 -
10404 drivers/staging/comedi/drivers/ni_usb6501.c | 16 +-
10405 drivers/staging/comedi/drivers/pcl711.c | 19 +-
10406 drivers/staging/comedi/drivers/pcl812.c | 186 +-
10407 drivers/staging/comedi/drivers/pcl816.c | 109 +-
10408 drivers/staging/comedi/drivers/pcl818.c | 40 +-
10409 drivers/staging/comedi/drivers/pcm3724.c | 112 +-
10410 drivers/staging/comedi/drivers/quatech_daqp_cs.c | 684 +-
10411 drivers/staging/comedi/drivers/rtd520.c | 369 +-
10412 drivers/staging/comedi/drivers/rti800.c | 28 +-
10413 drivers/staging/comedi/drivers/s526.c | 560 +-
10414 drivers/staging/comedi/drivers/serial2002.c | 51 +-
10415 drivers/staging/comedi/drivers/ssv_dnp.c | 57 +-
10416 drivers/staging/comedi/drivers/unioxx5.c | 506 --
10417 drivers/staging/comedi/drivers/usbdux.c | 164 +-
10418 drivers/staging/comedi/drivers/usbduxfast.c | 310 +-
10419 drivers/staging/comedi/drivers/usbduxsigma.c | 142 +-
10420 drivers/staging/comedi/drivers/vmk80xx.c | 127 +-
10421 .../staging/comedi/kcomedilib/kcomedilib_main.c | 32 +-
10422 drivers/staging/dgap/dgap.c | 532 +-
10423 drivers/staging/dgap/dgap.h | 4 -
10424 drivers/staging/dgnc/dgnc_cls.c | 50 +-
10425 drivers/staging/dgnc/dgnc_driver.c | 52 +-
10426 drivers/staging/dgnc/dgnc_driver.h | 59 +-
10427 drivers/staging/dgnc/dgnc_mgmt.c | 15 +-
10428 drivers/staging/dgnc/dgnc_neo.c | 65 +-
10429 drivers/staging/dgnc/dgnc_sysfs.c | 95 +-
10430 drivers/staging/dgnc/dgnc_tty.c | 324 +-
10431 drivers/staging/emxx_udc/emxx_udc.c | 183 +-
10432 drivers/staging/emxx_udc/emxx_udc.h | 30 -
10433 drivers/staging/fbtft/Kconfig | 10 +
10434 drivers/staging/fbtft/Makefile | 1 +
10435 drivers/staging/fbtft/fb_agm1264k-fl.c | 17 +-
10436 drivers/staging/fbtft/fb_bd663474.c | 11 +-
10437 drivers/staging/fbtft/fb_hx8340bn.c | 16 +-
10438 drivers/staging/fbtft/fb_hx8347d.c | 16 +-
10439 drivers/staging/fbtft/fb_hx8353d.c | 21 +-
10440 drivers/staging/fbtft/fb_hx8357d.c | 12 +-
10441 drivers/staging/fbtft/fb_ili9163.c | 13 +-
10442 drivers/staging/fbtft/fb_ili9320.c | 21 +-
10443 drivers/staging/fbtft/fb_ili9325.c | 20 +-
10444 drivers/staging/fbtft/fb_ili9340.c | 14 +-
10445 drivers/staging/fbtft/fb_ili9341.c | 20 +-
10446 drivers/staging/fbtft/fb_ili9481.c | 10 +-
10447 drivers/staging/fbtft/fb_ili9486.c | 12 +-
10448 drivers/staging/fbtft/fb_pcd8544.c | 25 +-
10449 drivers/staging/fbtft/fb_ra8875.c | 40 +-
10450 drivers/staging/fbtft/fb_s6d02a1.c | 16 +-
10451 drivers/staging/fbtft/fb_s6d1121.c | 18 +-
10452 drivers/staging/fbtft/fb_ssd1289.c | 20 +-
10453 drivers/staging/fbtft/fb_ssd1306.c | 25 +-
10454 drivers/staging/fbtft/fb_ssd1331.c | 11 +-
10455 drivers/staging/fbtft/fb_ssd1351.c | 67 +-
10456 drivers/staging/fbtft/fb_st7735r.c | 22 +-
10457 drivers/staging/fbtft/fb_st7789v.c | 265 +
10458 drivers/staging/fbtft/fb_tinylcd.c | 14 +-
10459 drivers/staging/fbtft/fb_tls8204.c | 24 +-
10460 drivers/staging/fbtft/fb_uc1611.c | 12 +-
10461 drivers/staging/fbtft/fb_uc1701.c | 25 +-
10462 drivers/staging/fbtft/fb_upd161704.c | 11 +-
10463 drivers/staging/fbtft/fb_watterott.c | 38 +-
10464 drivers/staging/fbtft/fbtft-bus.c | 27 +-
10465 drivers/staging/fbtft/fbtft-core.c | 135 +-
10466 drivers/staging/fbtft/fbtft-sysfs.c | 6 +-
10467 drivers/staging/fbtft/fbtft.h | 11 +-
10468 drivers/staging/fbtft/fbtft_device.c | 171 +-
10469 drivers/staging/fbtft/flexfb.c | 10 -
10470 drivers/staging/fsl-mc/bus/dpbp.c | 356 +-
10471 drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 81 +-
10472 drivers/staging/fsl-mc/bus/dpmcp.c | 316 +-
10473 drivers/staging/fsl-mc/bus/dpmcp.h | 220 +-
10474 drivers/staging/fsl-mc/bus/dpmng.c | 31 +-
10475 drivers/staging/fsl-mc/bus/dprc-cmd.h | 7 +-
10476 drivers/staging/fsl-mc/bus/dprc-driver.c | 12 +-
10477 drivers/staging/fsl-mc/bus/dprc.c | 955 ++-
10478 drivers/staging/fsl-mc/bus/mc-allocator.c | 98 +-
10479 drivers/staging/fsl-mc/bus/mc-bus.c | 136 +-
10480 drivers/staging/fsl-mc/bus/mc-sys.c | 208 +-
10481 drivers/staging/fsl-mc/include/dpbp-cmd.h | 2 +-
10482 drivers/staging/fsl-mc/include/dpbp.h | 303 +-
10483 drivers/staging/fsl-mc/include/dpcon-cmd.h | 62 +-
10484 drivers/staging/fsl-mc/include/dpmng.h | 33 +-
10485 drivers/staging/fsl-mc/include/dprc.h | 638 +-
10486 drivers/staging/fsl-mc/include/mc-cmd.h | 52 +-
10487 drivers/staging/fsl-mc/include/mc-private.h | 19 +-
10488 drivers/staging/fsl-mc/include/mc-sys.h | 55 +-
10489 drivers/staging/fsl-mc/include/mc.h | 18 +-
10490 drivers/staging/ft1000/Kconfig | 22 -
10491 drivers/staging/ft1000/Makefile | 3 -
10492 drivers/staging/ft1000/TODO | 9 -
10493 drivers/staging/ft1000/ft1000-pcmcia/Makefile | 2 -
10494 drivers/staging/ft1000/ft1000-pcmcia/boot.h | 158 -
10495 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 70 -
10496 drivers/staging/ft1000/ft1000-pcmcia/ft1000.img | Bin 305770 -> 0 bytes
10497 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 158 -
10498 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 769 --
10499 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 2068 -----
10500 drivers/staging/ft1000/ft1000-usb/Makefile | 3 -
10501 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 789 --
10502 .../staging/ft1000/ft1000-usb/ft1000_download.c | 1058 ---
10503 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 1586 ----
10504 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 123 -
10505 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 252 -
10506 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 150 -
10507 drivers/staging/ft1000/ft1000-usb/ft3000.img | Bin 280414 -> 0 bytes
10508 drivers/staging/ft1000/ft1000.h | 366 -
10509 drivers/staging/gdm724x/gdm_lte.c | 54 +-
10510 drivers/staging/gdm724x/gdm_mux.c | 28 +-
10511 drivers/staging/gdm724x/gdm_tty.c | 8 +-
10512 drivers/staging/gdm724x/gdm_usb.c | 56 +-
10513 drivers/staging/gdm724x/netlink_k.c | 10 +-
10514 drivers/staging/gdm72xx/gdm_qos.c | 4 +-
10515 drivers/staging/gdm72xx/gdm_sdio.c | 20 +-
10516 drivers/staging/gdm72xx/gdm_usb.c | 16 +-
10517 drivers/staging/gdm72xx/gdm_wimax.c | 22 +-
10518 drivers/staging/gdm72xx/sdio_boot.c | 4 +-
10519 drivers/staging/gdm72xx/usb_boot.c | 8 +-
10520 drivers/staging/goldfish/goldfish_nand.c | 4 +-
10521 drivers/staging/goldfish/goldfish_nand_reg.h | 10 +-
10522 drivers/staging/iio/accel/lis3l02dq_core.c | 10 +-
10523 drivers/staging/iio/accel/lis3l02dq_ring.c | 30 +-
10524 drivers/staging/iio/accel/sca3000_core.c | 65 +-
10525 drivers/staging/iio/accel/sca3000_ring.c | 19 +-
10526 drivers/staging/iio/adc/ad7192.c | 64 +-
10527 drivers/staging/iio/adc/ad7192.h | 2 +-
10528 drivers/staging/iio/adc/ad7280a.c | 180 +-
10529 drivers/staging/iio/adc/ad7606_core.c | 23 +-
10530 drivers/staging/iio/adc/ad7606_par.c | 15 +-
10531 drivers/staging/iio/adc/ad7606_spi.c | 5 +-
10532 drivers/staging/iio/adc/ad7780.c | 13 +-
10533 drivers/staging/iio/adc/ad7816.c | 58 +-
10534 drivers/staging/iio/adc/lpc32xx_adc.c | 18 +-
10535 drivers/staging/iio/adc/mxs-lradc.c | 185 +-
10536 drivers/staging/iio/adc/spear_adc.c | 4 +-
10537 drivers/staging/iio/addac/adt7316.c | 16 +-
10538 drivers/staging/iio/cdc/ad7150.c | 19 +-
10539 drivers/staging/iio/cdc/ad7152.c | 14 +-
10540 drivers/staging/iio/cdc/ad7746.c | 49 +-
10541 drivers/staging/iio/frequency/ad9834.c | 2 +-
10542 drivers/staging/iio/gyro/adis16060_core.c | 16 +-
10543 drivers/staging/iio/iio_dummy_evgen.c | 26 +-
10544 drivers/staging/iio/iio_simple_dummy.c | 11 +-
10545 drivers/staging/iio/iio_simple_dummy.h | 17 +-
10546 drivers/staging/iio/iio_simple_dummy_buffer.c | 8 +-
10547 drivers/staging/iio/iio_simple_dummy_events.c | 19 +-
10548 drivers/staging/iio/impedance-analyzer/ad5933.c | 11 +-
10549 drivers/staging/iio/light/isl29018.c | 6 +-
10550 drivers/staging/iio/light/isl29028.c | 11 +-
10551 drivers/staging/iio/light/tsl2583.c | 16 +-
10552 drivers/staging/iio/light/tsl2x7x_core.c | 14 +-
10553 drivers/staging/iio/magnetometer/hmc5843.h | 2 +-
10554 drivers/staging/iio/magnetometer/hmc5843_core.c | 6 +-
10555 drivers/staging/iio/magnetometer/hmc5843_i2c.c | 2 +-
10556 drivers/staging/iio/magnetometer/hmc5843_spi.c | 4 +-
10557 drivers/staging/iio/meter/ade7753.c | 10 +-
10558 drivers/staging/iio/meter/ade7754.c | 8 +-
10559 drivers/staging/iio/meter/ade7758_core.c | 6 +-
10560 drivers/staging/iio/meter/ade7759.c | 10 +-
10561 drivers/staging/iio/meter/ade7854-spi.c | 2 +-
10562 drivers/staging/iio/meter/ade7854.c | 6 +-
10563 drivers/staging/iio/resolver/ad2s1210.c | 2 +-
10564 drivers/staging/iio/resolver/ad2s90.c | 10 +-
10565 drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 4 +-
10566 .../staging/iio/trigger/iio-trig-periodic-rtc.c | 2 +-
10567 .../staging/lustre/include/linux/libcfs/libcfs.h | 13 +-
10568 .../lustre/include/linux/libcfs/libcfs_debug.h | 1 +
10569 .../lustre/include/linux/libcfs/libcfs_hash.h | 189 +-
10570 .../lustre/include/linux/libcfs/libcfs_prim.h | 13 -
10571 .../lustre/include/linux/libcfs/libcfs_private.h | 2 +-
10572 .../lustre/include/linux/libcfs/libcfs_string.h | 5 +-
10573 .../lustre/include/linux/libcfs/libcfs_time.h | 49 -
10574 .../lustre/include/linux/libcfs/linux/libcfs.h | 3 -
10575 .../lustre/include/linux/libcfs/linux/linux-time.h | 35 +-
10576 .../staging/lustre/include/linux/lnet/lib-lnet.h | 6 +-
10577 .../staging/lustre/include/linux/lnet/lib-types.h | 2 +-
10578 drivers/staging/lustre/include/linux/lnet/nidstr.h | 47 +-
10579 drivers/staging/lustre/include/linux/lnet/types.h | 2 +-
10580 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 44 +-
10581 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 289 +-
10582 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 65 +-
10583 .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 1 -
10584 .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 61 +-
10585 .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 6 +-
10586 .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 21 +-
10587 .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 6 +-
10588 .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 1 -
10589 drivers/staging/lustre/lnet/lnet/Makefile | 2 +-
10590 drivers/staging/lustre/lnet/lnet/acceptor.c | 2 -
10591 drivers/staging/lustre/lnet/lnet/api-ni.c | 18 +-
10592 drivers/staging/lustre/lnet/lnet/config.c | 4 +-
10593 drivers/staging/lustre/lnet/lnet/lib-eq.c | 12 +-
10594 drivers/staging/lustre/lnet/lnet/lib-move.c | 7 +-
10595 drivers/staging/lustre/lnet/lnet/lib-ptl.c | 4 +-
10596 drivers/staging/lustre/lnet/lnet/nidstrings.c | 1260 +++
10597 drivers/staging/lustre/lnet/lnet/router.c | 15 +-
10598 drivers/staging/lustre/lnet/lnet/router_proc.c | 45 +-
10599 drivers/staging/lustre/lnet/selftest/brw_test.c | 6 +-
10600 drivers/staging/lustre/lnet/selftest/conctl.c | 4 +-
10601 drivers/staging/lustre/lnet/selftest/conrpc.c | 18 +-
10602 drivers/staging/lustre/lnet/selftest/conrpc.h | 5 +-
10603 drivers/staging/lustre/lnet/selftest/console.c | 20 +-
10604 drivers/staging/lustre/lnet/selftest/console.h | 3 +-
10605 drivers/staging/lustre/lnet/selftest/framework.c | 12 +-
10606 drivers/staging/lustre/lnet/selftest/module.c | 1 -
10607 drivers/staging/lustre/lnet/selftest/ping_test.c | 16 +-
10608 drivers/staging/lustre/lnet/selftest/rpc.c | 11 +-
10609 drivers/staging/lustre/lnet/selftest/rpc.h | 1 -
10610 drivers/staging/lustre/lnet/selftest/selftest.h | 27 +-
10611 drivers/staging/lustre/lnet/selftest/timer.c | 17 +-
10612 drivers/staging/lustre/lnet/selftest/timer.h | 2 +-
10613 drivers/staging/lustre/lustre/fid/fid_request.c | 132 +-
10614 drivers/staging/lustre/lustre/fid/lproc_fid.c | 3 -
10615 drivers/staging/lustre/lustre/fld/fld_cache.c | 3 +-
10616 drivers/staging/lustre/lustre/fld/fld_internal.h | 3 -
10617 drivers/staging/lustre/lustre/fld/fld_request.c | 1 -
10618 drivers/staging/lustre/lustre/fld/lproc_fld.c | 1 -
10619 drivers/staging/lustre/lustre/include/cl_object.h | 59 +-
10620 drivers/staging/lustre/lustre/include/dt_object.h | 1496 ----
10621 .../staging/lustre/lustre/include/interval_tree.h | 36 -
10622 drivers/staging/lustre/lustre/include/lclient.h | 28 +-
10623 .../lustre/lustre/include/linux/lustre_compat25.h | 1 -
10624 .../lustre/lustre/include/linux/lustre_lite.h | 4 +-
10625 .../lustre/include/linux/lustre_patchless_compat.h | 1 -
10626 drivers/staging/lustre/lustre/include/linux/obd.h | 2 +-
10627 .../staging/lustre/lustre/include/lprocfs_status.h | 61 +-
10628 drivers/staging/lustre/lustre/include/lu_object.h | 61 +-
10629 drivers/staging/lustre/lustre/include/lu_ref.h | 1 -
10630 .../staging/lustre/lustre/include/lustre/libiam.h | 145 -
10631 .../lustre/lustre/include/lustre/ll_fiemap.h | 3 -
10632 .../lustre/lustre/include/lustre/lustre_idl.h | 98 +-
10633 .../lustre/include/lustre/lustre_lfsck_user.h | 95 -
10634 .../lustre/lustre/include/lustre/lustre_user.h | 40 +-
10635 .../staging/lustre/lustre/include/lustre_capa.h | 305 -
10636 drivers/staging/lustre/lustre/include/lustre_cfg.h | 10 +-
10637 .../staging/lustre/lustre/include/lustre_debug.h | 1 -
10638 .../staging/lustre/lustre/include/lustre_disk.h | 159 +-
10639 drivers/staging/lustre/lustre/include/lustre_dlm.h | 117 +-
10640 .../lustre/lustre/include/lustre_dlm_flags.h | 228 +-
10641 .../staging/lustre/lustre/include/lustre_eacl.h | 5 -
10642 .../staging/lustre/lustre/include/lustre_export.h | 37 +-
10643 drivers/staging/lustre/lustre/include/lustre_fid.h | 96 +-
10644 drivers/staging/lustre/lustre/include/lustre_fld.h | 5 -
10645 drivers/staging/lustre/lustre/include/lustre_ha.h | 1 -
10646 .../staging/lustre/lustre/include/lustre_handles.h | 3 +-
10647 .../staging/lustre/lustre/include/lustre_import.h | 22 +-
10648 drivers/staging/lustre/lustre/include/lustre_lib.h | 19 +-
10649 .../staging/lustre/lustre/include/lustre_lite.h | 1 -
10650 drivers/staging/lustre/lustre/include/lustre_log.h | 167 +-
10651 drivers/staging/lustre/lustre/include/lustre_mdc.h | 1 -
10652 drivers/staging/lustre/lustre/include/lustre_mds.h | 5 -
10653 drivers/staging/lustre/lustre/include/lustre_net.h | 152 +-
10654 .../staging/lustre/lustre/include/lustre_param.h | 12 -
10655 .../lustre/lustre/include/lustre_req_layout.h | 11 -
10656 drivers/staging/lustre/lustre/include/lustre_sec.h | 48 +-
10657 drivers/staging/lustre/lustre/include/obd.h | 188 +-
10658 drivers/staging/lustre/lustre/include/obd_cache.h | 39 -
10659 drivers/staging/lustre/lustre/include/obd_cksum.h | 1 -
10660 drivers/staging/lustre/lustre/include/obd_class.h | 236 +-
10661 .../staging/lustre/lustre/include/obd_support.h | 284 +-
10662 drivers/staging/lustre/lustre/lclient/glimpse.c | 6 +-
10663 drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 102 +-
10664 .../staging/lustre/lustre/lclient/lcommon_misc.c | 1 -
10665 drivers/staging/lustre/lustre/ldlm/interval_tree.c | 274 +-
10666 drivers/staging/lustre/lustre/ldlm/l_lock.c | 7 +-
10667 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 27 +-
10668 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 278 +-
10669 .../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 1 -
10670 drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 36 +-
10671 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 38 -
10672 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 391 +-
10673 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 132 +-
10674 drivers/staging/lustre/lustre/ldlm/ldlm_plain.c | 1 -
10675 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 441 +-
10676 drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 380 +-
10677 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 209 +-
10678 drivers/staging/lustre/lustre/libcfs/Makefile | 2 +-
10679 drivers/staging/lustre/lustre/libcfs/debug.c | 5 +-
10680 drivers/staging/lustre/lustre/libcfs/fail.c | 4 +-
10681 drivers/staging/lustre/lustre/libcfs/hash.c | 131 +-
10682 .../lustre/lustre/libcfs/kernel_user_comm.c | 1 +
10683 drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 8 +-
10684 drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 10 +-
10685 .../staging/lustre/lustre/libcfs/libcfs_string.c | 144 +-
10686 .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 3 +-
10687 .../lustre/libcfs/linux/linux-crypto-adler.c | 3 +-
10688 .../lustre/lustre/libcfs/linux/linux-crypto.c | 9 +-
10689 .../lustre/lustre/libcfs/linux/linux-curproc.c | 1 +
10690 .../lustre/lustre/libcfs/linux/linux-debug.c | 2 +-
10691 .../lustre/lustre/libcfs/linux/linux-module.c | 1 -
10692 .../lustre/lustre/libcfs/linux/linux-prim.c | 70 -
10693 .../lustre/lustre/libcfs/linux/linux-tracefile.c | 32 +-
10694 drivers/staging/lustre/lustre/libcfs/module.c | 185 +-
10695 drivers/staging/lustre/lustre/libcfs/nidstrings.c | 842 --
10696 drivers/staging/lustre/lustre/libcfs/tracefile.c | 6 +-
10697 drivers/staging/lustre/lustre/libcfs/tracefile.h | 3 -
10698 drivers/staging/lustre/lustre/libcfs/workitem.c | 16 +-
10699 drivers/staging/lustre/lustre/llite/Makefile | 2 +-
10700 drivers/staging/lustre/lustre/llite/dcache.c | 1 -
10701 drivers/staging/lustre/lustre/llite/dir.c | 15 +-
10702 drivers/staging/lustre/lustre/llite/file.c | 81 +-
10703 drivers/staging/lustre/lustre/llite/llite_capa.c | 661 --
10704 drivers/staging/lustre/lustre/llite/llite_close.c | 9 +-
10705 .../staging/lustre/lustre/llite/llite_internal.h | 49 +-
10706 drivers/staging/lustre/lustre/llite/llite_lib.c | 179 +-
10707 drivers/staging/lustre/lustre/llite/llite_mmap.c | 2 -
10708 drivers/staging/lustre/lustre/llite/llite_nfs.c | 9 +-
10709 drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 1 -
10710 drivers/staging/lustre/lustre/llite/lloop.c | 5 +-
10711 drivers/staging/lustre/lustre/llite/lproc_llite.c | 38 +-
10712 drivers/staging/lustre/lustre/llite/namei.c | 58 +-
10713 drivers/staging/lustre/lustre/llite/remote_perm.c | 16 +-
10714 drivers/staging/lustre/lustre/llite/rw.c | 42 +-
10715 drivers/staging/lustre/lustre/llite/rw26.c | 1 +
10716 drivers/staging/lustre/lustre/llite/statahead.c | 40 +-
10717 drivers/staging/lustre/lustre/llite/super25.c | 42 +-
10718 drivers/staging/lustre/lustre/llite/vvp_dev.c | 11 +-
10719 drivers/staging/lustre/lustre/llite/vvp_internal.h | 1 -
10720 drivers/staging/lustre/lustre/llite/vvp_io.c | 10 +-
10721 drivers/staging/lustre/lustre/llite/vvp_lock.c | 1 -
10722 drivers/staging/lustre/lustre/llite/vvp_object.c | 13 +-
10723 drivers/staging/lustre/lustre/llite/vvp_page.c | 1 -
10724 drivers/staging/lustre/lustre/llite/xattr.c | 19 +-
10725 drivers/staging/lustre/lustre/llite/xattr_cache.c | 24 +-
10726 drivers/staging/lustre/lustre/lmv/lmv_obd.c | 78 +-
10727 drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 2 +
10728 .../staging/lustre/lustre/lov/lov_cl_internal.h | 5 -
10729 drivers/staging/lustre/lustre/lov/lov_dev.c | 15 +-
10730 drivers/staging/lustre/lustre/lov/lov_ea.c | 7 +-
10731 drivers/staging/lustre/lustre/lov/lov_internal.h | 5 +-
10732 drivers/staging/lustre/lustre/lov/lov_io.c | 9 +-
10733 drivers/staging/lustre/lustre/lov/lov_lock.c | 21 +-
10734 drivers/staging/lustre/lustre/lov/lov_obd.c | 52 +-
10735 drivers/staging/lustre/lustre/lov/lov_object.c | 18 +-
10736 drivers/staging/lustre/lustre/lov/lov_pack.c | 22 -
10737 drivers/staging/lustre/lustre/lov/lov_page.c | 2 -
10738 drivers/staging/lustre/lustre/lov/lov_pool.c | 32 +-
10739 drivers/staging/lustre/lustre/lov/lov_request.c | 17 +-
10740 drivers/staging/lustre/lustre/lov/lovsub_dev.c | 5 +-
10741 drivers/staging/lustre/lustre/lov/lovsub_lock.c | 4 +-
10742 drivers/staging/lustre/lustre/lov/lovsub_object.c | 6 +-
10743 drivers/staging/lustre/lustre/lov/lproc_lov.c | 5 +
10744 drivers/staging/lustre/lustre/mdc/mdc_internal.h | 18 +-
10745 drivers/staging/lustre/lustre/mdc/mdc_lib.c | 50 +-
10746 drivers/staging/lustre/lustre/mdc/mdc_locks.c | 47 +-
10747 drivers/staging/lustre/lustre/mdc/mdc_reint.c | 24 +-
10748 drivers/staging/lustre/lustre/mdc/mdc_request.c | 258 +-
10749 drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 1 +
10750 drivers/staging/lustre/lustre/mgc/mgc_request.c | 63 +-
10751 drivers/staging/lustre/lustre/obdclass/Makefile | 2 +-
10752 drivers/staging/lustre/lustre/obdclass/acl.c | 120 -
10753 drivers/staging/lustre/lustre/obdclass/capa.c | 421 -
10754 drivers/staging/lustre/lustre/obdclass/cl_io.c | 106 +-
10755 drivers/staging/lustre/lustre/obdclass/cl_lock.c | 49 +-
10756 drivers/staging/lustre/lustre/obdclass/cl_object.c | 68 +-
10757 drivers/staging/lustre/lustre/obdclass/cl_page.c | 5 +-
10758 drivers/staging/lustre/lustre/obdclass/class_obd.c | 119 +-
10759 drivers/staging/lustre/lustre/obdclass/debug.c | 10 -
10760 drivers/staging/lustre/lustre/obdclass/dt_object.c | 1054 ---
10761 drivers/staging/lustre/lustre/obdclass/genops.c | 600 +-
10762 .../lustre/lustre/obdclass/linux/linux-module.c | 3 -
10763 .../lustre/lustre/obdclass/linux/linux-obdo.c | 137 -
10764 .../lustre/lustre/obdclass/linux/linux-sysctl.c | 4 -
10765 drivers/staging/lustre/lustre/obdclass/llog.c | 549 +-
10766 drivers/staging/lustre/lustre/obdclass/llog_cat.c | 590 +-
10767 .../staging/lustre/lustre/obdclass/llog_internal.h | 21 -
10768 drivers/staging/lustre/lustre/obdclass/llog_obd.c | 31 -
10769 drivers/staging/lustre/lustre/obdclass/llog_swab.c | 7 +-
10770 .../lustre/lustre/obdclass/lprocfs_counters.c | 9 -
10771 .../lustre/lustre/obdclass/lprocfs_status.c | 440 +-
10772 drivers/staging/lustre/lustre/obdclass/lu_object.c | 383 +-
10773 .../lustre/lustre/obdclass/lustre_handles.c | 22 +-
10774 .../staging/lustre/lustre/obdclass/obd_config.c | 468 +-
10775 drivers/staging/lustre/lustre/obdclass/obd_mount.c | 162 +-
10776 drivers/staging/lustre/lustre/obdclass/obdo.c | 173 +-
10777 .../staging/lustre/lustre/obdclass/statfs_pack.c | 14 -
10778 .../staging/lustre/lustre/obdecho/echo_client.c | 45 +-
10779 .../staging/lustre/lustre/obdecho/echo_internal.h | 1 -
10780 drivers/staging/lustre/lustre/osc/lproc_osc.c | 46 +-
10781 drivers/staging/lustre/lustre/osc/osc_cache.c | 44 +-
10782 .../staging/lustre/lustre/osc/osc_cl_internal.h | 3 +-
10783 drivers/staging/lustre/lustre/osc/osc_dev.c | 8 +-
10784 drivers/staging/lustre/lustre/osc/osc_internal.h | 7 +-
10785 drivers/staging/lustre/lustre/osc/osc_io.c | 14 +-
10786 drivers/staging/lustre/lustre/osc/osc_lock.c | 4 +-
10787 drivers/staging/lustre/lustre/osc/osc_object.c | 6 +-
10788 drivers/staging/lustre/lustre/osc/osc_page.c | 9 +-
10789 drivers/staging/lustre/lustre/osc/osc_quota.c | 11 +-
10790 drivers/staging/lustre/lustre/osc/osc_request.c | 238 +-
10791 drivers/staging/lustre/lustre/ptlrpc/client.c | 512 +-
10792 drivers/staging/lustre/lustre/ptlrpc/connection.c | 10 +-
10793 drivers/staging/lustre/lustre/ptlrpc/events.c | 12 +-
10794 drivers/staging/lustre/lustre/ptlrpc/import.c | 70 +-
10795 drivers/staging/lustre/lustre/ptlrpc/layout.c | 144 +-
10796 drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 37 +-
10797 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 134 +-
10798 drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 22 +-
10799 drivers/staging/lustre/lustre/ptlrpc/nrs.c | 129 +-
10800 .../staging/lustre/lustre/ptlrpc/pack_generic.c | 362 +-
10801 drivers/staging/lustre/lustre/ptlrpc/pers.c | 1 -
10802 drivers/staging/lustre/lustre/ptlrpc/pinger.c | 170 +-
10803 .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 19 +-
10804 .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 6 +-
10805 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 740 +-
10806 drivers/staging/lustre/lustre/ptlrpc/sec.c | 165 +-
10807 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 358 +-
10808 drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 78 +-
10809 drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 25 +-
10810 drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 6 +-
10811 drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 4 +-
10812 drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 2 +-
10813 drivers/staging/lustre/lustre/ptlrpc/service.c | 526 +-
10814 drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 6 +-
10815 drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 60 +-
10816 .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +-
10817 drivers/staging/media/lirc/lirc_sasem.c | 12 +-
10818 drivers/staging/media/omap4iss/iss.c | 40 +-
10819 drivers/staging/media/omap4iss/iss_csi2.c | 6 +-
10820 drivers/staging/media/omap4iss/iss_csi2.h | 4 +-
10821 drivers/staging/media/omap4iss/iss_ipipe.c | 26 +-
10822 drivers/staging/media/omap4iss/iss_ipipe.h | 4 +-
10823 drivers/staging/media/omap4iss/iss_ipipeif.c | 24 +-
10824 drivers/staging/media/omap4iss/iss_ipipeif.h | 8 +-
10825 drivers/staging/media/omap4iss/iss_regs.h | 316 +-
10826 drivers/staging/media/omap4iss/iss_resizer.c | 28 +-
10827 drivers/staging/media/omap4iss/iss_resizer.h | 6 +-
10828 drivers/staging/media/omap4iss/iss_video.c | 19 +-
10829 .../most/Documentation/ABI/sysfs-class-most.txt | 2 +-
10830 drivers/staging/most/aim-cdev/cdev.c | 68 +-
10831 drivers/staging/most/aim-network/networking.c | 53 +-
10832 drivers/staging/most/aim-sound/sound.c | 114 +-
10833 drivers/staging/most/aim-v4l2/Makefile | 1 -
10834 drivers/staging/most/aim-v4l2/video.c | 50 +-
10835 drivers/staging/most/hdm-dim2/Kconfig | 2 +-
10836 drivers/staging/most/hdm-dim2/dim2_hal.c | 62 +-
10837 drivers/staging/most/hdm-dim2/dim2_hal.h | 5 -
10838 drivers/staging/most/hdm-dim2/dim2_hdm.c | 79 +-
10839 drivers/staging/most/hdm-dim2/dim2_hdm.h | 3 +-
10840 drivers/staging/most/hdm-dim2/dim2_sysfs.c | 3 +-
10841 drivers/staging/most/hdm-i2c/hdm_i2c.c | 45 +-
10842 drivers/staging/most/hdm-usb/hdm_usb.c | 162 +-
10843 drivers/staging/most/mostcore/core.c | 230 +-
10844 drivers/staging/most/mostcore/mostcore.h | 13 +-
10845 drivers/staging/mt29f_spinand/mt29f_spinand.c | 67 +-
10846 drivers/staging/mt29f_spinand/mt29f_spinand.h | 18 +-
10847 drivers/staging/netlogic/platform_net.c | 1 -
10848 drivers/staging/netlogic/xlr_net.h | 3 +-
10849 drivers/staging/nvec/nvec.c | 1 -
10850 drivers/staging/octeon-usb/octeon-hcd.c | 7 +-
10851 drivers/staging/octeon/Makefile | 2 -
10852 drivers/staging/octeon/ethernet-defines.h | 5 +-
10853 drivers/staging/octeon/ethernet-rgmii.c | 2 +-
10854 drivers/staging/octeon/ethernet-rx.c | 10 +-
10855 drivers/staging/octeon/ethernet-sgmii.c | 2 +-
10856 drivers/staging/octeon/ethernet-tx.c | 8 +-
10857 drivers/staging/octeon/ethernet-xaui.c | 42 -
10858 drivers/staging/octeon/ethernet.c | 42 +-
10859 drivers/staging/octeon/octeon-ethernet.h | 6 +-
10860 drivers/staging/olpc_dcon/olpc_dcon.c | 36 +-
10861 drivers/staging/olpc_dcon/olpc_dcon.h | 4 +-
10862 drivers/staging/panel/panel.c | 138 +-
10863 drivers/staging/rdma/Kconfig | 2 +-
10864 drivers/staging/rdma/amso1100/c2.c | 6 +-
10865 drivers/staging/rdma/amso1100/c2_ae.c | 6 +-
10866 drivers/staging/rdma/amso1100/c2_alloc.c | 2 +-
10867 drivers/staging/rdma/amso1100/c2_cm.c | 3 -
10868 drivers/staging/rdma/amso1100/c2_cq.c | 12 +-
10869 drivers/staging/rdma/amso1100/c2_intr.c | 2 +-
10870 drivers/staging/rdma/amso1100/c2_mm.c | 10 +-
10871 drivers/staging/rdma/amso1100/c2_mq.c | 1 +
10872 drivers/staging/rdma/amso1100/c2_provider.c | 10 +-
10873 drivers/staging/rdma/amso1100/c2_qp.c | 20 +-
10874 drivers/staging/rdma/amso1100/c2_rnic.c | 28 +-
10875 drivers/staging/rdma/ehca/ehca_cq.c | 13 +-
10876 drivers/staging/rdma/hfi1/chip.c | 196 +-
10877 drivers/staging/rdma/hfi1/chip.h | 2 +
10878 drivers/staging/rdma/hfi1/common.h | 4 +-
10879 drivers/staging/rdma/hfi1/device.c | 2 +-
10880 drivers/staging/rdma/hfi1/diag.c | 9 +-
10881 drivers/staging/rdma/hfi1/driver.c | 83 +-
10882 drivers/staging/rdma/hfi1/file_ops.c | 18 +-
10883 drivers/staging/rdma/hfi1/firmware.c | 37 +-
10884 drivers/staging/rdma/hfi1/hfi.h | 22 +-
10885 drivers/staging/rdma/hfi1/init.c | 30 +-
10886 drivers/staging/rdma/hfi1/mad.c | 20 +-
10887 drivers/staging/rdma/hfi1/mr.c | 28 +-
10888 drivers/staging/rdma/hfi1/pcie.c | 15 +-
10889 drivers/staging/rdma/hfi1/pio.c | 21 +-
10890 drivers/staging/rdma/hfi1/qp.h | 15 +
10891 drivers/staging/rdma/hfi1/qsfp.c | 13 +-
10892 drivers/staging/rdma/hfi1/rc.c | 25 +-
10893 drivers/staging/rdma/hfi1/ruc.c | 25 +-
10894 drivers/staging/rdma/hfi1/sdma.c | 168 +-
10895 drivers/staging/rdma/hfi1/sdma.h | 74 +-
10896 drivers/staging/rdma/hfi1/sysfs.c | 2 +-
10897 drivers/staging/rdma/hfi1/trace.c | 4 +-
10898 drivers/staging/rdma/hfi1/trace.h | 48 +-
10899 drivers/staging/rdma/hfi1/user_sdma.c | 124 +-
10900 drivers/staging/rdma/hfi1/verbs.c | 19 +-
10901 drivers/staging/rdma/hfi1/verbs.h | 3 +-
10902 drivers/staging/rdma/ipath/ipath_driver.c | 27 +-
10903 drivers/staging/rdma/ipath/ipath_eeprom.c | 2 +-
10904 drivers/staging/rdma/ipath/ipath_file_ops.c | 15 +-
10905 drivers/staging/rdma/ipath/ipath_fs.c | 13 +-
10906 drivers/staging/rdma/ipath/ipath_iba6110.c | 7 +-
10907 drivers/staging/rdma/ipath/ipath_init_chip.c | 32 +-
10908 drivers/staging/rdma/ipath/ipath_intr.c | 8 +-
10909 drivers/staging/rdma/ipath/ipath_kernel.h | 3 +-
10910 drivers/staging/rdma/ipath/ipath_qp.c | 3 +-
10911 drivers/staging/rdma/ipath/ipath_ruc.c | 1 -
10912 drivers/staging/rdma/ipath/ipath_sdma.c | 6 +-
10913 drivers/staging/rdma/ipath/ipath_sysfs.c | 7 +-
10914 drivers/staging/rdma/ipath/ipath_ud.c | 1 -
10915 drivers/staging/rdma/ipath/ipath_user_pages.c | 1 -
10916 drivers/staging/rdma/ipath/ipath_user_sdma.c | 5 +-
10917 drivers/staging/rdma/ipath/ipath_verbs.c | 15 +-
10918 drivers/staging/rdma/ipath/ipath_verbs_mcast.c | 1 -
10919 drivers/staging/rtl8188eu/Kconfig | 2 +-
10920 drivers/staging/rtl8188eu/Makefile | 1 +
10921 drivers/staging/rtl8188eu/core/rtw_ap.c | 2 +-
10922 drivers/staging/rtl8188eu/core/rtw_cmd.c | 8 +-
10923 drivers/staging/rtl8188eu/core/rtw_debug.c | 3 +-
10924 drivers/staging/rtl8188eu/core/rtw_efuse.c | 50 +-
10925 drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 14 +-
10926 drivers/staging/rtl8188eu/core/rtw_mlme.c | 5 +-
10927 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 96 +-
10928 drivers/staging/rtl8188eu/core/rtw_recv.c | 20 +-
10929 drivers/staging/rtl8188eu/core/rtw_rf.c | 2 +-
10930 drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 15 +-
10931 drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 10 +-
10932 drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 +
10933 .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 14 +-
10934 drivers/staging/rtl8188eu/hal/bb_cfg.c | 93 +-
10935 drivers/staging/rtl8188eu/hal/fw.c | 5 +-
10936 drivers/staging/rtl8188eu/hal/mac_cfg.c | 4 +-
10937 drivers/staging/rtl8188eu/hal/odm.c | 33 +-
10938 drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 6 +-
10939 drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 122 +-
10940 drivers/staging/rtl8188eu/hal/phy.c | 32 +-
10941 drivers/staging/rtl8188eu/hal/rf_cfg.c | 6 +-
10942 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 26 +-
10943 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 27 +-
10944 drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 6 +-
10945 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 2 +-
10946 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 6 +-
10947 drivers/staging/rtl8188eu/hal/usb_halinit.c | 56 +-
10948 drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 14 +-
10949 drivers/staging/rtl8188eu/include/basic_types.h | 6 -
10950 drivers/staging/rtl8188eu/include/drv_types.h | 2 +
10951 drivers/staging/rtl8188eu/include/hal_intf.h | 16 +-
10952 drivers/staging/rtl8188eu/include/ieee80211.h | 4 +-
10953 drivers/staging/rtl8188eu/include/mon.h | 36 +
10954 drivers/staging/rtl8188eu/include/odm.h | 90 +-
10955 drivers/staging/rtl8188eu/include/odm_debug.h | 42 +-
10956 drivers/staging/rtl8188eu/include/odm_reg.h | 2 +-
10957 drivers/staging/rtl8188eu/include/osdep_service.h | 48 -
10958 drivers/staging/rtl8188eu/include/pwrseq.h | 84 +-
10959 drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 415 +-
10960 drivers/staging/rtl8188eu/include/rtw_security.h | 3 -
10961 drivers/staging/rtl8188eu/include/rtw_sreset.h | 14 +-
10962 drivers/staging/rtl8188eu/include/wifi.h | 12 -
10963 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 28 +-
10964 drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 9 +-
10965 drivers/staging/rtl8188eu/os_dep/mon.c | 195 +
10966 drivers/staging/rtl8188eu/os_dep/os_intfs.c | 8 +-
10967 drivers/staging/rtl8188eu/os_dep/osdep_service.c | 2 +-
10968 drivers/staging/rtl8188eu/os_dep/recv_linux.c | 2 +-
10969 drivers/staging/rtl8188eu/os_dep/usb_intf.c | 10 +
10970 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 5 +-
10971 drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +-
10972 drivers/staging/rtl8192e/dot11d.c | 4 -
10973 drivers/staging/rtl8192e/dot11d.h | 4 -
10974 drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 4 -
10975 drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 8 +-
10976 drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h | 4 -
10977 drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 62 +-
10978 drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 8 +-
10979 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 103 +-
10980 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 4 -
10981 .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 278 +-
10982 .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 23 +-
10983 drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 4 -
10984 drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c | 4 -
10985 drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 4 -
10986 drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 240 +-
10987 drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 4 -
10988 drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 4 -
10989 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 8 +-
10990 drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 4 -
10991 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 358 +-
10992 drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +-
10993 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 311 +-
10994 drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 4 -
10995 drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 4 -
10996 drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h | 4 -
10997 drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c | 14 +-
10998 drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 8 +-
10999 drivers/staging/rtl8192e/rtl8192e/rtl_pci.h | 4 -
11000 drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 4 -
11001 drivers/staging/rtl8192e/rtl8192e/rtl_pm.h | 4 -
11002 drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 31 +-
11003 drivers/staging/rtl8192e/rtl8192e/rtl_ps.h | 4 -
11004 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 349 +-
11005 drivers/staging/rtl8192e/rtl8192e/rtl_wx.h | 4 -
11006 drivers/staging/rtl8192e/rtl819x_BA.h | 4 -
11007 drivers/staging/rtl8192e/rtl819x_BAProc.c | 8 +-
11008 drivers/staging/rtl8192e/rtl819x_HT.h | 4 -
11009 drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 -
11010 drivers/staging/rtl8192e/rtl819x_Qos.h | 4 -
11011 drivers/staging/rtl8192e/rtl819x_TS.h | 4 -
11012 drivers/staging/rtl8192e/rtl819x_TSProc.c | 4 -
11013 drivers/staging/rtl8192e/rtllib_debug.h | 4 -
11014 drivers/staging/rtl8192e/rtllib_module.c | 9 +-
11015 drivers/staging/rtl8192e/rtllib_rx.c | 14 +-
11016 drivers/staging/rtl8192e/rtllib_softmac.c | 20 +-
11017 drivers/staging/rtl8192e/rtllib_tx.c | 12 +-
11018 drivers/staging/rtl8192e/rtllib_wx.c | 4 -
11019 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +-
11020 .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 47 +-
11021 .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 76 +-
11022 .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +-
11023 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 19 +-
11024 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 19 +-
11025 .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 102 +-
11026 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +-
11027 drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 8 -
11028 drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 49 +-
11029 drivers/staging/rtl8192u/r8192U.h | 99 +-
11030 drivers/staging/rtl8192u/r8192U_core.c | 1980 +++--
11031 drivers/staging/rtl8192u/r8192U_dm.c | 17 +-
11032 drivers/staging/rtl8192u/r8192U_hw.h | 145 +-
11033 drivers/staging/rtl8192u/r8192U_wx.c | 4 +-
11034 drivers/staging/rtl8192u/r819xU_cmdpkt.h | 6 +-
11035 drivers/staging/rtl8192u/r819xU_phy.c | 4 +-
11036 drivers/staging/rtl8712/drv_types.h | 11 +-
11037 drivers/staging/rtl8712/hal_init.c | 57 +-
11038 drivers/staging/rtl8712/ieee80211.c | 43 +-
11039 drivers/staging/rtl8712/ieee80211.h | 48 +-
11040 drivers/staging/rtl8712/mlme_linux.c | 5 +-
11041 drivers/staging/rtl8712/os_intfs.c | 11 +-
11042 drivers/staging/rtl8712/osdep_service.h | 4 -
11043 drivers/staging/rtl8712/recv_linux.c | 3 +-
11044 drivers/staging/rtl8712/rtl8712_cmd.c | 42 +-
11045 drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 3 +-
11046 drivers/staging/rtl8712/rtl8712_efuse.c | 138 +-
11047 drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 3 +-
11048 drivers/staging/rtl8712/rtl8712_hal.h | 14 +-
11049 drivers/staging/rtl8712/rtl8712_io.c | 28 +-
11050 drivers/staging/rtl8712/rtl8712_led.c | 187 +-
11051 drivers/staging/rtl8712/rtl8712_recv.c | 55 +-
11052 drivers/staging/rtl8712/rtl8712_xmit.c | 86 +-
11053 drivers/staging/rtl8712/rtl871x_cmd.c | 25 +-
11054 drivers/staging/rtl8712/rtl871x_eeprom.c | 22 +-
11055 drivers/staging/rtl8712/rtl871x_io.c | 2 +-
11056 drivers/staging/rtl8712/rtl871x_io.h | 8 -
11057 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 234 +-
11058 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 53 +-
11059 drivers/staging/rtl8712/rtl871x_ioctl_set.c | 33 +-
11060 drivers/staging/rtl8712/rtl871x_mlme.c | 150 +-
11061 drivers/staging/rtl8712/rtl871x_mlme.h | 2 +-
11062 drivers/staging/rtl8712/rtl871x_mp.c | 39 +-
11063 drivers/staging/rtl8712/rtl871x_mp.h | 1 -
11064 drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 38 +-
11065 drivers/staging/rtl8712/rtl871x_pwrctrl.c | 6 +-
11066 drivers/staging/rtl8712/rtl871x_recv.c | 70 +-
11067 drivers/staging/rtl8712/rtl871x_security.c | 133 +-
11068 drivers/staging/rtl8712/rtl871x_sta_mgt.c | 10 +-
11069 drivers/staging/rtl8712/rtl871x_xmit.c | 95 +-
11070 drivers/staging/rtl8712/usb_halinit.c | 13 +-
11071 drivers/staging/rtl8712/usb_intf.c | 21 +-
11072 drivers/staging/rtl8712/usb_ops.c | 20 +-
11073 drivers/staging/rtl8712/usb_ops_linux.c | 28 +-
11074 drivers/staging/rtl8712/wifi.h | 9 -
11075 drivers/staging/rtl8712/xmit_linux.c | 4 +-
11076 drivers/staging/rtl8723au/core/rtw_ap.c | 210 +-
11077 drivers/staging/rtl8723au/core/rtw_cmd.c | 16 +-
11078 drivers/staging/rtl8723au/core/rtw_efuse.c | 320 +-
11079 drivers/staging/rtl8723au/core/rtw_ieee80211.c | 9 +-
11080 drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 9 +-
11081 drivers/staging/rtl8723au/core/rtw_recv.c | 6 +-
11082 drivers/staging/rtl8723au/core/rtw_security.c | 17 +-
11083 drivers/staging/rtl8723au/core/rtw_wlan_util.c | 4 +-
11084 .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 88 +-
11085 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 3 +-
11086 drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 46 +-
11087 drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 55 +-
11088 drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 48 +-
11089 drivers/staging/rtl8723au/hal/usb_halinit.c | 5 +-
11090 drivers/staging/rtl8723au/include/rtw_cmd.h | 2 -
11091 drivers/staging/rts5208/rtsx.c | 6 +-
11092 drivers/staging/rts5208/rtsx_chip.c | 28 +-
11093 drivers/staging/skein/skein_api.c | 57 +-
11094 drivers/staging/skein/skein_api.h | 48 +-
11095 drivers/staging/skein/skein_base.c | 24 +-
11096 drivers/staging/skein/skein_block.c | 380 +-
11097 drivers/staging/skein/skein_generic.c | 3 +-
11098 drivers/staging/slicoss/slic.h | 23 +-
11099 drivers/staging/slicoss/slichw.h | 38 +-
11100 drivers/staging/slicoss/slicoss.c | 211 +-
11101 drivers/staging/sm750fb/ddk750_chip.c | 323 +-
11102 drivers/staging/sm750fb/ddk750_chip.h | 9 -
11103 drivers/staging/sm750fb/ddk750_display.c | 50 +-
11104 drivers/staging/sm750fb/ddk750_display.h | 69 +-
11105 drivers/staging/sm750fb/ddk750_help.h | 13 +-
11106 drivers/staging/sm750fb/ddk750_hwi2c.c | 109 +-
11107 drivers/staging/sm750fb/ddk750_hwi2c.h | 9 +-
11108 drivers/staging/sm750fb/ddk750_mode.c | 3 +-
11109 drivers/staging/sm750fb/ddk750_power.c | 71 +-
11110 drivers/staging/sm750fb/ddk750_power.h | 17 -
11111 drivers/staging/sm750fb/ddk750_reg.h | 244 -
11112 drivers/staging/sm750fb/ddk750_sii164.c | 8 +-
11113 drivers/staging/sm750fb/ddk750_swi2c.c | 296 +-
11114 drivers/staging/sm750fb/ddk750_swi2c.h | 47 +-
11115 drivers/staging/sm750fb/sm750.c | 439 +-
11116 drivers/staging/sm750fb/sm750.h | 134 +-
11117 drivers/staging/sm750fb/sm750_accel.c | 51 +-
11118 drivers/staging/sm750fb/sm750_cursor.c | 74 +-
11119 drivers/staging/sm750fb/sm750_help.h | 37 +-
11120 drivers/staging/sm750fb/sm750_hw.c | 209 +-
11121 drivers/staging/sm750fb/sm750_hw.h | 101 -
11122 drivers/staging/speakup/buffers.c | 3 +-
11123 drivers/staging/speakup/devsynth.c | 4 +-
11124 drivers/staging/speakup/i18n.c | 2 +-
11125 drivers/staging/speakup/kobjects.c | 16 +-
11126 drivers/staging/speakup/serialio.c | 4 +-
11127 drivers/staging/speakup/speakup_audptr.c | 2 +-
11128 drivers/staging/speakup/speakup_dectlk.c | 3 +-
11129 drivers/staging/speakup/speakup_soft.c | 3 +-
11130 drivers/staging/speakup/spk_priv.h | 42 +-
11131 drivers/staging/speakup/spk_priv_keyinfo.h | 44 +-
11132 drivers/staging/speakup/varhandlers.c | 20 +-
11133 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 -
11134 .../Documentation/ABI/sysfs-platform-visorchipset | 2 +
11135 drivers/staging/unisys/Documentation/overview.txt | 458 +-
11136 drivers/staging/unisys/Kconfig | 2 +
11137 drivers/staging/unisys/Makefile | 2 +
11138 drivers/staging/unisys/TODO | 25 +-
11139 drivers/staging/unisys/include/channel.h | 19 +-
11140 drivers/staging/unisys/include/diagchannel.h | 5 -
11141 drivers/staging/unisys/include/iochannel.h | 26 +-
11142 drivers/staging/unisys/include/periodic_work.h | 12 +-
11143 drivers/staging/unisys/visorbus/periodic_work.c | 8 +-
11144 drivers/staging/unisys/visorbus/visorchannel.c | 8 +-
11145 drivers/staging/unisys/visorbus/visorchipset.c | 2 +-
11146 drivers/staging/unisys/visorbus/vmcallinterface.h | 54 +-
11147 drivers/staging/unisys/visorhba/Kconfig | 14 +
11148 drivers/staging/unisys/visorhba/Makefile | 10 +
11149 drivers/staging/unisys/visorhba/visorhba_main.c | 1241 +++
11150 drivers/staging/unisys/visorinput/Kconfig | 10 +
11151 drivers/staging/unisys/visorinput/Makefile | 7 +
11152 .../staging/unisys/visorinput/ultrainputreport.h | 74 +
11153 drivers/staging/unisys/visorinput/visorinput.c | 715 ++
11154 drivers/staging/unisys/visornic/visornic_main.c | 70 +-
11155 drivers/staging/vt6655/baseband.c | 14 +-
11156 drivers/staging/vt6655/card.c | 398 +-
11157 drivers/staging/vt6655/desc.h | 58 +-
11158 drivers/staging/vt6655/device.h | 149 +-
11159 drivers/staging/vt6655/device_main.c | 866 +-
11160 drivers/staging/vt6655/dpc.c | 8 +-
11161 drivers/staging/vt6655/dpc.h | 2 +-
11162 drivers/staging/vt6655/mac.c | 3 +-
11163 drivers/staging/vt6655/rf.c | 12 +-
11164 drivers/staging/vt6655/rf.h | 4 +-
11165 drivers/staging/vt6655/rxtx.c | 6 +-
11166 drivers/staging/vt6656/baseband.c | 2 -
11167 drivers/staging/vt6656/card.c | 7 +-
11168 drivers/staging/vt6656/device.h | 2 +
11169 drivers/staging/vt6656/int.c | 14 +-
11170 drivers/staging/vt6656/main_usb.c | 28 +-
11171 drivers/staging/vt6656/power.c | 10 +-
11172 drivers/staging/vt6656/rxtx.c | 5 +-
11173 drivers/staging/vt6656/usbpipe.c | 6 -
11174 drivers/staging/wilc1000/Kconfig | 24 +-
11175 drivers/staging/wilc1000/Makefile | 14 +-
11176 drivers/staging/wilc1000/coreconfigurator.c | 1620 +---
11177 drivers/staging/wilc1000/coreconfigurator.h | 80 +-
11178 drivers/staging/wilc1000/host_interface.c | 8313 +++++++-------------
11179 drivers/staging/wilc1000/host_interface.h | 594 +-
11180 drivers/staging/wilc1000/linux_mon.c | 218 +-
11181 drivers/staging/wilc1000/linux_wlan.c | 1625 +---
11182 drivers/staging/wilc1000/linux_wlan_common.h | 22 +-
11183 drivers/staging/wilc1000/linux_wlan_sdio.c | 51 +-
11184 drivers/staging/wilc1000/linux_wlan_spi.c | 116 +-
11185 drivers/staging/wilc1000/linux_wlan_spi.h | 6 +-
11186 drivers/staging/wilc1000/wilc_errorsupport.h | 67 -
11187 drivers/staging/wilc1000/wilc_exported_buf.c | 71 -
11188 drivers/staging/wilc1000/wilc_memory.c | 16 -
11189 drivers/staging/wilc1000/wilc_memory.h | 66 -
11190 drivers/staging/wilc1000/wilc_msgqueue.c | 160 +-
11191 drivers/staging/wilc1000/wilc_msgqueue.h | 27 +-
11192 drivers/staging/wilc1000/wilc_oswrapper.h | 29 -
11193 drivers/staging/wilc1000/wilc_platform.h | 48 -
11194 drivers/staging/wilc1000/wilc_sdio.c | 154 +-
11195 drivers/staging/wilc1000/wilc_spi.c | 383 +-
11196 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 1387 ++--
11197 drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 94 +-
11198 drivers/staging/wilc1000/wilc_wfi_netdevice.h | 121 +-
11199 drivers/staging/wilc1000/wilc_wlan.c | 951 +--
11200 drivers/staging/wilc1000/wilc_wlan.h | 99 +-
11201 drivers/staging/wilc1000/wilc_wlan_cfg.c | 189 +-
11202 drivers/staging/wilc1000/wilc_wlan_cfg.h | 22 +-
11203 drivers/staging/wilc1000/wilc_wlan_if.h | 1455 ++--
11204 drivers/staging/wlan-ng/cfg80211.c | 15 -
11205 drivers/staging/wlan-ng/hfa384x_usb.c | 2 +-
11206 drivers/staging/wlan-ng/p80211conv.c | 50 +-
11207 drivers/staging/wlan-ng/p80211conv.h | 7 +-
11208 drivers/staging/wlan-ng/p80211meta.h | 90 -
11209 drivers/staging/wlan-ng/prism2fw.c | 13 +-
11210 drivers/staging/wlan-ng/prism2sta.c | 1027 +--
11211 drivers/staging/wlan-ng/prism2usb.c | 8 +-
11212 drivers/staging/xgifb/XGI_main_26.c | 6 +-
11213 drivers/staging/xgifb/vb_init.c | 103 +-
11214 drivers/staging/xgifb/vb_util.h | 4 +-
11215 drivers/vme/bridges/vme_ca91cx42.c | 5 +-
11216 drivers/vme/bridges/vme_tsi148.c | 172 +-
11217 drivers/vme/vme.c | 90 +
11218 drivers/vme/vme_bridge.h | 21 +-
11219 include/linux/fb.h | 5 +-
11220 include/linux/iio/common/st_sensors.h | 4 +
11221 include/linux/iio/iio.h | 3 +
11222 include/linux/iio/triggered_event.h | 11 +
11223 include/uapi/linux/iio/types.h | 4 +
11224 include/uapi/rdma/hfi/hfi1_user.h | 4 +-
11225 tools/iio/generic_buffer.c | 9 +
11226 tools/iio/iio_event_monitor.c | 6 +-
11227 990 files changed, 38366 insertions(+), 57692 deletions(-)
11228 create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435
11229 create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x
11230 create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc100x
11231 create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-meas-spec
11232 create mode 100644 Documentation/devicetree/bindings/iio/accel/mma8452.txt
11233 create mode 100644 Documentation/devicetree/bindings/iio/adc/hi8435.txt
11234 create mode 100644 Documentation/devicetree/bindings/iio/light/apds9960.txt
11235 create mode 100644 Documentation/devicetree/bindings/iio/light/us5182d.txt
11236 rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (81%)
11237 create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
11238 create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
11239 create mode 100644 drivers/iio/accel/bmc150-accel.h
11240 create mode 100644 drivers/iio/accel/mxc4005.c
11241 create mode 100644 drivers/iio/adc/hi8435.c
11242 create mode 100644 drivers/iio/buffer/Kconfig
11243 create mode 100644 drivers/iio/buffer/Makefile
11244 rename drivers/iio/{buffer_cb.c => buffer/industrialio-buffer-cb.c} (89%)
11245 rename drivers/iio/{ => buffer}/industrialio-triggered-buffer.c (100%)
11246 rename drivers/iio/{ => buffer}/kfifo_buf.c (100%)
11247 create mode 100644 drivers/iio/chemical/Kconfig
11248 create mode 100644 drivers/iio/chemical/Makefile
11249 create mode 100644 drivers/iio/chemical/vz89x.c
11250 create mode 100644 drivers/iio/common/ms_sensors/Kconfig
11251 create mode 100644 drivers/iio/common/ms_sensors/Makefile
11252 create mode 100644 drivers/iio/common/ms_sensors/ms_sensors_i2c.c
11253 create mode 100644 drivers/iio/common/ms_sensors/ms_sensors_i2c.h
11254 create mode 100644 drivers/iio/gyro/bmg160.h
11255 rename drivers/iio/gyro/{bmg160.c => bmg160_core.c} (75%)
11256 create mode 100644 drivers/iio/gyro/bmg160_i2c.c
11257 create mode 100644 drivers/iio/gyro/bmg160_spi.c
11258 create mode 100644 drivers/iio/humidity/hdc100x.c
11259 create mode 100644 drivers/iio/humidity/htu21.c
11260 create mode 100644 drivers/iio/industrialio-triggered-event.c
11261 create mode 100644 drivers/iio/light/apds9960.c
11262 create mode 100644 drivers/iio/light/us5182d.c
11263 create mode 100644 drivers/iio/potentiometer/Kconfig
11264 create mode 100644 drivers/iio/potentiometer/Makefile
11265 create mode 100644 drivers/iio/potentiometer/mcp4531.c
11266 create mode 100644 drivers/iio/pressure/ms5637.c
11267 create mode 100644 drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
11268 create mode 100644 drivers/iio/temperature/tsys01.c
11269 create mode 100644 drivers/iio/temperature/tsys02d.c
11270 delete mode 100644 drivers/staging/comedi/drivers/unioxx5.c
11271 create mode 100644 drivers/staging/fbtft/fb_st7789v.c
11272 delete mode 100644 drivers/staging/ft1000/Kconfig
11273 delete mode 100644 drivers/staging/ft1000/Makefile
11274 delete mode 100644 drivers/staging/ft1000/TODO
11275 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/Makefile
11276 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/boot.h
11277 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
11278 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000.img
11279 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
11280 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
11281 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
11282 delete mode 100644 drivers/staging/ft1000/ft1000-usb/Makefile
11283 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
11284 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_download.c
11285 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
11286 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h
11287 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
11288 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
11289 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft3000.img
11290 delete mode 100644 drivers/staging/ft1000/ft1000.h
11291 create mode 100644 drivers/staging/lustre/lnet/lnet/nidstrings.c
11292 delete mode 100644 drivers/staging/lustre/lustre/include/dt_object.h
11293 delete mode 100644 drivers/staging/lustre/lustre/include/lustre/libiam.h
11294 delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_lfsck_user.h
11295 delete mode 100644 drivers/staging/lustre/lustre/include/lustre_capa.h
11296 delete mode 100644 drivers/staging/lustre/lustre/include/obd_cache.h
11297 delete mode 100644 drivers/staging/lustre/lustre/libcfs/nidstrings.c
11298 delete mode 100644 drivers/staging/lustre/lustre/llite/llite_capa.c
11299 delete mode 100644 drivers/staging/lustre/lustre/obdclass/capa.c
11300 delete mode 100644 drivers/staging/lustre/lustre/obdclass/dt_object.c
11301 delete mode 100644 drivers/staging/octeon/ethernet-xaui.c
11302 create mode 100644 drivers/staging/rtl8188eu/include/mon.h
11303 create mode 100644 drivers/staging/rtl8188eu/os_dep/mon.c
11304 delete mode 100644 drivers/staging/sm750fb/sm750_hw.h
11305 create mode 100644 drivers/staging/unisys/visorhba/Kconfig
11306 create mode 100644 drivers/staging/unisys/visorhba/Makefile
11307 create mode 100644 drivers/staging/unisys/visorhba/visorhba_main.c
11308 create mode 100644 drivers/staging/unisys/visorinput/Kconfig
11309 create mode 100644 drivers/staging/unisys/visorinput/Makefile
11310 create mode 100644 drivers/staging/unisys/visorinput/ultrainputreport.h
11311 create mode 100644 drivers/staging/unisys/visorinput/visorinput.c
11312 delete mode 100644 drivers/staging/wilc1000/wilc_errorsupport.h
11313 delete mode 100644 drivers/staging/wilc1000/wilc_exported_buf.c
11314 delete mode 100644 drivers/staging/wilc1000/wilc_memory.c
11315 delete mode 100644 drivers/staging/wilc1000/wilc_memory.h
11316 delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h
11317 delete mode 100644 drivers/staging/wilc1000/wilc_platform.h
11318 delete mode 100644 drivers/staging/wlan-ng/p80211meta.h
11319 create mode 100644 include/linux/iio/triggered_event.h
11320 Merging char-misc/char-misc-next (e2d8680741ed fpga: socfpga: Fix check of return value of devm_request_irq)
11321 $ git merge char-misc/char-misc-next
11322 Auto-merging scripts/mod/file2alias.c
11323 Auto-merging scripts/mod/devicetable-offsets.c
11324 Removing include/linux/msm_mdp.h
11325 Auto-merging include/linux/mod_devicetable.h
11326 Auto-merging drivers/vme/vme_bridge.h
11327 Auto-merging drivers/spmi/spmi-pmic-arb.c
11328 Removing drivers/misc/mic/host/mic_sysfs.c
11329 Auto-merging drivers/misc/mei/mei_dev.h
11330 Auto-merging drivers/Makefile
11331 Auto-merging drivers/Kconfig
11332 Auto-merging MAINTAINERS
11333 Auto-merging Documentation/ioctl/ioctl-number.txt
11334 Merge made by the 'recursive' strategy.
11335 Documentation/ABI/testing/configfs-stp-policy | 48 +
11336 .../ABI/testing/sysfs-bus-coresight-devices-etm3x | 83 +-
11337 .../ABI/testing/sysfs-bus-intel_th-devices-gth | 49 +
11338 .../ABI/testing/sysfs-bus-intel_th-devices-msc | 33 +
11339 .../ABI/testing/sysfs-bus-intel_th-devices-pti | 24 +
11340 .../ABI/testing/sysfs-bus-intel_th-output-devices | 13 +
11341 Documentation/ABI/testing/sysfs-bus-mei | 7 +
11342 Documentation/ABI/testing/sysfs-class-fpga-manager | 37 +
11343 Documentation/ABI/testing/sysfs-class-mic.txt | 29 +-
11344 Documentation/ABI/testing/sysfs-class-stm | 14 +
11345 Documentation/ABI/testing/sysfs-class-stm_source | 11 +
11346 .../bindings/fpga/xilinx-zynq-fpga-mgr.txt | 19 +
11347 Documentation/devicetree/bindings/misc/sram.txt | 16 +
11348 .../devicetree/bindings/nvmem/imx-ocotp.txt | 20 +
11349 .../devicetree/bindings/nvmem/mxs-ocotp.txt | 25 +
11350 .../devicetree/bindings/nvmem/rockchip-efuse.txt | 38 +
11351 .../devicetree/bindings/nvmem/vf610-ocotp.txt | 19 +
11352 Documentation/devicetree/bindings/w1/omap-hdq.txt | 7 +-
11353 Documentation/fpga/fpga-mgr.txt | 171 ++
11354 Documentation/ioctl/ioctl-number.txt | 3 +
11355 Documentation/mic/mic_overview.txt | 31 +-
11356 Documentation/mic/mpssd/mpss | 4 +-
11357 Documentation/mic/mpssd/mpssd.c | 362 ++--
11358 Documentation/mic/mpssd/mpssd.h | 1 +
11359 Documentation/trace/intel_th.txt | 99 +
11360 Documentation/trace/stm.txt | 80 +
11361 Documentation/w1/masters/omap-hdq | 6 +
11363 arch/arm/boot/dts/zynq-7000.dtsi | 5 +
11364 drivers/Kconfig | 6 +
11365 drivers/Makefile | 3 +
11366 drivers/char/efirtc.c | 13 +-
11367 drivers/char/hpet.c | 25 +-
11368 drivers/char/snsc.c | 5 +-
11369 drivers/dma/mic_x100_dma.c | 39 +-
11370 drivers/extcon/extcon-arizona.c | 58 +-
11371 drivers/extcon/extcon-axp288.c | 35 +-
11372 drivers/extcon/extcon-gpio.c | 130 +-
11373 drivers/extcon/extcon-max14577.c | 17 +-
11374 drivers/extcon/extcon-max77693.c | 32 +-
11375 drivers/extcon/extcon-max77843.c | 27 +-
11376 drivers/extcon/extcon-max8997.c | 21 +-
11377 drivers/extcon/extcon-rt8973a.c | 7 +-
11378 drivers/extcon/extcon-sm5502.c | 7 +-
11379 drivers/extcon/extcon.c | 61 +-
11380 drivers/fpga/Kconfig | 29 +
11381 drivers/fpga/Makefile | 10 +
11382 drivers/fpga/fpga-mgr.c | 380 ++++
11383 drivers/fpga/socfpga.c | 616 ++++++
11384 drivers/fpga/zynq-fpga.c | 514 +++++
11385 drivers/hwtracing/coresight/coresight-etm3x.c | 107 +-
11386 drivers/hwtracing/coresight/coresight-etm4x.c | 22 +-
11387 drivers/hwtracing/coresight/coresight.c | 5 +
11388 drivers/hwtracing/intel_th/Kconfig | 72 +
11389 drivers/hwtracing/intel_th/Makefile | 18 +
11390 drivers/hwtracing/intel_th/core.c | 692 +++++++
11391 drivers/hwtracing/intel_th/debug.c | 36 +
11392 drivers/hwtracing/intel_th/debug.h | 34 +
11393 drivers/hwtracing/intel_th/gth.c | 706 +++++++
11394 drivers/hwtracing/intel_th/gth.h | 66 +
11395 drivers/hwtracing/intel_th/intel_th.h | 244 +++
11396 drivers/hwtracing/intel_th/msu.c | 1509 +++++++++++++++
11397 drivers/hwtracing/intel_th/msu.h | 116 ++
11398 drivers/hwtracing/intel_th/pci.c | 86 +
11399 drivers/hwtracing/intel_th/pti.c | 252 +++
11400 drivers/hwtracing/intel_th/pti.h | 29 +
11401 drivers/hwtracing/intel_th/sth.c | 259 +++
11402 drivers/hwtracing/intel_th/sth.h | 42 +
11403 drivers/hwtracing/stm/Kconfig | 26 +
11404 drivers/hwtracing/stm/Makefile | 9 +
11405 drivers/hwtracing/stm/console.c | 80 +
11406 drivers/hwtracing/stm/core.c | 1032 ++++++++++
11407 drivers/hwtracing/stm/dummy_stm.c | 66 +
11408 drivers/hwtracing/stm/policy.c | 529 ++++++
11409 drivers/hwtracing/stm/stm.h | 87 +
11410 drivers/mcb/mcb-core.c | 1 +
11411 drivers/mcb/mcb-pci.c | 1 +
11412 drivers/memory/fsl-corenet-cf.c | 1 +
11413 drivers/memory/ti-aemif.c | 1 +
11414 drivers/misc/Kconfig | 2 +-
11415 drivers/misc/ad525x_dpot-i2c.c | 1 -
11416 drivers/misc/genwqe/card_base.h | 2 +-
11417 drivers/misc/genwqe/card_ddcb.c | 2 +-
11418 drivers/misc/genwqe/card_dev.c | 4 +-
11419 drivers/misc/genwqe/card_utils.c | 5 +-
11420 drivers/misc/hpilo.c | 6 +-
11421 drivers/misc/kgdbts.c | 10 +-
11422 drivers/misc/lkdtm.c | 8 +-
11423 drivers/misc/mei/amthif.c | 2 +-
11424 drivers/misc/mei/bus-fixup.c | 4 +-
11425 drivers/misc/mei/bus.c | 218 ++-
11426 drivers/misc/mei/client.h | 12 +
11427 drivers/misc/mei/debugfs.c | 2 +-
11428 drivers/misc/mei/hbm.c | 6 +-
11429 drivers/misc/mei/hw-me.c | 4 +-
11430 drivers/misc/mei/init.c | 4 +-
11431 drivers/misc/mei/interrupt.c | 4 +
11432 drivers/misc/mei/mei_dev.h | 19 +-
11433 drivers/misc/mic/Kconfig | 25 +-
11434 drivers/misc/mic/Makefile | 2 +
11435 drivers/misc/mic/bus/Makefile | 1 +
11436 drivers/misc/mic/bus/cosm_bus.c | 141 ++
11437 drivers/misc/mic/bus/cosm_bus.h | 134 ++
11438 drivers/misc/mic/bus/mic_bus.c | 24 +-
11439 drivers/misc/mic/bus/scif_bus.c | 9 +-
11440 drivers/misc/mic/bus/scif_bus.h | 6 +-
11441 drivers/misc/mic/card/mic_device.c | 88 +-
11442 drivers/misc/mic/card/mic_x100.c | 2 +-
11443 drivers/misc/mic/common/mic_dev.h | 13 +
11444 drivers/misc/mic/cosm/Makefile | 10 +
11445 drivers/misc/mic/cosm/cosm_debugfs.c | 156 ++
11446 drivers/misc/mic/cosm/cosm_main.c | 388 ++++
11447 drivers/misc/mic/cosm/cosm_main.h | 70 +
11448 drivers/misc/mic/cosm/cosm_scif_server.c | 405 ++++
11449 drivers/misc/mic/cosm/cosm_sysfs.c | 461 +++++
11450 drivers/misc/mic/cosm_client/Makefile | 7 +
11451 drivers/misc/mic/cosm_client/cosm_scif_client.c | 275 +++
11452 drivers/misc/mic/host/Makefile | 1 -
11453 drivers/misc/mic/host/mic_boot.c | 317 +---
11454 drivers/misc/mic/host/mic_debugfs.c | 114 +-
11455 drivers/misc/mic/host/mic_device.h | 88 +-
11456 drivers/misc/mic/host/mic_fops.c | 4 +-
11457 drivers/misc/mic/host/mic_intr.c | 46 +-
11458 drivers/misc/mic/host/mic_main.c | 223 +--
11459 drivers/misc/mic/host/mic_smpt.c | 30 +-
11460 drivers/misc/mic/host/mic_sysfs.c | 459 -----
11461 drivers/misc/mic/host/mic_virtio.c | 17 +-
11462 drivers/misc/mic/host/mic_virtio.h | 2 +-
11463 drivers/misc/mic/host/mic_x100.c | 46 +-
11464 drivers/misc/mic/scif/Makefile | 5 +
11465 drivers/misc/mic/scif/scif_api.c | 234 ++-
11466 drivers/misc/mic/scif/scif_debugfs.c | 85 +-
11467 drivers/misc/mic/scif/scif_dma.c | 1979 ++++++++++++++++++++
11468 drivers/misc/mic/scif/scif_epd.c | 26 +-
11469 drivers/misc/mic/scif/scif_epd.h | 50 +
11470 drivers/misc/mic/scif/scif_fd.c | 178 +-
11471 drivers/misc/mic/scif/scif_fence.c | 771 ++++++++
11472 drivers/misc/mic/scif/scif_main.c | 111 +-
11473 drivers/misc/mic/scif/scif_main.h | 37 +-
11474 drivers/misc/mic/scif/scif_map.h | 25 +-
11475 drivers/misc/mic/scif/scif_mmap.c | 699 +++++++
11476 drivers/misc/mic/scif/scif_nm.c | 20 +-
11477 drivers/misc/mic/scif/scif_nodeqp.c | 149 +-
11478 drivers/misc/mic/scif/scif_nodeqp.h | 42 +-
11479 drivers/misc/mic/scif/scif_peer_bus.c | 179 +-
11480 drivers/misc/mic/scif/scif_peer_bus.h | 42 +-
11481 drivers/misc/mic/scif/scif_rma.c | 1775 ++++++++++++++++++
11482 drivers/misc/mic/scif/scif_rma.h | 464 +++++
11483 drivers/misc/mic/scif/scif_rma_list.c | 291 +++
11484 drivers/misc/mic/scif/scif_rma_list.h | 57 +
11485 drivers/misc/sgi-gru/gruhandles.c | 6 -
11486 drivers/misc/sgi-gru/gruhandles.h | 1 -
11487 drivers/misc/sgi-gru/grukdump.c | 16 +-
11488 drivers/misc/sgi-gru/grukservices.c | 15 +-
11489 drivers/misc/sgi-gru/grumain.c | 4 +-
11490 drivers/misc/sgi-gru/grutlbpurge.c | 25 +-
11491 drivers/misc/sram.c | 196 +-
11492 drivers/misc/ti-st/st_core.c | 18 +-
11493 drivers/misc/vmw_balloon.c | 843 +++++++--
11494 drivers/misc/vmw_vmci/vmci_datagram.c | 3 +-
11495 drivers/nfc/mei_phy.c | 31 +-
11496 drivers/nfc/mei_phy.h | 4 +-
11497 drivers/nfc/microread/mei.c | 14 +-
11498 drivers/nfc/pn544/mei.c | 14 +-
11499 drivers/nvmem/Kconfig | 42 +
11500 drivers/nvmem/Makefile | 8 +
11501 drivers/nvmem/imx-ocotp.c | 154 ++
11502 drivers/nvmem/mxs-ocotp.c | 257 +++
11503 drivers/nvmem/rockchip-efuse.c | 186 ++
11504 drivers/nvmem/vf610-ocotp.c | 302 +++
11505 drivers/pcmcia/ds.c | 4 +-
11506 drivers/spmi/spmi-pmic-arb.c | 11 +-
11507 drivers/spmi/spmi.c | 5 +-
11508 drivers/uio/uio.c | 1 +
11509 drivers/uio/uio_fsl_elbc_gpcm.c | 1 +
11510 drivers/vme/vme_bridge.h | 4 +-
11511 drivers/w1/masters/omap_hdq.c | 224 ++-
11512 drivers/w1/masters/w1-gpio.c | 20 +-
11513 drivers/w1/w1_int.c | 3 +-
11514 include/linux/coresight.h | 2 +-
11515 include/linux/dmaengine.h | 4 +
11516 include/linux/extcon.h | 62 +-
11517 include/linux/extcon/extcon-gpio.h | 24 +-
11518 include/linux/fpga/fpga-mgr.h | 127 ++
11519 include/linux/mei_cl_bus.h | 40 +-
11520 include/linux/mic_bus.h | 3 +-
11521 include/linux/mod_devicetable.h | 7 +-
11522 include/linux/msm_mdp.h | 79 -
11523 include/linux/scif.h | 366 +++-
11524 include/linux/spmi.h | 4 +-
11525 include/linux/stm.h | 126 ++
11526 include/linux/ti_wilink_st.h | 1 +
11527 include/linux/vme.h | 3 +
11528 include/uapi/linux/mic_common.h | 16 +-
11529 include/uapi/linux/scif_ioctl.h | 85 +
11530 include/uapi/linux/stm.h | 50 +
11531 scripts/mod/devicetable-offsets.c | 1 +
11532 scripts/mod/file2alias.c | 12 +-
11533 scripts/ver_linux | 223 ++-
11534 199 files changed, 21579 insertions(+), 2620 deletions(-)
11535 create mode 100644 Documentation/ABI/testing/configfs-stp-policy
11536 create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-gth
11537 create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc
11538 create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-pti
11539 create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-output-devices
11540 create mode 100644 Documentation/ABI/testing/sysfs-class-fpga-manager
11541 create mode 100644 Documentation/ABI/testing/sysfs-class-stm
11542 create mode 100644 Documentation/ABI/testing/sysfs-class-stm_source
11543 create mode 100644 Documentation/devicetree/bindings/fpga/xilinx-zynq-fpga-mgr.txt
11544 create mode 100644 Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
11545 create mode 100644 Documentation/devicetree/bindings/nvmem/mxs-ocotp.txt
11546 create mode 100644 Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt
11547 create mode 100644 Documentation/devicetree/bindings/nvmem/vf610-ocotp.txt
11548 create mode 100644 Documentation/fpga/fpga-mgr.txt
11549 create mode 100644 Documentation/trace/intel_th.txt
11550 create mode 100644 Documentation/trace/stm.txt
11551 create mode 100644 drivers/fpga/Kconfig
11552 create mode 100644 drivers/fpga/Makefile
11553 create mode 100644 drivers/fpga/fpga-mgr.c
11554 create mode 100644 drivers/fpga/socfpga.c
11555 create mode 100644 drivers/fpga/zynq-fpga.c
11556 create mode 100644 drivers/hwtracing/intel_th/Kconfig
11557 create mode 100644 drivers/hwtracing/intel_th/Makefile
11558 create mode 100644 drivers/hwtracing/intel_th/core.c
11559 create mode 100644 drivers/hwtracing/intel_th/debug.c
11560 create mode 100644 drivers/hwtracing/intel_th/debug.h
11561 create mode 100644 drivers/hwtracing/intel_th/gth.c
11562 create mode 100644 drivers/hwtracing/intel_th/gth.h
11563 create mode 100644 drivers/hwtracing/intel_th/intel_th.h
11564 create mode 100644 drivers/hwtracing/intel_th/msu.c
11565 create mode 100644 drivers/hwtracing/intel_th/msu.h
11566 create mode 100644 drivers/hwtracing/intel_th/pci.c
11567 create mode 100644 drivers/hwtracing/intel_th/pti.c
11568 create mode 100644 drivers/hwtracing/intel_th/pti.h
11569 create mode 100644 drivers/hwtracing/intel_th/sth.c
11570 create mode 100644 drivers/hwtracing/intel_th/sth.h
11571 create mode 100644 drivers/hwtracing/stm/Kconfig
11572 create mode 100644 drivers/hwtracing/stm/Makefile
11573 create mode 100644 drivers/hwtracing/stm/console.c
11574 create mode 100644 drivers/hwtracing/stm/core.c
11575 create mode 100644 drivers/hwtracing/stm/dummy_stm.c
11576 create mode 100644 drivers/hwtracing/stm/policy.c
11577 create mode 100644 drivers/hwtracing/stm/stm.h
11578 create mode 100644 drivers/misc/mic/bus/cosm_bus.c
11579 create mode 100644 drivers/misc/mic/bus/cosm_bus.h
11580 create mode 100644 drivers/misc/mic/cosm/Makefile
11581 create mode 100644 drivers/misc/mic/cosm/cosm_debugfs.c
11582 create mode 100644 drivers/misc/mic/cosm/cosm_main.c
11583 create mode 100644 drivers/misc/mic/cosm/cosm_main.h
11584 create mode 100644 drivers/misc/mic/cosm/cosm_scif_server.c
11585 create mode 100644 drivers/misc/mic/cosm/cosm_sysfs.c
11586 create mode 100644 drivers/misc/mic/cosm_client/Makefile
11587 create mode 100644 drivers/misc/mic/cosm_client/cosm_scif_client.c
11588 delete mode 100644 drivers/misc/mic/host/mic_sysfs.c
11589 create mode 100644 drivers/misc/mic/scif/scif_dma.c
11590 create mode 100644 drivers/misc/mic/scif/scif_fence.c
11591 create mode 100644 drivers/misc/mic/scif/scif_mmap.c
11592 create mode 100644 drivers/misc/mic/scif/scif_rma.c
11593 create mode 100644 drivers/misc/mic/scif/scif_rma.h
11594 create mode 100644 drivers/misc/mic/scif/scif_rma_list.c
11595 create mode 100644 drivers/misc/mic/scif/scif_rma_list.h
11596 create mode 100644 drivers/nvmem/imx-ocotp.c
11597 create mode 100644 drivers/nvmem/mxs-ocotp.c
11598 create mode 100644 drivers/nvmem/rockchip-efuse.c
11599 create mode 100644 drivers/nvmem/vf610-ocotp.c
11600 create mode 100644 include/linux/fpga/fpga-mgr.h
11601 delete mode 100644 include/linux/msm_mdp.h
11602 create mode 100644 include/linux/stm.h
11603 create mode 100644 include/uapi/linux/stm.h
11604 Merging extcon/extcon-next (11eecf910bd8 extcon: Modify the id and name of external connector)
11605 $ git merge extcon/extcon-next
11606 Already up-to-date.
11607 Merging cgroup/for-next (d57456753787 cgroup: fix race condition around termination check in css_task_iter_next())
11608 $ git merge cgroup/for-next
11609 Resolved 'kernel/events/core.c' using previous resolution.
11610 Resolved 'kernel/sched/core.c' using previous resolution.
11611 Auto-merging mm/memcontrol.c
11612 Auto-merging kernel/sched/core.c
11613 CONFLICT (content): Merge conflict in kernel/sched/core.c
11614 Auto-merging kernel/fork.c
11615 Auto-merging kernel/events/core.c
11616 CONFLICT (content): Merge conflict in kernel/events/core.c
11617 Auto-merging include/linux/sched.h
11618 Auto-merging include/linux/memcontrol.h
11619 Auto-merging include/linux/jump_label.h
11620 Auto-merging include/linux/init_task.h
11621 Auto-merging include/linux/backing-dev.h
11622 Auto-merging block/blk-cgroup.c
11623 Auto-merging Documentation/cgroups/unified-hierarchy.txt
11624 Automatic merge failed; fix conflicts and then commit the result.
11626 [master abf82ef11e5b] Merge remote-tracking branch 'cgroup/for-next'
11627 $ git diff -M --stat --summary HEAD^..
11628 Documentation/cgroups/cgroups.txt | 4 +
11629 Documentation/cgroups/unified-hierarchy.txt | 25 +-
11630 block/blk-cgroup.c | 1 +
11631 block/blk-throttle.c | 2 +-
11632 block/cfq-iosched.c | 4 +-
11633 include/linux/backing-dev.h | 5 +-
11634 include/linux/cgroup-defs.h | 76 +-
11635 include/linux/cgroup.h | 129 +--
11636 include/linux/hugetlb_cgroup.h | 4 +-
11637 include/linux/init_task.h | 8 -
11638 include/linux/jump_label.h | 18 +-
11639 include/linux/memcontrol.h | 8 +-
11640 include/linux/sched.h | 12 -
11641 kernel/cgroup.c | 1297 +++++++++++++++------------
11642 kernel/cgroup_pids.c | 8 +-
11643 kernel/cpuset.c | 72 +-
11644 kernel/events/core.c | 8 -
11645 kernel/fork.c | 5 +-
11646 kernel/sched/core.c | 8 -
11647 mm/memcontrol.c | 27 +-
11648 20 files changed, 951 insertions(+), 770 deletions(-)
11649 $ git am -3 ../patches/vmscan-build-fix.patch
11650 Applying: vmscan build fix
11652 Unstaged changes after reset:
11655 $ git commit -v -a --amend
11656 [master 200f1a14cbb6] Merge remote-tracking branch 'cgroup/for-next'
11657 Date: Mon Nov 2 13:49:04 2015 +1100
11658 Merging scsi/for-next (5575a6ea316b Merge branch 'fixes' into for-next)
11659 $ git merge scsi/for-next
11660 Auto-merging MAINTAINERS
11661 Merge made by the 'recursive' strategy.
11663 drivers/scsi/be2iscsi/Kconfig | 4 +-
11664 drivers/scsi/be2iscsi/Makefile | 2 +-
11665 drivers/scsi/be2iscsi/be.h | 4 +-
11666 drivers/scsi/be2iscsi/be_cmds.c | 4 +-
11667 drivers/scsi/be2iscsi/be_cmds.h | 4 +-
11668 drivers/scsi/be2iscsi/be_iscsi.c | 4 +-
11669 drivers/scsi/be2iscsi/be_main.c | 8 +-
11670 drivers/scsi/be2iscsi/be_main.h | 6 +-
11671 drivers/scsi/be2iscsi/be_mgmt.c | 4 +-
11672 drivers/scsi/be2iscsi/be_mgmt.h | 4 +-
11673 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 1 -
11674 drivers/scsi/fnic/fnic_fcs.c | 46 ++++++++--
11675 drivers/scsi/fnic/fnic_scsi.c | 16 ++++
11676 drivers/scsi/lpfc/lpfc.h | 8 +-
11677 drivers/scsi/lpfc/lpfc_attr.c | 23 +++--
11678 drivers/scsi/lpfc/lpfc_bsg.c | 20 ----
11679 drivers/scsi/lpfc/lpfc_ct.c | 11 ++-
11680 drivers/scsi/lpfc/lpfc_els.c | 100 ++++++--------------
11681 drivers/scsi/lpfc/lpfc_hbadisc.c | 27 ++++--
11682 drivers/scsi/lpfc/lpfc_hw.h | 6 +-
11683 drivers/scsi/lpfc/lpfc_init.c | 36 +++++---
11684 drivers/scsi/lpfc/lpfc_mbox.c | 19 ++--
11685 drivers/scsi/lpfc/lpfc_nportdisc.c | 2 -
11686 drivers/scsi/lpfc/lpfc_scsi.c | 14 +--
11687 drivers/scsi/lpfc/lpfc_sli.c | 10 +-
11688 drivers/scsi/lpfc/lpfc_sli4.h | 1 -
11689 drivers/scsi/lpfc/lpfc_version.h | 2 +-
11690 drivers/scsi/scsi_devinfo.c | 181 ++++++++++++++++---------------------
11691 29 files changed, 267 insertions(+), 304 deletions(-)
11692 Merging target-updates/for-next (517982229f78 configfs: remove old API)
11693 $ git merge target-updates/for-next
11694 Auto-merging samples/configfs/configfs_sample.c
11695 Removing include/target/target_core_fabric_configfs.h
11696 Auto-merging include/target/target_core_base.h
11697 Removing include/target/configfs_macros.h
11698 Auto-merging drivers/vhost/scsi.c
11699 Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c
11700 Auto-merging drivers/usb/gadget/function/f_uac2.c
11701 Auto-merging drivers/usb/gadget/function/f_uac1.c
11702 Auto-merging drivers/usb/gadget/function/f_subset.c
11703 Auto-merging drivers/usb/gadget/function/f_sourcesink.c
11704 Auto-merging drivers/usb/gadget/function/f_serial.c
11705 Auto-merging drivers/usb/gadget/function/f_rndis.c
11706 Auto-merging drivers/usb/gadget/function/f_printer.c
11707 Auto-merging drivers/usb/gadget/function/f_phonet.c
11708 Auto-merging drivers/usb/gadget/function/f_obex.c
11709 Auto-merging drivers/usb/gadget/function/f_ncm.c
11710 Auto-merging drivers/usb/gadget/function/f_midi.c
11711 Auto-merging drivers/usb/gadget/function/f_mass_storage.c
11712 Auto-merging drivers/usb/gadget/function/f_loopback.c
11713 Auto-merging drivers/usb/gadget/function/f_hid.c
11714 Auto-merging drivers/usb/gadget/function/f_eem.c
11715 Auto-merging drivers/usb/gadget/function/f_ecm.c
11716 Auto-merging drivers/usb/gadget/function/f_acm.c
11717 Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c
11718 Removing Documentation/filesystems/configfs/configfs_example_explicit.c
11719 Removing Documentation/filesystems/configfs/Makefile
11720 Merge made by the 'recursive' strategy.
11721 Documentation/filesystems/Makefile | 2 -
11722 Documentation/filesystems/configfs/Makefile | 3 -
11723 Documentation/filesystems/configfs/configfs.txt | 38 +-
11724 .../configfs/configfs_example_explicit.c | 483 --------
11725 Documentation/target/tcm_mod_builder.py | 17 -
11726 drivers/infiniband/ulp/srpt/ib_srpt.c | 78 +-
11727 drivers/misc/spear13xx_pcie_gadget.c | 216 ++--
11728 drivers/net/netconsole.c | 271 +++--
11729 drivers/scsi/qla2xxx/tcm_qla2xxx.c | 153 +--
11730 drivers/target/iscsi/iscsi_target_configfs.c | 791 +++++--------
11731 drivers/target/iscsi/iscsi_target_stat.c | 666 +++++------
11732 drivers/target/loopback/tcm_loop.c | 60 +-
11733 drivers/target/sbp/sbp_target.c | 87 +-
11734 drivers/target/target_core_configfs.c | 1209 +++++++-------------
11735 drivers/target/target_core_fabric_configfs.c | 275 ++---
11736 drivers/target/target_core_internal.h | 3 +
11737 drivers/target/target_core_stat.c | 918 ++++++---------
11738 drivers/target/tcm_fc/tfc_cmd.c | 1 -
11739 drivers/target/tcm_fc/tfc_conf.c | 44 +-
11740 drivers/target/tcm_fc/tfc_io.c | 1 -
11741 drivers/target/tcm_fc/tfc_sess.c | 1 -
11742 drivers/usb/gadget/configfs.c | 295 ++---
11743 drivers/usb/gadget/function/f_acm.c | 26 +-
11744 drivers/usb/gadget/function/f_ecm.c | 8 +-
11745 drivers/usb/gadget/function/f_eem.c | 8 +-
11746 drivers/usb/gadget/function/f_hid.c | 34 +-
11747 drivers/usb/gadget/function/f_loopback.c | 31 +-
11748 drivers/usb/gadget/function/f_mass_storage.c | 119 +-
11749 drivers/usb/gadget/function/f_midi.c | 37 +-
11750 drivers/usb/gadget/function/f_ncm.c | 8 +-
11751 drivers/usb/gadget/function/f_obex.c | 26 +-
11752 drivers/usb/gadget/function/f_phonet.c | 25 +-
11753 drivers/usb/gadget/function/f_printer.c | 30 +-
11754 drivers/usb/gadget/function/f_rndis.c | 8 +-
11755 drivers/usb/gadget/function/f_serial.c | 26 +-
11756 drivers/usb/gadget/function/f_sourcesink.c | 83 +-
11757 drivers/usb/gadget/function/f_subset.c | 8 +-
11758 drivers/usb/gadget/function/f_uac1.c | 39 +-
11759 drivers/usb/gadget/function/f_uac2.c | 28 +-
11760 drivers/usb/gadget/function/u_ether_configfs.h | 44 +-
11761 drivers/usb/gadget/function/uvc_configfs.c | 387 +++----
11762 drivers/usb/gadget/legacy/tcm_usb_gadget.c | 44 +-
11763 drivers/vhost/scsi.c | 41 +-
11764 drivers/xen/xen-scsiback.c | 32 +-
11765 fs/configfs/file.c | 12 +-
11766 fs/dlm/config.c | 288 ++---
11767 fs/ocfs2/cluster/heartbeat.c | 205 +---
11768 fs/ocfs2/cluster/nodemanager.c | 281 ++---
11769 include/linux/configfs.h | 97 +-
11770 include/linux/usb/gadget_configfs.h | 19 +-
11771 include/target/configfs_macros.h | 147 ---
11772 include/target/target_core_base.h | 60 +
11773 include/target/target_core_fabric_configfs.h | 122 --
11774 samples/Kconfig | 6 +
11775 samples/Makefile | 3 +-
11776 samples/configfs/Makefile | 2 +
11777 .../configfs/configfs_sample.c | 140 +--
11778 57 files changed, 2652 insertions(+), 5434 deletions(-)
11779 delete mode 100644 Documentation/filesystems/configfs/Makefile
11780 delete mode 100644 Documentation/filesystems/configfs/configfs_example_explicit.c
11781 delete mode 100644 include/target/configfs_macros.h
11782 delete mode 100644 include/target/target_core_fabric_configfs.h
11783 create mode 100644 samples/configfs/Makefile
11784 rename Documentation/filesystems/configfs/configfs_example_macros.c => samples/configfs/configfs_sample.c (74%)
11785 $ git am -3 ../patches/stm-class--Use-per-attribute-show-and-store-methods-in-configfs-policy,patch
11786 Applying: stm class: Use per-attribute show and store methods in configfs policy
11788 Unstaged changes after reset:
11789 M drivers/hwtracing/stm/policy.c
11791 $ git commit -v -a --amend
11792 [master c96d26e53518] Merge remote-tracking branch 'target-updates/for-next'
11793 Date: Mon Nov 2 13:58:35 2015 +1100
11794 Merging target-merge/for-next-merge (8edb1554f7c2 mpt3sas: Fix unprotected list lookup in v4.3-rc0 changes)
11795 $ git merge target-merge/for-next-merge
11796 Merge made by the 'recursive' strategy.
11797 drivers/scsi/mpt3sas/mpt3sas_base.h | 25 +-
11798 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 595 ++++++++++++++++++++++---------
11799 drivers/scsi/mpt3sas/mpt3sas_transport.c | 18 +-
11800 3 files changed, 458 insertions(+), 180 deletions(-)
11801 Merging pinctrl/for-next (d99c8053fc24 pinctrl: pinconf: remove needless loop)
11802 $ git merge pinctrl/for-next
11803 Resolved 'arch/arm/boot/dts/sama5d2.dtsi' using previous resolution.
11804 Auto-merging drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c
11805 Auto-merging arch/arm/boot/dts/sama5d2.dtsi
11806 CONFLICT (content): Merge conflict in arch/arm/boot/dts/sama5d2.dtsi
11807 Auto-merging MAINTAINERS
11808 Automatic merge failed; fix conflicts and then commit the result.
11810 [master 4dbf91769706] Merge remote-tracking branch 'pinctrl/for-next'
11811 $ git diff -M --stat --summary HEAD^..
11812 .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 +
11813 .../bindings/pinctrl/atmel,at91-pio4-pinctrl.txt | 90 +
11814 .../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 5 +-
11815 .../bindings/pinctrl/brcm,cygnus-gpio.txt | 16 +-
11816 .../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 63 +-
11817 .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 +
11819 arch/arm/boot/dts/sama5d2.dtsi | 14 +
11820 drivers/base/dd.c | 2 +
11821 drivers/base/pinctrl.c | 15 +-
11822 drivers/pinctrl/Kconfig | 13 +
11823 drivers/pinctrl/Makefile | 3 +-
11824 drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 131 +-
11825 drivers/pinctrl/berlin/Kconfig | 16 +-
11826 drivers/pinctrl/berlin/Makefile | 1 +
11827 drivers/pinctrl/berlin/berlin-bg2.c | 4 +-
11828 drivers/pinctrl/berlin/berlin-bg2cd.c | 66 +-
11829 drivers/pinctrl/berlin/berlin-bg2q.c | 4 +-
11830 drivers/pinctrl/berlin/berlin-bg4ct.c | 503 ++++
11831 drivers/pinctrl/berlin/berlin.c | 28 +-
11832 drivers/pinctrl/berlin/berlin.h | 6 +-
11833 drivers/pinctrl/core.c | 32 +
11834 drivers/pinctrl/freescale/pinctrl-imx.c | 36 +-
11835 drivers/pinctrl/freescale/pinctrl-imx.h | 2 +
11836 drivers/pinctrl/freescale/pinctrl-imx7d.c | 30 +
11837 drivers/pinctrl/freescale/pinctrl-mxs.c | 2 +-
11838 drivers/pinctrl/intel/Kconfig | 8 +
11839 drivers/pinctrl/intel/Makefile | 1 +
11840 drivers/pinctrl/intel/pinctrl-baytrail.c | 2 +
11841 drivers/pinctrl/intel/pinctrl-broxton.c | 1065 ++++++++
11842 drivers/pinctrl/intel/pinctrl-intel.c | 108 +-
11843 drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +-
11844 drivers/pinctrl/pinconf-generic.c | 35 +-
11845 drivers/pinctrl/pinconf.c | 13 +-
11846 drivers/pinctrl/pinctrl-at91-pio4.c | 1094 ++++++++
11847 drivers/pinctrl/pinctrl-at91.c | 5 +-
11848 drivers/pinctrl/pinctrl-rockchip.c | 17 +
11849 drivers/pinctrl/pinctrl-tegra-xusb.c | 9 -
11850 drivers/pinctrl/pinctrl-tz1090-pdc.c | 4 +-
11851 drivers/pinctrl/pinctrl-tz1090.c | 4 +-
11852 drivers/pinctrl/pinctrl-zynq.c | 16 +-
11853 drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +-
11854 drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +-
11855 drivers/pinctrl/samsung/pinctrl-exynos5440.c | 2 +-
11856 drivers/pinctrl/sh-pfc/Kconfig | 5 +
11857 drivers/pinctrl/sh-pfc/Makefile | 1 +
11858 drivers/pinctrl/sh-pfc/core.c | 16 +-
11859 drivers/pinctrl/sh-pfc/core.h | 3 +
11860 drivers/pinctrl/sh-pfc/gpio.c | 37 +-
11861 drivers/pinctrl/sh-pfc/pfc-emev2.c | 4 +-
11862 drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 124 +-
11863 drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 68 +-
11864 drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 266 +-
11865 drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 425 ++-
11866 drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 1062 ++++----
11867 drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 1103 ++++----
11868 drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 1035 ++++---
11869 drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 2816 ++++++++++++++++++++
11870 drivers/pinctrl/sh-pfc/pfc-sh7203.c | 4 +-
11871 drivers/pinctrl/sh-pfc/pfc-sh7264.c | 4 +-
11872 drivers/pinctrl/sh-pfc/pfc-sh7269.c | 4 +-
11873 drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 68 +-
11874 drivers/pinctrl/sh-pfc/pfc-sh7720.c | 4 +-
11875 drivers/pinctrl/sh-pfc/pfc-sh7722.c | 4 +-
11876 drivers/pinctrl/sh-pfc/pfc-sh7723.c | 4 +-
11877 drivers/pinctrl/sh-pfc/pfc-sh7724.c | 4 +-
11878 drivers/pinctrl/sh-pfc/pfc-sh7734.c | 782 +++---
11879 drivers/pinctrl/sh-pfc/pfc-sh7757.c | 4 +-
11880 drivers/pinctrl/sh-pfc/pfc-sh7785.c | 4 +-
11881 drivers/pinctrl/sh-pfc/pfc-sh7786.c | 4 +-
11882 drivers/pinctrl/sh-pfc/pfc-shx3.c | 4 +-
11883 drivers/pinctrl/sh-pfc/sh_pfc.h | 93 +-
11884 drivers/pinctrl/sirf/pinctrl-atlas7.c | 1828 +++++++++++--
11885 drivers/pinctrl/sunxi/Kconfig | 4 +
11886 drivers/pinctrl/sunxi/Makefile | 1 +
11887 drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 24 +-
11888 drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 603 +++++
11889 drivers/pinctrl/sunxi/pinctrl-sunxi.c | 8 +-
11890 drivers/pinctrl/uniphier/Kconfig | 14 +-
11891 drivers/pinctrl/uniphier/Makefile | 2 +-
11892 drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c | 5 +
11893 drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c | 5 +
11894 drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c | 11 +
11895 drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c | 5 +
11896 drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c | 5 +
11897 drivers/pinctrl/uniphier/pinctrl-proxstream2.c | 5 +
11898 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 10 +-
11899 drivers/usb/renesas_usbhs/rcar2.c | 1 -
11900 include/linux/pinctrl/devinfo.h | 10 +
11901 include/linux/pinctrl/pinconf-generic.h | 64 +-
11902 include/linux/pinctrl/pinctrl-state.h | 8 +
11903 91 files changed, 11047 insertions(+), 3000 deletions(-)
11904 create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pio4-pinctrl.txt
11905 create mode 100644 drivers/pinctrl/berlin/berlin-bg4ct.c
11906 create mode 100644 drivers/pinctrl/intel/pinctrl-broxton.c
11907 create mode 100644 drivers/pinctrl/pinctrl-at91-pio4.c
11908 create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7795.c
11909 create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
11910 Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache)
11911 $ git merge vhost/linux-next
11912 Merge made by the 'recursive' strategy.
11913 drivers/virtio/virtio_ring.c | 11 ++++++++++-
11914 1 file changed, 10 insertions(+), 1 deletion(-)
11915 Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage)
11916 $ git merge remoteproc/for-next
11917 Already up-to-date.
11918 Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
11919 $ git merge rpmsg/for-next
11920 Already up-to-date.
11921 Merging gpio/for-next (0963670aeaec gpio: fix up SPI submenu)
11922 $ git merge gpio/for-next
11923 Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c
11924 Auto-merging drivers/pinctrl/pinctrl-rockchip.c
11925 Auto-merging drivers/pinctrl/pinctrl-at91.c
11926 Auto-merging drivers/pinctrl/mediatek/pinctrl-mtk-common.c
11927 Auto-merging drivers/pinctrl/intel/pinctrl-intel.c
11928 Auto-merging drivers/gpio/gpiolib.h
11929 Auto-merging drivers/gpio/gpiolib.c
11930 Auto-merging drivers/gpio/gpiolib-acpi.c
11931 Removing drivers/gpio/gpio-msm-v2.c
11932 Removing drivers/gpio/gpio-it8761e.c
11933 Auto-merging MAINTAINERS
11934 Auto-merging Documentation/devicetree/bindings/gpio/gpio.txt
11935 Removing Documentation/devicetree/bindings/gpio/gpio-msm.txt
11936 Merge made by the 'recursive' strategy.
11937 .../devicetree/bindings/gpio/gpio-msm.txt | 26 --
11938 .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 +
11939 .../devicetree/bindings/gpio/gpio-zynq.txt | 9 +
11940 Documentation/devicetree/bindings/gpio/gpio.txt | 41 +-
11941 Documentation/gpio/driver.txt | 80 ++++
11943 drivers/gpio/Kconfig | 196 ++++-----
11944 drivers/gpio/Makefile | 5 +-
11945 drivers/gpio/gpio-104-idio-16.c | 216 ++++++++++
11946 drivers/gpio/gpio-altera.c | 15 +-
11947 drivers/gpio/gpio-amdpt.c | 261 ++++++++++++
11948 drivers/gpio/gpio-arizona.c | 2 +
11949 drivers/gpio/gpio-ath79.c | 119 +++---
11950 drivers/gpio/gpio-etraxfs.c | 23 +-
11951 drivers/gpio/gpio-generic.c | 58 +--
11952 drivers/gpio/gpio-it87.c | 411 +++++++++++++++++++
11953 drivers/gpio/gpio-it8761e.c | 230 -----------
11954 drivers/gpio/gpio-lpc18xx.c | 14 +-
11955 drivers/gpio/gpio-max730x.c | 1 -
11956 drivers/gpio/gpio-moxart.c | 14 +-
11957 drivers/gpio/gpio-msm-v2.c | 453 ---------------------
11958 drivers/gpio/gpio-mvebu.c | 14 +-
11959 drivers/gpio/gpio-omap.c | 82 ++--
11960 drivers/gpio/gpio-pca953x.c | 45 +-
11961 drivers/gpio/gpio-pl061.c | 112 +++--
11962 drivers/gpio/gpio-sx150x.c | 31 +-
11963 drivers/gpio/gpio-tb10x.c | 14 +-
11964 drivers/gpio/gpio-tz1090-pdc.c | 14 +-
11965 drivers/gpio/gpio-vf610.c | 43 +-
11966 drivers/gpio/gpio-xlp.c | 21 +-
11967 drivers/gpio/gpio-zx.c | 28 +-
11968 drivers/gpio/gpio-zynq.c | 32 +-
11969 drivers/gpio/gpiolib-acpi.c | 21 +-
11970 drivers/gpio/gpiolib-legacy.c | 8 +-
11971 drivers/gpio/gpiolib-of.c | 20 +-
11972 drivers/gpio/gpiolib.c | 175 ++++++--
11973 drivers/gpio/gpiolib.h | 3 +
11974 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 14 +-
11975 drivers/pinctrl/intel/pinctrl-cherryview.c | 14 +-
11976 drivers/pinctrl/intel/pinctrl-intel.c | 14 +-
11977 drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 14 +-
11978 drivers/pinctrl/nomadik/pinctrl-abx500.c | 18 +-
11979 drivers/pinctrl/nomadik/pinctrl-nomadik.c | 22 +-
11980 drivers/pinctrl/pinctrl-adi2.c | 14 +-
11981 drivers/pinctrl/pinctrl-as3722.c | 14 +-
11982 drivers/pinctrl/pinctrl-at91.c | 26 +-
11983 drivers/pinctrl/pinctrl-coh901.c | 22 +-
11984 drivers/pinctrl/pinctrl-digicolor.c | 14 +-
11985 drivers/pinctrl/pinctrl-pistachio.c | 14 +-
11986 drivers/pinctrl/pinctrl-rockchip.c | 14 +-
11987 drivers/pinctrl/pinctrl-st.c | 14 +-
11988 drivers/pinctrl/pinctrl-xway.c | 18 +-
11989 drivers/pinctrl/qcom/pinctrl-msm.c | 16 +-
11990 drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 14 +-
11991 drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 14 +-
11992 drivers/pinctrl/samsung/pinctrl-samsung.c | 14 +-
11993 drivers/pinctrl/sunxi/pinctrl-sunxi.c | 14 +-
11994 drivers/pinctrl/vt8500/pinctrl-wmt.c | 14 +-
11995 include/dt-bindings/gpio/gpio.h | 12 +
11996 include/linux/gpio/consumer.h | 1 +
11997 include/linux/gpio/driver.h | 3 +
11998 include/linux/of_gpio.h | 1 +
11999 62 files changed, 1728 insertions(+), 1473 deletions(-)
12000 delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt
12001 create mode 100644 drivers/gpio/gpio-104-idio-16.c
12002 create mode 100644 drivers/gpio/gpio-amdpt.c
12003 create mode 100644 drivers/gpio/gpio-it87.c
12004 delete mode 100644 drivers/gpio/gpio-it8761e.c
12005 delete mode 100644 drivers/gpio/gpio-msm-v2.c
12006 Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
12007 $ git merge dma-mapping/dma-mapping-next
12008 Already up-to-date.
12009 Merging pwm/for-next (7e3b7dc76c41 pwm: Add MediaTek display PWM driver support)
12010 $ git merge pwm/for-next
12011 Merge made by the 'recursive' strategy.
12012 .../devicetree/bindings/pwm/brcm,bcm7038-pwm.txt | 20 ++
12013 .../devicetree/bindings/pwm/pwm-berlin.txt | 17 +
12014 .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 42 +++
12015 .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 27 ++
12016 drivers/pwm/Kconfig | 47 ++-
12017 drivers/pwm/Makefile | 4 +
12018 drivers/pwm/pwm-atmel-hlcdc.c | 4 +
12019 drivers/pwm/pwm-berlin.c | 219 +++++++++++++
12020 drivers/pwm/pwm-brcmstb.c | 343 +++++++++++++++++++++
12021 drivers/pwm/pwm-mtk-disp.c | 243 +++++++++++++++
12022 drivers/pwm/pwm-rcar.c | 274 ++++++++++++++++
12023 11 files changed, 1237 insertions(+), 3 deletions(-)
12024 create mode 100644 Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.txt
12025 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-berlin.txt
12026 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt
12027 create mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt
12028 create mode 100644 drivers/pwm/pwm-berlin.c
12029 create mode 100644 drivers/pwm/pwm-brcmstb.c
12030 create mode 100644 drivers/pwm/pwm-mtk-disp.c
12031 create mode 100644 drivers/pwm/pwm-rcar.c
12032 Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
12033 $ git merge dma-buf/for-next
12034 Already up-to-date.
12035 Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
12036 $ git merge userns/for-next
12037 Auto-merging fs/namei.c
12038 Merge made by the 'recursive' strategy.
12039 fs/namei.c | 7 ++-----
12040 1 file changed, 2 insertions(+), 5 deletions(-)
12041 Merging ktest/for-next (b953c0d234bc Linux 4.1)
12042 $ git merge ktest/for-next
12043 Already up-to-date.
12044 Merging clk/clk-next (e5bf1991ea62 clk: qcom: msm8960: Fix dsi1/2 halt bits)
12045 $ git merge clk/clk-next
12046 Resolved 'drivers/clk/Kconfig' using previous resolution.
12047 Auto-merging drivers/tty/serial/8250/8250_dw.c
12048 Auto-merging drivers/clk/shmobile/clk-mstp.c
12049 Auto-merging drivers/clk/rockchip/clk-mmc-phase.c
12050 Auto-merging drivers/clk/berlin/bg2q.c
12051 Auto-merging drivers/clk/Makefile
12052 Auto-merging drivers/clk/Kconfig
12053 CONFLICT (content): Merge conflict in drivers/clk/Kconfig
12054 Auto-merging drivers/base/power/domain.c
12055 Auto-merging arch/arm/mach-bcm/Kconfig
12056 Auto-merging arch/arm/mach-at91/Kconfig
12057 Automatic merge failed; fix conflicts and then commit the result.
12059 [master 4d3c5b17ee3d] Merge remote-tracking branch 'clk/clk-next'
12060 $ git diff -M --stat --summary HEAD^..
12061 .../bindings/arm/mediatek/mediatek,imgsys.txt | 22 +
12062 .../bindings/arm/mediatek/mediatek,mmsys.txt | 22 +
12063 .../bindings/arm/mediatek/mediatek,vdecsys.txt | 22 +
12064 .../bindings/arm/mediatek/mediatek,vencltsys.txt | 22 +
12065 .../bindings/arm/mediatek/mediatek,vencsys.txt | 22 +
12066 .../devicetree/bindings/clock/at91-clock.txt | 35 ++
12067 .../bindings/clock/brcm,iproc-clocks.txt | 78 +++
12068 .../bindings/clock/renesas,cpg-div6-clocks.txt | 2 +-
12069 .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 69 +++
12070 .../devicetree/bindings/clock/silabs,si514.txt | 24 +
12071 .../devicetree/bindings/clock/st/st,clkgen-pll.txt | 1 +
12072 arch/arm/mach-at91/Kconfig | 3 +
12073 arch/arm/mach-bcm/Kconfig | 2 +-
12074 drivers/base/power/domain.c | 2 +
12075 drivers/clk/Kconfig | 19 +-
12076 drivers/clk/Makefile | 3 +-
12077 drivers/clk/at91/Makefile | 1 +
12078 drivers/clk/at91/clk-generated.c | 306 +++++++++++
12079 drivers/clk/at91/clk-peripheral.c | 24 +-
12080 drivers/clk/at91/clk-system.c | 3 +-
12081 drivers/clk/at91/clk-utmi.c | 4 +-
12082 drivers/clk/at91/pmc.c | 21 +
12083 drivers/clk/at91/pmc.h | 3 +
12084 drivers/clk/bcm/Kconfig | 6 +-
12085 drivers/clk/bcm/Makefile | 3 +
12086 drivers/clk/bcm/clk-cygnus.c | 155 +++---
12087 drivers/clk/bcm/clk-iproc-pll.c | 196 +++----
12088 drivers/clk/bcm/clk-iproc.h | 22 +-
12089 drivers/clk/bcm/clk-ns2.c | 288 +++++++++++
12090 drivers/clk/bcm/clk-nsp.c | 139 +++++
12091 drivers/clk/berlin/bg2.c | 4 +-
12092 drivers/clk/berlin/bg2q.c | 2 +-
12093 drivers/clk/clk-divider.c | 20 +-
12094 drivers/clk/clk-fractional-divider.c | 53 +-
12095 drivers/clk/clk-max77802.c | 2 +-
12096 drivers/clk/clk-multiplier.c | 51 --
12097 drivers/clk/clk-si514.c | 379 ++++++++++++++
12098 drivers/clk/clk-si5351.c | 17 +-
12099 drivers/clk/clk-xgene.c | 1 -
12100 drivers/clk/clk.c | 38 +-
12101 drivers/clk/hisilicon/clk-hi6220-stub.c | 2 +-
12102 drivers/clk/imx/clk-imx27.c | 4 +-
12103 drivers/clk/imx/clk-imx31.c | 4 +-
12104 drivers/clk/imx/clk-pllv2.c | 12 +-
12105 drivers/clk/keystone/pll.c | 2 +-
12106 drivers/clk/mediatek/Makefile | 2 +-
12107 drivers/clk/mediatek/clk-apmixed.c | 107 ++++
12108 drivers/clk/mediatek/clk-gate.c | 2 +-
12109 drivers/clk/mediatek/clk-mt8173.c | 347 ++++++++++++-
12110 drivers/clk/mediatek/clk-mtk.c | 36 +-
12111 drivers/clk/mediatek/clk-mtk.h | 24 +-
12112 drivers/clk/mediatek/clk-pll.c | 7 +-
12113 drivers/clk/mvebu/clk-cpu.c | 4 +-
12114 drivers/clk/mvebu/common.c | 2 +-
12115 drivers/clk/mxs/clk-frac.c | 12 +-
12116 drivers/clk/nxp/clk-lpc18xx-ccu.c | 17 +-
12117 drivers/clk/nxp/clk-lpc18xx-cgu.c | 42 +-
12118 drivers/clk/qcom/Kconfig | 9 +
12119 drivers/clk/qcom/Makefile | 1 +
12120 drivers/clk/qcom/clk-rcg.c | 230 +++++++++
12121 drivers/clk/qcom/clk-rcg.h | 8 +-
12122 drivers/clk/qcom/clk-rcg2.c | 170 +++++-
12123 drivers/clk/qcom/common.c | 42 +-
12124 drivers/clk/qcom/common.h | 4 +-
12125 drivers/clk/qcom/gcc-apq8084.c | 49 +-
12126 drivers/clk/qcom/gcc-ipq806x.c | 7 -
12127 drivers/clk/qcom/gcc-msm8660.c | 7 -
12128 drivers/clk/qcom/gcc-msm8916.c | 569 ++++++++++++++++++++-
12129 drivers/clk/qcom/gcc-msm8960.c | 20 +-
12130 drivers/clk/qcom/gcc-msm8974.c | 22 +-
12131 drivers/clk/qcom/gdsc.c | 237 +++++++++
12132 drivers/clk/qcom/gdsc.h | 68 +++
12133 drivers/clk/qcom/lcc-ipq806x.c | 7 -
12134 drivers/clk/qcom/lcc-msm8960.c | 7 -
12135 drivers/clk/qcom/mmcc-apq8084.c | 111 +++-
12136 drivers/clk/qcom/mmcc-msm8960.c | 411 ++++++++++++++-
12137 drivers/clk/qcom/mmcc-msm8974.c | 92 +++-
12138 drivers/clk/rockchip/clk-mmc-phase.c | 11 +
12139 drivers/clk/rockchip/clk-pll.c | 135 ++---
12140 drivers/clk/rockchip/clk.c | 6 +-
12141 drivers/clk/samsung/clk-exynos7.c | 467 +++++++++++------
12142 drivers/clk/shmobile/clk-mstp.c | 2 +-
12143 drivers/clk/shmobile/clk-r8a7778.c | 8 +-
12144 drivers/clk/sirf/clk-atlas7.c | 358 +++++++------
12145 drivers/clk/st/clk-flexgen.c | 7 +-
12146 drivers/clk/st/clkgen-mux.c | 3 +
12147 drivers/clk/st/clkgen-pll.c | 469 ++++++++++++++++-
12148 drivers/clk/st/clkgen.h | 2 +
12149 drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 1 +
12150 drivers/clk/sunxi/clk-sun6i-apb0.c | 1 +
12151 drivers/clk/sunxi/clk-sun6i-ar100.c | 1 +
12152 drivers/clk/sunxi/clk-sun8i-apb0.c | 1 +
12153 drivers/clk/sunxi/clk-sun9i-mmc.c | 1 +
12154 drivers/clk/tegra/clk-emc.c | 4 +-
12155 drivers/clk/versatile/Kconfig | 2 +-
12156 drivers/clk/versatile/clk-icst.c | 4 +-
12157 drivers/tty/serial/8250/8250_dw.c | 4 -
12158 include/dt-bindings/clock/at91.h | 1 +
12159 include/dt-bindings/clock/bcm-ns2.h | 72 +++
12160 include/dt-bindings/clock/bcm-nsp.h | 51 ++
12161 include/dt-bindings/clock/exynos7-clk.h | 43 +-
12162 include/dt-bindings/clock/mt8173-clk.h | 104 +++-
12163 include/dt-bindings/clock/qcom,gcc-apq8084.h | 6 +
12164 include/dt-bindings/clock/qcom,gcc-msm8916.h | 30 ++
12165 include/dt-bindings/clock/qcom,gcc-msm8974.h | 3 +
12166 include/dt-bindings/clock/qcom,mmcc-apq8084.h | 10 +
12167 include/dt-bindings/clock/qcom,mmcc-msm8974.h | 8 +
12168 include/dt-bindings/clock/r8a7795-cpg-mssr.h | 63 +++
12169 include/dt-bindings/clock/renesas-cpg-mssr.h | 15 +
12170 include/linux/clk-provider.h | 22 +-
12171 include/linux/clk/at91_pmc.h | 22 +-
12172 111 files changed, 5837 insertions(+), 883 deletions(-)
12173 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,imgsys.txt
12174 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
12175 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vdecsys.txt
12176 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vencltsys.txt
12177 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vencsys.txt
12178 create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
12179 create mode 100644 Documentation/devicetree/bindings/clock/silabs,si514.txt
12180 create mode 100644 drivers/clk/at91/clk-generated.c
12181 create mode 100644 drivers/clk/bcm/clk-ns2.c
12182 create mode 100644 drivers/clk/bcm/clk-nsp.c
12183 create mode 100644 drivers/clk/clk-si514.c
12184 create mode 100644 drivers/clk/mediatek/clk-apmixed.c
12185 create mode 100644 drivers/clk/qcom/gdsc.c
12186 create mode 100644 drivers/clk/qcom/gdsc.h
12187 create mode 100644 include/dt-bindings/clock/bcm-ns2.h
12188 create mode 100644 include/dt-bindings/clock/bcm-nsp.h
12189 create mode 100644 include/dt-bindings/clock/r8a7795-cpg-mssr.h
12190 create mode 100644 include/dt-bindings/clock/renesas-cpg-mssr.h
12191 Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
12192 $ git merge random/dev
12193 Already up-to-date.
12194 Merging aio/master (6ff33f3902c3 Linux 4.3-rc1)
12195 $ git merge aio/master
12196 Already up-to-date.
12197 Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
12198 $ git merge llvmlinux/for-next
12199 Merge made by the 'recursive' strategy.
12200 Merging kselftest/next (256d0afb11d6 selftests/seccomp: build and pass on arm64)
12201 $ git merge kselftest/next
12202 Merge made by the 'recursive' strategy.
12203 tools/testing/selftests/Makefile | 4 ++
12204 tools/testing/selftests/efivarfs/.gitignore | 2 +
12205 tools/testing/selftests/memfd/memfd_test.c | 2 +-
12206 tools/testing/selftests/pstore/Makefile | 15 ++++
12207 tools/testing/selftests/pstore/common_tests | 83 ++++++++++++++++++++++
12208 tools/testing/selftests/pstore/pstore_crash_test | 30 ++++++++
12209 .../selftests/pstore/pstore_post_reboot_tests | 77 ++++++++++++++++++++
12210 tools/testing/selftests/pstore/pstore_tests | 30 ++++++++
12211 tools/testing/selftests/seccomp/seccomp_bpf.c | 71 ++++++++++++------
12212 9 files changed, 291 insertions(+), 23 deletions(-)
12213 create mode 100644 tools/testing/selftests/efivarfs/.gitignore
12214 create mode 100644 tools/testing/selftests/pstore/Makefile
12215 create mode 100755 tools/testing/selftests/pstore/common_tests
12216 create mode 100755 tools/testing/selftests/pstore/pstore_crash_test
12217 create mode 100755 tools/testing/selftests/pstore/pstore_post_reboot_tests
12218 create mode 100755 tools/testing/selftests/pstore/pstore_tests
12219 Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
12220 $ git merge y2038/y2038
12221 Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution.
12222 Auto-merging kernel/cpuset.c
12223 Auto-merging fs/coredump.c
12224 Auto-merging drivers/staging/media/lirc/lirc_serial.c
12225 Auto-merging drivers/staging/media/lirc/lirc_sasem.c
12226 Auto-merging drivers/staging/media/lirc/lirc_parallel.c
12227 CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
12228 Auto-merging drivers/staging/gdm72xx/gdm_sdio.c
12229 CONFLICT (modify/delete): drivers/staging/ft1000/ft1000.h deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/ft1000/ft1000.h left in tree.
12230 CONFLICT (modify/delete): drivers/staging/ft1000/ft1000-usb/ft1000_hw.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/ft1000/ft1000-usb/ft1000_hw.c left in tree.
12231 CONFLICT (modify/delete): drivers/staging/ft1000/ft1000-usb/ft1000_debug.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/ft1000/ft1000-usb/ft1000_debug.c left in tree.
12232 CONFLICT (modify/delete): drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c left in tree.
12233 Automatic merge failed; fix conflicts and then commit the result.
12234 $ git rm -f drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c drivers/staging/ft1000/ft1000-usb/ft1000_debug.c drivers/staging/ft1000/ft1000-usb/ft1000_hw.c drivers/staging/ft1000/ft1000.h
12235 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c: needs merge
12236 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c: needs merge
12237 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c: needs merge
12238 drivers/staging/ft1000/ft1000.h: needs merge
12239 rm 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c'
12240 rm 'drivers/staging/ft1000/ft1000-usb/ft1000_debug.c'
12241 rm 'drivers/staging/ft1000/ft1000-usb/ft1000_hw.c'
12242 rm 'drivers/staging/ft1000/ft1000.h'
12244 [master be179ea691b3] Merge remote-tracking branch 'y2038/y2038'
12245 $ git diff -M --stat --summary HEAD^..
12246 drivers/staging/gdm72xx/gdm_sdio.c | 13 ++++----
12247 drivers/staging/gdm72xx/gdm_sdio.h | 4 +--
12248 drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++++------------
12249 drivers/staging/media/lirc/lirc_sasem.c | 20 ++++++------
12250 drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++++--------------------
12251 fs/coredump.c | 8 +++--
12252 kernel/cpuset.c | 12 ++++---
12253 7 files changed, 62 insertions(+), 80 deletions(-)
12254 Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
12255 $ git merge luto-misc/next
12256 Already up-to-date.
12257 Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic)
12258 $ git merge access_once/linux-next
12259 Merge made by the 'recursive' strategy.
12260 Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next)
12261 $ git merge livepatching/for-next
12262 Already up-to-date!
12263 Merge made by the 'recursive' strategy.
12264 Merging coresight/next (c0d90ad7604a coresight: checking for NULL string in coresight_name_match())
12265 $ git merge coresight/next
12266 Auto-merging drivers/hwtracing/coresight/coresight.c
12267 Merge made by the 'recursive' strategy.
12268 drivers/hwtracing/coresight/coresight.c | 2 +-
12269 1 file changed, 1 insertion(+), 1 deletion(-)
12270 Merging rtc/rtc-next (c794f92f7802 rtc: rtc-s3c: Set year, month, day value for setting alarm)
12271 $ git merge rtc/rtc-next
12272 Auto-merging drivers/rtc/rtc-ds1390.c
12273 Auto-merging drivers/rtc/rtc-ds1343.c
12274 Merge made by the 'recursive' strategy.
12275 .../devicetree/bindings/rtc/dallas,ds1390.txt | 18 +++
12276 Documentation/devicetree/bindings/rtc/pcf8563.txt | 25 +++
12277 drivers/rtc/Kconfig | 4 +-
12278 drivers/rtc/rtc-ab8500.c | 6 +-
12279 drivers/rtc/rtc-at91rm9200.c | 2 +
12280 drivers/rtc/rtc-da9063.c | 18 +--
12281 drivers/rtc/rtc-davinci.c | 1 -
12282 drivers/rtc/rtc-ds1307.c | 4 +-
12283 drivers/rtc/rtc-ds1343.c | 9 +-
12284 drivers/rtc/rtc-ds1390.c | 65 +++++++-
12285 drivers/rtc/rtc-isl12057.c | 10 +-
12286 drivers/rtc/rtc-isl1208.c | 2 +-
12287 drivers/rtc/rtc-opal.c | 9 +-
12288 drivers/rtc/rtc-pcf2127.c | 47 +++---
12289 drivers/rtc/rtc-pcf85063.c | 8 +-
12290 drivers/rtc/rtc-pcf8563.c | 170 ++++++++++++++++++++-
12291 drivers/rtc/rtc-pl031.c | 13 +-
12292 drivers/rtc/rtc-rx8025.c | 4 +-
12293 drivers/rtc/rtc-s3c.c | 16 ++
12294 drivers/rtc/rtc-stmp3xxx.c | 27 ++--
12295 tools/testing/selftests/timers/rtctest.c | 2 +-
12296 21 files changed, 377 insertions(+), 83 deletions(-)
12297 create mode 100644 Documentation/devicetree/bindings/rtc/dallas,ds1390.txt
12298 create mode 100644 Documentation/devicetree/bindings/rtc/pcf8563.txt
12299 Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
12300 $ git merge hwspinlock/for-next
12301 Already up-to-date.
12302 Merging nvdimm/libnvdimm-for-next (538ea4aa4473 pmem, memremap: convert to numa aware allocations)
12303 $ git merge nvdimm/libnvdimm-for-next
12304 Auto-merging arch/x86/mm/init_64.c
12305 Auto-merging arch/x86/mm/init.c
12306 Merge made by the 'recursive' strategy.
12307 arch/x86/mm/init.c | 4 ++--
12308 arch/x86/mm/init_64.c | 4 ++--
12309 drivers/base/devres.c | 19 ++++++++++---------
12310 drivers/nvdimm/pmem.c | 28 +++++++++++++---------------
12311 include/linux/device.h | 16 ++++++++++++----
12312 include/linux/pmem.h | 26 +-------------------------
12313 kernel/memremap.c | 16 ++++++++--------
12314 7 files changed, 48 insertions(+), 65 deletions(-)
12315 Merging akpm-current/current (f1e1fabe6b48 ipc/msg.c: use freezable blocking call)
12316 $ git merge --no-ff akpm-current/current
12317 Resolved 'arch/arc/mm/cache.c' using previous resolution.
12318 Resolved 'arch/s390/include/asm/pgtable.h' using previous resolution.
12319 Resolved 'block/blk-mq.c' using previous resolution.
12320 Resolved 'drivers/usb/host/u132-hcd.c' using previous resolution.
12321 Resolved 'fs/9p/vfs_file.c' using previous resolution.
12322 Resolved 'fs/proc/task_mmu.c' using previous resolution.
12323 Resolved 'mm/failslab.c' using previous resolution.
12324 Resolved 'mm/huge_memory.c' using previous resolution.
12325 Resolved 'mm/page_alloc.c' using previous resolution.
12326 Resolved 'mm/pgtable-generic.c' using previous resolution.
12327 Auto-merging tools/testing/selftests/Makefile
12328 Auto-merging net/rxrpc/ar-connection.c
12329 Auto-merging net/rds/ib_recv.c
12330 Auto-merging net/openvswitch/flow.c
12331 Auto-merging net/netlink/af_netlink.c
12332 Auto-merging net/core/sock.c
12333 Auto-merging mm/vmscan.c
12334 Auto-merging mm/pgtable-generic.c
12335 CONFLICT (content): Merge conflict in mm/pgtable-generic.c
12336 Auto-merging mm/page_alloc.c
12337 CONFLICT (content): Merge conflict in mm/page_alloc.c
12338 Auto-merging mm/memory_hotplug.c
12339 Auto-merging mm/memcontrol.c
12340 Auto-merging mm/huge_memory.c
12341 CONFLICT (content): Merge conflict in mm/huge_memory.c
12342 Auto-merging mm/filemap.c
12343 Auto-merging mm/failslab.c
12344 CONFLICT (content): Merge conflict in mm/failslab.c
12345 Auto-merging mm/cma.c
12346 Auto-merging mm/backing-dev.c
12347 Auto-merging lib/kobject.c
12348 Auto-merging lib/dma-debug.c
12349 Auto-merging lib/Makefile
12350 Auto-merging lib/Kconfig.debug
12351 Auto-merging kernel/sysctl.c
12352 Auto-merging kernel/params.c
12353 Auto-merging kernel/kexec_core.c
12354 Auto-merging kernel/futex.c
12355 Auto-merging kernel/fork.c
12356 Auto-merging kernel/cpuset.c
12357 Auto-merging kernel/cgroup.c
12358 Auto-merging kernel/audit.c
12359 Auto-merging include/net/sock.h
12360 Auto-merging include/linux/skbuff.h
12361 Auto-merging include/linux/sched.h
12362 Auto-merging include/linux/memcontrol.h
12363 Auto-merging include/linux/hugetlb_cgroup.h
12364 Auto-merging include/linux/fs.h
12365 Auto-merging include/linux/compiler.h
12366 Auto-merging include/linux/compiler-gcc.h
12367 Auto-merging include/drm/drmP.h
12368 Auto-merging include/asm-generic/pgtable.h
12369 Auto-merging fs/xfs/xfs_qm.c
12370 Auto-merging fs/proc/task_mmu.c
12371 CONFLICT (content): Merge conflict in fs/proc/task_mmu.c
12372 Auto-merging fs/proc/array.c
12373 Auto-merging fs/ocfs2/dlm/dlmrecovery.c
12374 Auto-merging fs/ocfs2/cluster/heartbeat.c
12375 Auto-merging fs/nfs/file.c
12376 Auto-merging fs/namei.c
12377 Auto-merging fs/mpage.c
12378 Auto-merging fs/jffs2/wbuf.c
12379 Auto-merging fs/fs-writeback.c
12380 Auto-merging fs/ext4/super.c
12381 Auto-merging fs/ext4/readpage.c
12382 Auto-merging fs/ext4/inode.c
12383 Auto-merging fs/direct-io.c
12384 Auto-merging fs/coredump.c
12385 Auto-merging fs/cifs/file.c
12386 Auto-merging fs/9p/vfs_file.c
12387 CONFLICT (content): Merge conflict in fs/9p/vfs_file.c
12388 Auto-merging drivers/usb/host/u132-hcd.c
12389 CONFLICT (content): Merge conflict in drivers/usb/host/u132-hcd.c
12390 Auto-merging drivers/usb/gadget/function/f_mass_storage.c
12391 Auto-merging drivers/staging/rdma/ipath/ipath_file_ops.c
12392 Auto-merging drivers/staging/rdma/hfi1/init.c
12393 Auto-merging drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
12394 Auto-merging drivers/staging/android/ion/ion_system_heap.c
12395 Auto-merging drivers/nvme/host/pci.c
12396 Auto-merging drivers/mtd/mtdcore.c
12397 Auto-merging drivers/misc/vmw_balloon.c
12398 Auto-merging drivers/media/pci/tw68/tw68-video.c
12399 Auto-merging drivers/media/pci/solo6x10/solo6x10-v4l2.c
12400 Auto-merging drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
12401 Auto-merging drivers/md/dm-crypt.c
12402 Auto-merging drivers/iommu/intel-iommu.c
12403 Auto-merging drivers/iommu/amd_iommu.c
12404 Auto-merging drivers/infiniband/core/sa_query.c
12405 Auto-merging drivers/gpu/drm/i915/i915_gem.c
12406 Auto-merging drivers/gpu/drm/drm_gem.c
12407 Auto-merging drivers/block/pktcdvd.c
12408 Auto-merging drivers/block/nbd.c
12409 Auto-merging drivers/block/drbd/drbd_bitmap.c
12410 Auto-merging block/genhd.c
12411 Auto-merging block/blk-mq.c
12412 CONFLICT (content): Merge conflict in block/blk-mq.c
12413 Auto-merging block/blk-mq-tag.c
12414 Auto-merging block/blk-core.c
12415 Auto-merging arch/x86/mm/gup.c
12416 Auto-merging arch/x86/kernel/smpboot.c
12417 Auto-merging arch/x86/kernel/pci-dma.c
12418 Auto-merging arch/x86/kernel/acpi/boot.c
12419 Auto-merging arch/x86/include/asm/pgtable_types.h
12420 Auto-merging arch/x86/include/asm/pgtable.h
12421 Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
12422 Auto-merging arch/x86/Kconfig
12423 Auto-merging arch/s390/include/asm/pgtable.h
12424 CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h
12425 Auto-merging arch/powerpc/sysdev/fsl_pci.c
12426 Auto-merging arch/powerpc/mm/numa.c
12427 Auto-merging arch/powerpc/mm/hugetlbpage.c
12428 Auto-merging arch/powerpc/include/asm/pgtable-ppc64.h
12429 Auto-merging arch/mips/mm/tlbex.c
12430 Auto-merging arch/arm64/mm/dma-mapping.c
12431 Auto-merging arch/arm64/include/asm/pgtable.h
12432 Auto-merging arch/arm/xen/mm.c
12433 Auto-merging arch/arm/mm/dma-mapping.c
12434 Auto-merging arch/arc/mm/cache.c
12435 CONFLICT (content): Merge conflict in arch/arc/mm/cache.c
12436 Auto-merging MAINTAINERS
12437 Auto-merging Documentation/kernel-parameters.txt
12438 Auto-merging Documentation/filesystems/proc.txt
12439 Removing Documentation/features/vm/pmdp_splitting_flush/arch-support.txt
12440 Automatic merge failed; fix conflicts and then commit the result.
12442 [master 3bca89f98866] Merge branch 'akpm-current/current'
12443 $ git diff -M --stat --summary HEAD^..
12444 .../vm/pmdp_splitting_flush/arch-support.txt | 40 -
12445 Documentation/filesystems/proc.txt | 11 +-
12446 Documentation/filesystems/vfat.txt | 10 +
12447 Documentation/kasan.txt | 46 +-
12448 Documentation/kernel-parameters.txt | 5 +
12449 Documentation/lockup-watchdogs.txt | 5 +-
12450 Documentation/printk-formats.txt | 29 +
12451 Documentation/sysctl/kernel.txt | 12 +
12452 Documentation/vm/balance | 14 +-
12453 Documentation/vm/page_migration | 27 +-
12454 Documentation/vm/split_page_table_lock | 4 +-
12455 Documentation/vm/transhuge.txt | 161 ++-
12456 Documentation/vm/unevictable-lru.txt | 120 +-
12458 arch/alpha/include/uapi/asm/mman.h | 4 +
12459 arch/arc/mm/cache.c | 4 +-
12460 arch/arm/include/asm/pgtable-3level.h | 10 +-
12461 arch/arm/lib/uaccess_with_memcpy.c | 5 +-
12462 arch/arm/mm/alignment.c | 2 +-
12463 arch/arm/mm/dma-mapping.c | 6 +-
12464 arch/arm/mm/flush.c | 17 +-
12465 arch/arm/xen/mm.c | 2 +-
12466 arch/arm64/include/asm/pgtable.h | 10 +-
12467 arch/arm64/mm/dma-mapping.c | 4 +-
12468 arch/arm64/mm/flush.c | 16 -
12469 arch/mips/include/asm/pgtable-bits.h | 10 +-
12470 arch/mips/include/asm/pgtable.h | 18 -
12471 arch/mips/include/uapi/asm/mman.h | 7 +
12472 arch/mips/mm/c-r4k.c | 3 +-
12473 arch/mips/mm/cache.c | 2 +-
12474 arch/mips/mm/gup.c | 17 +-
12475 arch/mips/mm/init.c | 6 +-
12476 arch/mips/mm/pgtable-64.c | 14 -
12477 arch/mips/mm/tlbex.c | 1 -
12478 arch/parisc/include/uapi/asm/mman.h | 4 +
12479 arch/powerpc/include/asm/pgtable-ppc64.h | 29 +-
12480 arch/powerpc/include/uapi/asm/mman.h | 1 +
12481 arch/powerpc/mm/hugepage-hash64.c | 3 -
12482 arch/powerpc/mm/hugetlbpage.c | 17 +-
12483 arch/powerpc/mm/numa.c | 2 +-
12484 arch/powerpc/mm/pgtable_64.c | 49 -
12485 arch/powerpc/mm/subpage-prot.c | 2 +-
12486 arch/powerpc/sysdev/fsl_pci.c | 2 +-
12487 arch/s390/include/asm/pgtable.h | 16 +-
12488 arch/s390/mm/gup.c | 24 +-
12489 arch/s390/mm/pgtable.c | 16 -
12490 arch/sh/kernel/cpu/sh5/unwind.c | 2 +-
12491 arch/sh/kernel/traps_64.c | 2 +-
12492 arch/sh/mm/cache-sh4.c | 2 +-
12493 arch/sh/mm/cache.c | 8 +-
12494 arch/sparc/include/asm/pgtable_64.h | 19 +-
12495 arch/sparc/include/uapi/asm/mman.h | 1 +
12496 arch/sparc/mm/fault_64.c | 3 -
12497 arch/sparc/mm/gup.c | 16 +-
12498 arch/tile/include/asm/pgtable.h | 10 -
12499 arch/tile/include/uapi/asm/mman.h | 1 +
12500 arch/x86/Kconfig | 3 +
12501 arch/x86/boot/Makefile | 4 +-
12502 arch/x86/entry/syscalls/syscall_32.tbl | 1 +
12503 arch/x86/entry/syscalls/syscall_64.tbl | 1 +
12504 arch/x86/include/asm/pgtable.h | 14 +-
12505 arch/x86/include/asm/pgtable_types.h | 2 -
12506 arch/x86/kernel/acpi/boot.c | 9 +-
12507 arch/x86/kernel/cpu/perf_event_msr.c | 7 +-
12508 arch/x86/kernel/machine_kexec_64.c | 1 +
12509 arch/x86/kernel/pci-dma.c | 2 +-
12510 arch/x86/kernel/smpboot.c | 2 +
12511 arch/x86/kernel/vm86_32.c | 6 +-
12512 arch/x86/mm/gup.c | 17 +-
12513 arch/x86/mm/kasan_init_64.c | 2 +-
12514 arch/x86/mm/numa.c | 59 +-
12515 arch/x86/mm/pgtable.c | 14 -
12516 arch/xtensa/configs/iss_defconfig | 1 -
12517 arch/xtensa/include/uapi/asm/mman.h | 7 +
12518 arch/xtensa/mm/tlb.c | 2 +-
12519 block/bio.c | 26 +-
12520 block/blk-core.c | 16 +-
12521 block/blk-ioc.c | 2 +-
12522 block/blk-mq-tag.c | 2 +-
12523 block/blk-mq.c | 6 +-
12524 block/genhd.c | 2 +-
12525 block/ioprio.c | 6 +-
12526 block/scsi_ioctl.c | 6 +-
12527 drivers/block/drbd/drbd_bitmap.c | 2 +-
12528 drivers/block/drbd/drbd_receiver.c | 3 +-
12529 drivers/block/mtip32xx/mtip32xx.c | 2 +-
12530 drivers/block/nbd.c | 9 +-
12531 drivers/block/osdblk.c | 2 +-
12532 drivers/block/paride/pd.c | 2 +-
12533 drivers/block/pktcdvd.c | 4 +-
12534 drivers/block/zram/zram_drv.c | 28 +-
12535 drivers/connector/connector.c | 3 +-
12536 drivers/firewire/core-cdev.c | 2 +-
12537 drivers/gpu/drm/drm_gem.c | 2 +-
12538 drivers/gpu/drm/drm_lock.c | 41 -
12539 drivers/gpu/drm/i915/i915_gem.c | 5 +-
12540 drivers/ide/ide-atapi.c | 2 +-
12541 drivers/ide/ide-cd.c | 2 +-
12542 drivers/ide/ide-cd_ioctl.c | 2 +-
12543 drivers/ide/ide-devsets.c | 2 +-
12544 drivers/ide/ide-disk.c | 2 +-
12545 drivers/ide/ide-ioctls.c | 4 +-
12546 drivers/ide/ide-park.c | 2 +-
12547 drivers/ide/ide-pm.c | 4 +-
12548 drivers/ide/ide-tape.c | 4 +-
12549 drivers/ide/ide-taskfile.c | 4 +-
12550 drivers/infiniband/core/sa_query.c | 2 +-
12551 drivers/infiniband/hw/qib/qib_init.c | 2 +-
12552 drivers/iommu/amd_iommu.c | 2 +-
12553 drivers/iommu/intel-iommu.c | 2 +-
12554 drivers/md/dm-crypt.c | 6 +-
12555 drivers/md/dm-kcopyd.c | 2 +-
12556 drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +-
12557 drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +-
12558 drivers/media/pci/tw68/tw68-video.c | 2 +-
12559 drivers/misc/sgi-xp/xpc_uv.c | 2 +-
12560 drivers/misc/vmw_balloon.c | 2 +-
12561 drivers/mtd/mtdcore.c | 3 +-
12562 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +-
12563 drivers/nvme/host/pci.c | 4 +-
12564 drivers/scsi/scsi_error.c | 2 +-
12565 drivers/scsi/scsi_lib.c | 4 +-
12566 drivers/staging/android/ion/ion_system_heap.c | 2 +-
12567 .../lustre/include/linux/libcfs/libcfs_private.h | 2 +-
12568 drivers/staging/rdma/hfi1/init.c | 2 +-
12569 drivers/staging/rdma/ipath/ipath_file_ops.c | 2 +-
12570 drivers/usb/gadget/function/f_mass_storage.c | 4 +-
12571 drivers/usb/host/u132-hcd.c | 2 +-
12572 drivers/video/fbdev/vermilion/vermilion.c | 2 +-
12573 fs/9p/vfs_file.c | 3 +-
12574 fs/btrfs/compression.c | 7 +-
12575 fs/btrfs/ctree.h | 2 +-
12576 fs/btrfs/disk-io.c | 2 +-
12577 fs/btrfs/extent_io.c | 14 +-
12578 fs/btrfs/free-space-cache.c | 4 +-
12579 fs/btrfs/volumes.c | 4 +-
12581 fs/cachefiles/internal.h | 2 +-
12582 fs/ceph/addr.c | 7 +-
12583 fs/cifs/file.c | 10 +-
12584 fs/coredump.c | 35 +-
12585 fs/direct-io.c | 2 +-
12586 fs/ext4/fsync.c | 5 +-
12587 fs/ext4/inode.c | 2 +-
12588 fs/ext4/readpage.c | 2 +-
12589 fs/ext4/super.c | 2 +-
12590 fs/fat/cache.c | 79 +-
12591 fs/fat/dir.c | 2 +-
12592 fs/fat/fat.h | 6 +-
12593 fs/fat/file.c | 61 +
12594 fs/fat/inode.c | 75 +-
12595 fs/fs-writeback.c | 7 +-
12596 fs/fscache/cookie.c | 2 +-
12597 fs/fscache/page.c | 6 +-
12598 fs/hugetlbfs/inode.c | 155 ++-
12599 fs/jbd2/transaction.c | 4 +-
12600 fs/jffs2/background.c | 7 +-
12601 fs/jffs2/wbuf.c | 2 +-
12602 fs/logfs/dev_bdev.c | 4 +-
12603 fs/logfs/segment.c | 2 +-
12606 fs/nfs/file.c | 6 +-
12607 fs/nilfs2/alloc.c | 308 +++--
12608 fs/nilfs2/alloc.h | 1 +
12609 fs/nilfs2/btree.c | 7 +-
12610 fs/nilfs2/dat.c | 2 -
12611 fs/nilfs2/inode.c | 4 +-
12612 fs/nilfs2/mdt.c | 6 +
12613 fs/nilfs2/mdt.h | 2 +-
12614 fs/nilfs2/recovery.c | 4 +-
12615 fs/nilfs2/segment.c | 107 +-
12616 fs/nilfs2/segment.h | 3 +-
12617 fs/nilfs2/sufile.c | 11 +-
12618 fs/nilfs2/super.c | 17 +-
12619 fs/notify/fdinfo.c | 9 +-
12620 fs/notify/inotify/inotify_user.c | 14 +-
12621 fs/ntfs/file.c | 4 +-
12622 fs/ocfs2/alloc.c | 105 +-
12623 fs/ocfs2/aops.c | 1118 ++++++++--------
12624 fs/ocfs2/aops.h | 11 +-
12625 fs/ocfs2/cluster/heartbeat.c | 19 +-
12626 fs/ocfs2/dlm/dlmconvert.c | 24 +-
12627 fs/ocfs2/dlm/dlmrecovery.c | 1 -
12628 fs/ocfs2/file.c | 138 +-
12629 fs/ocfs2/inode.c | 3 +
12630 fs/ocfs2/inode.h | 5 +
12631 fs/ocfs2/journal.c | 109 +-
12632 fs/ocfs2/localalloc.c | 4 +-
12633 fs/ocfs2/mmap.c | 4 +-
12634 fs/ocfs2/namei.c | 13 +-
12635 fs/ocfs2/namei.h | 3 +
12636 fs/ocfs2/ocfs2.h | 8 +
12637 fs/ocfs2/ocfs2_trace.h | 16 +-
12638 fs/ocfs2/quota_global.c | 2 +-
12639 fs/ocfs2/resize.c | 2 +-
12640 fs/ocfs2/suballoc.c | 5 +-
12641 fs/ocfs2/super.c | 38 +-
12642 fs/ocfs2/super.h | 2 -
12643 fs/proc/array.c | 10 +-
12644 fs/proc/page.c | 4 +-
12645 fs/proc/task_mmu.c | 115 +-
12646 fs/seq_file.c | 51 +-
12649 fs/xfs/xfs_qm.c | 2 +-
12650 include/asm-generic/dma-mapping-common.h | 2 +-
12651 include/asm-generic/pgtable.h | 9 -
12652 include/drm/drmP.h | 1 -
12653 include/linux/bitops.h | 13 +
12654 include/linux/compaction.h | 3 +-
12655 include/linux/compiler-gcc.h | 22 +-
12656 include/linux/compiler.h | 8 +
12657 include/linux/cpuset.h | 10 +-
12658 include/linux/crc64_ecma.h | 56 +
12659 include/linux/dma-debug.h | 6 +-
12660 include/linux/dma-mapping.h | 18 +-
12661 include/linux/fs.h | 1 +
12662 include/linux/gfp.h | 287 ++--
12663 include/linux/huge_mm.h | 60 +-
12664 include/linux/hugetlb.h | 29 +
12665 include/linux/hugetlb_cgroup.h | 4 +-
12666 include/linux/kernel.h | 2 +
12667 include/linux/kexec.h | 2 +
12668 include/linux/memblock.h | 4 -
12669 include/linux/memcontrol.h | 163 +--
12670 include/linux/mm.h | 207 ++-
12671 include/linux/mm_types.h | 63 +-
12672 include/linux/mmdebug.h | 6 +
12673 include/linux/mmzone.h | 104 +-
12674 include/linux/moduleparam.h | 1 +
12675 include/linux/nmi.h | 1 +
12676 include/linux/page-flags.h | 343 ++---
12677 include/linux/pageblock-flags.h | 2 +-
12678 include/linux/pagemap.h | 45 +-
12679 include/linux/poison.h | 9 +-
12680 include/linux/rbtree.h | 12 +-
12681 include/linux/rmap.h | 17 +-
12682 include/linux/sched.h | 45 +-
12683 include/linux/skbuff.h | 6 +-
12684 include/linux/slab.h | 45 +-
12685 include/linux/string.h | 1 +
12686 include/linux/swap.h | 6 +-
12687 include/linux/syscalls.h | 2 +
12688 include/linux/tracehook.h | 3 +
12689 include/linux/types.h | 16 +-
12690 include/linux/uaccess.h | 40 +-
12691 include/linux/vm_event_item.h | 9 +-
12692 include/linux/vmstat.h | 24 +-
12693 include/linux/zpool.h | 8 +-
12694 include/linux/zsmalloc.h | 2 +-
12695 include/linux/zutil.h | 4 +-
12696 include/net/sock.h | 2 +-
12697 include/trace/events/compaction.h | 72 +-
12698 include/trace/events/gfpflags.h | 5 +-
12699 include/trace/events/huge_memory.h | 166 +++
12700 include/trace/events/nilfs2.h | 224 ++++
12701 include/uapi/asm-generic/mman-common.h | 6 +
12702 include/uapi/asm-generic/mman.h | 1 +
12703 include/uapi/asm-generic/unistd.h | 4 +-
12705 ipc/msgutil.c | 1 -
12706 kernel/audit.c | 6 +-
12707 kernel/cgroup.c | 2 +-
12708 kernel/cpuset.c | 14 +-
12709 kernel/events/uprobes.c | 11 +-
12710 kernel/fork.c | 3 +-
12711 kernel/futex.c | 61 +-
12712 kernel/kexec.c | 2 +
12713 kernel/kexec_core.c | 4 +-
12714 kernel/kexec_file.c | 2 +
12715 kernel/locking/lockdep.c | 2 +-
12716 kernel/panic.c | 10 +
12717 kernel/params.c | 3 +-
12718 kernel/power/snapshot.c | 2 +-
12719 kernel/power/swap.c | 16 +-
12720 kernel/profile.c | 2 +-
12721 kernel/signal.c | 53 +-
12722 kernel/smp.c | 2 +-
12723 kernel/sys.c | 4 +-
12724 kernel/sys_ni.c | 1 +
12725 kernel/sysctl.c | 20 +
12726 kernel/watchdog.c | 101 +-
12728 lib/Kconfig.debug | 21 +
12729 lib/Kconfig.kasan | 3 +-
12731 lib/crc64_ecma.c | 341 +++++
12732 lib/dma-debug.c | 14 +-
12733 lib/dynamic_debug.c | 8 +-
12734 lib/halfmd4.c | 3 +-
12736 lib/is_single_threaded.c | 5 +-
12737 lib/kasprintf.c | 16 +
12738 lib/kobject.c | 30 +-
12740 lib/percpu_ida.c | 2 +-
12741 lib/radix-tree.c | 10 +-
12742 lib/test-string_helpers.c | 36 +
12743 lib/test_kasan.c | 69 +
12744 lib/test_printf.c | 362 +++++
12745 lib/vsprintf.c | 80 +-
12747 mm/backing-dev.c | 2 +-
12748 mm/balloon_compaction.c | 10 +-
12750 mm/compaction.c | 46 +-
12752 mm/dmapool.c | 2 +-
12753 mm/early_ioremap.c | 6 +-
12754 mm/failslab.c | 8 +-
12755 mm/filemap.c | 108 +-
12756 mm/frame_vector.c | 2 +-
12758 mm/huge_memory.c | 1412 ++++++++++++--------
12759 mm/hugetlb.c | 220 ++-
12760 mm/hugetlb_cgroup.c | 2 +-
12761 mm/internal.h | 107 +-
12762 mm/kasan/kasan.c | 38 +-
12763 mm/kasan/kasan.h | 5 +-
12764 mm/kasan/report.c | 113 +-
12765 mm/kmemleak.c | 2 +-
12767 mm/list_lru.c | 44 +-
12768 mm/maccess.c | 7 +-
12769 mm/madvise.c | 173 +++
12770 mm/memblock.c | 2 +-
12771 mm/memcontrol.c | 371 ++---
12772 mm/memory-failure.c | 51 +-
12773 mm/memory.c | 77 +-
12774 mm/memory_hotplug.c | 4 +-
12775 mm/mempolicy.c | 40 +-
12776 mm/mempool.c | 10 +-
12777 mm/migrate.c | 272 ++--
12778 mm/mincore.c | 4 +-
12779 mm/mlock.c | 112 +-
12781 mm/mprotect.c | 2 +-
12782 mm/mremap.c | 27 +-
12785 mm/oom_kill.c | 76 +-
12786 mm/page_alloc.c | 786 +++++------
12787 mm/page_idle.c | 3 +-
12788 mm/pagewalk.c | 2 +-
12789 mm/percpu.c | 10 +-
12790 mm/pgtable-generic.c | 12 -
12791 mm/readahead.c | 18 +-
12792 mm/rmap.c | 279 ++--
12796 mm/slab_common.c | 142 +-
12797 mm/slub.c | 304 +++--
12798 mm/swap.c | 318 +----
12799 mm/swap_state.c | 9 +-
12800 mm/swapfile.c | 16 +-
12801 mm/userfaultfd.c | 8 +-
12803 mm/vmacache.c | 2 +-
12804 mm/vmalloc.c | 16 +-
12805 mm/vmpressure.c | 2 +-
12806 mm/vmscan.c | 50 +-
12807 mm/vmstat.c | 29 +-
12810 mm/zsmalloc.c | 49 +-
12812 net/core/skbuff.c | 8 +-
12813 net/core/sock.c | 6 +-
12814 net/netlink/af_netlink.c | 2 +-
12815 net/openvswitch/flow.c | 2 +-
12816 net/rds/ib_recv.c | 4 +-
12817 net/rxrpc/ar-connection.c | 2 +-
12818 net/sctp/associola.c | 2 +-
12819 scripts/checkpatch.pl | 51 +-
12820 security/integrity/ima/ima_crypto.c | 2 +-
12821 tools/testing/selftests/Makefile | 1 +
12822 tools/testing/selftests/lib/Makefile | 8 +
12823 tools/testing/selftests/lib/printf.sh | 10 +
12824 tools/testing/selftests/vm/Makefile | 2 +
12825 tools/testing/selftests/vm/mlock2-tests.c | 737 ++++++++++
12826 tools/testing/selftests/vm/on-fault-limit.c | 47 +
12827 tools/testing/selftests/vm/run_vmtests | 22 +
12828 tools/vm/slabinfo-gnuplot.sh | 275 ++++
12829 tools/vm/slabinfo.c | 255 ++--
12830 386 files changed, 9377 insertions(+), 5894 deletions(-)
12831 delete mode 100644 Documentation/features/vm/pmdp_splitting_flush/arch-support.txt
12832 create mode 100644 include/linux/crc64_ecma.h
12833 create mode 100644 include/trace/events/huge_memory.h
12834 create mode 100644 include/trace/events/nilfs2.h
12835 create mode 100644 lib/crc64_ecma.c
12836 create mode 100644 lib/test_printf.c
12837 create mode 100644 tools/testing/selftests/lib/Makefile
12838 create mode 100644 tools/testing/selftests/lib/printf.sh
12839 create mode 100644 tools/testing/selftests/vm/mlock2-tests.c
12840 create mode 100644 tools/testing/selftests/vm/on-fault-limit.c
12841 create mode 100644 tools/vm/slabinfo-gnuplot.sh
12842 $ git am -3 ../patches/mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix.patch
12843 Applying: mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix
12845 Unstaged changes after reset:
12846 M arch/arm64/mm/dma-mapping.c
12848 $ git commit -v -a --amend
12849 [master 2e247d244282] Merge branch 'akpm-current/current'
12850 Date: Mon Nov 2 14:45:18 2015 +1100
12851 $ git am -3 ../patches/mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix-fix.patch
12852 Applying: mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix-fix
12854 Unstaged changes after reset:
12855 M arch/arm64/mm/dma-mapping.c
12857 $ git commit -v -a --amend
12858 [master 1a580094ce76] Merge branch 'akpm-current/current'
12859 Date: Mon Nov 2 14:45:18 2015 +1100
12860 $ git am -3 ../patches/0001-block-fixes-for-__GPF_WAIT-changes.patch
12861 Applying: block: fixes for __GPF_WAIT changes
12863 Unstaged changes after reset:
12866 $ git commit -v -a --amend
12867 [master 72ccfdcde2e6] Merge branch 'akpm-current/current'
12868 Date: Mon Nov 2 14:45:18 2015 +1100
12869 $ git am -3 ../patches/0001-ndb-fix-up-for-dequeue_signal_lock-API-change.patch
12870 Applying: ndb: fix up for dequeue_signal_lock API change
12872 Unstaged changes after reset:
12873 M drivers/block/nbd.c
12875 $ git commit -v -a --amend
12876 [master 2727c56c12b1] Merge branch 'akpm-current/current'
12877 Date: Mon Nov 2 14:45:18 2015 +1100
12878 $ git clone -s -l -n -q . ../rebase-tmp
12880 $ git checkout -b akpm remotes/origin/akpm/master
12881 Switched to a new branch 'akpm'
12882 $ git rebase --onto master remotes/origin/akpm/master-base
12883 First, rewinding head to replay your work on top of it...
12884 Applying: net/ipv4/route.c: prevent oops
12885 Applying: mips: add entry for new mlock2 syscall
12886 Applying: sparc/sparc64: allocate sys_membarrier system call number
12887 Applying: kernel.h: make abs() work with 64-bit types
12888 Applying: Remove abs64()
12889 Applying: remove-abs64-fix
12890 Applying: remove-abs64-fix-fix
12891 Applying: Documentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory
12892 Applying: pcnet32: use pci_set_dma_mask insted of pci_dma_supported
12893 Applying: tw68-core: use pci_set_dma_mask insted of pci_dma_supported
12894 Applying: saa7164: use pci_set_dma_mask insted of pci_dma_supported
12895 Applying: saa7134: use pci_set_dma_mask insted of pci_dma_supported
12896 Applying: cx88: use pci_set_dma_mask insted of pci_dma_supported
12897 Applying: cx25821: use pci_set_dma_mask insted of pci_dma_supported
12898 Applying: cx23885: use pci_set_dma_mask insted of pci_dma_supported
12899 Applying: netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported
12900 Applying: nouveau: don't call pci_dma_supported
12901 Applying: sfc: don't call dma_supported
12902 Applying: kaweth: remove ifdefed out call to dma_supported
12903 Applying: usbnet: remove ifdefed out call to dma_supported
12904 Applying: pci: remove pci_dma_supported
12905 Applying: dma: remove external references to dma_supported
12906 Applying: drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS
12907 Applying: kmap_atomic_to_page() has no users, remove it
12908 Applying: include/linux/kdev_t.h: remove unused huge_valid_dev()
12909 Applying: include/linux/kdev_t.h: old/new_valid_dev() can return bool
12910 Applying: fs/9p: remove unnecessary new_valid_dev() checks
12911 Applying: fs/btrfs/inode.c: remove unnecessary new_valid_dev() check
12912 Applying: fs/exofs/namei.c: remove unnecessary new_valid_dev() check
12913 Applying: fs/ext2/namei.c: remove unnecessary new_valid_dev() check
12914 Applying: fs/ext4/namei.c: remove unnecessary new_valid_dev() check
12915 Applying: fs/f2fs/namei.c: remove unnecessary new_valid_dev() check
12916 Applying: fs/hpfs/namei.c: remove unnecessary new_valid_dev() check
12917 Applying: fs/jfs: remove unnecessary new_valid_dev() checks
12918 Applying: fs/ncpfs/dir.c: remove unnecessary new_valid_dev() check
12919 Applying: fs/nfs/dir.c: remove unnecessary new_valid_dev() check
12920 Applying: fs/nilfs2/namei.c: remove unnecessary new_valid_dev() check
12921 Applying: fs/reiserfs/namei.c: remove unnecessary new_valid_dev() check
12922 Applying: fs/stat.c: remove unnecessary new_valid_dev() check
12923 Applying: fs/ubifs/: remove unnecessary new_valid_dev() checks
12924 Applying: fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries
12926 $ git fetch -f ../rebase-tmp akpm:akpm/master
12928 + fb3e4d832b0c...481e86742ee1 akpm -> akpm/master (forced update)
12929 $ rm -rf ../rebase-tmp
12930 Merging akpm/master (481e86742ee1 fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries)
12931 $ git merge --no-ff akpm/master
12932 Merge made by the 'recursive' strategy.
12933 Documentation/DMA-API.txt | 13 ------
12934 Documentation/sysctl/vm.txt | 2 +-
12935 arch/arm/include/asm/highmem.h | 1 -
12936 arch/arm/mm/highmem.c | 10 -----
12937 arch/frv/include/asm/highmem.h | 2 -
12938 arch/frv/mm/highmem.c | 5 ---
12939 arch/metag/include/asm/highmem.h | 1 -
12940 arch/metag/mm/highmem.c | 14 -------
12941 arch/microblaze/include/asm/highmem.h | 13 ------
12942 arch/mips/include/asm/highmem.h | 1 -
12943 arch/mips/include/uapi/asm/unistd.h | 15 ++++---
12944 arch/mips/kernel/scall32-o32.S | 1 +
12945 arch/mips/kernel/scall64-64.S | 1 +
12946 arch/mips/kernel/scall64-n32.S | 1 +
12947 arch/mips/kernel/scall64-o32.S | 1 +
12948 arch/mips/mm/highmem.c | 13 ------
12949 arch/parisc/include/asm/cacheflush.h | 1 -
12950 arch/powerpc/include/asm/highmem.h | 13 ------
12951 arch/sparc/include/uapi/asm/unistd.h | 3 +-
12952 arch/sparc/kernel/systbls_32.S | 2 +-
12953 arch/sparc/kernel/systbls_64.S | 4 +-
12954 arch/tile/include/asm/highmem.h | 1 -
12955 arch/tile/mm/highmem.c | 12 ------
12956 arch/x86/include/asm/highmem.h | 1 -
12957 arch/x86/mm/highmem_32.c | 14 -------
12958 drivers/gpu/drm/nouveau/nouveau_ttm.c | 7 +++-
12959 drivers/gpu/drm/tegra/sor.c | 4 +-
12960 drivers/input/joystick/walkera0701.c | 4 +-
12961 drivers/media/i2c/ov9650.c | 2 +-
12962 drivers/media/pci/cx23885/cx23885-core.c | 2 +-
12963 drivers/media/pci/cx25821/cx25821-core.c | 2 +-
12964 drivers/media/pci/cx88/cx88-alsa.c | 2 +-
12965 drivers/media/pci/cx88/cx88-mpeg.c | 2 +-
12966 drivers/media/pci/cx88/cx88-video.c | 2 +-
12967 drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +-
12968 drivers/media/pci/saa7134/saa7134-core.c | 2 +-
12969 drivers/media/pci/saa7164/saa7164-core.c | 2 +-
12970 drivers/media/pci/tw68/tw68-core.c | 2 +-
12971 drivers/net/ethernet/amd/pcnet32.c | 2 +-
12972 drivers/net/ethernet/sfc/efx.c | 8 ++--
12973 drivers/net/usb/kaweth.c | 6 ---
12974 drivers/net/usb/usbnet.c | 6 ---
12975 drivers/net/wireless/mac80211_hwsim.c | 2 +-
12976 drivers/parisc/ccio-dma.c | 2 -
12977 drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +-
12978 drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +-
12979 drivers/thermal/power_allocator.c | 2 +-
12980 drivers/usb/host/ehci-hcd.c | 2 +-
12981 drivers/usb/host/fotg210-hcd.c | 2 +-
12982 drivers/usb/host/oxu210hp-hcd.c | 2 +-
12983 fs/9p/vfs_inode.c | 3 --
12984 fs/9p/vfs_inode_dotl.c | 3 --
12985 fs/binfmt_elf_fdpic.c | 46 ++++++++++++++++++----
12986 fs/btrfs/inode.c | 3 --
12987 fs/exofs/namei.c | 3 --
12988 fs/ext2/namei.c | 3 --
12989 fs/ext4/namei.c | 3 --
12990 fs/f2fs/namei.c | 3 --
12991 fs/gfs2/lock_dlm.c | 2 +-
12992 fs/hpfs/namei.c | 2 -
12993 fs/jfs/namei.c | 3 --
12994 fs/jfs/super.c | 3 --
12995 fs/ncpfs/dir.c | 2 -
12996 fs/nfs/dir.c | 3 --
12997 fs/nilfs2/namei.c | 3 --
12998 fs/reiserfs/namei.c | 3 --
13000 fs/ubifs/dir.c | 3 --
13001 fs/ubifs/misc.h | 9 +----
13002 include/asm-generic/pci-dma-compat.h | 6 ---
13003 include/linux/highmem.h | 1 -
13004 include/linux/kdev_t.h | 9 +----
13005 include/linux/kernel.h | 42 ++++++++++----------
13006 kernel/time/clocksource.c | 2 +-
13007 kernel/time/timekeeping.c | 2 +-
13009 net/ipv4/route.c | 2 +
13010 net/sctp/transport.c | 2 +-
13011 78 files changed, 119 insertions(+), 269 deletions(-)
13012 $ git am -3 ../patches/0001-Revert-ext4-fix-abs-usage-in-ext4_mb_check_group_pa.patch
13013 Applying: Revert "ext4: fix abs() usage in ext4_mb_check_group_pa"
13015 Unstaged changes after reset:
13016 M fs/ext4/mballoc.c
13018 $ git commit -v -a --amend
13019 [master 4cb2de2063db] Merge branch 'akpm/master'
13020 Date: Mon Nov 2 14:55:54 2015 +1100