2 Tue, 13 Sep 2016 07:50:24 +1000
5 $ git reset --hard stable
6 HEAD is now at 98ac9a608dc7 Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
7 Merging origin/master (da499f8f5385 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
8 $ git merge origin/master
9 Updating 98ac9a608dc7..da499f8f5385
13 drivers/iio/accel/bmc150-accel-core.c | 11 ++
14 drivers/iio/accel/kxsd9.c | 1 +
15 .../iio/common/hid-sensors/hid-sensor-attributes.c | 4 +-
16 drivers/iio/industrialio-buffer.c | 4 +-
17 drivers/iio/industrialio-core.c | 5 +-
18 drivers/net/bonding/bond_main.c | 7 +-
19 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 19 +-
20 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +-
21 drivers/net/ethernet/broadcom/tg3.c | 11 +-
22 drivers/net/ethernet/cadence/macb.c | 23 +++
23 drivers/net/ethernet/cavium/thunder/nic.h | 1 +
24 drivers/net/ethernet/cavium/thunder/nic_main.c | 11 +-
25 drivers/net/ethernet/cavium/thunder/nicvf_main.c | 20 +-
26 drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 64 ++++++-
27 drivers/net/ethernet/intel/i40e/i40e_main.c | 15 +-
28 drivers/net/ethernet/mediatek/mtk_eth_soc.c | 82 ++++----
29 drivers/net/ethernet/mediatek/mtk_eth_soc.h | 22 ++-
30 drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 57 +++---
31 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 21 +-
32 drivers/net/ethernet/mellanox/mlx4/en_tx.c | 12 +-
33 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 15 +-
34 drivers/net/ethernet/mellanox/mlx4/port.c | 4 +-
35 .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 8 +-
36 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 22 ++-
37 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +-
38 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 28 ++-
39 drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 +
40 .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 160 ++++++++++------
41 .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 28 ++-
42 .../net/ethernet/netronome/nfp/nfp_net_common.c | 5 -
43 .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 1 -
44 .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 7 +-
45 drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 20 +-
46 drivers/net/ethernet/qlogic/qede/qede_main.c | 3 +-
47 drivers/net/ethernet/renesas/sh_eth.c | 7 +
48 drivers/net/ethernet/smsc/smc91x.h | 2 +
49 drivers/net/ethernet/smsc/smsc911x.c | 213 ++++++++++-----------
50 drivers/net/ethernet/synopsys/dwc_eth_qos.c | 38 ++--
51 drivers/net/phy/Kconfig | 1 +
52 drivers/net/vxlan.c | 38 ++--
53 drivers/net/wireless/ath/ath10k/htt_rx.c | 10 +-
54 drivers/net/wireless/ath/ath10k/pci.c | 1 -
55 drivers/net/wireless/ath/ath9k/hw.c | 4 +-
56 drivers/net/wireless/ath/ath9k/main.c | 18 +-
57 .../broadcom/brcm80211/brcmfmac/cfg80211.c | 28 +--
58 .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 +-
59 .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +-
60 .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 8 +-
61 .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 2 +-
62 drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 3 +-
63 drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h | 3 +-
64 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 1 +
65 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +
66 drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 3 +-
67 drivers/nvme/host/Kconfig | 2 +-
68 drivers/usb/chipidea/udc.c | 9 +
69 drivers/usb/dwc3/dwc3-pci.c | 4 +-
70 drivers/usb/dwc3/gadget.c | 5 +-
71 drivers/usb/gadget/function/f_eem.c | 2 +-
72 drivers/usb/gadget/udc/renesas_usb3.c | 2 +
73 drivers/usb/host/xhci-ring.c | 6 +-
74 drivers/usb/phy/phy-generic.c | 8 +-
75 drivers/usb/renesas_usbhs/mod.c | 11 +-
76 include/linux/mlx5/mlx5_ifc.h | 5 +-
77 include/linux/netdevice.h | 1 +
78 include/net/af_unix.h | 2 +-
79 include/net/cfg80211.h | 9 +
80 include/net/ip_fib.h | 3 +-
81 include/net/netfilter/nft_meta.h | 4 +
82 include/net/netfilter/nft_reject.h | 4 +
83 net/bridge/br_input.c | 7 +-
84 net/bridge/br_multicast.c | 2 +-
85 net/bridge/netfilter/ebtables.c | 2 +
86 net/bridge/netfilter/nft_meta_bridge.c | 1 +
87 net/core/dev.c | 16 ++
88 net/core/flow_dissector.c | 6 +-
89 net/ipv4/devinet.c | 11 +-
90 net/ipv4/fib_frontend.c | 3 +-
91 net/ipv4/fib_semantics.c | 8 +-
92 net/ipv4/netfilter/nft_reject_ipv4.c | 1 +
93 net/ipv4/tcp_fastopen.c | 2 +
94 net/ipv4/tcp_yeah.c | 2 +-
95 net/ipv4/xfrm4_policy.c | 2 +-
96 net/ipv6/addrconf.c | 18 +-
97 net/ipv6/ip6_tunnel.c | 2 +
98 net/ipv6/netfilter/nft_reject_ipv6.c | 1 +
99 net/ipv6/ping.c | 9 +-
100 net/ipv6/xfrm6_input.c | 1 +
101 net/ipv6/xfrm6_policy.c | 2 +-
102 net/kcm/kcmsock.c | 3 +-
103 net/l2tp/l2tp_core.c | 3 +
104 net/mac80211/tdls.c | 7 +-
105 net/netfilter/nf_tables_netdev.c | 1 -
106 net/netfilter/nfnetlink_acct.c | 6 +-
107 net/netfilter/nfnetlink_cttimeout.c | 49 +++--
108 net/netfilter/nft_meta.c | 17 +-
109 net/netfilter/nft_reject.c | 16 ++
110 net/netfilter/nft_reject_inet.c | 7 +-
111 net/sctp/output.c | 13 +-
112 net/tipc/name_distr.c | 8 +-
113 net/unix/af_unix.c | 111 +++++------
114 net/wireless/wext-core.c | 25 +--
115 net/xfrm/xfrm_input.c | 14 +-
116 net/xfrm/xfrm_policy.c | 4 +
117 net/xfrm/xfrm_user.c | 13 +-
118 tools/iio/iio_generic_buffer.c | 2 +-
119 108 files changed, 935 insertions(+), 628 deletions(-)
120 Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
121 $ git merge fixes/master
123 Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured)
124 $ git merge kbuild-current/rc-fixes
126 Merging arc-current/for-curr (3eab887a5542 Linux 4.8-rc4)
127 $ git merge arc-current/for-curr
129 Merging arm-current/fixes (1a57c286d8ce ARM: pxa/lubbock: add pcmcia clock)
130 $ git merge arm-current/fixes
131 Merge made by the 'recursive' strategy.
132 arch/arm/common/locomo.c | 5 ++---
133 arch/arm/common/sa1111.c | 32 +++++++++++++++++------------
134 arch/arm/include/asm/pgtable-2level-hwdef.h | 1 +
135 arch/arm/include/asm/pgtable-3level-hwdef.h | 1 +
136 arch/arm/mach-pxa/lubbock.c | 14 +++++++++++++
137 arch/arm/mm/mmu.c | 2 +-
138 drivers/pcmcia/ds.c | 12 ++++++-----
139 drivers/pcmcia/pxa2xx_base.c | 9 ++++----
140 drivers/pcmcia/pxa2xx_base.h | 2 +-
141 drivers/pcmcia/sa1111_badge4.c | 22 ++++++++------------
142 drivers/pcmcia/sa1111_generic.c | 22 +++++++++++++++-----
143 drivers/pcmcia/sa1111_jornada720.c | 25 +++++++++-------------
144 drivers/pcmcia/sa1111_lubbock.c | 32 ++++++++++++-----------------
145 drivers/pcmcia/sa1111_neponset.c | 26 +++++++++--------------
146 drivers/pcmcia/sa11xx_base.c | 8 ++++----
147 drivers/pcmcia/soc_common.c | 2 +-
148 16 files changed, 114 insertions(+), 101 deletions(-)
149 Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
150 $ git merge m68k-current/for-linus
152 Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init())
153 $ git merge metag-fixes/fixes
155 Merging powerpc-fixes/fixes (f077aaf0754b powerpc/mm: Don't alias user region to other regions below PAGE_OFFSET)
156 $ git merge powerpc-fixes/fixes
158 Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled)
159 $ git merge sparc/master
161 Merging net/master (da499f8f5385 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
162 $ git merge net/master
164 Merging ipsec/master (1fb81e09d487 vti: use right inner_mode for inbound inter address family policy checks)
165 $ git merge ipsec/master
166 Merge made by the 'recursive' strategy.
167 net/ipv4/ip_vti.c | 15 ++++++++++++++-
168 net/ipv6/ip6_vti.c | 15 ++++++++++++++-
169 net/xfrm/xfrm_user.c | 9 ++++++---
170 3 files changed, 34 insertions(+), 5 deletions(-)
171 Merging netfilter/master (ecfcdfec7e0c netfilter: nf_nat: handle NF_DROP from nfnetlink_parse_nat_setup())
172 $ git merge netfilter/master
173 Merge made by the 'recursive' strategy.
174 net/ipv4/netfilter/nft_chain_route_ipv4.c | 11 +++++++----
175 net/ipv6/netfilter/nft_chain_route_ipv6.c | 10 +++++++---
176 net/netfilter/nf_nat_core.c | 2 +-
177 net/netfilter/nf_tables_trace.c | 2 +-
178 4 files changed, 16 insertions(+), 9 deletions(-)
179 Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
180 $ git merge ipvs/master
182 Merging wireless-drivers/master (a0714125d11b Merge ath-current from ath.git)
183 $ git merge wireless-drivers/master
185 Merging mac80211/master (5df20f2141ea mac80211: make mpath path fixing more robust)
186 $ git merge mac80211/master
187 Merge made by the 'recursive' strategy.
188 net/mac80211/mesh_hwmp.c | 3 ++-
189 net/mac80211/mesh_pathtbl.c | 2 +-
190 net/mac80211/sta_info.c | 4 +--
191 net/mac80211/tx.c | 65 +++++++++++++++++++++++----------------------
192 4 files changed, 38 insertions(+), 36 deletions(-)
193 Merging sound-current/for-linus (3f640970a414 ALSA: hda - Fix headset mic detection problem for several Dell laptops)
194 $ git merge sound-current/for-linus
195 Merge made by the 'recursive' strategy.
196 sound/pci/hda/patch_realtek.c | 13 +++++++++++++
197 1 file changed, 13 insertions(+)
198 Merging pci-current/for-linus (6af7e4f77259 PCI: Mark Haswell Power Control Unit as having non-compliant BARs)
199 $ git merge pci-current/for-linus
200 Merge made by the 'recursive' strategy.
201 arch/x86/pci/fixup.c | 20 +++++++++++++-------
202 1 file changed, 13 insertions(+), 7 deletions(-)
203 Merging driver-core.current/driver-core-linus (c6935931c189 Linux 4.8-rc5)
204 $ git merge driver-core.current/driver-core-linus
206 Merging tty.current/tty-linus (c6935931c189 Linux 4.8-rc5)
207 $ git merge tty.current/tty-linus
209 Merging usb.current/usb-linus (9395452b4aab Linux 4.8-rc6)
210 $ git merge usb.current/usb-linus
212 Merging usb-gadget-fixes/fixes (696118c016dd usb: dwc3: pci: fix build warning on !PM_SLEEP)
213 $ git merge usb-gadget-fixes/fixes
215 Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add support for another Infineon flashloader)
216 $ git merge usb-serial-fixes/usb-linus
217 Merge made by the 'recursive' strategy.
218 drivers/usb/serial/usb-serial-simple.c | 3 ++-
219 1 file changed, 2 insertions(+), 1 deletion(-)
220 Merging usb-chipidea-fixes/ci-for-usb-stable (6f3c4fb6d05e usb: chipidea: udc: fix NULL ptr dereference in isr_setup_status_phase)
221 $ git merge usb-chipidea-fixes/ci-for-usb-stable
223 Merging staging.current/staging-linus (9395452b4aab Linux 4.8-rc6)
224 $ git merge staging.current/staging-linus
226 Merging char-misc.current/char-misc-linus (c6935931c189 Linux 4.8-rc5)
227 $ git merge char-misc.current/char-misc-linus
229 Merging input-current/for-linus (4af2ff91ec3f Input: silead_gsl1680 - use "silead/" prefix for firmware loading)
230 $ git merge input-current/for-linus
231 Merge made by the 'recursive' strategy.
232 .../bindings/input/touchscreen/silead_gsl1680.txt | 1 +
233 drivers/input/touchscreen/silead.c | 16 +++++++++-------
234 2 files changed, 10 insertions(+), 7 deletions(-)
235 Merging crypto-current/master (0bd2223594a4 crypto: cryptd - initialize child shash_desc on import)
236 $ git merge crypto-current/master
237 Merge made by the 'recursive' strategy.
238 crypto/cryptd.c | 9 +++++++--
239 1 file changed, 7 insertions(+), 2 deletions(-)
240 Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
241 $ git merge ide/master
243 Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
244 $ git merge rr-fixes/fixes
246 Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling)
247 $ git merge vfio-fixes/for-linus
249 Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1)
250 $ git merge kselftest-fixes/fixes
252 Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
253 $ git merge backlight-fixes/for-backlight-fixes
255 Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
256 $ git merge ftrace-fixes/for-next-urgent
258 Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
259 $ git merge mfd-fixes/for-mfd-fixes
261 Merging drm-intel-fixes/for-linux-next-fixes (fc2780b66b15 drm/i915: Add GEN7_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE to SNB)
262 $ git merge drm-intel-fixes/for-linux-next-fixes
263 Merge made by the 'recursive' strategy.
264 drivers/gpu/drm/i915/i915_gem_gtt.c | 9 ++++++---
265 drivers/gpu/drm/i915/i915_vgpu.c | 3 ---
266 drivers/gpu/drm/i915/intel_dvo.c | 1 -
267 drivers/gpu/drm/i915/intel_pm.c | 1 +
268 4 files changed, 7 insertions(+), 7 deletions(-)
269 Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
270 $ git merge asm-generic/master
272 Merging arc/for-next (a0869b8c905c ARCv2: Implement atomic64 based on LLOCKD/SCONDD instructions)
273 $ git merge arc/for-next
274 Merge made by the 'recursive' strategy.
275 arch/arc/Kconfig | 2 +-
276 arch/arc/boot/dts/abilis_tb100_dvk.dts | 1 +
277 arch/arc/boot/dts/abilis_tb101_dvk.dts | 1 +
278 arch/arc/boot/dts/axs101.dts | 1 +
279 arch/arc/boot/dts/axs103.dts | 1 +
280 arch/arc/boot/dts/axs103_idu.dts | 1 +
281 arch/arc/boot/dts/nsim_700.dts | 1 +
282 arch/arc/boot/dts/nsim_hs.dts | 1 +
283 arch/arc/boot/dts/nsim_hs_idu.dts | 1 +
284 arch/arc/boot/dts/nsimosci.dts | 1 +
285 arch/arc/boot/dts/nsimosci_hs.dts | 1 +
286 arch/arc/boot/dts/nsimosci_hs_idu.dts | 1 +
287 arch/arc/boot/dts/vdk_hs38.dts | 1 +
288 arch/arc/boot/dts/vdk_hs38_smp.dts | 1 +
289 arch/arc/boot/dts/zebu_hs.dts | 69 +++++++++
290 arch/arc/boot/dts/zebu_hs_idu.dts | 85 +++++++++++
291 arch/arc/configs/zebu_hs_defconfig | 86 +++++++++++
292 arch/arc/configs/zebu_hs_smp_defconfig | 89 +++++++++++
293 arch/arc/include/asm/arcregs.h | 10 +-
294 arch/arc/include/asm/atomic.h | 261 ++++++++++++++++++++++++++++++++-
295 arch/arc/include/asm/cache.h | 2 +-
296 arch/arc/kernel/setup.c | 5 +-
297 arch/arc/mm/cache.c | 23 ++-
298 arch/arc/mm/ioremap.c | 2 +-
299 arch/arc/plat-sim/platform.c | 1 +
300 25 files changed, 627 insertions(+), 21 deletions(-)
301 create mode 100644 arch/arc/boot/dts/zebu_hs.dts
302 create mode 100644 arch/arc/boot/dts/zebu_hs_idu.dts
303 create mode 100644 arch/arc/configs/zebu_hs_defconfig
304 create mode 100644 arch/arc/configs/zebu_hs_smp_defconfig
305 Merging arm/for-next (32cb4b0bce85 Merge branch 'devel-stable' into for-next)
306 $ git merge arm/for-next
307 Merge made by the 'recursive' strategy.
308 arch/arm/Makefile | 1 -
309 arch/arm/boot/Makefile | 2 +
310 arch/arm/include/asm/assembler.h | 4 +
311 arch/arm/include/asm/cacheflush.h | 17 -
312 arch/arm/include/asm/cachetype.h | 39 ++
313 arch/arm/include/asm/cputype.h | 36 +-
314 arch/arm/include/asm/flat.h | 5 +-
315 arch/arm/include/asm/glue-cache.h | 4 -
316 arch/arm/include/asm/hardware/cache-l2x0.h | 19 +
317 arch/arm/include/asm/hw_breakpoint.h | 1 -
318 arch/arm/include/asm/memory.h | 15 +-
319 arch/arm/include/asm/module.h | 6 +-
320 arch/arm/include/asm/v7m.h | 22 +
321 arch/arm/kernel/cpuidle.c | 2 +-
322 arch/arm/kernel/head-nommu.S | 16 +-
323 arch/arm/kernel/module-plts.c | 243 ++++++----
324 arch/arm/kernel/module.lds | 3 +-
325 arch/arm/kernel/setup.c | 26 +-
326 arch/arm/kernel/smp.c | 2 +-
327 arch/arm/kernel/vdso.c | 11 +-
328 arch/arm/lib/delay.c | 2 +-
329 arch/arm/mach-footbridge/include/mach/hardware.h | 2 +-
330 arch/arm/mach-rpc/include/mach/hardware.h | 2 +-
331 arch/arm/mach-sa1100/include/mach/hardware.h | 20 +-
332 arch/arm/mm/Kconfig | 17 +-
333 arch/arm/mm/Makefile | 3 +
334 arch/arm/mm/cache-l2x0-pmu.c | 584 +++++++++++++++++++++++
335 arch/arm/mm/cache-l2x0.c | 11 +-
336 arch/arm/mm/cache-v7m.S | 453 ++++++++++++++++++
337 arch/arm/mm/dma-mapping.c | 4 +-
338 arch/arm/mm/mmu.c | 2 +-
339 arch/arm/mm/proc-macros.S | 16 +
340 arch/arm/mm/proc-v7m.S | 108 ++++-
341 drivers/amba/bus.c | 5 +
342 drivers/cpufreq/sa1110-cpufreq.c | 2 +-
343 fs/Kconfig.binfmt | 2 +-
344 include/linux/cpuhotplug.h | 1 +
345 37 files changed, 1492 insertions(+), 216 deletions(-)
346 create mode 100644 arch/arm/mm/cache-l2x0-pmu.c
347 create mode 100644 arch/arm/mm/cache-v7m.S
348 Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2)
349 $ git merge arm-perf/for-next/perf
351 Merging arm-soc/for-next (73b72470894d Merge tag 'v4.8-rc5' into for-next)
352 $ git merge arm-soc/for-next
353 Removing arch/arm/mach-realview/realview_pbx.c
354 Removing arch/arm/mach-realview/realview_pba8.c
355 Removing arch/arm/mach-realview/realview_pb11mp.c
356 Removing arch/arm/mach-realview/realview_pb1176.c
357 Removing arch/arm/mach-realview/realview_eb.c
358 Removing arch/arm/mach-realview/platsmp.c
359 Removing arch/arm/mach-realview/platform.h
360 Removing arch/arm/mach-realview/irqs-pbx.h
361 Removing arch/arm/mach-realview/irqs-pba8.h
362 Removing arch/arm/mach-realview/irqs-pb11mp.h
363 Removing arch/arm/mach-realview/irqs-pb1176.h
364 Removing arch/arm/mach-realview/irqs-eb.h
365 Removing arch/arm/mach-realview/hardware.h
366 Removing arch/arm/mach-realview/core.h
367 Removing arch/arm/mach-realview/core.c
368 Removing arch/arm/mach-realview/board-pbx.h
369 Removing arch/arm/mach-realview/board-pba8.h
370 Removing arch/arm/mach-realview/board-pb11mp.h
371 Removing arch/arm/mach-realview/board-pb1176.h
372 Removing arch/arm/mach-realview/board-eb.h
373 Removing arch/arm/mach-omap2/board-rx51.h
374 Removing arch/arm/mach-omap2/board-rx51.c
375 Removing arch/arm/mach-omap2/board-rx51-video.c
376 Removing arch/arm/mach-omap2/board-rx51-peripherals.c
377 Removing arch/arm/mach-omap2/board-ldp.c
378 Removing arch/arm/mach-clps711x/devices.h
379 Removing arch/arm/mach-clps711x/devices.c
380 Removing arch/arm/mach-clps711x/common.h
381 Removing arch/arm/mach-clps711x/common.c
382 Removing arch/arm/mach-clps711x/board-p720t.c
383 Removing arch/arm/mach-clps711x/board-edb7211.c
384 Removing arch/arm/mach-clps711x/board-clep7312.c
385 Removing arch/arm/mach-clps711x/board-cdb89712.c
386 Removing arch/arm/mach-clps711x/board-autcpu12.c
387 Removing arch/arm/mach-clps711x/Makefile.boot
388 Auto-merging MAINTAINERS
389 Merge made by the 'recursive' strategy.
390 .../devicetree/bindings/clock/st,stm32-rcc.txt | 42 +-
391 .../devicetree/bindings/reset/st,stm32-rcc.txt | 6 +
392 .../devicetree/bindings/reset/uniphier-reset.txt | 93 ++
394 arch/arm/Kconfig | 3 +-
395 arch/arm/arm-soc-for-next-contents.txt | 64 +
396 arch/arm/boot/dts/bcm2835-rpi.dtsi | 1 +
397 arch/arm/boot/dts/bcm283x.dtsi | 3 +-
398 arch/arm/boot/dts/stih407-family.dtsi | 10 +-
399 arch/arm/boot/dts/stih410.dtsi | 12 +-
400 arch/arm/boot/dts/stm32f429.dtsi | 1 +
401 arch/arm/configs/davinci_all_defconfig | 66 +-
402 arch/arm/configs/exynos_defconfig | 11 +-
403 arch/arm/configs/integrator_defconfig | 13 +-
404 arch/arm/configs/multi_v7_defconfig | 7 +-
405 arch/arm/configs/omap2plus_defconfig | 2 +-
406 arch/arm/configs/s3c2410_defconfig | 1 -
407 arch/arm/mach-clps711x/Makefile.boot | 0
408 arch/arm/mach-clps711x/board-autcpu12.c | 275 ----
409 arch/arm/mach-clps711x/board-cdb89712.c | 147 ---
410 arch/arm/mach-clps711x/board-clep7312.c | 45 -
411 arch/arm/mach-clps711x/board-edb7211.c | 188 ---
412 arch/arm/mach-clps711x/board-p720t.c | 373 ------
413 arch/arm/mach-clps711x/common.c | 65 -
414 arch/arm/mach-clps711x/common.h | 23 -
415 arch/arm/mach-clps711x/devices.c | 149 ---
416 arch/arm/mach-clps711x/devices.h | 12 -
417 arch/arm/mach-davinci/da850.c | 1 +
418 arch/arm/mach-davinci/da8xx-dt.c | 1 +
419 arch/arm/mach-exynos/Kconfig | 1 +
420 arch/arm/mach-exynos/exynos.c | 15 -
421 arch/arm/mach-exynos/include/mach/map.h | 5 -
422 arch/arm/mach-omap1/board-h2-mmc.c | 2 +-
423 arch/arm/mach-omap1/board-h2.c | 2 +-
424 arch/arm/mach-omap1/board-h3-mmc.c | 2 +-
425 arch/arm/mach-omap1/board-h3.c | 2 +-
426 arch/arm/mach-omap1/board-htcherald.c | 4 +-
427 arch/arm/mach-omap1/board-innovator.c | 4 +-
428 arch/arm/mach-omap1/board-nokia770.c | 4 +-
429 arch/arm/mach-omap1/board-sx1-mmc.c | 2 +-
430 arch/arm/mach-omap1/devices.c | 10 +-
431 arch/arm/mach-omap1/fb.c | 2 +-
432 arch/arm/mach-omap1/include/mach/usb.h | 2 +-
433 arch/arm/mach-omap1/mmc.h | 2 +-
434 arch/arm/mach-omap1/usb.c | 6 +-
435 arch/arm/mach-omap2/Kconfig | 12 -
436 arch/arm/mach-omap2/Makefile | 4 -
437 arch/arm/mach-omap2/board-flash.c | 10 +-
438 arch/arm/mach-omap2/board-flash.h | 11 +-
439 arch/arm/mach-omap2/board-ldp.c | 430 -------
440 arch/arm/mach-omap2/board-n8x0.c | 5 +-
441 arch/arm/mach-omap2/board-rx51-peripherals.c | 1312 --------------------
442 arch/arm/mach-omap2/board-rx51-video.c | 67 -
443 arch/arm/mach-omap2/board-rx51.c | 141 ---
444 arch/arm/mach-omap2/board-rx51.h | 11 -
445 arch/arm/mach-omap2/common-board-devices.c | 3 +-
446 arch/arm/mach-omap2/devices.c | 7 +-
447 arch/arm/mach-omap2/drm.c | 2 +-
448 arch/arm/mach-omap2/fb.c | 2 +-
449 arch/arm/mach-omap2/gpmc-smsc911x.h | 2 +-
450 arch/arm/mach-omap2/hsmmc.c | 2 +-
451 arch/arm/mach-omap2/hsmmc.h | 2 +-
452 arch/arm/mach-omap2/twl-common.c | 3 +-
453 arch/arm/mach-realview/Kconfig | 72 +-
454 arch/arm/mach-realview/Makefile | 12 +-
455 arch/arm/mach-realview/board-eb.h | 94 --
456 arch/arm/mach-realview/board-pb1176.h | 81 --
457 arch/arm/mach-realview/board-pb11mp.h | 96 --
458 arch/arm/mach-realview/board-pba8.h | 71 --
459 arch/arm/mach-realview/board-pbx.h | 106 --
460 arch/arm/mach-realview/core.c | 405 ------
461 arch/arm/mach-realview/core.h | 58 -
462 arch/arm/mach-realview/hardware.h | 40 -
463 arch/arm/mach-realview/hotplug.h | 1 +
464 arch/arm/mach-realview/irqs-eb.h | 114 --
465 arch/arm/mach-realview/irqs-pb1176.h | 77 --
466 arch/arm/mach-realview/irqs-pb11mp.h | 97 --
467 arch/arm/mach-realview/irqs-pba8.h | 71 --
468 arch/arm/mach-realview/irqs-pbx.h | 87 --
469 arch/arm/mach-realview/platform.h | 247 ----
470 arch/arm/mach-realview/platsmp-dt.c | 3 +-
471 arch/arm/mach-realview/platsmp.c | 86 --
472 arch/arm/mach-realview/realview_eb.c | 492 --------
473 arch/arm/mach-realview/realview_pb1176.c | 395 ------
474 arch/arm/mach-realview/realview_pb11mp.c | 385 ------
475 arch/arm/mach-realview/realview_pba8.c | 307 -----
476 arch/arm/mach-realview/realview_pbx.c | 402 ------
477 arch/arm/mach-s3c24xx/common.c | 20 +-
478 arch/arm/mach-s3c24xx/mach-mini2440.c | 1 +
479 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 3 +-
480 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 62 +-
481 arch/arm/plat-samsung/include/plat/map-s5p.h | 4 -
482 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 +-
483 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 8 +-
484 arch/arm64/boot/dts/apm/apm-storm.dtsi | 8 +-
485 arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi | 1 +
486 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 4 +-
487 arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 2 +-
488 .../boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi | 1 +
489 arch/arm64/boot/dts/broadcom/bcm283x.dtsi | 1 +
490 arch/arm64/boot/dts/broadcom/ns2.dtsi | 8 +-
491 arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 8 +-
492 arch/arm64/boot/dts/exynos/exynos7.dtsi | 8 +-
493 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 8 +-
494 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 8 +-
495 arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 8 +-
496 .../boot/dts/socionext/uniphier-ph1-ld20.dtsi | 8 +-
497 arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 +-
498 drivers/irqchip/Makefile | 2 +-
499 drivers/memory/omap-gpmc.c | 20 +-
500 drivers/mtd/maps/Kconfig | 2 +-
501 drivers/reset/Kconfig | 65 +
502 drivers/reset/Makefile | 20 +-
503 drivers/reset/core.c | 12 +-
504 drivers/reset/hisilicon/Kconfig | 3 +-
505 drivers/reset/reset-ath79.c | 1 +
506 drivers/reset/reset-socfpga.c | 19 +-
507 drivers/reset/reset-stm32.c | 108 ++
508 drivers/reset/reset-uniphier.c | 440 +++++++
509 include/dt-bindings/mfd/stm32f4-rcc.h | 98 ++
510 include/linux/omap-gpmc.h | 4 +-
511 121 files changed, 1166 insertions(+), 7320 deletions(-)
512 create mode 100644 Documentation/devicetree/bindings/reset/st,stm32-rcc.txt
513 create mode 100644 Documentation/devicetree/bindings/reset/uniphier-reset.txt
514 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
515 delete mode 100644 arch/arm/mach-clps711x/Makefile.boot
516 delete mode 100644 arch/arm/mach-clps711x/board-autcpu12.c
517 delete mode 100644 arch/arm/mach-clps711x/board-cdb89712.c
518 delete mode 100644 arch/arm/mach-clps711x/board-clep7312.c
519 delete mode 100644 arch/arm/mach-clps711x/board-edb7211.c
520 delete mode 100644 arch/arm/mach-clps711x/board-p720t.c
521 delete mode 100644 arch/arm/mach-clps711x/common.c
522 delete mode 100644 arch/arm/mach-clps711x/common.h
523 delete mode 100644 arch/arm/mach-clps711x/devices.c
524 delete mode 100644 arch/arm/mach-clps711x/devices.h
525 delete mode 100644 arch/arm/mach-omap2/board-ldp.c
526 delete mode 100644 arch/arm/mach-omap2/board-rx51-peripherals.c
527 delete mode 100644 arch/arm/mach-omap2/board-rx51-video.c
528 delete mode 100644 arch/arm/mach-omap2/board-rx51.c
529 delete mode 100644 arch/arm/mach-omap2/board-rx51.h
530 delete mode 100644 arch/arm/mach-realview/board-eb.h
531 delete mode 100644 arch/arm/mach-realview/board-pb1176.h
532 delete mode 100644 arch/arm/mach-realview/board-pb11mp.h
533 delete mode 100644 arch/arm/mach-realview/board-pba8.h
534 delete mode 100644 arch/arm/mach-realview/board-pbx.h
535 delete mode 100644 arch/arm/mach-realview/core.c
536 delete mode 100644 arch/arm/mach-realview/core.h
537 delete mode 100644 arch/arm/mach-realview/hardware.h
538 create mode 100644 arch/arm/mach-realview/hotplug.h
539 delete mode 100644 arch/arm/mach-realview/irqs-eb.h
540 delete mode 100644 arch/arm/mach-realview/irqs-pb1176.h
541 delete mode 100644 arch/arm/mach-realview/irqs-pb11mp.h
542 delete mode 100644 arch/arm/mach-realview/irqs-pba8.h
543 delete mode 100644 arch/arm/mach-realview/irqs-pbx.h
544 delete mode 100644 arch/arm/mach-realview/platform.h
545 delete mode 100644 arch/arm/mach-realview/platsmp.c
546 delete mode 100644 arch/arm/mach-realview/realview_eb.c
547 delete mode 100644 arch/arm/mach-realview/realview_pb1176.c
548 delete mode 100644 arch/arm/mach-realview/realview_pb11mp.c
549 delete mode 100644 arch/arm/mach-realview/realview_pba8.c
550 delete mode 100644 arch/arm/mach-realview/realview_pbx.c
551 create mode 120000 arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
552 create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
553 create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x.dtsi
554 create mode 100644 drivers/reset/reset-stm32.c
555 create mode 100644 drivers/reset/reset-uniphier.c
556 create mode 100644 include/dt-bindings/mfd/stm32f4-rcc.h
557 Merging amlogic/for-next (cbf216bf60bb Merge v4.8/mmc)
558 $ git merge amlogic/for-next
559 Auto-merging arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
560 Auto-merging MAINTAINERS
561 Merge made by the 'recursive' strategy.
562 .../bindings/clock/amlogic,gxbb-aoclkc.txt | 45 +
563 .../bindings/firmware/meson/meson_sm.txt | 15 +
564 .../devicetree/bindings/media/meson-ir.txt | 5 +-
565 .../devicetree/bindings/mmc/amlogic,meson-gxbb.txt | 29 +
566 .../devicetree/bindings/nvmem/amlogic-efuse.txt | 39 +
568 .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 80 ++
569 arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 77 ++
570 .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 6 +
571 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 169 +++-
572 arch/arm64/configs/defconfig | 5 +-
573 drivers/clk/meson/Makefile | 2 +-
574 drivers/clk/meson/gxbb-aoclk.c | 191 +++++
575 drivers/clk/meson/gxbb.c | 9 +
576 drivers/clk/meson/gxbb.h | 7 +-
577 drivers/firmware/Kconfig | 1 +
578 drivers/firmware/Makefile | 1 +
579 drivers/firmware/meson/Kconfig | 9 +
580 drivers/firmware/meson/Makefile | 1 +
581 drivers/firmware/meson/meson_sm.c | 248 ++++++
582 drivers/media/rc/meson-ir.c | 29 +-
583 drivers/mmc/host/Kconfig | 10 +
584 drivers/mmc/host/Makefile | 1 +
585 drivers/mmc/host/meson-gxbb.c | 916 +++++++++++++++++++++
586 drivers/nvmem/Kconfig | 10 +
587 drivers/nvmem/Makefile | 2 +
588 drivers/nvmem/meson-efuse.c | 93 +++
589 drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 87 ++
590 include/dt-bindings/clock/gxbb-aoclkc.h | 66 ++
591 include/dt-bindings/clock/gxbb-clkc.h | 4 +
592 include/dt-bindings/reset/gxbb-aoclkc.h | 66 ++
593 include/linux/firmware/meson/meson_sm.h | 31 +
594 32 files changed, 2243 insertions(+), 12 deletions(-)
595 create mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
596 create mode 100644 Documentation/devicetree/bindings/firmware/meson/meson_sm.txt
597 create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt
598 create mode 100644 Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt
599 create mode 100644 drivers/clk/meson/gxbb-aoclk.c
600 create mode 100644 drivers/firmware/meson/Kconfig
601 create mode 100644 drivers/firmware/meson/Makefile
602 create mode 100644 drivers/firmware/meson/meson_sm.c
603 create mode 100644 drivers/mmc/host/meson-gxbb.c
604 create mode 100644 drivers/nvmem/meson-efuse.c
605 create mode 100644 include/dt-bindings/clock/gxbb-aoclkc.h
606 create mode 100644 include/dt-bindings/reset/gxbb-aoclkc.h
607 create mode 100644 include/linux/firmware/meson/meson_sm.h
608 Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
609 $ git merge at91/at91-next
611 Merge made by the 'recursive' strategy.
612 Merging bcm2835/for-next (9336be5db24d Merge branch anholt/bcm2835-dt-next into for-next)
613 $ git merge bcm2835/for-next
614 Auto-merging arch/arm/boot/dts/bcm283x.dtsi
615 Merge made by the 'recursive' strategy.
616 .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 ++
617 arch/arm/boot/dts/Makefile | 3 +-
618 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 1 +
619 arch/arm/boot/dts/bcm2835-rpi-a.dts | 1 +
620 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 +
621 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 +
622 arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 +
623 arch/arm/boot/dts/bcm2835-rpi-zero.dts | 40 +++++++++++++++++
624 arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 +
625 arch/arm/boot/dts/bcm283x-rpi-usb-host.dtsi | 3 ++
626 arch/arm/boot/dts/bcm283x.dtsi | 9 ++++
627 drivers/gpu/drm/vc4/vc4_crtc.c | 52 ++++++++++++++++------
628 drivers/gpu/drm/vc4/vc4_dpi.c | 11 +++++
629 drivers/gpu/drm/vc4/vc4_hdmi.c | 29 +++++++++++-
630 14 files changed, 141 insertions(+), 16 deletions(-)
631 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-zero.dts
632 create mode 100644 arch/arm/boot/dts/bcm283x-rpi-usb-host.dtsi
633 Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next)
634 $ git merge berlin/berlin/for-next
635 Merge made by the 'recursive' strategy.
636 arch/arm/boot/dts/berlin2.dtsi | 2 --
637 arch/arm/boot/dts/berlin2q.dtsi | 2 --
638 arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 12 +++++++++---
639 3 files changed, 9 insertions(+), 7 deletions(-)
640 Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
641 $ git merge cortex-m/for-next
643 Merging imx-mxs/for-next (70da51e698c7 Merge branch 'imx/defconfig' into for-next)
644 $ git merge imx-mxs/for-next
645 Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution.
646 Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
647 Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
648 Removing arch/arm/mach-imx/mx1.h
649 Removing arch/arm/mach-imx/mm-imx1.c
650 Removing arch/arm/mach-imx/mach-scb9328.c
651 Auto-merging arch/arm/mach-imx/mach-imx1.c
652 Removing arch/arm/mach-imx/mach-apf9328.c
653 Removing arch/arm/mach-imx/iomux-mx1.h
654 Removing arch/arm/mach-imx/devices-imx1.h
655 Auto-merging arch/arm/configs/multi_v7_defconfig
656 CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
657 Auto-merging arch/arm/boot/dts/Makefile
658 Automatic merge failed; fix conflicts and then commit the result.
660 [master 3595e8fb51af] Merge remote-tracking branch 'imx-mxs/for-next'
661 $ git diff -M --stat --summary HEAD^..
662 .../devicetree/bindings/arm/technologic.txt | 6 +
663 .../devicetree/bindings/vendor-prefixes.txt | 1 +
664 arch/arm/boot/dts/Makefile | 9 +-
665 arch/arm/boot/dts/imx35.dtsi | 7 +
666 arch/arm/boot/dts/imx50.dtsi | 10 +
667 arch/arm/boot/dts/imx53-usbarmory.dts | 224 ++++++++++
668 arch/arm/boot/dts/imx53.dtsi | 18 +
669 arch/arm/boot/dts/imx6dl-gw553x.dts | 55 +++
670 arch/arm/boot/dts/imx6dl-riotboard.dts | 22 +-
671 arch/arm/boot/dts/imx6dl-ts4900.dts | 49 +++
672 arch/arm/boot/dts/imx6dl.dtsi | 53 +++
673 arch/arm/boot/dts/imx6q-arm2.dts | 24 +-
674 arch/arm/boot/dts/imx6q-b450v3.dts | 16 +
675 arch/arm/boot/dts/imx6q-b650v3.dts | 9 +
676 arch/arm/boot/dts/imx6q-ba16.dtsi | 24 +-
677 arch/arm/boot/dts/imx6q-bx50v3.dtsi | 70 +++
678 arch/arm/boot/dts/imx6q-cm-fx6.dts | 24 +-
679 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 24 +-
680 arch/arm/boot/dts/imx6q-evi.dts | 28 +-
681 arch/arm/boot/dts/imx6q-gw5400-a.dts | 24 +-
682 arch/arm/boot/dts/imx6q-gw553x.dts | 55 +++
683 arch/arm/boot/dts/imx6q-marsboard.dts | 24 +-
684 arch/arm/boot/dts/imx6q-novena.dts | 12 +-
685 arch/arm/boot/dts/imx6q-sbc6x.dts | 24 +-
686 arch/arm/boot/dts/imx6q-tbs2910.dts | 24 +-
687 arch/arm/boot/dts/imx6q-ts4900.dts | 53 +++
688 arch/arm/boot/dts/imx6q.dtsi | 37 ++
689 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 24 +-
690 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 24 +-
691 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 36 +-
692 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 39 +-
693 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 39 +-
694 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 44 +-
695 arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 12 +
696 arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 12 +
697 arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 433 +++++++++++++++++++
698 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 24 +-
699 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 12 +-
700 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 24 +-
701 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 24 +-
702 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 36 +-
703 arch/arm/boot/dts/imx6qdl-rex.dtsi | 24 +-
704 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 24 +-
705 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 24 +-
706 arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 24 +-
707 arch/arm/boot/dts/imx6qdl-ts4900.dtsi | 481 +++++++++++++++++++++
708 arch/arm/boot/dts/imx6qdl-udoo.dtsi | 24 +-
709 arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 24 +-
710 arch/arm/boot/dts/imx6sl.dtsi | 47 ++
711 arch/arm/boot/dts/imx6sx-pinfunc.h | 14 +
712 arch/arm/boot/dts/imx6sx.dtsi | 22 +
713 arch/arm/boot/dts/imx6ul-geam-kit.dts | 101 +++++
714 arch/arm/boot/dts/imx6ul-geam.dtsi | 361 ++++++++++++++++
715 arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 33 ++
716 arch/arm/boot/dts/imx6ul.dtsi | 9 +-
717 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 4 -
718 arch/arm/boot/dts/imx7-colibri.dtsi | 61 ++-
719 arch/arm/boot/dts/imx7d.dtsi | 42 +-
720 arch/arm/boot/dts/imx7s-warp.dts | 446 +++++++++++++++++++
721 arch/arm/boot/dts/imx7s.dtsi | 371 +++++++++-------
722 arch/arm/boot/dts/ls1021a-twr.dts | 13 +-
723 arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 13 +-
724 arch/arm/configs/imx_v4_v5_defconfig | 3 +-
725 arch/arm/configs/imx_v6_v7_defconfig | 17 +-
726 arch/arm/configs/multi_v4t_defconfig | 4 +-
727 arch/arm/configs/multi_v7_defconfig | 3 +
728 arch/arm/mach-imx/Kconfig | 50 +--
729 arch/arm/mach-imx/Makefile | 8 +-
730 arch/arm/mach-imx/common.h | 7 +-
731 arch/arm/mach-imx/cpuidle-imx6q.c | 2 +-
732 arch/arm/mach-imx/cpuidle-imx6sx.c | 11 +
733 arch/arm/mach-imx/devices-imx1.h | 30 --
734 arch/arm/mach-imx/devices/Makefile | 1 -
735 arch/arm/mach-imx/devices/devices-common.h | 12 -
736 arch/arm/mach-imx/devices/platform-imx-fb.c | 5 -
737 arch/arm/mach-imx/devices/platform-imx-i2c.c | 5 -
738 arch/arm/mach-imx/devices/platform-imx-uart.c | 37 --
739 arch/arm/mach-imx/devices/platform-spi_imx.c | 9 -
740 arch/arm/mach-imx/hardware.h | 3 +-
741 arch/arm/mach-imx/iomux-mx1.h | 155 -------
742 arch/arm/mach-imx/iomux-mx3.h | 34 --
743 arch/arm/mach-imx/mach-apf9328.c | 148 -------
744 arch/arm/mach-imx/{imx1-dt.c => mach-imx1.c} | 23 +-
745 arch/arm/mach-imx/mach-imx6ul.c | 3 +
746 arch/arm/mach-imx/mach-kzm_arm11_01.c | 6 +-
747 arch/arm/mach-imx/mach-pcm037.c | 2 +-
748 arch/arm/mach-imx/mach-scb9328.c | 143 ------
749 arch/arm/mach-imx/mm-imx1.c | 67 ---
750 arch/arm/mach-imx/mx1.h | 172 --------
751 arch/arm/mach-imx/pm-imx6.c | 8 +-
752 arch/arm/mach-mxs/mach-mxs.c | 77 ----
753 arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 14 +-
754 arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 8 +
755 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 7 +
756 arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 3 +
757 arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 4 +
758 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 18 +
759 drivers/clk/imx/clk-imx1.c | 46 +-
760 98 files changed, 3494 insertions(+), 1522 deletions(-)
761 create mode 100644 arch/arm/boot/dts/imx53-usbarmory.dts
762 create mode 100644 arch/arm/boot/dts/imx6dl-gw553x.dts
763 create mode 100644 arch/arm/boot/dts/imx6dl-ts4900.dts
764 create mode 100644 arch/arm/boot/dts/imx6q-gw553x.dts
765 create mode 100644 arch/arm/boot/dts/imx6q-ts4900.dts
766 create mode 100644 arch/arm/boot/dts/imx6qdl-gw553x.dtsi
767 create mode 100644 arch/arm/boot/dts/imx6qdl-ts4900.dtsi
768 create mode 100644 arch/arm/boot/dts/imx6ul-geam-kit.dts
769 create mode 100644 arch/arm/boot/dts/imx6ul-geam.dtsi
770 create mode 100644 arch/arm/boot/dts/imx7s-warp.dts
771 delete mode 100644 arch/arm/mach-imx/devices-imx1.h
772 delete mode 100644 arch/arm/mach-imx/iomux-mx1.h
773 delete mode 100644 arch/arm/mach-imx/mach-apf9328.c
774 rename arch/arm/mach-imx/{imx1-dt.c => mach-imx1.c} (63%)
775 delete mode 100644 arch/arm/mach-imx/mach-scb9328.c
776 delete mode 100644 arch/arm/mach-imx/mm-imx1.c
777 delete mode 100644 arch/arm/mach-imx/mx1.h
778 Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
779 $ git merge keystone/next
780 Auto-merging arch/arm/boot/dts/keystone.dtsi
781 Merge made by the 'recursive' strategy.
782 arch/arm/boot/dts/keystone-k2e-evm.dts | 12 ++++++++++--
783 arch/arm/boot/dts/keystone-k2e.dtsi | 4 ++--
784 arch/arm/boot/dts/keystone-k2g.dtsi | 32 ++++++++++++++++++++++++++++++++
785 arch/arm/boot/dts/keystone-k2hk-evm.dts | 6 +++++-
786 arch/arm/boot/dts/keystone-k2l-evm.dts | 6 +++++-
787 arch/arm/boot/dts/keystone.dtsi | 4 ++--
788 arch/arm/configs/keystone_defconfig | 1 +
789 7 files changed, 57 insertions(+), 8 deletions(-)
790 Merging mvebu/for-next (6c7707b7629c Merge branch 'mvebu/dt64' into mvebu/for-next)
791 $ git merge mvebu/for-next
792 Auto-merging arch/arm64/configs/defconfig
793 Auto-merging arch/arm64/boot/dts/marvell/armada-ap806.dtsi
794 Merge made by the 'recursive' strategy.
795 .../devicetree/bindings/arm/marvell/armada-39x.txt | 15 +-
796 arch/arm/boot/dts/armada-370-db.dts | 29 +--
797 .../dts/armada-370-seagate-personal-cloud.dtsi | 40 ++--
798 arch/arm/boot/dts/armada-370-synology-ds213j.dts | 112 +++++-----
799 arch/arm/boot/dts/armada-370-xp.dtsi | 56 +++--
800 arch/arm/boot/dts/armada-370.dtsi | 34 ++-
801 arch/arm/boot/dts/armada-385-db-ap.dts | 58 +++--
802 arch/arm/boot/dts/armada-385-linksys.dtsi | 9 +-
803 arch/arm/boot/dts/armada-388-clearfog.dts | 48 ++--
804 arch/arm/boot/dts/armada-388-db.dts | 25 ++-
805 arch/arm/boot/dts/armada-388-gp.dts | 30 +--
806 arch/arm/boot/dts/armada-388-rd.dts | 25 ++-
807 arch/arm/boot/dts/armada-38x.dtsi | 57 +++--
808 arch/arm/boot/dts/armada-390-db.dts | 175 +++++++++++++++
809 arch/arm/boot/dts/armada-390.dtsi | 3 +
810 arch/arm/boot/dts/armada-395-gp.dts | 163 ++++++++++++++
811 arch/arm/boot/dts/armada-395.dtsi | 76 +++++++
812 arch/arm/boot/dts/armada-398-db.dts | 56 +++--
813 arch/arm/boot/dts/armada-398.dtsi | 10 +-
814 arch/arm/boot/dts/armada-39x.dtsi | 126 ++++++++---
815 arch/arm/boot/dts/armada-xp-axpwifiap.dts | 24 +-
816 arch/arm/boot/dts/armada-xp-db.dts | 24 +-
817 arch/arm/boot/dts/armada-xp-gp.dts | 24 +-
818 arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 24 +-
819 arch/arm/boot/dts/armada-xp-synology-ds414.dts | 112 +++++-----
820 arch/arm/boot/dts/armada-xp.dtsi | 31 +--
821 arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 9 +-
822 arch/arm/configs/mvebu_v5_defconfig | 5 +-
823 arch/arm/configs/mvebu_v7_defconfig | 3 +
824 arch/arm64/boot/dts/marvell/Makefile | 1 +
825 arch/arm64/boot/dts/marvell/armada-8020.dtsi | 1 +
826 arch/arm64/boot/dts/marvell/armada-8040-db.dts | 150 +++++++++++++
827 arch/arm64/boot/dts/marvell/armada-8040.dtsi | 1 +
828 arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 14 ++
829 .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 246 +++++++++++++++++++++
830 arch/arm64/configs/defconfig | 2 +
831 36 files changed, 1407 insertions(+), 411 deletions(-)
832 create mode 100644 arch/arm/boot/dts/armada-390-db.dts
833 create mode 100644 arch/arm/boot/dts/armada-395-gp.dts
834 create mode 100644 arch/arm/boot/dts/armada-395.dtsi
835 create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-db.dts
836 create mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
837 Merging omap/for-next (91dda79fa02c Merge branch 'omap-for-v4.9/dt' into for-next)
838 $ git merge omap/for-next
839 Merge made by the 'recursive' strategy.
840 .../devicetree/bindings/arm/omap/omap.txt | 6 ++
841 arch/arm/boot/dts/am335x-baltos.dtsi | 6 +-
842 arch/arm/boot/dts/am335x-base0033.dts | 4 +-
843 arch/arm/boot/dts/am335x-bone-common.dtsi | 12 ++--
844 arch/arm/boot/dts/am335x-chilisom.dtsi | 2 +-
845 arch/arm/boot/dts/am335x-cm-t335.dts | 8 +--
846 arch/arm/boot/dts/am335x-evm.dts | 16 +++---
847 arch/arm/boot/dts/am335x-evmsk.dts | 28 +++++-----
848 arch/arm/boot/dts/am335x-icev2.dts | 47 +++++++++-------
849 arch/arm/boot/dts/am335x-igep0033.dtsi | 8 +--
850 arch/arm/boot/dts/am335x-lxm.dts | 6 +-
851 arch/arm/boot/dts/am335x-nano.dts | 4 +-
852 arch/arm/boot/dts/am335x-pepper.dts | 18 +++---
853 arch/arm/boot/dts/am335x-phycore-som.dtsi | 4 +-
854 arch/arm/boot/dts/am335x-shc.dts | 16 +++---
855 arch/arm/boot/dts/am335x-sl50.dts | 15 +++--
856 arch/arm/boot/dts/am335x-wega.dtsi | 64 +++++++++++++++++++++-
857 arch/arm/boot/dts/am33xx.dtsi | 4 +-
858 arch/arm/boot/dts/am3517-craneboard.dts | 2 +-
859 arch/arm/boot/dts/am3517-evm.dts | 2 +-
860 arch/arm/boot/dts/am3517.dtsi | 2 +-
861 arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 +-
862 arch/arm/boot/dts/am4372.dtsi | 10 +++-
863 arch/arm/boot/dts/am437x-cm-t43.dts | 6 --
864 arch/arm/boot/dts/am437x-gp-evm.dts | 21 ++++---
865 arch/arm/boot/dts/am437x-idk-evm.dts | 2 +-
866 arch/arm/boot/dts/am437x-sk-evm.dts | 45 +++++++++++----
867 arch/arm/boot/dts/am43x-epos-evm.dts | 11 +---
868 arch/arm/boot/dts/am572x-idk.dts | 2 +-
869 arch/arm/boot/dts/am57xx-beagle-x15.dts | 10 ++--
870 arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 4 +-
871 arch/arm/boot/dts/am57xx-idk-common.dtsi | 49 +++++++++++++++++
872 arch/arm/boot/dts/da850-evm.dts | 2 +-
873 arch/arm/boot/dts/dm8148-evm.dts | 4 +-
874 arch/arm/boot/dts/dm8148-t410.dts | 4 +-
875 arch/arm/boot/dts/dm814x.dtsi | 4 +-
876 arch/arm/boot/dts/dm8168-evm.dts | 4 +-
877 arch/arm/boot/dts/dm816x.dtsi | 4 +-
878 arch/arm/boot/dts/dra62x-j5eco-evm.dts | 4 +-
879 arch/arm/boot/dts/dra7-evm.dts | 14 ++---
880 arch/arm/boot/dts/dra7.dtsi | 10 ++--
881 arch/arm/boot/dts/dra72-evm-common.dtsi | 4 +-
882 arch/arm/boot/dts/dra72-evm-revc.dts | 2 +-
883 arch/arm/boot/dts/dra72-evm.dts | 2 +-
884 arch/arm/boot/dts/dra7xx-clocks.dtsi | 15 +++--
885 arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 5 ++
886 arch/arm/boot/dts/omap2.dtsi | 4 +-
887 arch/arm/boot/dts/omap2420-h4.dts | 2 +-
888 arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 2 +-
889 arch/arm/boot/dts/omap2430-sdp.dts | 2 +-
890 arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
891 arch/arm/boot/dts/omap3-beagle.dts | 2 +-
892 arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +-
893 arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +-
894 arch/arm/boot/dts/omap3-evm-37xx.dts | 2 +-
895 arch/arm/boot/dts/omap3-evm.dts | 2 +-
896 arch/arm/boot/dts/omap3-gta04.dtsi | 2 +-
897 arch/arm/boot/dts/omap3-igep.dtsi | 2 +-
898 arch/arm/boot/dts/omap3-ldp.dts | 2 +-
899 arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +-
900 arch/arm/boot/dts/omap3-n900.dts | 2 +-
901 arch/arm/boot/dts/omap3-n950-n9.dtsi | 6 +-
902 arch/arm/boot/dts/omap3-overo-alto35-common.dtsi | 2 +-
903 arch/arm/boot/dts/omap3-overo-base.dtsi | 6 ++
904 .../boot/dts/omap3-overo-chestnut43-common.dtsi | 4 +-
905 arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +-
906 arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi | 4 +-
907 arch/arm/boot/dts/omap3-overo-palo35-common.dtsi | 4 +-
908 arch/arm/boot/dts/omap3-overo-palo43-common.dtsi | 4 +-
909 arch/arm/boot/dts/omap3-pandora-common.dtsi | 10 ++--
910 arch/arm/boot/dts/omap3-sniper.dts | 2 +-
911 arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +-
912 arch/arm/boot/dts/omap3-zoom3.dts | 2 +-
913 arch/arm/boot/dts/omap3.dtsi | 6 +-
914 arch/arm/boot/dts/omap3430-sdp.dts | 2 +-
915 arch/arm/boot/dts/omap34xx.dtsi | 2 +-
916 arch/arm/boot/dts/omap36xx.dtsi | 2 +-
917 arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +-
918 arch/arm/boot/dts/omap4-duovero.dtsi | 2 +-
919 arch/arm/boot/dts/omap4-kc1.dts | 2 +-
920 arch/arm/boot/dts/omap4-panda-common.dtsi | 2 +-
921 arch/arm/boot/dts/omap4-sdp.dts | 2 +-
922 arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 +-
923 arch/arm/boot/dts/omap4.dtsi | 4 +-
924 arch/arm/boot/dts/omap5-board-common.dtsi | 2 +-
925 arch/arm/boot/dts/omap5-cm-t54.dts | 4 +-
926 arch/arm/boot/dts/omap5-igep0050.dts | 2 +-
927 arch/arm/boot/dts/omap5-uevm.dts | 2 +-
928 arch/arm/boot/dts/omap5.dtsi | 2 -
929 89 files changed, 402 insertions(+), 232 deletions(-)
930 Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
931 $ git merge omap-pending/for-next
933 Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8)
934 $ git merge qcom/for-next
935 Auto-merging arch/arm64/configs/defconfig
936 Auto-merging arch/arm64/boot/dts/qcom/apq8096-db820c.dts
937 Auto-merging arch/arm/boot/dts/Makefile
938 Merge made by the 'recursive' strategy.
939 .../devicetree/bindings/clock/qcom,gcc.txt | 16 ++
940 .../devicetree/bindings/mfd/qcom-pm8xxx.txt | 1 +
941 arch/arm/boot/dts/Makefile | 1 +
942 arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 39 +++
943 arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 15 ++
944 arch/arm/boot/dts/qcom-apq8064.dtsi | 180 +++++++++++--
945 arch/arm/boot/dts/qcom-apq8084.dtsi | 103 ++++++++
946 arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 1 +
947 arch/arm/boot/dts/qcom-msm8660.dtsi | 75 ++++--
948 .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 262 +++++++++++++++++++
949 .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 81 ++++--
950 arch/arm/boot/dts/qcom-msm8974.dtsi | 139 ++++++++++
951 arch/arm/boot/dts/qcom-pm8941.dtsi | 5 +
952 arch/arm/mach-qcom/Makefile | 1 -
953 arch/arm64/boot/dts/qcom/Makefile | 1 +
954 arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 48 ++++
955 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 82 ++++++
956 arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 39 +++
957 .../boot/dts/qcom/apq8096-db820c.dts} | 24 +-
958 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 88 +++++++
959 arch/arm64/boot/dts/qcom/msm8916.dtsi | 286 ++++++++++++++++++++-
960 arch/arm64/boot/dts/qcom/msm8996.dtsi | 94 ++++++-
961 arch/arm64/configs/defconfig | 4 +
962 drivers/firmware/qcom_scm.c | 19 +-
963 drivers/rtc/rtc-pm8xxx.c | 1 +
964 drivers/soc/qcom/smd.c | 265 +++++++++++--------
965 drivers/soc/qcom/smem.c | 3 +-
966 include/linux/soc/qcom/smd.h | 29 ++-
967 28 files changed, 1690 insertions(+), 212 deletions(-)
968 create mode 100644 arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
969 create mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi
970 rename arch/{arm/mach-qcom/board.c => arm64/boot/dts/qcom/apq8096-db820c.dts} (51%)
971 create mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
972 Merging renesas/next (a64ca8158b21 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9', 'defconfig-for-v4.9', 'dt-for-v4.9' and 'soc-for-v4.9' into next)
973 $ git merge renesas/next
974 Auto-merging arch/arm64/configs/defconfig
975 Auto-merging arch/arm/boot/dts/Makefile
976 Merge made by the 'recursive' strategy.
977 Documentation/devicetree/bindings/arm/shmobile.txt | 6 +
978 .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 2 +
979 arch/arm/Kconfig.debug | 8 +-
980 arch/arm/boot/dts/Makefile | 2 +
981 arch/arm/boot/dts/r7s72100-rskrza1.dts | 61 +
982 arch/arm/boot/dts/r7s72100.dtsi | 22 +
983 arch/arm/boot/dts/r8a7790.dtsi | 23 -
984 arch/arm/boot/dts/r8a7791.dtsi | 18 -
985 arch/arm/boot/dts/r8a7792-blanche.dts | 264 ++
986 arch/arm/boot/dts/r8a7792-wheat.dts | 199 ++
987 arch/arm/boot/dts/r8a7792.dtsi | 554 +++-
988 arch/arm/boot/dts/r8a7794-alt.dts | 106 +
989 arch/arm/boot/dts/r8a7794-silk.dts | 70 +
990 arch/arm/boot/dts/r8a7794.dtsi | 309 ++-
991 arch/arm/configs/shmobile_defconfig | 1 +
992 arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
993 arch/arm/mach-shmobile/setup-r8a7791.c | 2 +-
994 arch/arm64/boot/dts/renesas/Makefile | 2 +-
995 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 328 +++
996 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 87 +
997 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 276 +-
998 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 16 +
999 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 117 +
1000 arch/arm64/configs/defconfig | 3 +
1001 drivers/pinctrl/sh-pfc/Kconfig | 10 +
1002 drivers/pinctrl/sh-pfc/Makefile | 2 +
1003 drivers/pinctrl/sh-pfc/core.c | 12 +
1004 drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 2624 +++++++++++++++++++
1005 drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 356 ++-
1006 drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 2647 ++++++++++++++++++++
1007 drivers/pinctrl/sh-pfc/sh_pfc.h | 109 +-
1008 include/dt-bindings/clock/r7s72100-clock.h | 3 +
1009 include/dt-bindings/clock/r8a7794-clock.h | 25 +
1010 33 files changed, 8155 insertions(+), 111 deletions(-)
1011 create mode 100644 arch/arm/boot/dts/r7s72100-rskrza1.dts
1012 create mode 100644 arch/arm/boot/dts/r8a7792-wheat.dts
1013 create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
1014 create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7792.c
1015 create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7796.c
1016 Merging rockchip/for-next (e80be333a38f Merge branch 'v4.9-armsoc/dts32' into for-next)
1017 $ git merge rockchip/for-next
1018 Auto-merging arch/arm64/boot/dts/rockchip/rk3368.dtsi
1019 Auto-merging arch/arm/boot/dts/rk3xxx.dtsi
1020 Auto-merging arch/arm/boot/dts/rk3288.dtsi
1021 Auto-merging arch/arm/boot/dts/Makefile
1022 Merge made by the 'recursive' strategy.
1023 Documentation/devicetree/bindings/arm/rockchip.txt | 12 +
1024 arch/arm/boot/dts/Makefile | 2 +
1025 arch/arm/boot/dts/rk3036-evb.dts | 2 +-
1026 arch/arm/boot/dts/rk3036-kylin.dts | 2 +-
1027 arch/arm/boot/dts/rk3036.dtsi | 16 +-
1028 arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 +-
1029 arch/arm/boot/dts/rk3066a-marsboard.dts | 2 +-
1030 arch/arm/boot/dts/rk3066a-rayeager.dts | 2 +-
1031 arch/arm/boot/dts/rk3188-radxarock.dts | 2 +-
1032 arch/arm/boot/dts/rk3228-evb.dts | 2 +-
1033 arch/arm/boot/dts/rk3229-evb.dts | 2 +-
1034 arch/arm/boot/dts/rk322x.dtsi | 4 +-
1035 arch/arm/boot/dts/rk3288-evb-act8846.dts | 4 +
1036 arch/arm/boot/dts/rk3288-evb-rk808.dts | 4 +
1037 arch/arm/boot/dts/rk3288-evb.dtsi | 47 +-
1038 arch/arm/boot/dts/rk3288-fennec.dts | 382 +++++++++++++
1039 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 310 +++++++++++
1040 arch/arm/boot/dts/rk3288-firefly-reload.dts | 403 ++++++++++++++
1041 arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +-
1042 arch/arm/boot/dts/rk3288-miqi.dts | 2 +-
1043 arch/arm/boot/dts/rk3288-popmetal.dts | 14 +-
1044 arch/arm/boot/dts/rk3288-r89.dts | 2 +-
1045 arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +-
1046 arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +-
1047 arch/arm/boot/dts/rk3288.dtsi | 77 +--
1048 arch/arm/boot/dts/rk3xxx.dtsi | 16 +-
1049 arch/arm64/boot/dts/rockchip/Makefile | 1 +
1050 .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 382 +++++++++++++
1051 arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 1 -
1052 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 22 +-
1053 arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 87 +++
1054 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 609 +++++++++++++++++++--
1055 drivers/clk/rockchip/Makefile | 1 +
1056 drivers/clk/rockchip/clk-ddr.c | 154 ++++++
1057 drivers/clk/rockchip/clk-pll.c | 4 +-
1058 drivers/clk/rockchip/clk-rk3399.c | 56 +-
1059 drivers/clk/rockchip/clk-rockchip.c | 7 +-
1060 drivers/clk/rockchip/clk.c | 11 +-
1061 drivers/clk/rockchip/clk.h | 35 +-
1062 drivers/soc/rockchip/pm_domains.c | 100 ++--
1063 include/dt-bindings/clock/rk3399-cru.h | 3 +
1064 include/dt-bindings/soc/rockchip,boot-mode.h | 15 +
1065 include/soc/rockchip/rockchip_sip.h | 27 +
1066 43 files changed, 2653 insertions(+), 179 deletions(-)
1067 create mode 100644 arch/arm/boot/dts/rk3288-fennec.dts
1068 create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
1069 create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
1070 create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
1071 create mode 100644 drivers/clk/rockchip/clk-ddr.c
1072 create mode 100644 include/dt-bindings/soc/rockchip,boot-mode.h
1073 create mode 100644 include/soc/rockchip/rockchip_sip.h
1074 Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
1075 $ git merge rpi/for-rpi-next
1077 Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
1078 $ git merge samsung/for-next
1080 Merging samsung-krzk/for-next (9c2c94f84659 Merge branch 'next/dt' into for-next)
1081 $ git merge samsung-krzk/for-next
1082 Resolved 'arch/arm64/boot/dts/exynos/exynos7.dtsi' using previous resolution.
1083 Auto-merging arch/arm64/boot/dts/exynos/exynos7.dtsi
1084 CONFLICT (content): Merge conflict in arch/arm64/boot/dts/exynos/exynos7.dtsi
1085 Auto-merging MAINTAINERS
1086 Automatic merge failed; fix conflicts and then commit the result.
1088 [master 6e480ba6719c] Merge remote-tracking branch 'samsung-krzk/for-next'
1089 $ git diff -M --stat --summary HEAD^..
1090 .../devicetree/bindings/display/exynos/exynos_hdmi.txt | 4 ++--
1092 arch/arm/boot/dts/exynos3250-artik5.dtsi | 3 ++-
1093 arch/arm/boot/dts/exynos3250-monk.dts | 3 ++-
1094 arch/arm/boot/dts/exynos3250-rinato.dts | 3 ++-
1095 arch/arm/boot/dts/exynos3250.dtsi | 3 ++-
1096 arch/arm/boot/dts/exynos4.dtsi | 3 ++-
1097 arch/arm/boot/dts/exynos4210-origen.dts | 3 ++-
1098 arch/arm/boot/dts/exynos4210-smdkv310.dts | 3 ++-
1099 arch/arm/boot/dts/exynos4210-trats.dts | 3 ++-
1100 arch/arm/boot/dts/exynos4210-universal_c210.dts | 5 +++--
1101 arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +-
1102 arch/arm/boot/dts/exynos4412-odroidu3.dts | 3 ++-
1103 arch/arm/boot/dts/exynos4412-odroidx.dts | 3 ++-
1104 arch/arm/boot/dts/exynos4412-odroidx2.dts | 3 ++-
1105 arch/arm/boot/dts/exynos4412-origen.dts | 3 ++-
1106 arch/arm/boot/dts/exynos4412-smdk4412.dts | 3 ++-
1107 arch/arm/boot/dts/exynos4412-tiny4412.dts | 3 ++-
1108 arch/arm/boot/dts/exynos4412-trats2.dts | 3 ++-
1109 arch/arm/boot/dts/exynos4415.dtsi | 3 ++-
1110 arch/arm/boot/dts/exynos4x12.dtsi | 5 ++++-
1111 arch/arm/boot/dts/exynos5.dtsi | 3 ++-
1112 arch/arm/boot/dts/exynos5250-arndale.dts | 5 +++--
1113 arch/arm/boot/dts/exynos5250-smdk5250.dts | 5 +++--
1114 arch/arm/boot/dts/exynos5250-snow-common.dtsi | 5 +++--
1115 arch/arm/boot/dts/exynos5250-spring.dts | 5 +++--
1116 arch/arm/boot/dts/exynos5260-xyref5260.dts | 3 ++-
1117 arch/arm/boot/dts/exynos5260.dtsi | 4 ++--
1118 arch/arm/boot/dts/exynos5410-odroidxu.dts | 5 +++--
1119 arch/arm/boot/dts/exynos5410-smdk5410.dts | 3 ++-
1120 arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 +++++++++++++++-
1121 arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +++--
1122 arch/arm/boot/dts/exynos5420-smdk5420.dts | 5 +++--
1123 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 7 ++++---
1124 arch/arm/boot/dts/exynos5440-sd5v1.dts | 6 ++++++
1125 arch/arm/boot/dts/exynos5440-ssdk5440.dts | 6 ++++++
1126 arch/arm/boot/dts/exynos5440.dtsi | 3 ++-
1127 arch/arm/boot/dts/exynos54xx.dtsi | 1 -
1128 arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +++--
1129 arch/arm/mach-exynos/suspend.c | 6 ++++++
1130 arch/arm64/boot/dts/exynos/exynos7.dtsi | 13 +++++++++----
1131 41 files changed, 123 insertions(+), 53 deletions(-)
1132 Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
1133 $ git merge tegra/for-next
1134 Auto-merging arch/arm64/Kconfig.platforms
1135 Merge made by the 'recursive' strategy.
1136 arch/arm/boot/dts/tegra114.dtsi | 8 +-
1137 arch/arm64/Kconfig.platforms | 2 +
1138 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 120 ++++++++++++++++++++++++++
1139 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 79 +++++++++++++++--
1140 drivers/bus/Kconfig | 6 +-
1141 drivers/bus/tegra-aconnect.c | 22 +----
1142 drivers/clk/tegra/clk-tegra-pmc.c | 2 +-
1143 drivers/soc/tegra/pmc.c | 28 ++----
1144 8 files changed, 210 insertions(+), 57 deletions(-)
1145 Merging arm64/for-next/core (e506236a7b81 arm64/kvm: use alternative auto-nop)
1146 $ git merge arm64/for-next/core
1147 Resolved 'arch/arm64/kernel/head.S' using previous resolution.
1148 Resolved 'drivers/perf/arm_pmu.c' using previous resolution.
1149 Auto-merging include/linux/cpuhotplug.h
1150 Auto-merging drivers/perf/arm_pmu.c
1151 CONFLICT (content): Merge conflict in drivers/perf/arm_pmu.c
1152 Auto-merging arch/arm64/mm/proc.S
1153 Removing arch/arm64/mm/mm.h
1154 Auto-merging arch/arm64/kvm/sys_regs.c
1155 Auto-merging arch/arm64/kernel/head.S
1156 CONFLICT (content): Merge conflict in arch/arm64/kernel/head.S
1157 Auto-merging arch/arm64/include/asm/spinlock.h
1158 Auto-merging arch/arm64/Kconfig.platforms
1159 Automatic merge failed; fix conflicts and then commit the result.
1161 [master ecb061820599] Merge remote-tracking branch 'arm64/for-next/core'
1162 $ git diff -M --stat --summary HEAD^..
1163 Documentation/static-keys.txt | 9 ++
1164 arch/arm/kernel/perf_event_v7.c | 47 ++++----
1165 arch/arm64/Kconfig | 28 +++--
1166 arch/arm64/Kconfig.debug | 10 --
1167 arch/arm64/Kconfig.platforms | 1 -
1168 arch/arm64/Makefile | 10 ++
1169 arch/arm64/include/asm/Kbuild | 5 -
1170 arch/arm64/include/asm/acpi.h | 8 +-
1171 arch/arm64/include/asm/alternative.h | 70 +++++++++---
1172 arch/arm64/include/asm/arch_timer.h | 41 +++----
1173 arch/arm64/include/asm/assembler.h | 53 ++++++++-
1174 arch/arm64/include/asm/atomic_lse.h | 64 +++++------
1175 arch/arm64/include/asm/barrier.h | 3 +
1176 arch/arm64/include/asm/cacheflush.h | 3 +-
1177 arch/arm64/include/asm/cmpxchg.h | 4 +-
1178 arch/arm64/include/asm/cpufeature.h | 42 ++++---
1179 arch/arm64/include/asm/cputype.h | 6 +-
1180 arch/arm64/include/asm/dcc.h | 14 +--
1181 arch/arm64/include/asm/esr.h | 84 ++++++++++++--
1182 arch/arm64/include/asm/hw_breakpoint.h | 15 ++-
1183 arch/arm64/include/asm/insn.h | 11 +-
1184 arch/arm64/include/asm/io.h | 19 +---
1185 arch/arm64/include/asm/kvm_mmu.h | 10 +-
1186 arch/arm64/include/asm/mmu_context.h | 36 +++---
1187 arch/arm64/include/asm/pgtable-hwdef.h | 1 +
1188 arch/arm64/include/asm/pgtable-prot.h | 5 +-
1189 arch/arm64/include/asm/pgtable.h | 20 +++-
1190 arch/arm64/include/asm/processor.h | 2 -
1191 arch/arm64/include/asm/sections.h | 30 +++++
1192 arch/arm64/include/asm/spinlock.h | 27 ++---
1193 arch/arm64/include/asm/suspend.h | 3 +
1194 arch/arm64/include/asm/sysreg.h | 44 ++++++--
1195 arch/arm64/include/asm/system_misc.h | 6 -
1196 arch/arm64/include/asm/thread_info.h | 3 +
1197 arch/arm64/include/asm/traps.h | 6 +-
1198 arch/arm64/include/asm/virt.h | 15 +--
1199 arch/arm64/kernel/Makefile | 2 +
1200 arch/arm64/kernel/acpi_numa.c | 4 +-
1201 arch/arm64/kernel/alternative.c | 28 ++++-
1202 arch/arm64/kernel/asm-offsets.c | 2 +
1203 arch/arm64/kernel/cacheinfo.c | 8 +-
1204 arch/arm64/kernel/cpu_errata.c | 26 ++++-
1205 arch/arm64/kernel/cpu_ops.c | 3 +-
1206 arch/arm64/kernel/cpufeature.c | 137 ++++++++++++----------
1207 arch/arm64/kernel/cpuinfo.c | 2 -
1208 arch/arm64/kernel/debug-monitors.c | 48 +++-----
1209 arch/arm64/kernel/entry.S | 24 ++--
1210 arch/arm64/kernel/head.S | 200 ++++++++++++++++++---------------
1211 arch/arm64/kernel/hibernate-asm.S | 6 +-
1212 arch/arm64/kernel/hibernate.c | 118 +++++++++++++------
1213 arch/arm64/kernel/hw_breakpoint.c | 48 +++-----
1214 arch/arm64/kernel/insn.c | 15 ++-
1215 arch/arm64/kernel/kaslr.c | 3 +-
1216 arch/arm64/kernel/perf_event.c | 42 ++++---
1217 arch/arm64/kernel/probes/kprobes.c | 34 +++---
1218 arch/arm64/kernel/process.c | 14 +--
1219 arch/arm64/kernel/relocate_kernel.S | 2 +-
1220 arch/arm64/kernel/setup.c | 11 +-
1221 arch/arm64/kernel/signal.c | 36 ++++--
1222 arch/arm64/kernel/sleep.S | 29 ++---
1223 arch/arm64/kernel/smp.c | 14 ++-
1224 arch/arm64/kernel/smp_spin_table.c | 3 +-
1225 arch/arm64/kernel/stacktrace.c | 21 ++++
1226 arch/arm64/kernel/suspend.c | 10 +-
1227 arch/arm64/kernel/sys_compat.c | 2 +-
1228 arch/arm64/kernel/traps.c | 87 +++++++++-----
1229 arch/arm64/kernel/vdso.c | 34 +++---
1230 arch/arm64/kernel/vmlinux.lds.S | 19 ++++
1231 arch/arm64/kvm/hyp.S | 6 +-
1232 arch/arm64/kvm/sys_regs.c | 31 ++---
1233 arch/arm64/kvm/sys_regs_generic_v8.c | 6 +-
1234 arch/arm64/lib/copy_page.S | 13 +--
1235 arch/arm64/mm/cache.S | 82 +++++++-------
1236 arch/arm64/mm/dma-mapping.c | 9 +-
1237 arch/arm64/mm/fault.c | 5 +-
1238 arch/arm64/mm/flush.c | 2 -
1239 arch/arm64/mm/init.c | 15 ++-
1240 arch/arm64/mm/mm.h | 2 -
1241 arch/arm64/mm/mmu.c | 15 +--
1242 arch/arm64/mm/numa.c | 115 +++++++++++++------
1243 arch/arm64/mm/pageattr.c | 41 ++++++-
1244 arch/arm64/mm/pgd.c | 2 -
1245 arch/arm64/mm/proc.S | 13 +--
1246 drivers/of/of_numa.c | 66 +++++------
1247 drivers/perf/arm_pmu.c | 33 +++++-
1248 include/linux/cpu.h | 6 +-
1249 include/linux/cpuhotplug.h | 2 +
1250 include/linux/jump_label.h | 12 ++
1251 include/linux/perf/arm_pmu.h | 11 +-
1254 91 files changed, 1376 insertions(+), 912 deletions(-)
1255 create mode 100644 arch/arm64/include/asm/sections.h
1256 delete mode 100644 arch/arm64/mm/mm.h
1257 Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
1258 $ git merge blackfin/for-linus
1259 Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution.
1260 Auto-merging arch/blackfin/mach-common/pm.c
1261 CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
1262 Automatic merge failed; fix conflicts and then commit the result.
1264 [master 72e8ca53444b] Merge remote-tracking branch 'blackfin/for-linus'
1265 $ git diff -M --stat --summary HEAD^..
1266 Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
1267 $ git merge c6x/for-linux-next
1269 Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
1270 $ git merge cris/for-next
1272 Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
1273 $ git merge h8300/h8300-next
1274 Merge made by the 'recursive' strategy.
1275 Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
1276 $ git merge hexagon/linux-next
1278 Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
1279 $ git merge ia64/next
1281 Merging m68k/for-next (986d80466712 m68k/defconfig: Update defconfigs for v4.8-rc1)
1282 $ git merge m68k/for-next
1283 Merge made by the 'recursive' strategy.
1284 arch/m68k/configs/amiga_defconfig | 3 +++
1285 arch/m68k/configs/apollo_defconfig | 3 +++
1286 arch/m68k/configs/atari_defconfig | 3 +++
1287 arch/m68k/configs/bvme6000_defconfig | 3 +++
1288 arch/m68k/configs/hp300_defconfig | 3 +++
1289 arch/m68k/configs/mac_defconfig | 3 +++
1290 arch/m68k/configs/multi_defconfig | 3 +++
1291 arch/m68k/configs/mvme147_defconfig | 3 +++
1292 arch/m68k/configs/mvme16x_defconfig | 3 +++
1293 arch/m68k/configs/q40_defconfig | 3 +++
1294 arch/m68k/configs/sun3_defconfig | 3 +++
1295 arch/m68k/configs/sun3x_defconfig | 3 +++
1296 12 files changed, 36 insertions(+)
1297 Merging m68knommu/for-next (15bbcf4ac65a m68knommu: convert printk(KERN_INFO) to pr_info())
1298 $ git merge m68knommu/for-next
1299 Merge made by the 'recursive' strategy.
1300 arch/m68k/Kconfig | 1 -
1301 arch/m68k/Kconfig.cpu | 6 ++
1302 arch/m68k/coldfire/head.S | 8 +--
1303 arch/m68k/coldfire/m528x.c | 8 +--
1304 arch/m68k/coldfire/m53xx.c | 8 +--
1305 arch/m68k/coldfire/m54xx.c | 40 +------------
1306 arch/m68k/include/asm/bootinfo.h | 6 ++
1307 arch/m68k/include/asm/m5441xsim.h | 4 ++
1308 arch/m68k/include/asm/m54xxacr.h | 2 +-
1309 arch/m68k/include/asm/m54xxsim.h | 4 ++
1310 arch/m68k/include/asm/mcfmmu.h | 1 +
1311 arch/m68k/include/asm/nettel.h | 2 +-
1312 arch/m68k/include/uapi/asm/bootinfo.h | 1 +
1313 arch/m68k/kernel/Makefile | 1 +
1314 arch/m68k/kernel/process.c | 56 +++++++++---------
1315 arch/m68k/kernel/setup_mm.c | 6 +-
1316 arch/m68k/kernel/setup_no.c | 103 +++++---------------------------
1317 arch/m68k/kernel/uboot.c | 107 ++++++++++++++++++++++++++++++++++
1318 arch/m68k/mm/mcfmmu.c | 31 +++++++++-
1319 19 files changed, 218 insertions(+), 177 deletions(-)
1320 create mode 100644 arch/m68k/kernel/uboot.c
1321 Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
1322 $ git merge metag/for-next
1324 Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
1325 $ git merge microblaze/next
1327 Merging mips/mips-for-linux-next (82440d0d030d Merge branch '4.8-fixes' into mips-for-linux-next)
1328 $ git merge mips/mips-for-linux-next
1329 Removing arch/mips/kernel/smp-gic.c
1330 Auto-merging arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts
1331 Merge made by the 'recursive' strategy.
1332 .../devicetree/bindings/mips/brcm/soc.txt | 4 +-
1333 arch/mips/Kconfig | 13 ++
1334 arch/mips/ath79/clock.c | 2 +-
1335 arch/mips/bcm47xx/serial.c | 11 +-
1336 arch/mips/bmips/Kconfig | 20 ++-
1337 arch/mips/bmips/setup.c | 4 +-
1338 arch/mips/boot/dts/brcm/Makefile | 36 +++---
1339 .../mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts | 22 ++++
1340 arch/mips/boot/dts/brcm/bcm3368.dtsi | 101 ++++++++++++++++
1341 .../boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts | 108 +++++++++++++++++
1342 arch/mips/boot/dts/brcm/bcm63268.dtsi | 134 +++++++++++++++++++++
1343 ...6358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} | 1 +
1344 .../boot/dts/brcm/bcm6362-neufbox6-sercomm.dts | 22 ++++
1345 arch/mips/boot/dts/brcm/bcm6362.dtsi | 134 +++++++++++++++++++++
1346 arch/mips/cavium-octeon/setup.c | 38 +++---
1347 arch/mips/configs/loongson1c_defconfig | 126 +++++++++++++++++++
1348 arch/mips/configs/pistachio_defconfig | 2 -
1349 arch/mips/include/asm/cpu-type.h | 3 +-
1350 arch/mips/include/asm/cpu.h | 1 +
1351 arch/mips/include/asm/mach-loongson32/irq.h | 41 ++++++-
1352 arch/mips/include/asm/mach-loongson32/loongson1.h | 5 +
1353 arch/mips/include/asm/mach-loongson32/regs-clk.h | 34 ++++++
1354 arch/mips/include/asm/mach-loongson32/regs-mux.h | 61 ++++++++++
1355 arch/mips/kernel/proc.c | 7 ++
1356 arch/mips/kernel/setup.c | 7 ++
1357 arch/mips/kernel/smp-gic.c | 66 ----------
1358 arch/mips/kernel/smp-mt.c | 23 ----
1359 arch/mips/kernel/uprobes.c | 2 +-
1360 arch/mips/lantiq/xway/vmmc.c | 6 +-
1361 arch/mips/lantiq/xway/xrx200_phy_fw.c | 12 +-
1362 arch/mips/loongson32/Kconfig | 15 +++
1363 arch/mips/loongson32/Makefile | 6 +
1364 arch/mips/loongson32/Platform | 1 +
1365 arch/mips/loongson32/common/irq.c | 55 ++++++++-
1366 arch/mips/loongson32/common/platform.c | 19 +++
1367 arch/mips/loongson32/common/setup.c | 4 +
1368 arch/mips/loongson32/ls1c/Makefile | 5 +
1369 arch/mips/loongson32/ls1c/board.c | 28 +++++
1370 arch/mips/mm/init.c | 13 +-
1371 arch/mips/pci/pci-mt7620.c | 1 -
1372 arch/mips/ralink/timer.c | 28 ++---
1373 41 files changed, 1035 insertions(+), 186 deletions(-)
1374 create mode 100644 arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts
1375 create mode 100644 arch/mips/boot/dts/brcm/bcm3368.dtsi
1376 create mode 100644 arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts
1377 create mode 100644 arch/mips/boot/dts/brcm/bcm63268.dtsi
1378 rename arch/mips/boot/dts/brcm/{bcm96358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} (94%)
1379 create mode 100644 arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts
1380 create mode 100644 arch/mips/boot/dts/brcm/bcm6362.dtsi
1381 create mode 100644 arch/mips/configs/loongson1c_defconfig
1382 delete mode 100644 arch/mips/kernel/smp-gic.c
1383 create mode 100644 arch/mips/loongson32/ls1c/Makefile
1384 create mode 100644 arch/mips/loongson32/ls1c/board.c
1385 Merging nios2/for-next (65f836ae4de0 nios2: use of_property_read_bool)
1386 $ git merge nios2/for-next
1387 Merge made by the 'recursive' strategy.
1388 arch/nios2/include/asm/cpuinfo.h | 8 ++++----
1389 arch/nios2/kernel/cpuinfo.c | 15 +++++----------
1390 2 files changed, 9 insertions(+), 14 deletions(-)
1391 Merging parisc-hd/for-next (523d939ef98f Linux 4.7)
1392 $ git merge parisc-hd/for-next
1394 Merging powerpc/next (c6935931c189 Linux 4.8-rc5)
1395 $ git merge powerpc/next
1397 Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number)
1398 $ git merge fsl/next
1400 Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
1401 $ git merge mpc5xxx/next
1403 Merging s390/features (c783b91ebdba s390: add assembler include path for vx-insn.h)
1404 $ git merge s390/features
1405 Merge made by the 'recursive' strategy.
1406 arch/s390/Makefile | 2 +
1407 arch/s390/appldata/appldata_base.c | 2 +-
1408 arch/s390/crypto/aes_s390.c | 590 +++++++++++++--------------------
1409 arch/s390/crypto/crc32-vx.c | 2 +-
1410 arch/s390/crypto/des_s390.c | 330 ++++++++----------
1411 arch/s390/crypto/ghash_s390.c | 20 +-
1412 arch/s390/crypto/prng.c | 101 ++----
1413 arch/s390/crypto/sha1_s390.c | 2 +-
1414 arch/s390/crypto/sha256_s390.c | 2 +-
1415 arch/s390/crypto/sha512_s390.c | 2 +-
1416 arch/s390/crypto/sha_common.c | 23 +-
1417 arch/s390/include/asm/cpacf.h | 178 +++++-----
1418 arch/s390/include/asm/facilities_src.h | 24 ++
1419 arch/s390/include/asm/fpu/api.h | 32 +-
1420 arch/s390/include/asm/lowcore.h | 3 +-
1421 arch/s390/include/asm/mmu.h | 1 +
1422 arch/s390/include/asm/mmu_context.h | 1 +
1423 arch/s390/include/asm/pci.h | 4 +
1424 arch/s390/include/asm/pgtable.h | 74 ++---
1425 arch/s390/include/asm/tlbflush.h | 72 ++--
1426 arch/s390/include/asm/vx-insn.h | 148 +++++++--
1427 arch/s390/kernel/fpu.c | 317 +++++++-----------
1428 arch/s390/kernel/nmi.c | 67 ++--
1429 arch/s390/kernel/sysinfo.c | 2 +-
1430 arch/s390/kernel/time.c | 86 +----
1431 arch/s390/kvm/kvm-s390.c | 38 ++-
1432 arch/s390/mm/gmap.c | 15 +
1433 arch/s390/mm/pageattr.c | 4 +-
1434 arch/s390/mm/pgtable.c | 18 +-
1435 arch/s390/pci/pci.c | 9 +
1436 drivers/s390/char/tape_3590.c | 11 +-
1437 drivers/s390/cio/cio.h | 1 -
1438 drivers/s390/scsi/zfcp_aux.c | 2 +-
1439 include/linux/raid/pq.h | 2 +
1440 lib/raid6/.gitignore | 1 +
1441 lib/raid6/Makefile | 6 +
1442 lib/raid6/algos.c | 6 +
1443 lib/raid6/recov_s390xc.c | 116 +++++++
1444 lib/raid6/s390vx.uc | 168 ++++++++++
1445 39 files changed, 1240 insertions(+), 1242 deletions(-)
1446 create mode 100644 lib/raid6/recov_s390xc.c
1447 create mode 100644 lib/raid6/s390vx.uc
1448 Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
1449 $ git merge sparc-next/master
1451 Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
1452 $ git merge sh/for-next
1454 Merging tile/master (ecc8bebe29f5 tile: remove #pragma unroll from finv_buffer_remote())
1455 $ git merge tile/master
1456 Merge made by the 'recursive' strategy.
1457 arch/tile/kernel/module.c | 11 +++++------
1458 arch/tile/kernel/pci_gx.c | 2 +-
1459 arch/tile/lib/cacheflush.c | 8 +-------
1460 drivers/char/tile-srom.c | 28 +++++++++++++++-------------
1461 4 files changed, 22 insertions(+), 27 deletions(-)
1462 Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
1463 $ git merge uml/linux-next
1465 Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
1466 $ git merge unicore32/unicore32
1467 Merge made by the 'recursive' strategy.
1468 Merging xtensa/for_next (9e8511ff7e3f Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
1469 $ git merge xtensa/for_next
1470 Auto-merging arch/xtensa/kernel/setup.c
1471 Merge made by the 'recursive' strategy.
1472 Documentation/xtensa/mmu.txt | 173 ++++++++++++++++---
1473 arch/xtensa/Kconfig | 90 ++++++++--
1474 arch/xtensa/boot/boot-elf/boot.lds.S | 2 +-
1475 arch/xtensa/boot/boot-elf/bootstrap.S | 7 +-
1476 arch/xtensa/boot/boot-uboot/Makefile | 10 +-
1477 arch/xtensa/include/asm/bitops.h | 2 +-
1478 arch/xtensa/include/asm/cacheasm.h | 11 +-
1479 arch/xtensa/include/asm/fixmap.h | 5 +
1480 arch/xtensa/include/asm/highmem.h | 5 +
1481 arch/xtensa/include/asm/initialize_mmu.h | 44 +++--
1482 arch/xtensa/include/asm/kmem_layout.h | 74 ++++++++
1483 arch/xtensa/include/asm/page.h | 27 ++-
1484 arch/xtensa/include/asm/pgtable.h | 7 +-
1485 arch/xtensa/include/asm/processor.h | 2 +-
1486 arch/xtensa/include/asm/sysmem.h | 21 +--
1487 arch/xtensa/include/asm/vectors.h | 67 +++-----
1488 arch/xtensa/include/uapi/asm/types.h | 3 +-
1489 arch/xtensa/include/uapi/asm/unistd.h | 15 +-
1490 arch/xtensa/kernel/entry.S | 5 +-
1491 arch/xtensa/kernel/head.S | 2 +-
1492 arch/xtensa/kernel/setup.c | 48 +++---
1493 arch/xtensa/kernel/vmlinux.lds.S | 4 -
1494 arch/xtensa/mm/init.c | 279 +++----------------------------
1495 23 files changed, 448 insertions(+), 455 deletions(-)
1496 create mode 100644 arch/xtensa/include/asm/kmem_layout.h
1497 Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c)
1498 $ git merge befs/for-next
1499 Merge made by the 'recursive' strategy.
1500 fs/befs/befs.h | 19 +---
1501 fs/befs/btree.c | 60 ++++++------
1502 fs/befs/datastream.c | 253 +++++++++++++++++++++++++--------------------------
1503 fs/befs/debug.c | 1 +
1504 fs/befs/io.c | 26 +-----
1506 fs/befs/linuxvfs.c | 130 +++++++++++++-------------
1507 fs/befs/super.c | 36 +++++---
1508 8 files changed, 244 insertions(+), 283 deletions(-)
1509 Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
1510 $ git merge btrfs/next
1512 Merging btrfs-kdave/for-next (56b508b018fd Merge branch 'for-next-next-4.9-20160909' into for-next-20160909)
1513 $ git merge btrfs-kdave/for-next
1514 Auto-merging fs/btrfs/tree-log.c
1515 Merge made by the 'recursive' strategy.
1516 fs/btrfs/backref.c | 361 ++++++++++++++++++++++++++++++++++++++++--
1517 fs/btrfs/btrfs_inode.h | 11 --
1518 fs/btrfs/ctree.c | 2 -
1519 fs/btrfs/ctree.h | 78 ++++++---
1520 fs/btrfs/delayed-inode.c | 3 +-
1521 fs/btrfs/delayed-ref.c | 6 +-
1522 fs/btrfs/disk-io.c | 120 ++++++++++----
1523 fs/btrfs/disk-io.h | 2 +
1524 fs/btrfs/extent-tree.c | 99 +++++++++---
1525 fs/btrfs/extent_io.c | 62 +++++---
1526 fs/btrfs/extent_io.h | 4 +-
1527 fs/btrfs/file.c | 43 +++--
1528 fs/btrfs/free-space-tree.c | 6 +-
1529 fs/btrfs/inode.c | 44 +++--
1530 fs/btrfs/qgroup.c | 55 ++++---
1531 fs/btrfs/raid56.c | 5 +-
1532 fs/btrfs/relocation.c | 4 +-
1533 fs/btrfs/super.c | 2 +-
1534 fs/btrfs/sysfs.c | 11 +-
1535 fs/btrfs/tests/inode-tests.c | 12 +-
1536 fs/btrfs/tests/qgroup-tests.c | 2 +-
1537 fs/btrfs/transaction.c | 24 ++-
1538 fs/btrfs/tree-log.c | 4 +-
1539 fs/btrfs/volumes.c | 68 ++++----
1540 24 files changed, 787 insertions(+), 241 deletions(-)
1541 Merging ceph/master (0276dca6c1ec rbd: add force close option)
1542 $ git merge ceph/master
1543 Merge made by the 'recursive' strategy.
1544 Documentation/ABI/testing/sysfs-bus-rbd | 29 +-
1545 drivers/block/rbd.c | 1195 +++++++++++++++++++++++++++----
1546 drivers/block/rbd_types.h | 11 +
1547 include/linux/ceph/auth.h | 2 +-
1548 include/linux/ceph/ceph_fs.h | 11 +
1549 include/linux/ceph/cls_lock_client.h | 49 ++
1550 include/linux/ceph/libceph.h | 3 +-
1551 include/linux/ceph/mon_client.h | 3 +
1552 include/linux/ceph/osd_client.h | 23 +-
1553 net/ceph/Makefile | 1 +
1554 net/ceph/auth.c | 7 +-
1555 net/ceph/auth_none.c | 2 +-
1556 net/ceph/ceph_common.c | 13 +-
1557 net/ceph/ceph_strings.c | 1 +
1558 net/ceph/cls_lock_client.c | 325 +++++++++
1559 net/ceph/mon_client.c | 82 +++
1560 net/ceph/osd_client.c | 169 +++++
1561 17 files changed, 1777 insertions(+), 149 deletions(-)
1562 create mode 100644 include/linux/ceph/cls_lock_client.h
1563 create mode 100644 net/ceph/cls_lock_client.c
1564 Merging cifs/for-next (8e1e83d23606 Move check for prefix path to within cifs_get_root())
1565 $ git merge cifs/for-next
1566 Merge made by the 'recursive' strategy.
1567 fs/cifs/cifsfs.c | 29 ++++++++++++-----------------
1568 fs/cifs/cifsproto.h | 2 +-
1569 fs/cifs/connect.c | 31 +++++++++++++++++++++++++++++--
1570 3 files changed, 42 insertions(+), 20 deletions(-)
1571 Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error)
1572 $ git merge configfs/for-next
1574 Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
1575 $ git merge ecryptfs/next
1576 Merge made by the 'recursive' strategy.
1577 Merging ext3/for_next (f27792f5b7e0 udf: Remove useless check in udf_adinicb_write_begin())
1578 $ git merge ext3/for_next
1579 Merge made by the 'recursive' strategy.
1580 fs/ext2/ialloc.c | 5 +++++
1581 fs/quota/quota.c | 18 ++++++++++++------
1582 fs/udf/file.c | 2 +-
1583 3 files changed, 18 insertions(+), 7 deletions(-)
1584 Merging ext4/dev (933ef679501f ext4: improve ext4lazyinit scalability)
1585 $ git merge ext4/dev
1586 Auto-merging fs/ext4/ioctl.c
1587 Merge made by the 'recursive' strategy.
1588 fs/ext4/ext4.h | 32 ++---
1589 fs/ext4/fsync.c | 9 +-
1590 fs/ext4/ialloc.c | 2 +-
1591 fs/ext4/inode.c | 15 ++-
1592 fs/ext4/ioctl.c | 6 +-
1593 fs/ext4/move_extent.c | 7 ++
1594 fs/ext4/super.c | 80 ++++++++----
1595 fs/ext4/xattr.c | 340 ++++++++++++++++++++++++++------------------------
1597 9 files changed, 275 insertions(+), 222 deletions(-)
1598 Merging f2fs/dev (9b9c618fbed6 f2fs: check free_sections for defragmentation)
1599 $ git merge f2fs/dev
1600 Auto-merging fs/f2fs/file.c
1601 Merge made by the 'recursive' strategy.
1602 Documentation/filesystems/f2fs.txt | 1 +
1603 fs/f2fs/checkpoint.c | 25 +++++
1604 fs/f2fs/data.c | 56 +++++++-----
1605 fs/f2fs/debug.c | 14 ++-
1606 fs/f2fs/dir.c | 106 +++++++++++++---------
1607 fs/f2fs/f2fs.h | 42 +++++++--
1608 fs/f2fs/file.c | 8 +-
1609 fs/f2fs/gc.c | 62 +++++++------
1610 fs/f2fs/inline.c | 21 +++--
1611 fs/f2fs/namei.c | 13 ++-
1612 fs/f2fs/node.c | 2 -
1613 fs/f2fs/recovery.c | 25 +++--
1614 fs/f2fs/segment.c | 181 ++++++++++++++++++++++++++++++-------
1615 fs/f2fs/segment.h | 11 ++-
1616 fs/f2fs/super.c | 8 ++
1617 fs/f2fs/xattr.c | 2 +
1618 include/trace/events/f2fs.h | 18 ++--
1619 17 files changed, 419 insertions(+), 176 deletions(-)
1620 Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
1621 $ git merge freevxfs/for-next
1623 Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
1624 $ git merge fscache/fscache
1626 Merging fuse/for-next (663ed4a5e67c fuse: update attributes before splice read)
1627 $ git merge fuse/for-next
1628 Merge made by the 'recursive' strategy.
1629 fs/fuse/file.c | 42 ++++++++++++++++++++++++++++++++----------
1630 1 file changed, 32 insertions(+), 10 deletions(-)
1631 Merging gfs2/for-next (23e5671a79be gfs2: Fix extended attribute readahead optimization)
1632 $ git merge gfs2/for-next
1633 Merge made by the 'recursive' strategy.
1634 fs/gfs2/aops.c | 19 +++++++++++++------
1635 fs/gfs2/bmap.c | 6 +++---
1636 fs/gfs2/dir.c | 20 ++++++++++----------
1637 fs/gfs2/glock.c | 2 +-
1638 fs/gfs2/inode.h | 2 +-
1639 fs/gfs2/meta_io.c | 35 +++++++++++++++++++----------------
1640 fs/gfs2/ops_fstype.c | 8 ++++----
1641 fs/gfs2/quota.c | 4 ++--
1642 fs/gfs2/super.c | 2 +-
1643 9 files changed, 54 insertions(+), 44 deletions(-)
1644 Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
1645 $ git merge jfs/jfs-next
1646 Merge made by the 'recursive' strategy.
1647 fs/jfs/jfs_txnmgr.c | 3 +--
1648 fs/jfs/resize.c | 10 ++++++++--
1649 2 files changed, 9 insertions(+), 4 deletions(-)
1650 Merging nfs/linux-next (b519d408ea32 NFSv4.1: Fix the CREATE_SESSION slot number accounting)
1651 $ git merge nfs/linux-next
1652 Merge made by the 'recursive' strategy.
1653 fs/nfs/file.c | 5 ++++-
1654 fs/nfs/nfs4proc.c | 21 ++++++++++++++-----
1655 fs/nfs/pnfs.c | 42 +++++++++++++++++++++-----------------
1656 net/sunrpc/xprtrdma/verbs.c | 45 +++++++++++++++++++++++++++++------------
1657 net/sunrpc/xprtrdma/xprt_rdma.h | 1 +
1658 net/sunrpc/xprtsock.c | 2 +-
1659 6 files changed, 78 insertions(+), 38 deletions(-)
1660 Merging nfsd/nfsd-next (6ab13dd7deef nfsd: randomize SETCLIENTID reply to help distinguish servers)
1661 $ git merge nfsd/nfsd-next
1662 Merge made by the 'recursive' strategy.
1663 fs/nfsd/flexfilelayout.c | 1 +
1664 fs/nfsd/nfs4callback.c | 7 +++----
1665 fs/nfsd/nfs4layouts.c | 6 +++++-
1666 fs/nfsd/nfsctl.c | 2 ++
1667 fs/nfsd/pnfs.h | 1 +
1668 fs/nfsd/state.h | 1 -
1669 6 files changed, 12 insertions(+), 6 deletions(-)
1670 Merging orangefs/for-next (a21aae3bb15a Merge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux)
1671 $ git merge orangefs/for-next
1672 Merge made by the 'recursive' strategy.
1673 fs/orangefs/downcall.h | 5 +-
1674 fs/orangefs/file.c | 36 ++++++++++-
1675 fs/orangefs/orangefs-cache.c | 4 +-
1676 fs/orangefs/orangefs-dev-proto.h | 2 +-
1677 fs/orangefs/orangefs-sysfs.c | 127 +++++++++++++++++++++++++++++++++++----
1678 fs/orangefs/orangefs-utils.c | 2 +-
1679 fs/orangefs/upcall.h | 12 +++-
1680 7 files changed, 167 insertions(+), 21 deletions(-)
1681 Merging overlayfs/overlayfs-next (f654a0253c96 Revert "ovl: get_write_access() in truncate")
1682 $ git merge overlayfs/overlayfs-next
1683 Merge made by the 'recursive' strategy.
1684 Documentation/filesystems/overlayfs.txt | 3 --
1685 fs/inode.c | 38 +++++++++++++++++++----
1686 fs/locks.c | 53 +++++++++++++++++++--------------
1687 fs/namespace.c | 2 +-
1688 fs/open.c | 17 +++++++++--
1689 fs/overlayfs/inode.c | 21 -------------
1690 fs/overlayfs/super.c | 2 +-
1691 include/linux/dcache.h | 5 ++--
1692 include/linux/fs.h | 16 ++++++++--
1693 include/linux/fsnotify.h | 14 +++++----
1694 include/uapi/linux/fs.h | 1 +
1695 11 files changed, 105 insertions(+), 67 deletions(-)
1696 Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
1697 $ git merge v9fs/for-next
1699 Merging ubifs/linux-next (17ce1eb0b64e ubifs: Fix xattr generic handler usage)
1700 $ git merge ubifs/linux-next
1702 Merging xfs/for-next (ea78d80866ce xfs: track log done items directly in the deferred pending work item)
1703 $ git merge xfs/for-next
1705 Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns)
1706 $ git merge file-locks/linux-next
1707 Auto-merging fs/locks.c
1708 Merge made by the 'recursive' strategy.
1709 fs/locks.c | 21 ++++++++++++++++++---
1710 1 file changed, 18 insertions(+), 3 deletions(-)
1711 Merging vfs-miklos/next (d55af8a321be vfs: add note about i_op->rename changes to porting)
1712 $ git merge vfs-miklos/next
1713 Auto-merging include/linux/fs.h
1714 Auto-merging fs/xfs/xfs_iops.c
1715 Auto-merging fs/overlayfs/overlayfs.h
1716 Auto-merging fs/overlayfs/dir.c
1717 Auto-merging fs/nfs/internal.h
1718 Auto-merging fs/f2fs/namei.c
1719 Auto-merging fs/cifs/cifsfs.c
1720 Auto-merging fs/ceph/dir.c
1721 Auto-merging fs/btrfs/inode.c
1722 Auto-merging drivers/staging/lustre/lustre/llite/namei.c
1723 Merge made by the 'recursive' strategy.
1724 Documentation/filesystems/Locking | 8 ++------
1725 Documentation/filesystems/directory-locking | 2 +-
1726 Documentation/filesystems/porting | 4 ++++
1727 Documentation/filesystems/vfs.txt | 9 ++-------
1728 drivers/staging/lustre/lustre/llite/namei.c | 8 ++++++--
1729 fs/9p/v9fs.h | 3 ++-
1730 fs/9p/vfs_inode.c | 6 +++++-
1731 fs/affs/affs.h | 3 ++-
1732 fs/affs/namei.c | 6 +++++-
1733 fs/afs/dir.c | 9 +++++++--
1734 fs/bad_inode.c | 2 +-
1735 fs/bfs/dir.c | 6 +++++-
1736 fs/btrfs/inode.c | 2 +-
1737 fs/cachefiles/namei.c | 3 +--
1738 fs/ceph/dir.c | 6 +++++-
1739 fs/cifs/cifsfs.c | 2 +-
1740 fs/coda/dir.c | 6 +++++-
1741 fs/debugfs/inode.c | 2 +-
1742 fs/ecryptfs/inode.c | 6 +++++-
1743 fs/exofs/namei.c | 8 ++++++--
1744 fs/ext2/namei.c | 6 +++++-
1745 fs/ext4/namei.c | 2 +-
1746 fs/f2fs/namei.c | 2 +-
1747 fs/fat/namei_msdos.c | 6 +++++-
1748 fs/fat/namei_vfat.c | 6 +++++-
1749 fs/fuse/dir.c | 2 +-
1750 fs/gfs2/inode.c | 2 +-
1751 fs/hfs/dir.c | 6 +++++-
1752 fs/hfsplus/dir.c | 6 +++++-
1753 fs/hostfs/hostfs_kern.c | 2 +-
1754 fs/hpfs/namei.c | 6 +++++-
1755 fs/jffs2/dir.c | 9 +++++++--
1756 fs/jfs/namei.c | 5 ++++-
1757 fs/kernfs/dir.c | 6 +++++-
1758 fs/libfs.c | 6 +++++-
1759 fs/logfs/dir.c | 6 +++++-
1760 fs/minix/namei.c | 6 +++++-
1761 fs/namei.c | 15 +++------------
1762 fs/ncpfs/dir.c | 11 +++++++----
1763 fs/nfs/dir.c | 6 +++++-
1764 fs/nfs/internal.h | 3 ++-
1765 fs/nilfs2/namei.c | 6 +++++-
1766 fs/ocfs2/namei.c | 6 +++++-
1767 fs/omfs/dir.c | 6 +++++-
1768 fs/orangefs/namei.c | 6 +++++-
1769 fs/overlayfs/dir.c | 2 +-
1770 fs/overlayfs/overlayfs.h | 4 ++--
1771 fs/reiserfs/namei.c | 6 +++++-
1772 fs/sysv/namei.c | 6 +++++-
1773 fs/ubifs/dir.c | 8 ++++++--
1774 fs/udf/namei.c | 6 +++++-
1775 fs/ufs/namei.c | 6 +++++-
1776 fs/xfs/xfs_iops.c | 4 ++--
1777 include/linux/fs.h | 5 ++---
1779 security/tomoyo/realpath.c | 4 ++--
1780 56 files changed, 206 insertions(+), 91 deletions(-)
1781 Merging vfs/for-next (3baf32898e1c parisc: use %pD)
1782 $ git merge vfs/for-next
1783 Auto-merging fs/orangefs/namei.c
1784 Auto-merging fs/orangefs/file.c
1785 Merge made by the 'recursive' strategy.
1786 arch/parisc/kernel/cache.c | 2 +-
1787 drivers/gpu/drm/drm_debugfs.c | 4 +-
1788 drivers/gpu/drm/msm/msm_perf.c | 4 +-
1789 drivers/gpu/drm/msm/msm_rd.c | 4 +-
1790 drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 6 +--
1791 .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 16 ++++----
1792 drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 4 +-
1793 drivers/staging/lustre/lustre/llite/file.c | 4 +-
1794 fs/orangefs/dir.c | 4 +-
1795 fs/orangefs/file.c | 4 +-
1796 fs/orangefs/inode.c | 12 +++---
1797 fs/orangefs/namei.c | 44 +++++++++++-----------
1798 fs/orangefs/orangefs-debugfs.c | 4 +-
1799 13 files changed, 53 insertions(+), 59 deletions(-)
1800 Merging pci/next (503104ad2dc4 Merge branches 'pci/host-aardvark', 'pci/host-hv', 'pci/host-keystone', 'pci/host-rcar' and 'pci/host-tegra' into next)
1801 $ git merge pci/next
1802 Auto-merging include/linux/pci.h
1803 Auto-merging drivers/pci/quirks.c
1804 Merge made by the 'recursive' strategy.
1805 drivers/pci/host/pci-aardvark.c | 4 +-
1806 drivers/pci/host/pci-dra7xx.c | 31 +------
1807 drivers/pci/host/pci-exynos.c | 7 +-
1808 drivers/pci/host/pci-host-common.c | 7 +-
1809 drivers/pci/host/pci-hyperv.c | 3 +-
1810 drivers/pci/host/pci-imx6.c | 9 +-
1811 drivers/pci/host/pci-keystone.c | 5 +-
1812 drivers/pci/host/pci-tegra.c | 47 +++++------
1813 drivers/pci/host/pcie-altera-msi.c | 10 +--
1814 drivers/pci/host/pcie-altera.c | 12 ++-
1815 drivers/pci/host/pcie-designware.c | 5 --
1816 drivers/pci/host/pcie-qcom.c | 28 ++-----
1817 drivers/pci/host/pcie-rcar.c | 10 +--
1818 drivers/pci/host/pcie-spear13xx.c | 11 +--
1819 drivers/pci/host/pcie-xilinx-nwl.c | 53 +-----------
1820 drivers/pci/host/pcie-xilinx.c | 53 +-----------
1821 drivers/pci/hotplug/cpci_hotplug.h | 2 -
1822 drivers/pci/hotplug/cpci_hotplug_core.c | 10 ---
1823 drivers/pci/hotplug/pci_hotplug_core.c | 18 ++--
1824 drivers/pci/hotplug/pciehp_core.c | 20 ++---
1825 drivers/pci/pci.h | 6 ++
1826 drivers/pci/pcie/Kconfig | 11 +++
1827 drivers/pci/pcie/Makefile | 1 +
1828 drivers/pci/pcie/aer/aerdrv.c | 18 +---
1829 drivers/pci/pcie/pcie-dpc.c | 18 +---
1830 drivers/pci/pcie/pme.c | 16 +---
1831 drivers/pci/pcie/portdrv_pci.c | 17 +---
1832 drivers/pci/pcie/ptm.c | 142 ++++++++++++++++++++++++++++++++
1833 drivers/pci/probe.c | 3 +
1834 drivers/pci/quirks.c | 1 +
1835 include/linux/pci.h | 13 +++
1836 include/uapi/linux/pci_regs.h | 12 ++-
1837 32 files changed, 269 insertions(+), 334 deletions(-)
1838 create mode 100644 drivers/pci/pcie/ptm.c
1839 Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking)
1840 $ git merge pstore/for-next/pstore
1841 Merge made by the 'recursive' strategy.
1842 drivers/acpi/apei/erst.c | 2 +-
1843 drivers/firmware/efi/efi-pstore.c | 2 +-
1844 fs/pstore/platform.c | 53 ++++++++++++++++++---
1845 fs/pstore/pmsg.c | 35 +++-----------
1846 fs/pstore/ram.c | 46 ++++++++++++++++---
1847 fs/pstore/ram_core.c | 96 ++++++++++++++++++++-------------------
1848 include/linux/pstore.h | 17 +++++--
1849 include/linux/pstore_ram.h | 7 ++-
1850 8 files changed, 162 insertions(+), 96 deletions(-)
1851 Merging hid/for-next (ec3727c27e6b Merge branch 'for-4.9/intel-ish' into for-next)
1852 $ git merge hid/for-next
1853 Auto-merging MAINTAINERS
1854 Merge made by the 'recursive' strategy.
1855 Documentation/ABI/testing/sysfs-driver-wacom | 5 +
1856 Documentation/hid/intel-ish-hid.txt | 454 +++++++++
1858 drivers/hid/Kconfig | 3 +
1859 drivers/hid/Makefile | 2 +
1860 drivers/hid/hid-core.c | 5 +-
1861 drivers/hid/hid-ids.h | 2 +
1862 drivers/hid/hid-input.c | 1 +
1863 drivers/hid/hid-microsoft.c | 2 +
1864 drivers/hid/hid-saitek.c | 2 +
1865 drivers/hid/hid-sensor-hub.c | 4 +
1866 drivers/hid/hid-sony.c | 6 +-
1867 drivers/hid/intel-ish-hid/Kconfig | 17 +
1868 drivers/hid/intel-ish-hid/Makefile | 22 +
1869 drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h | 220 ++++
1870 drivers/hid/intel-ish-hid/ipc/hw-ish.h | 71 ++
1871 drivers/hid/intel-ish-hid/ipc/ipc.c | 881 ++++++++++++++++
1872 drivers/hid/intel-ish-hid/ipc/pci-ish.c | 322 ++++++
1873 drivers/hid/intel-ish-hid/ipc/utils.h | 64 ++
1874 drivers/hid/intel-ish-hid/ishtp-hid-client.c | 978 ++++++++++++++++++
1875 drivers/hid/intel-ish-hid/ishtp-hid.c | 246 +++++
1876 drivers/hid/intel-ish-hid/ishtp-hid.h | 182 ++++
1877 drivers/hid/intel-ish-hid/ishtp/bus.c | 788 ++++++++++++++
1878 drivers/hid/intel-ish-hid/ishtp/bus.h | 114 +++
1879 drivers/hid/intel-ish-hid/ishtp/client-buffers.c | 257 +++++
1880 drivers/hid/intel-ish-hid/ishtp/client.c | 1054 +++++++++++++++++++
1881 drivers/hid/intel-ish-hid/ishtp/client.h | 182 ++++
1882 drivers/hid/intel-ish-hid/ishtp/dma-if.c | 175 ++++
1883 drivers/hid/intel-ish-hid/ishtp/hbm.c | 1032 +++++++++++++++++++
1884 drivers/hid/intel-ish-hid/ishtp/hbm.h | 321 ++++++
1885 drivers/hid/intel-ish-hid/ishtp/init.c | 115 +++
1886 drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 277 +++++
1887 drivers/hid/usbhid/hid-quirks.c | 1 +
1888 drivers/hid/wacom.h | 96 +-
1889 drivers/hid/wacom_sys.c | 1187 ++++++++++++++++------
1890 drivers/hid/wacom_wac.c | 435 +++++---
1891 drivers/hid/wacom_wac.h | 22 +-
1892 include/trace/events/intel_ish.h | 30 +
1893 include/uapi/linux/input.h | 1 +
1894 39 files changed, 9066 insertions(+), 517 deletions(-)
1895 create mode 100644 Documentation/hid/intel-ish-hid.txt
1896 create mode 100644 drivers/hid/intel-ish-hid/Kconfig
1897 create mode 100644 drivers/hid/intel-ish-hid/Makefile
1898 create mode 100644 drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h
1899 create mode 100644 drivers/hid/intel-ish-hid/ipc/hw-ish.h
1900 create mode 100644 drivers/hid/intel-ish-hid/ipc/ipc.c
1901 create mode 100644 drivers/hid/intel-ish-hid/ipc/pci-ish.c
1902 create mode 100644 drivers/hid/intel-ish-hid/ipc/utils.h
1903 create mode 100644 drivers/hid/intel-ish-hid/ishtp-hid-client.c
1904 create mode 100644 drivers/hid/intel-ish-hid/ishtp-hid.c
1905 create mode 100644 drivers/hid/intel-ish-hid/ishtp-hid.h
1906 create mode 100644 drivers/hid/intel-ish-hid/ishtp/bus.c
1907 create mode 100644 drivers/hid/intel-ish-hid/ishtp/bus.h
1908 create mode 100644 drivers/hid/intel-ish-hid/ishtp/client-buffers.c
1909 create mode 100644 drivers/hid/intel-ish-hid/ishtp/client.c
1910 create mode 100644 drivers/hid/intel-ish-hid/ishtp/client.h
1911 create mode 100644 drivers/hid/intel-ish-hid/ishtp/dma-if.c
1912 create mode 100644 drivers/hid/intel-ish-hid/ishtp/hbm.c
1913 create mode 100644 drivers/hid/intel-ish-hid/ishtp/hbm.h
1914 create mode 100644 drivers/hid/intel-ish-hid/ishtp/init.c
1915 create mode 100644 drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h
1916 create mode 100644 include/trace/events/intel_ish.h
1917 Merging i2c/i2c/for-next (fd0f514448a9 Merge branch 'i2c/for-4.9' into i2c/for-next)
1918 $ git merge i2c/i2c/for-next
1919 Auto-merging drivers/i2c/busses/i2c-octeon-core.c
1920 Auto-merging MAINTAINERS
1921 Merge made by the 'recursive' strategy.
1922 .../bindings/i2c/i2c-arb-gpio-challenge.txt | 8 +-
1923 Documentation/devicetree/bindings/i2c/i2c-arb.txt | 35 +
1924 Documentation/devicetree/bindings/i2c/i2c-gate.txt | 41 +
1925 Documentation/devicetree/bindings/i2c/i2c-mux.txt | 23 +-
1926 .../devicetree/bindings/i2c/nxp,pca9541.txt | 29 +
1928 drivers/gpu/drm/drm_dp_helper.c | 10 +-
1929 drivers/i2c/busses/Kconfig | 13 +-
1930 drivers/i2c/busses/Makefile | 3 +
1931 drivers/i2c/busses/i2c-amd756.c | 5 +-
1932 drivers/i2c/busses/i2c-at91.c | 2 -
1933 drivers/i2c/busses/i2c-axxia.c | 8 +-
1934 drivers/i2c/busses/i2c-bcm-iproc.c | 8 +-
1935 drivers/i2c/busses/i2c-bcm-kona.c | 4 +-
1936 drivers/i2c/busses/i2c-bfin-twi.c | 4 +-
1937 drivers/i2c/busses/i2c-brcmstb.c | 4 +-
1938 drivers/i2c/busses/i2c-cadence.c | 4 +-
1939 drivers/i2c/busses/i2c-cpm.c | 4 +-
1940 drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +-
1941 drivers/i2c/busses/i2c-davinci.c | 4 +-
1942 drivers/i2c/busses/i2c-designware-core.c | 196 ++--
1943 drivers/i2c/busses/i2c-designware-core.h | 12 +
1944 drivers/i2c/busses/i2c-designware-platdrv.c | 43 +-
1945 drivers/i2c/busses/i2c-diolan-u2c.c | 4 +-
1946 drivers/i2c/busses/i2c-dln2.c | 4 +-
1947 drivers/i2c/busses/i2c-efm32.c | 1 -
1948 drivers/i2c/busses/i2c-exynos5.c | 4 +-
1949 drivers/i2c/busses/i2c-hix5hd2.c | 4 +-
1950 drivers/i2c/busses/i2c-i801.c | 1 -
1951 drivers/i2c/busses/i2c-ibm_iic.c | 4 +-
1952 drivers/i2c/busses/i2c-img-scb.c | 4 +-
1953 drivers/i2c/busses/i2c-imx.c | 4 +-
1954 drivers/i2c/busses/i2c-isch.c | 4 +-
1955 drivers/i2c/busses/i2c-ismt.c | 4 +-
1956 drivers/i2c/busses/i2c-jz4780.c | 4 +-
1957 drivers/i2c/busses/i2c-lpc2k.c | 4 +-
1958 drivers/i2c/busses/i2c-meson.c | 1 -
1959 drivers/i2c/busses/i2c-mpc.c | 4 +-
1960 drivers/i2c/busses/i2c-mt65xx.c | 4 +-
1961 drivers/i2c/busses/i2c-mxs.c | 1 -
1962 drivers/i2c/busses/i2c-nforce2.c | 1 -
1963 drivers/i2c/busses/i2c-nomadik.c | 4 +-
1964 drivers/i2c/busses/i2c-ocores.c | 4 +-
1965 .../i2c/busses/{i2c-octeon.c => i2c-octeon-core.c} | 1039 ++++++--------------
1966 drivers/i2c/busses/i2c-octeon-core.h | 211 ++++
1967 drivers/i2c/busses/i2c-octeon-platdrv.c | 286 ++++++
1968 drivers/i2c/busses/i2c-omap.c | 4 +-
1969 drivers/i2c/busses/i2c-piix4.c | 1 -
1970 drivers/i2c/busses/i2c-pmcmsp.c | 4 +-
1971 drivers/i2c/busses/i2c-pnx.c | 4 +-
1972 drivers/i2c/busses/i2c-puv3.c | 5 +-
1973 drivers/i2c/busses/i2c-pxa.c | 4 +-
1974 drivers/i2c/busses/i2c-rcar.c | 4 +-
1975 drivers/i2c/busses/i2c-riic.c | 4 +-
1976 drivers/i2c/busses/i2c-rk3x.c | 4 +-
1977 drivers/i2c/busses/i2c-s3c2410.c | 1 -
1978 drivers/i2c/busses/i2c-sh7760.c | 4 +-
1979 drivers/i2c/busses/i2c-sh_mobile.c | 1 -
1980 drivers/i2c/busses/i2c-sirf.c | 4 +-
1981 drivers/i2c/busses/i2c-st.c | 4 +-
1982 drivers/i2c/busses/i2c-stu300.c | 5 +-
1983 drivers/i2c/busses/i2c-tegra.c | 279 ++++--
1984 drivers/i2c/busses/i2c-thunderx-pcidrv.c | 259 +++++
1985 drivers/i2c/busses/i2c-uniphier-f.c | 90 +-
1986 drivers/i2c/busses/i2c-uniphier.c | 78 +-
1987 drivers/i2c/busses/i2c-wmt.c | 4 +-
1988 drivers/i2c/busses/i2c-xgene-slimpro.c | 1 -
1989 drivers/i2c/busses/i2c-xiic.c | 1 -
1990 drivers/i2c/busses/i2c-xlp9xx.c | 4 +-
1991 drivers/i2c/busses/i2c-xlr.c | 4 +-
1992 drivers/i2c/i2c-core.c | 237 +++--
1993 drivers/i2c/i2c-mux.c | 73 +-
1994 drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 2 +-
1995 drivers/i2c/muxes/i2c-mux-pca9541.c | 11 +-
1996 drivers/i2c/muxes/i2c-mux-pca954x.c | 46 +-
1997 drivers/misc/eeprom/at24.c | 15 +-
1998 include/linux/i2c-mux.h | 8 +-
1999 include/linux/i2c.h | 46 +-
2000 78 files changed, 2002 insertions(+), 1284 deletions(-)
2001 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-arb.txt
2002 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-gate.txt
2003 create mode 100644 Documentation/devicetree/bindings/i2c/nxp,pca9541.txt
2004 rename drivers/i2c/busses/{i2c-octeon.c => i2c-octeon-core.c} (57%)
2005 create mode 100644 drivers/i2c/busses/i2c-octeon-core.h
2006 create mode 100644 drivers/i2c/busses/i2c-octeon-platdrv.c
2007 create mode 100644 drivers/i2c/busses/i2c-thunderx-pcidrv.c
2008 Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
2009 $ git merge jdelvare-hwmon/master
2011 Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
2012 $ git merge dmi/master
2013 Merge made by the 'recursive' strategy.
2014 Merging hwmon-staging/hwmon-next (93cacfd41f82 hwmon: (adt7470) Allow faster removal)
2015 $ git merge hwmon-staging/hwmon-next
2016 Merge made by the 'recursive' strategy.
2017 .../devicetree/bindings/hwmon/ltc4151.txt | 18 +
2018 .../devicetree/bindings/hwmon/max6650.txt | 28 +
2019 Documentation/hwmon/adt7470 | 17 +
2020 Documentation/hwmon/hwmon-kernel-api.txt | 231 +++++-
2021 Documentation/hwmon/max6650 | 1 +
2022 Documentation/hwmon/ucd9000 | 12 +-
2023 Documentation/hwmon/xgene-hwmon | 30 +
2024 drivers/hwmon/Kconfig | 9 +-
2025 drivers/hwmon/Makefile | 1 +
2026 drivers/hwmon/adt7411.c | 51 +-
2027 drivers/hwmon/adt7470.c | 104 ++-
2028 drivers/hwmon/ftsteutates.c | 45 ++
2029 drivers/hwmon/hwmon.c | 616 +++++++++++++++-
2030 drivers/hwmon/iio_hwmon.c | 5 +-
2031 drivers/hwmon/it87.c | 8 +-
2032 drivers/hwmon/jc42.c | 293 ++++----
2033 drivers/hwmon/lm75.c | 185 +++--
2034 drivers/hwmon/lm90.c | 811 +++++++++++----------
2035 drivers/hwmon/lm95241.c | 467 +++++++-----
2036 drivers/hwmon/lm95245.c | 638 +++++++++-------
2037 drivers/hwmon/ltc4151.c | 22 +-
2038 drivers/hwmon/ltc4245.c | 362 +++++----
2039 drivers/hwmon/max31790.c | 521 ++++++-------
2040 drivers/hwmon/max6650.c | 155 ++--
2041 drivers/hwmon/nct6775.c | 8 +-
2042 drivers/hwmon/nct7904.c | 555 +++++++-------
2043 drivers/hwmon/ntc_thermistor.c | 107 +--
2044 drivers/hwmon/pmbus/Kconfig | 6 +-
2045 drivers/hwmon/pmbus/pmbus.c | 20 +-
2046 drivers/hwmon/pmbus/ucd9000.c | 3 +-
2047 drivers/hwmon/scpi-hwmon.c | 1 -
2048 drivers/hwmon/tmp102.c | 154 ++--
2049 drivers/hwmon/tmp421.c | 133 ++--
2050 drivers/hwmon/xgene-hwmon.c | 787 ++++++++++++++++++++
2051 include/linux/hwmon.h | 342 +++++++++
2052 35 files changed, 4602 insertions(+), 2144 deletions(-)
2053 create mode 100644 Documentation/devicetree/bindings/hwmon/ltc4151.txt
2054 create mode 100644 Documentation/devicetree/bindings/hwmon/max6650.txt
2055 create mode 100644 Documentation/hwmon/xgene-hwmon
2056 create mode 100644 drivers/hwmon/xgene-hwmon.c
2057 Merging v4l-dvb/master (431bffd2bd89 Merge branch 'patchwork' into to_next)
2058 $ git merge v4l-dvb/master
2059 Removing include/media/drv-intf/sh_mobile_csi2.h
2060 Removing drivers/staging/media/tw686x-kh/tw686x-kh.h
2061 Removing drivers/staging/media/tw686x-kh/tw686x-kh-video.c
2062 Removing drivers/staging/media/tw686x-kh/tw686x-kh-regs.h
2063 Removing drivers/staging/media/tw686x-kh/tw686x-kh-core.c
2064 Removing drivers/staging/media/tw686x-kh/TODO
2065 Removing drivers/staging/media/tw686x-kh/Makefile
2066 Removing drivers/staging/media/tw686x-kh/Kconfig
2067 Removing drivers/media/platform/soc_camera/sh_mobile_csi2.c
2068 Removing drivers/media/platform/s5p-tv/sii9234_drv.c
2069 Removing drivers/media/platform/s5p-tv/sdo_drv.c
2070 Removing drivers/media/platform/s5p-tv/regs-vp.h
2071 Removing drivers/media/platform/s5p-tv/regs-sdo.h
2072 Removing drivers/media/platform/s5p-tv/regs-mixer.h
2073 Removing drivers/media/platform/s5p-tv/regs-hdmi.h
2074 Removing drivers/media/platform/s5p-tv/mixer_vp_layer.c
2075 Removing drivers/media/platform/s5p-tv/mixer_video.c
2076 Removing drivers/media/platform/s5p-tv/mixer_reg.c
2077 Removing drivers/media/platform/s5p-tv/mixer_grp_layer.c
2078 Removing drivers/media/platform/s5p-tv/mixer_drv.c
2079 Removing drivers/media/platform/s5p-tv/mixer.h
2080 Removing drivers/media/platform/s5p-tv/hdmiphy_drv.c
2081 Removing drivers/media/platform/s5p-tv/hdmi_drv.c
2082 Removing drivers/media/platform/s5p-tv/Makefile
2083 Removing drivers/media/platform/s5p-tv/Kconfig
2084 Auto-merging drivers/media/platform/pxa_camera.c
2085 Auto-merging drivers/media/i2c/mt9m111.c
2086 Auto-merging Makefile
2087 Auto-merging MAINTAINERS
2088 Removing Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst
2089 Removing Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst
2090 Removing Documentation/media/uapi/v4l/pixfmt-sbggr8.rst
2091 Removing Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.gif
2092 Removing Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.gif
2093 Auto-merging Documentation/media/kapi/cec-core.rst
2094 Removing Documentation/kmemcheck.txt
2095 Removing Documentation/kasan.txt
2096 Removing Documentation/gcov.txt
2097 Auto-merging Documentation/dev-tools/ubsan.rst
2098 Auto-merging Documentation/dev-tools/sparse.rst
2099 Auto-merging Documentation/dev-tools/kmemleak.rst
2100 Auto-merging Documentation/dev-tools/kcov.rst
2101 Auto-merging Documentation/dev-tools/gdb-kernel-debugging.rst
2102 Auto-merging Documentation/dev-tools/coccinelle.rst
2103 Merge made by the 'recursive' strategy.
2104 Documentation/CodingStyle | 28 +-
2105 Documentation/DocBook/Makefile | 8 +
2106 Documentation/Makefile.sphinx | 64 +-
2107 Documentation/arm/sunxi/README | 11 +-
2108 Documentation/clk.txt | 42 +-
2109 Documentation/conf.py | 104 +-
2110 .../{coccinelle.txt => dev-tools/coccinelle.rst} | 359 +-
2111 Documentation/dev-tools/gcov.rst | 256 +
2112 .../gdb-kernel-debugging.rst} | 77 +-
2113 Documentation/dev-tools/kasan.rst | 173 +
2114 Documentation/{kcov.txt => dev-tools/kcov.rst} | 84 +-
2115 Documentation/dev-tools/kmemcheck.rst | 733 +++
2116 .../{kmemleak.txt => dev-tools/kmemleak.rst} | 93 +-
2117 Documentation/{sparse.txt => dev-tools/sparse.rst} | 39 +-
2118 Documentation/dev-tools/tools.rst | 25 +
2119 Documentation/{ubsan.txt => dev-tools/ubsan.rst} | 42 +-
2120 .../devicetree/bindings/media/atmel-isc.txt | 65 +
2121 .../devicetree/bindings/media/i2c/ad5820.txt | 19 +
2122 .../devicetree/bindings/media/i2c/adv7180.txt | 5 +
2123 .../devicetree/bindings/media/renesas,fcp.txt | 9 +-
2124 .../devicetree/bindings/media/st,st-hva.txt | 24 +
2125 Documentation/docutils.conf | 7 +
2126 Documentation/gcov.txt | 257 -
2127 Documentation/gpu/conf.py | 5 +
2128 Documentation/gpu/index.rst | 7 +
2129 Documentation/index.rst | 9 +-
2130 Documentation/kasan.txt | 171 -
2131 Documentation/kbuild/kconfig-language.txt | 39 +-
2132 Documentation/kernel-documentation.rst | 29 +
2133 Documentation/kernel-parameters.txt | 22 +-
2134 Documentation/kmemcheck.txt | 754 ---
2135 Documentation/kprobes.txt | 10 +
2136 Documentation/media/Makefile | 3 +-
2137 Documentation/media/audio.h.rst.exceptions | 6 +-
2138 Documentation/media/ca.h.rst.exceptions | 32 +-
2139 Documentation/media/cec.h.rst.exceptions | 6 -
2140 Documentation/media/conf.py | 10 +
2141 Documentation/media/conf_nitpick.py | 109 +
2142 Documentation/media/dmx.h.rst.exceptions | 85 +-
2143 Documentation/media/frontend.h.rst.exceptions | 8 +-
2144 Documentation/media/index.rst | 24 +
2145 Documentation/media/intro.rst | 2 +-
2146 Documentation/{cec.txt => media/kapi/cec-core.rst} | 147 +-
2147 Documentation/media/kapi/dtv-core.rst | 40 +-
2148 Documentation/media/kapi/mc-core.rst | 25 +-
2149 Documentation/media/kapi/v4l2-dev.rst | 8 +-
2150 Documentation/media/kapi/v4l2-event.rst | 6 +-
2151 Documentation/media/kapi/v4l2-fh.rst | 4 +-
2152 Documentation/media/kapi/v4l2-subdev.rst | 23 +-
2153 .../media/media_api_files/typical_media_device.pdf | Bin 134268 -> 52895 bytes
2154 Documentation/media/media_kapi.rst | 1 +
2155 Documentation/media/net.h.rst.exceptions | 4 +-
2156 Documentation/media/uapi/cec/cec-func-close.rst | 9 +-
2157 Documentation/media/uapi/cec/cec-func-ioctl.rst | 11 +-
2158 Documentation/media/uapi/cec/cec-func-open.rst | 9 +-
2159 Documentation/media/uapi/cec/cec-func-poll.rst | 18 +-
2160 Documentation/media/uapi/cec/cec-intro.rst | 4 +-
2161 .../media/uapi/cec/cec-ioc-adap-g-caps.rst | 16 +-
2162 .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 52 +-
2163 .../media/uapi/cec/cec-ioc-adap-g-phys-addr.rst | 17 +-
2164 Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 46 +-
2165 Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 20 +-
2166 Documentation/media/uapi/cec/cec-ioc-receive.rst | 38 +-
2167 .../uapi/dvb/audio-bilingual-channel-select.rst | 15 +-
2168 .../media/uapi/dvb/audio-channel-select.rst | 14 +-
2169 .../media/uapi/dvb/audio-clear-buffer.rst | 12 +-
2170 Documentation/media/uapi/dvb/audio-continue.rst | 11 +-
2171 Documentation/media/uapi/dvb/audio-fclose.rst | 4 +-
2172 Documentation/media/uapi/dvb/audio-fopen.rst | 6 +-
2173 Documentation/media/uapi/dvb/audio-fwrite.rst | 4 +-
2174 .../media/uapi/dvb/audio-get-capabilities.rst | 14 +-
2175 Documentation/media/uapi/dvb/audio-get-pts.rst | 14 +-
2176 Documentation/media/uapi/dvb/audio-get-status.rst | 14 +-
2177 Documentation/media/uapi/dvb/audio-pause.rst | 11 +-
2178 Documentation/media/uapi/dvb/audio-play.rst | 11 +-
2179 .../media/uapi/dvb/audio-select-source.rst | 14 +-
2180 .../media/uapi/dvb/audio-set-attributes.rst | 16 +-
2181 Documentation/media/uapi/dvb/audio-set-av-sync.rst | 24 +-
2182 .../media/uapi/dvb/audio-set-bypass-mode.rst | 25 +-
2183 Documentation/media/uapi/dvb/audio-set-ext-id.rst | 15 +-
2184 Documentation/media/uapi/dvb/audio-set-id.rst | 15 +-
2185 Documentation/media/uapi/dvb/audio-set-karaoke.rst | 14 +-
2186 Documentation/media/uapi/dvb/audio-set-mixer.rst | 15 +-
2187 Documentation/media/uapi/dvb/audio-set-mute.rst | 24 +-
2188 .../media/uapi/dvb/audio-set-streamtype.rst | 14 +-
2189 Documentation/media/uapi/dvb/audio-stop.rst | 11 +-
2190 Documentation/media/uapi/dvb/audio_data_types.rst | 37 +-
2191 Documentation/media/uapi/dvb/ca-fclose.rst | 18 +-
2192 Documentation/media/uapi/dvb/ca-fopen.rst | 51 +-
2193 Documentation/media/uapi/dvb/ca-get-cap.rst | 51 +-
2194 Documentation/media/uapi/dvb/ca-get-descr-info.rst | 44 +-
2195 Documentation/media/uapi/dvb/ca-get-msg.rst | 47 +-
2196 Documentation/media/uapi/dvb/ca-get-slot-info.rst | 92 +-
2197 Documentation/media/uapi/dvb/ca-reset.rst | 24 +-
2198 Documentation/media/uapi/dvb/ca-send-msg.rst | 30 +-
2199 Documentation/media/uapi/dvb/ca-set-descr.rst | 30 +-
2200 Documentation/media/uapi/dvb/ca-set-pid.rst | 37 +-
2201 Documentation/media/uapi/dvb/ca_data_types.rst | 12 +-
2202 Documentation/media/uapi/dvb/dmx-add-pid.rst | 28 +-
2203 Documentation/media/uapi/dvb/dmx-fclose.rst | 16 +-
2204 Documentation/media/uapi/dvb/dmx-fopen.rst | 45 +-
2205 Documentation/media/uapi/dvb/dmx-fread.rst | 34 +-
2206 Documentation/media/uapi/dvb/dmx-fwrite.rst | 34 +-
2207 Documentation/media/uapi/dvb/dmx-get-caps.rst | 32 +-
2208 Documentation/media/uapi/dvb/dmx-get-event.rst | 28 +-
2209 Documentation/media/uapi/dvb/dmx-get-pes-pids.rst | 31 +-
2210 Documentation/media/uapi/dvb/dmx-get-stc.rst | 31 +-
2211 Documentation/media/uapi/dvb/dmx-remove-pid.rst | 28 +-
2212 .../media/uapi/dvb/dmx-set-buffer-size.rst | 29 +-
2213 Documentation/media/uapi/dvb/dmx-set-filter.rst | 28 +-
2214 .../media/uapi/dvb/dmx-set-pes-filter.rst | 29 +-
2215 Documentation/media/uapi/dvb/dmx-set-source.rst | 29 +-
2216 Documentation/media/uapi/dvb/dmx-start.rst | 24 +-
2217 Documentation/media/uapi/dvb/dmx-stop.rst | 22 +-
2218 Documentation/media/uapi/dvb/dmx_types.rst | 40 +-
2219 Documentation/media/uapi/dvb/dtv-fe-stats.rst | 2 +-
2220 Documentation/media/uapi/dvb/dtv-properties.rst | 2 +-
2221 Documentation/media/uapi/dvb/dtv-property.rst | 2 +-
2222 Documentation/media/uapi/dvb/dtv-stats.rst | 2 +-
2223 .../media/uapi/dvb/dvb-fe-read-status.rst | 4 +-
2224 .../media/uapi/dvb/dvb-frontend-event.rst | 2 +-
2225 .../media/uapi/dvb/dvb-frontend-parameters.rst | 10 +-
2226 Documentation/media/uapi/dvb/dvbapi.rst | 4 +-
2227 Documentation/media/uapi/dvb/dvbproperty.rst | 6 +-
2228 Documentation/media/uapi/dvb/examples.rst | 4 +-
2229 Documentation/media/uapi/dvb/fe-bandwidth-t.rst | 5 +-
2230 .../media/uapi/dvb/fe-diseqc-recv-slave-reply.rst | 13 +-
2231 .../media/uapi/dvb/fe-diseqc-reset-overload.rst | 7 +-
2232 .../media/uapi/dvb/fe-diseqc-send-burst.rst | 15 +-
2233 .../media/uapi/dvb/fe-diseqc-send-master-cmd.rst | 14 +-
2234 .../uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst | 16 +-
2235 .../media/uapi/dvb/fe-enable-high-lnb-voltage.rst | 6 +-
2236 Documentation/media/uapi/dvb/fe-get-event.rst | 35 +-
2237 Documentation/media/uapi/dvb/fe-get-frontend.rst | 30 +-
2238 Documentation/media/uapi/dvb/fe-get-info.rst | 24 +-
2239 Documentation/media/uapi/dvb/fe-get-property.rst | 11 +-
2240 Documentation/media/uapi/dvb/fe-read-ber.rst | 30 +-
2241 .../media/uapi/dvb/fe-read-signal-strength.rst | 31 +-
2242 Documentation/media/uapi/dvb/fe-read-snr.rst | 29 +-
2243 Documentation/media/uapi/dvb/fe-read-status.rst | 19 +-
2244 .../media/uapi/dvb/fe-read-uncorrected-blocks.rst | 31 +-
2245 .../media/uapi/dvb/fe-set-frontend-tune-mode.rst | 6 +-
2246 Documentation/media/uapi/dvb/fe-set-frontend.rst | 31 +-
2247 Documentation/media/uapi/dvb/fe-set-tone.rst | 15 +-
2248 Documentation/media/uapi/dvb/fe-set-voltage.rst | 10 +-
2249 Documentation/media/uapi/dvb/fe-type-t.rst | 10 +-
2250 .../media/uapi/dvb/fe_property_parameters.rst | 77 +-
2251 .../media/uapi/dvb/frontend-stat-properties.rst | 2 +-
2252 Documentation/media/uapi/dvb/frontend.rst | 4 +-
2253 Documentation/media/uapi/dvb/frontend_f_close.rst | 6 +-
2254 Documentation/media/uapi/dvb/frontend_f_open.rst | 4 +-
2255 Documentation/media/uapi/dvb/net-add-if.rst | 18 +-
2256 Documentation/media/uapi/dvb/net-get-if.rst | 12 +-
2257 Documentation/media/uapi/dvb/net-remove-if.rst | 6 +-
2258 .../media/uapi/dvb/video-clear-buffer.rst | 4 +-
2259 Documentation/media/uapi/dvb/video-command.rst | 34 +-
2260 Documentation/media/uapi/dvb/video-continue.rst | 4 +-
2261 .../media/uapi/dvb/video-fast-forward.rst | 4 +-
2262 Documentation/media/uapi/dvb/video-fclose.rst | 3 +-
2263 Documentation/media/uapi/dvb/video-fopen.rst | 5 +-
2264 Documentation/media/uapi/dvb/video-freeze.rst | 4 +-
2265 Documentation/media/uapi/dvb/video-fwrite.rst | 3 +-
2266 .../media/uapi/dvb/video-get-capabilities.rst | 4 +-
2267 Documentation/media/uapi/dvb/video-get-event.rst | 21 +-
2268 .../media/uapi/dvb/video-get-frame-count.rst | 4 +-
2269 .../media/uapi/dvb/video-get-frame-rate.rst | 4 +-
2270 Documentation/media/uapi/dvb/video-get-navi.rst | 12 +-
2271 Documentation/media/uapi/dvb/video-get-pts.rst | 4 +-
2272 Documentation/media/uapi/dvb/video-get-size.rst | 14 +-
2273 Documentation/media/uapi/dvb/video-get-status.rst | 15 +-
2274 Documentation/media/uapi/dvb/video-play.rst | 4 +-
2275 .../media/uapi/dvb/video-select-source.rst | 14 +-
2276 .../media/uapi/dvb/video-set-attributes.rst | 20 +-
2277 Documentation/media/uapi/dvb/video-set-blank.rst | 4 +-
2278 .../media/uapi/dvb/video-set-display-format.rst | 4 +-
2279 Documentation/media/uapi/dvb/video-set-format.rst | 13 +-
2280 .../media/uapi/dvb/video-set-highlight.rst | 28 +-
2281 Documentation/media/uapi/dvb/video-set-id.rst | 4 +-
2282 .../media/uapi/dvb/video-set-spu-palette.rst | 12 +-
2283 Documentation/media/uapi/dvb/video-set-spu.rst | 13 +-
2284 .../media/uapi/dvb/video-set-streamtype.rst | 4 +-
2285 Documentation/media/uapi/dvb/video-set-system.rst | 4 +-
2286 Documentation/media/uapi/dvb/video-slowmotion.rst | 4 +-
2287 .../media/uapi/dvb/video-stillpicture.rst | 4 +-
2288 Documentation/media/uapi/dvb/video-stop.rst | 4 +-
2289 Documentation/media/uapi/dvb/video-try-command.rst | 4 +-
2290 Documentation/media/uapi/dvb/video_types.rst | 16 +-
2291 Documentation/media/uapi/gen-errors.rst | 2 +
2292 .../media/uapi/mediactl/media-func-close.rst | 6 +-
2293 .../media/uapi/mediactl/media-func-ioctl.rst | 6 +-
2294 .../media/uapi/mediactl/media-func-open.rst | 4 +-
2295 .../media/uapi/mediactl/media-ioc-device-info.rst | 12 +-
2296 .../uapi/mediactl/media-ioc-enum-entities.rst | 14 +-
2297 .../media/uapi/mediactl/media-ioc-enum-links.rst | 34 +-
2298 .../media/uapi/mediactl/media-ioc-g-topology.rst | 28 +-
2299 .../media/uapi/mediactl/media-ioc-setup-link.rst | 10 +-
2300 Documentation/media/uapi/mediactl/media-types.rst | 40 +-
2301 Documentation/media/uapi/rc/lirc-get-features.rst | 6 +-
2302 Documentation/media/uapi/rc/lirc-get-length.rst | 6 +-
2303 Documentation/media/uapi/rc/lirc-get-rec-mode.rst | 11 +-
2304 .../media/uapi/rc/lirc-get-rec-resolution.rst | 6 +-
2305 Documentation/media/uapi/rc/lirc-get-send-mode.rst | 9 +-
2306 Documentation/media/uapi/rc/lirc-get-timeout.rst | 9 +-
2307 Documentation/media/uapi/rc/lirc-read.rst | 7 +-
2308 .../uapi/rc/lirc-set-measure-carrier-mode.rst | 6 +-
2309 .../media/uapi/rc/lirc-set-rec-carrier-range.rst | 6 +-
2310 .../media/uapi/rc/lirc-set-rec-carrier.rst | 6 +-
2311 .../media/uapi/rc/lirc-set-rec-timeout-reports.rst | 6 +-
2312 .../media/uapi/rc/lirc-set-rec-timeout.rst | 6 +-
2313 .../media/uapi/rc/lirc-set-send-carrier.rst | 6 +-
2314 .../media/uapi/rc/lirc-set-send-duty-cycle.rst | 6 +-
2315 .../media/uapi/rc/lirc-set-transmitter-mask.rst | 6 +-
2316 .../media/uapi/rc/lirc-set-wideband-receiver.rst | 10 +-
2317 Documentation/media/uapi/rc/lirc-write.rst | 8 +-
2318 Documentation/media/uapi/rc/rc-tables.rst | 2 +
2319 Documentation/media/uapi/v4l/audio.rst | 16 +-
2320 Documentation/media/uapi/v4l/buffer.rst | 101 +-
2321 Documentation/media/uapi/v4l/control.rst | 4 +-
2322 Documentation/media/uapi/v4l/crop.rst | 26 +-
2323 Documentation/media/uapi/v4l/dev-capture.rst | 16 +-
2324 Documentation/media/uapi/v4l/dev-codec.rst | 4 +-
2325 Documentation/media/uapi/v4l/dev-osd.rst | 26 +-
2326 Documentation/media/uapi/v4l/dev-output.rst | 18 +-
2327 Documentation/media/uapi/v4l/dev-overlay.rst | 34 +-
2328 Documentation/media/uapi/v4l/dev-radio.rst | 2 +-
2329 Documentation/media/uapi/v4l/dev-raw-vbi.rst | 28 +-
2330 .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf | Bin 3395 -> 3706 bytes
2331 .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf | Bin 3683 -> 3996 bytes
2332 Documentation/media/uapi/v4l/dev-rds.rst | 24 +-
2333 Documentation/media/uapi/v4l/dev-sdr.rst | 14 +-
2334 Documentation/media/uapi/v4l/dev-sliced-vbi.rst | 92 +-
2335 Documentation/media/uapi/v4l/dev-subdev.rst | 13 +-
2336 Documentation/media/uapi/v4l/dev-touch.rst | 56 +
2337 Documentation/media/uapi/v4l/devices.rst | 1 +
2338 Documentation/media/uapi/v4l/diff-v4l.rst | 108 +-
2339 Documentation/media/uapi/v4l/dmabuf.rst | 8 +-
2340 Documentation/media/uapi/v4l/extended-controls.rst | 338 +-
2341 Documentation/media/uapi/v4l/field-order.rst | 14 +-
2342 Documentation/media/uapi/v4l/format.rst | 2 +-
2343 Documentation/media/uapi/v4l/func-close.rst | 4 +-
2344 Documentation/media/uapi/v4l/func-ioctl.rst | 4 +-
2345 Documentation/media/uapi/v4l/func-mmap.rst | 16 +-
2346 Documentation/media/uapi/v4l/func-munmap.rst | 8 +-
2347 Documentation/media/uapi/v4l/func-open.rst | 4 +-
2348 Documentation/media/uapi/v4l/func-poll.rst | 4 +-
2349 Documentation/media/uapi/v4l/func-read.rst | 8 +-
2350 Documentation/media/uapi/v4l/func-select.rst | 18 +-
2351 Documentation/media/uapi/v4l/func-write.rst | 8 +-
2352 Documentation/media/uapi/v4l/hist-v4l2.rst | 178 +-
2353 .../media/uapi/v4l/libv4l-introduction.rst | 77 +-
2354 Documentation/media/uapi/v4l/mmap.rst | 12 +-
2355 Documentation/media/uapi/v4l/pixfmt-002.rst | 19 +-
2356 Documentation/media/uapi/v4l/pixfmt-003.rst | 35 +-
2357 Documentation/media/uapi/v4l/pixfmt-006.rst | 39 +-
2358 Documentation/media/uapi/v4l/pixfmt-007.rst | 255 +-
2359 Documentation/media/uapi/v4l/pixfmt-013.rst | 2 +
2360 Documentation/media/uapi/v4l/pixfmt-grey.rst | 5 -
2361 Documentation/media/uapi/v4l/pixfmt-m420.rst | 4 -
2362 Documentation/media/uapi/v4l/pixfmt-nv12.rst | 4 -
2363 Documentation/media/uapi/v4l/pixfmt-nv12m.rst | 3 -
2364 Documentation/media/uapi/v4l/pixfmt-nv12mt.rst | 6 +-
2365 .../media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.gif | Bin 2108 -> 0 bytes
2366 .../media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png | Bin 0 -> 1920 bytes
2367 .../v4l/pixfmt-nv12mt_files/nv12mt_example.gif | Bin 6858 -> 0 bytes
2368 .../v4l/pixfmt-nv12mt_files/nv12mt_example.png | Bin 0 -> 5261 bytes
2369 Documentation/media/uapi/v4l/pixfmt-nv16.rst | 5 -
2370 Documentation/media/uapi/v4l/pixfmt-nv16m.rst | 5 -
2371 Documentation/media/uapi/v4l/pixfmt-nv24.rst | 5 -
2372 Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 114 +-
2373 Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst | 26 +-
2374 Documentation/media/uapi/v4l/pixfmt-reserved.rst | 4 +
2375 Documentation/media/uapi/v4l/pixfmt-rgb.rst | 3 -
2376 Documentation/media/uapi/v4l/pixfmt-sbggr16.rst | 9 -
2377 Documentation/media/uapi/v4l/pixfmt-sbggr8.rst | 81 -
2378 Documentation/media/uapi/v4l/pixfmt-sdr-cs08.rst | 5 -
2379 Documentation/media/uapi/v4l/pixfmt-sdr-cs14le.rst | 5 -
2380 Documentation/media/uapi/v4l/pixfmt-sdr-cu08.rst | 6 -
2381 Documentation/media/uapi/v4l/pixfmt-sdr-cu16le.rst | 4 -
2382 Documentation/media/uapi/v4l/pixfmt-sdr-ru12le.rst | 3 +-
2383 Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst | 81 -
2384 Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst | 81 -
2385 Documentation/media/uapi/v4l/pixfmt-srggb10.rst | 18 +-
2386 .../media/uapi/v4l/pixfmt-srggb10alaw8.rst | 2 -
2387 Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 36 +-
2388 Documentation/media/uapi/v4l/pixfmt-srggb12.rst | 8 +-
2389 Documentation/media/uapi/v4l/pixfmt-srggb8.rst | 41 +-
2390 Documentation/media/uapi/v4l/pixfmt-tch-td08.rst | 80 +
2391 Documentation/media/uapi/v4l/pixfmt-tch-td16.rst | 111 +
2392 Documentation/media/uapi/v4l/pixfmt-tch-tu08.rst | 78 +
2393 Documentation/media/uapi/v4l/pixfmt-tch-tu16.rst | 110 +
2394 Documentation/media/uapi/v4l/pixfmt-uv8.rst | 3 +-
2395 Documentation/media/uapi/v4l/pixfmt-uyvy.rst | 3 +-
2396 Documentation/media/uapi/v4l/pixfmt-vyuy.rst | 3 +-
2397 Documentation/media/uapi/v4l/pixfmt-y10.rst | 3 +-
2398 Documentation/media/uapi/v4l/pixfmt-y10b.rst | 6 -
2399 Documentation/media/uapi/v4l/pixfmt-y12.rst | 3 +-
2400 Documentation/media/uapi/v4l/pixfmt-y12i.rst | 3 -
2401 Documentation/media/uapi/v4l/pixfmt-y16-be.rst | 7 +-
2402 Documentation/media/uapi/v4l/pixfmt-y16.rst | 7 +-
2403 Documentation/media/uapi/v4l/pixfmt-y41p.rst | 3 +-
2404 Documentation/media/uapi/v4l/pixfmt-y8i.rst | 3 +-
2405 Documentation/media/uapi/v4l/pixfmt-yuv410.rst | 3 +-
2406 Documentation/media/uapi/v4l/pixfmt-yuv411p.rst | 3 +-
2407 Documentation/media/uapi/v4l/pixfmt-yuv420.rst | 3 +-
2408 Documentation/media/uapi/v4l/pixfmt-yuv420m.rst | 3 +-
2409 Documentation/media/uapi/v4l/pixfmt-yuv422m.rst | 3 +-
2410 Documentation/media/uapi/v4l/pixfmt-yuv422p.rst | 3 +-
2411 Documentation/media/uapi/v4l/pixfmt-yuv444m.rst | 3 +-
2412 Documentation/media/uapi/v4l/pixfmt-yuyv.rst | 3 +-
2413 Documentation/media/uapi/v4l/pixfmt-yvyu.rst | 3 +-
2414 Documentation/media/uapi/v4l/pixfmt-z16.rst | 3 +-
2415 Documentation/media/uapi/v4l/pixfmt.rst | 5 +-
2416 Documentation/media/uapi/v4l/planar-apis.rst | 10 +-
2417 Documentation/media/uapi/v4l/rw.rst | 2 +-
2418 Documentation/media/uapi/v4l/selection-api-005.rst | 10 +-
2419 Documentation/media/uapi/v4l/standard.rst | 12 +-
2420 Documentation/media/uapi/v4l/streaming-par.rst | 2 +-
2421 Documentation/media/uapi/v4l/subdev-formats.rst | 6152 +++++++++++---------
2422 Documentation/media/uapi/v4l/tch-formats.rst | 18 +
2423 Documentation/media/uapi/v4l/tuner.rst | 18 +-
2424 Documentation/media/uapi/v4l/userp.rst | 12 +-
2425 .../media/uapi/v4l/v4l2-selection-flags.rst | 1 +
2426 .../media/uapi/v4l/v4l2-selection-targets.rst | 2 +
2427 Documentation/media/uapi/v4l/v4l2.rst | 12 +-
2428 Documentation/media/uapi/v4l/video.rst | 2 +-
2429 .../media/uapi/v4l/vidioc-create-bufs.rst | 18 +-
2430 Documentation/media/uapi/v4l/vidioc-cropcap.rst | 21 +-
2431 .../media/uapi/v4l/vidioc-dbg-g-chip-info.rst | 16 +-
2432 .../media/uapi/v4l/vidioc-dbg-g-register.rst | 21 +-
2433 .../media/uapi/v4l/vidioc-decoder-cmd.rst | 25 +-
2434 Documentation/media/uapi/v4l/vidioc-dqevent.rst | 74 +-
2435 .../media/uapi/v4l/vidioc-dv-timings-cap.rst | 38 +-
2436 .../media/uapi/v4l/vidioc-encoder-cmd.rst | 18 +-
2437 .../media/uapi/v4l/vidioc-enum-dv-timings.rst | 25 +-
2438 Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 33 +-
2439 .../media/uapi/v4l/vidioc-enum-frameintervals.rst | 32 +-
2440 .../media/uapi/v4l/vidioc-enum-framesizes.rst | 30 +-
2441 .../media/uapi/v4l/vidioc-enum-freq-bands.rst | 35 +-
2442 Documentation/media/uapi/v4l/vidioc-enumaudio.rst | 10 +-
2443 .../media/uapi/v4l/vidioc-enumaudioout.rst | 14 +-
2444 Documentation/media/uapi/v4l/vidioc-enuminput.rst | 30 +-
2445 Documentation/media/uapi/v4l/vidioc-enumoutput.rst | 20 +-
2446 Documentation/media/uapi/v4l/vidioc-enumstd.rst | 71 +-
2447 Documentation/media/uapi/v4l/vidioc-expbuf.rst | 22 +-
2448 Documentation/media/uapi/v4l/vidioc-g-audio.rst | 21 +-
2449 Documentation/media/uapi/v4l/vidioc-g-audioout.rst | 21 +-
2450 Documentation/media/uapi/v4l/vidioc-g-crop.rst | 26 +-
2451 Documentation/media/uapi/v4l/vidioc-g-ctrl.rst | 21 +-
2452 .../media/uapi/v4l/vidioc-g-dv-timings.rst | 51 +-
2453 Documentation/media/uapi/v4l/vidioc-g-edid.rst | 25 +-
2454 .../media/uapi/v4l/vidioc-g-enc-index.rst | 23 +-
2455 .../media/uapi/v4l/vidioc-g-ext-ctrls.rst | 63 +-
2456 Documentation/media/uapi/v4l/vidioc-g-fbuf.rst | 39 +-
2457 Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 39 +-
2458 .../media/uapi/v4l/vidioc-g-frequency.rst | 33 +-
2459 Documentation/media/uapi/v4l/vidioc-g-input.rst | 11 +-
2460 Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst | 14 +-
2461 .../media/uapi/v4l/vidioc-g-modulator.rst | 37 +-
2462 Documentation/media/uapi/v4l/vidioc-g-output.rst | 11 +-
2463 Documentation/media/uapi/v4l/vidioc-g-parm.rst | 43 +-
2464 Documentation/media/uapi/v4l/vidioc-g-priority.rst | 13 +-
2465 .../media/uapi/v4l/vidioc-g-selection.rst | 42 +-
2466 .../media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst | 44 +-
2467 Documentation/media/uapi/v4l/vidioc-g-std.rst | 13 +-
2468 Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 83 +-
2469 Documentation/media/uapi/v4l/vidioc-log-status.rst | 5 +-
2470 Documentation/media/uapi/v4l/vidioc-overlay.rst | 6 +-
2471 .../media/uapi/v4l/vidioc-prepare-buf.rst | 8 +-
2472 Documentation/media/uapi/v4l/vidioc-qbuf.rst | 33 +-
2473 .../media/uapi/v4l/vidioc-query-dv-timings.rst | 15 +-
2474 Documentation/media/uapi/v4l/vidioc-querybuf.rst | 20 +-
2475 Documentation/media/uapi/v4l/vidioc-querycap.rst | 46 +-
2476 Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 77 +-
2477 Documentation/media/uapi/v4l/vidioc-querystd.rst | 10 +-
2478 Documentation/media/uapi/v4l/vidioc-reqbufs.rst | 18 +-
2479 .../media/uapi/v4l/vidioc-s-hw-freq-seek.rst | 32 +-
2480 Documentation/media/uapi/v4l/vidioc-streamon.rst | 15 +-
2481 .../uapi/v4l/vidioc-subdev-enum-frame-interval.rst | 15 +-
2482 .../uapi/v4l/vidioc-subdev-enum-frame-size.rst | 14 +-
2483 .../uapi/v4l/vidioc-subdev-enum-mbus-code.rst | 14 +-
2484 .../media/uapi/v4l/vidioc-subdev-g-crop.rst | 21 +-
2485 .../media/uapi/v4l/vidioc-subdev-g-fmt.rst | 25 +-
2486 .../uapi/v4l/vidioc-subdev-g-frame-interval.rst | 22 +-
2487 .../media/uapi/v4l/vidioc-subdev-g-selection.rst | 17 +-
2488 .../media/uapi/v4l/vidioc-subscribe-event.rst | 19 +-
2489 Documentation/media/v4l-drivers/bttv.rst | 1 +
2490 Documentation/media/v4l-drivers/cpia2.rst | 3 +
2491 .../media/v4l-drivers/cx23885-cardlist.rst | 1 +
2492 Documentation/media/v4l-drivers/si476x.rst | 116 +-
2493 Documentation/media/v4l-drivers/zr364xx.rst | 2 +-
2494 Documentation/media/video.h.rst.exceptions | 20 +-
2495 Documentation/media/videodev2.h.rst.exceptions | 206 +-
2496 Documentation/serial/serial-rs485.txt | 5 +-
2497 Documentation/sphinx/cdomain.py | 102 +
2498 Documentation/sphinx/kernel-doc.py | 8 +
2499 Documentation/sphinx/kernel_include.py | 7 +
2500 Documentation/sphinx/load_config.py | 32 +
2501 Documentation/sphinx/parse-headers.pl | 129 +-
2502 Documentation/sphinx/rstFlatTable.py | 6 +
2506 drivers/gpu/drm/exynos/Kconfig | 3 +-
2507 drivers/input/rmi4/Kconfig | 11 +
2508 drivers/input/rmi4/Makefile | 1 +
2509 drivers/input/rmi4/rmi_bus.c | 3 +
2510 drivers/input/rmi4/rmi_driver.h | 1 +
2511 drivers/input/rmi4/rmi_f54.c | 756 +++
2512 drivers/input/touchscreen/Kconfig | 8 +
2513 drivers/input/touchscreen/atmel_mxt_ts.c | 520 ++
2514 drivers/input/touchscreen/sur40.c | 142 +-
2515 drivers/media/cec-edid.c | 5 +-
2516 drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 14 +-
2517 drivers/media/dvb-core/demux.h | 44 +-
2518 drivers/media/dvb-core/dvb_frontend.c | 28 +-
2519 drivers/media/dvb-core/dvb_ringbuffer.h | 226 +-
2520 drivers/media/dvb-frontends/drxk_hard.c | 2 +-
2521 drivers/media/dvb-frontends/helene.c | 8 +-
2522 drivers/media/dvb-frontends/mb86a20s.c | 104 +-
2523 drivers/media/dvb-frontends/rtl2832_sdr.c | 1 -
2524 drivers/media/i2c/Kconfig | 16 +-
2525 drivers/media/i2c/Makefile | 2 +
2526 drivers/media/i2c/ad5820.c | 381 ++
2527 drivers/media/i2c/ad9389b.c | 23 +-
2528 drivers/media/i2c/adv7180.c | 112 +-
2529 drivers/media/i2c/adv7183.c | 1 -
2530 drivers/media/i2c/adv7393.c | 1 -
2531 drivers/media/i2c/adv7511.c | 1 +
2532 drivers/media/i2c/ak881x.c | 28 +-
2533 drivers/media/i2c/cs3308.c | 1 -
2534 drivers/media/i2c/{soc_camera => }/mt9m111.c | 116 +-
2535 drivers/media/i2c/s5k4ecgx.c | 1 -
2536 drivers/media/i2c/s5k6a3.c | 1 -
2537 drivers/media/i2c/smiapp/smiapp-core.c | 180 +-
2538 drivers/media/i2c/smiapp/smiapp-quirk.c | 16 +-
2539 drivers/media/i2c/smiapp/smiapp-regs.c | 22 +-
2540 drivers/media/i2c/smiapp/smiapp.h | 5 +-
2541 drivers/media/i2c/soc_camera/Kconfig | 7 +-
2542 drivers/media/i2c/soc_camera/Makefile | 1 -
2543 drivers/media/i2c/soc_camera/imx074.c | 42 +-
2544 drivers/media/i2c/soc_camera/mt9m001.c | 70 +-
2545 drivers/media/i2c/soc_camera/mt9t031.c | 54 +-
2546 drivers/media/i2c/soc_camera/mt9t112.c | 60 +-
2547 drivers/media/i2c/soc_camera/mt9v022.c | 68 +-
2548 drivers/media/i2c/soc_camera/ov2640.c | 41 +-
2549 drivers/media/i2c/soc_camera/ov5642.c | 53 +-
2550 drivers/media/i2c/soc_camera/ov6650.c | 74 +-
2551 drivers/media/i2c/soc_camera/ov772x.c | 44 +-
2552 drivers/media/i2c/soc_camera/ov9640.c | 41 +-
2553 drivers/media/i2c/soc_camera/ov9740.c | 41 +-
2554 drivers/media/i2c/soc_camera/rj54n1cb0c.c | 52 +-
2555 drivers/media/i2c/soc_camera/tw9910.c | 47 +-
2556 drivers/media/i2c/ths8200.c | 1 -
2557 drivers/media/i2c/tlv320aic23b.c | 1 -
2558 drivers/media/i2c/tvp514x.c | 1 -
2559 drivers/media/i2c/tvp5150.c | 89 +-
2560 drivers/media/i2c/tvp7002.c | 1 -
2561 drivers/media/i2c/vs6624.c | 1 -
2562 drivers/media/media-entity.c | 13 +-
2563 drivers/media/pci/Kconfig | 1 +
2564 drivers/media/pci/Makefile | 1 +
2565 drivers/media/pci/bt8xx/bttv-driver.c | 59 +-
2566 drivers/media/pci/bt8xx/bttvp.h | 2 +-
2567 drivers/media/pci/cobalt/cobalt-driver.c | 47 +-
2568 drivers/media/pci/cobalt/cobalt-v4l2.c | 7 +-
2569 drivers/media/pci/cx23885/cx23885-cards.c | 29 +
2570 drivers/media/pci/cx23885/cx23885-dvb.c | 100 +
2571 drivers/media/pci/cx23885/cx23885.h | 3 +-
2572 drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c | 5 +-
2573 drivers/media/pci/pt3/pt3.c | 4 +-
2574 drivers/media/pci/saa7134/saa7134-video.c | 39 +-
2575 drivers/media/pci/tw5864/Kconfig | 12 +
2576 drivers/media/pci/tw5864/Makefile | 3 +
2577 drivers/media/pci/tw5864/tw5864-core.c | 359 ++
2578 drivers/media/pci/tw5864/tw5864-h264.c | 259 +
2579 drivers/media/pci/tw5864/tw5864-reg.h | 2133 +++++++
2580 drivers/media/pci/tw5864/tw5864-util.c | 37 +
2581 drivers/media/pci/tw5864/tw5864-video.c | 1510 +++++
2582 drivers/media/pci/tw5864/tw5864.h | 205 +
2583 drivers/media/pci/tw686x/tw686x-video.c | 180 +-
2584 drivers/media/pci/zoran/zoran_driver.c | 113 +-
2585 drivers/media/platform/Kconfig | 30 +-
2586 drivers/media/platform/Makefile | 5 +-
2587 drivers/media/platform/atmel/Kconfig | 9 +
2588 drivers/media/platform/atmel/Makefile | 1 +
2589 drivers/media/platform/atmel/atmel-isc-regs.h | 165 +
2590 drivers/media/platform/atmel/atmel-isc.c | 1514 +++++
2591 drivers/media/platform/davinci/vpbe_display.c | 65 +-
2592 drivers/media/platform/davinci/vpfe_capture.c | 52 +-
2593 drivers/media/platform/exynos-gsc/gsc-m2m.c | 7 +-
2594 drivers/media/platform/exynos4-is/fimc-is-i2c.c | 5 +-
2595 drivers/media/platform/exynos4-is/fimc-is.c | 16 +-
2596 drivers/media/platform/exynos4-is/media-dev.c | 6 +-
2597 drivers/media/platform/m2m-deinterlace.c | 2 +-
2598 drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 3 +-
2599 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 108 +-
2600 .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 6 +-
2601 .../media/platform/mtk-vcodec/mtk_vcodec_intr.h | 1 -
2602 .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 22 +-
2603 .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 22 +-
2604 drivers/media/platform/mtk-vcodec/venc_drv_if.c | 4 +-
2605 drivers/media/platform/omap/omap_vout.c | 53 +-
2606 drivers/media/platform/omap3isp/isp.c | 6 +-
2607 drivers/media/platform/omap3isp/ispvideo.c | 88 +-
2608 .../media/platform/{soc_camera => }/pxa_camera.c | 1944 +++++--
2609 drivers/media/platform/rcar-fcp.c | 9 +-
2610 drivers/media/platform/rcar-vin/Kconfig | 2 +-
2611 drivers/media/platform/rcar-vin/rcar-core.c | 258 +-
2612 drivers/media/platform/rcar-vin/rcar-dma.c | 18 +-
2613 drivers/media/platform/rcar-vin/rcar-v4l2.c | 93 +-
2614 drivers/media/platform/rcar-vin/rcar-vin.h | 25 +-
2615 drivers/media/platform/s5p-jpeg/jpeg-core.c | 20 +-
2616 drivers/media/platform/s5p-mfc/s5p_mfc.c | 86 +-
2617 drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 +
2618 drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 11 +-
2619 drivers/media/platform/s5p-tv/Kconfig | 88 -
2620 drivers/media/platform/s5p-tv/Makefile | 19 -
2621 drivers/media/platform/s5p-tv/hdmi_drv.c | 1059 ----
2622 drivers/media/platform/s5p-tv/hdmiphy_drv.c | 324 --
2623 drivers/media/platform/s5p-tv/mixer.h | 364 --
2624 drivers/media/platform/s5p-tv/mixer_drv.c | 527 --
2625 drivers/media/platform/s5p-tv/mixer_grp_layer.c | 270 -
2626 drivers/media/platform/s5p-tv/mixer_reg.c | 551 --
2627 drivers/media/platform/s5p-tv/mixer_video.c | 1130 ----
2628 drivers/media/platform/s5p-tv/mixer_vp_layer.c | 242 -
2629 drivers/media/platform/s5p-tv/regs-hdmi.h | 146 -
2630 drivers/media/platform/s5p-tv/regs-mixer.h | 122 -
2631 drivers/media/platform/s5p-tv/regs-sdo.h | 63 -
2632 drivers/media/platform/s5p-tv/regs-vp.h | 88 -
2633 drivers/media/platform/s5p-tv/sdo_drv.c | 497 --
2634 drivers/media/platform/s5p-tv/sii9234_drv.c | 407 --
2635 drivers/media/platform/sh_vou.c | 15 +-
2636 drivers/media/platform/soc_camera/Kconfig | 15 -
2637 drivers/media/platform/soc_camera/Makefile | 2 -
2638 drivers/media/platform/soc_camera/rcar_vin.c | 30 +-
2639 .../platform/soc_camera/sh_mobile_ceu_camera.c | 267 +-
2640 drivers/media/platform/soc_camera/sh_mobile_csi2.c | 400 --
2641 drivers/media/platform/soc_camera/soc_camera.c | 130 +-
2642 .../platform/soc_camera/soc_camera_platform.c | 45 +-
2643 drivers/media/platform/soc_camera/soc_scale_crop.c | 97 +-
2644 drivers/media/platform/soc_camera/soc_scale_crop.h | 6 +-
2645 drivers/media/platform/sti/hva/Makefile | 2 +
2646 drivers/media/platform/sti/hva/hva-h264.c | 1050 ++++
2647 drivers/media/platform/sti/hva/hva-hw.c | 538 ++
2648 drivers/media/platform/sti/hva/hva-hw.h | 42 +
2649 drivers/media/platform/sti/hva/hva-mem.c | 59 +
2650 drivers/media/platform/sti/hva/hva-mem.h | 34 +
2651 drivers/media/platform/sti/hva/hva-v4l2.c | 1415 +++++
2652 drivers/media/platform/sti/hva/hva.h | 315 +
2653 drivers/media/platform/vivid/vivid-core.c | 58 +-
2654 drivers/media/platform/vivid/vivid-ctrls.c | 3 +-
2655 drivers/media/platform/vivid/vivid-vid-cap.c | 4 +-
2656 drivers/media/platform/vsp1/vsp1.h | 2 +
2657 drivers/media/platform/vsp1/vsp1_drm.c | 6 +-
2658 drivers/media/platform/vsp1/vsp1_drv.c | 43 +-
2659 drivers/media/platform/vsp1/vsp1_regs.h | 2 +
2660 drivers/media/radio/si470x/radio-si470x-i2c.c | 1 -
2661 drivers/media/radio/si470x/radio-si470x-usb.c | 1 -
2662 drivers/media/rc/imon.c | 13 +-
2663 drivers/media/rc/redrat3.c | 6 +-
2664 drivers/media/tuners/tda18271-fe.c | 11 +-
2665 drivers/media/tuners/tda18271-priv.h | 2 +
2666 drivers/media/tuners/tea5767.c | 9 +-
2667 drivers/media/usb/airspy/airspy.c | 1 -
2668 drivers/media/usb/as102/as102_usb_drv.c | 2 -
2669 drivers/media/usb/au0828/au0828-video.c | 1 -
2670 drivers/media/usb/cpia2/cpia2_usb.c | 1 -
2671 drivers/media/usb/cx231xx/cx231xx-audio.c | 2 -
2672 drivers/media/usb/cx231xx/cx231xx-avcore.c | 5 +-
2673 drivers/media/usb/cx231xx/cx231xx-cards.c | 6 +-
2674 drivers/media/usb/cx231xx/cx231xx-core.c | 71 +-
2675 drivers/media/usb/cx231xx/cx231xx-i2c.c | 2 +-
2676 drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 -
2677 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 2 -
2678 drivers/media/usb/dvb-usb/dib0700_core.c | 4 +-
2679 drivers/media/usb/em28xx/em28xx-audio.c | 1 -
2680 drivers/media/usb/em28xx/em28xx-core.c | 1 -
2681 drivers/media/usb/gspca/benq.c | 4 +-
2682 drivers/media/usb/gspca/finepix.c | 8 +-
2683 drivers/media/usb/gspca/gspca.c | 4 +-
2684 drivers/media/usb/gspca/jl2005bcd.c | 8 +-
2685 drivers/media/usb/gspca/konica.c | 4 +-
2686 drivers/media/usb/gspca/sonixj.c | 13 +-
2687 drivers/media/usb/gspca/vicam.c | 8 +-
2688 drivers/media/usb/hackrf/hackrf.c | 3 +-
2689 drivers/media/usb/hdpvr/hdpvr-video.c | 4 +-
2690 drivers/media/usb/msi2500/msi2500.c | 1 -
2691 drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h | 1 -
2692 drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 23 +-
2693 drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 81 +-
2694 drivers/media/usb/pwc/pwc-if.c | 1 -
2695 drivers/media/usb/s2255/s2255drv.c | 9 +-
2696 drivers/media/usb/stk1160/stk1160-video.c | 4 +-
2697 drivers/media/usb/stkwebcam/stk-webcam.c | 4 +-
2698 drivers/media/usb/tm6000/tm6000-dvb.c | 4 +-
2699 drivers/media/usb/tm6000/tm6000-video.c | 1 -
2700 drivers/media/usb/usbvision/usbvision-core.c | 5 +-
2701 drivers/media/usb/zr364xx/zr364xx.c | 4 +-
2702 drivers/media/v4l2-core/v4l2-async.c | 7 -
2703 drivers/media/v4l2-core/v4l2-common.c | 2 +-
2704 drivers/media/v4l2-core/v4l2-ctrls.c | 1 +
2705 drivers/media/v4l2-core/v4l2-dev.c | 14 +-
2706 drivers/media/v4l2-core/v4l2-device.c | 5 +-
2707 drivers/media/v4l2-core/v4l2-ioctl.c | 44 +-
2708 drivers/media/v4l2-core/v4l2-mem2mem.c | 128 +-
2709 drivers/media/v4l2-core/videobuf2-core.c | 278 +-
2710 drivers/media/v4l2-core/videobuf2-dma-contig.c | 9 +
2711 drivers/media/v4l2-core/videobuf2-dma-sg.c | 19 +-
2712 drivers/media/v4l2-core/videobuf2-v4l2.c | 142 -
2713 drivers/media/v4l2-core/videobuf2-vmalloc.c | 13 +-
2714 drivers/staging/media/Kconfig | 2 -
2715 drivers/staging/media/Makefile | 1 -
2716 drivers/staging/media/cec/TODO | 1 +
2717 drivers/staging/media/cec/cec-adap.c | 30 +-
2718 drivers/staging/media/cec/cec-api.c | 12 +-
2719 drivers/staging/media/cec/cec-core.c | 30 +-
2720 drivers/staging/media/lirc/lirc_imon.c | 9 +-
2721 drivers/staging/media/lirc/lirc_sasem.c | 5 -
2722 drivers/staging/media/omap4iss/iss.c | 6 +-
2723 drivers/staging/media/omap4iss/iss_video.c | 99 +
2724 drivers/staging/media/pulse8-cec/pulse8-cec.c | 376 +-
2725 drivers/staging/media/tw686x-kh/Kconfig | 17 -
2726 drivers/staging/media/tw686x-kh/Makefile | 3 -
2727 drivers/staging/media/tw686x-kh/TODO | 6 -
2728 drivers/staging/media/tw686x-kh/tw686x-kh-core.c | 140 -
2729 drivers/staging/media/tw686x-kh/tw686x-kh-regs.h | 103 -
2730 drivers/staging/media/tw686x-kh/tw686x-kh-video.c | 813 ---
2731 drivers/staging/media/tw686x-kh/tw686x-kh.h | 117 -
2732 include/linux/cec-funcs.h | 78 +-
2733 include/linux/cec.h | 5 +-
2734 include/linux/platform_data/media/camera-pxa.h | 2 +
2735 include/media/cec.h | 2 +-
2736 include/media/drv-intf/sh_mobile_ceu.h | 1 -
2737 include/media/drv-intf/sh_mobile_csi2.h | 48 -
2738 include/media/i2c/smiapp.h | 7 +-
2739 include/media/media-device.h | 131 +-
2740 include/media/media-devnode.h | 5 +-
2741 include/media/media-entity.h | 243 +-
2742 include/media/rc-map.h | 94 +-
2743 include/media/rcar-fcp.h | 2 +-
2744 include/media/soc_camera.h | 7 +-
2745 include/media/v4l2-ctrls.h | 61 +-
2746 include/media/v4l2-dev.h | 16 +-
2747 include/media/v4l2-device.h | 68 +-
2748 include/media/v4l2-dv-timings.h | 4 +-
2749 include/media/v4l2-flash-led-class.h | 15 +-
2750 include/media/v4l2-ioctl.h | 510 +-
2751 include/media/v4l2-mem2mem.h | 262 +-
2752 include/media/v4l2-subdev.h | 25 +-
2753 include/media/videobuf2-core.h | 378 +-
2754 include/media/videobuf2-v4l2.h | 182 +-
2755 include/media/vsp1.h | 2 +-
2756 include/uapi/linux/dvb/video.h | 3 +-
2757 include/uapi/linux/media-bus-format.h | 10 +-
2758 include/uapi/linux/media.h | 1 +
2759 include/uapi/linux/videodev2.h | 30 +-
2760 scripts/kernel-doc | 43 +-
2761 657 files changed, 27346 insertions(+), 19532 deletions(-)
2762 rename Documentation/{coccinelle.txt => dev-tools/coccinelle.rst} (56%)
2763 create mode 100644 Documentation/dev-tools/gcov.rst
2764 rename Documentation/{gdb-kernel-debugging.txt => dev-tools/gdb-kernel-debugging.rst} (73%)
2765 create mode 100644 Documentation/dev-tools/kasan.rst
2766 rename Documentation/{kcov.txt => dev-tools/kcov.rst} (78%)
2767 create mode 100644 Documentation/dev-tools/kmemcheck.rst
2768 rename Documentation/{kmemleak.txt => dev-tools/kmemleak.rst} (73%)
2769 rename Documentation/{sparse.txt => dev-tools/sparse.rst} (82%)
2770 create mode 100644 Documentation/dev-tools/tools.rst
2771 rename Documentation/{ubsan.txt => dev-tools/ubsan.rst} (78%)
2772 create mode 100644 Documentation/devicetree/bindings/media/atmel-isc.txt
2773 create mode 100644 Documentation/devicetree/bindings/media/i2c/ad5820.txt
2774 create mode 100644 Documentation/devicetree/bindings/media/st,st-hva.txt
2775 create mode 100644 Documentation/docutils.conf
2776 delete mode 100644 Documentation/gcov.txt
2777 create mode 100644 Documentation/gpu/conf.py
2778 delete mode 100644 Documentation/kasan.txt
2779 delete mode 100644 Documentation/kmemcheck.txt
2780 create mode 100644 Documentation/media/conf.py
2781 create mode 100644 Documentation/media/conf_nitpick.py
2782 create mode 100644 Documentation/media/index.rst
2783 rename Documentation/{cec.txt => media/kapi/cec-core.rst} (72%)
2784 create mode 100644 Documentation/media/uapi/v4l/dev-touch.rst
2785 delete mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.gif
2786 create mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png
2787 delete mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.gif
2788 create mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png
2789 delete mode 100644 Documentation/media/uapi/v4l/pixfmt-sbggr8.rst
2790 delete mode 100644 Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst
2791 delete mode 100644 Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst
2792 create mode 100644 Documentation/media/uapi/v4l/pixfmt-tch-td08.rst
2793 create mode 100644 Documentation/media/uapi/v4l/pixfmt-tch-td16.rst
2794 create mode 100644 Documentation/media/uapi/v4l/pixfmt-tch-tu08.rst
2795 create mode 100644 Documentation/media/uapi/v4l/pixfmt-tch-tu16.rst
2796 create mode 100644 Documentation/media/uapi/v4l/tch-formats.rst
2797 create mode 100644 Documentation/sphinx/cdomain.py
2798 create mode 100644 Documentation/sphinx/load_config.py
2799 mode change 100644 => 100755 Documentation/sphinx/rstFlatTable.py
2800 create mode 100644 drivers/input/rmi4/rmi_f54.c
2801 create mode 100644 drivers/media/i2c/ad5820.c
2802 rename drivers/media/i2c/{soc_camera => }/mt9m111.c (92%)
2803 create mode 100644 drivers/media/pci/tw5864/Kconfig
2804 create mode 100644 drivers/media/pci/tw5864/Makefile
2805 create mode 100644 drivers/media/pci/tw5864/tw5864-core.c
2806 create mode 100644 drivers/media/pci/tw5864/tw5864-h264.c
2807 create mode 100644 drivers/media/pci/tw5864/tw5864-reg.h
2808 create mode 100644 drivers/media/pci/tw5864/tw5864-util.c
2809 create mode 100644 drivers/media/pci/tw5864/tw5864-video.c
2810 create mode 100644 drivers/media/pci/tw5864/tw5864.h
2811 create mode 100644 drivers/media/platform/atmel/Kconfig
2812 create mode 100644 drivers/media/platform/atmel/Makefile
2813 create mode 100644 drivers/media/platform/atmel/atmel-isc-regs.h
2814 create mode 100644 drivers/media/platform/atmel/atmel-isc.c
2815 rename drivers/media/platform/{soc_camera => }/pxa_camera.c (50%)
2816 delete mode 100644 drivers/media/platform/s5p-tv/Kconfig
2817 delete mode 100644 drivers/media/platform/s5p-tv/Makefile
2818 delete mode 100644 drivers/media/platform/s5p-tv/hdmi_drv.c
2819 delete mode 100644 drivers/media/platform/s5p-tv/hdmiphy_drv.c
2820 delete mode 100644 drivers/media/platform/s5p-tv/mixer.h
2821 delete mode 100644 drivers/media/platform/s5p-tv/mixer_drv.c
2822 delete mode 100644 drivers/media/platform/s5p-tv/mixer_grp_layer.c
2823 delete mode 100644 drivers/media/platform/s5p-tv/mixer_reg.c
2824 delete mode 100644 drivers/media/platform/s5p-tv/mixer_video.c
2825 delete mode 100644 drivers/media/platform/s5p-tv/mixer_vp_layer.c
2826 delete mode 100644 drivers/media/platform/s5p-tv/regs-hdmi.h
2827 delete mode 100644 drivers/media/platform/s5p-tv/regs-mixer.h
2828 delete mode 100644 drivers/media/platform/s5p-tv/regs-sdo.h
2829 delete mode 100644 drivers/media/platform/s5p-tv/regs-vp.h
2830 delete mode 100644 drivers/media/platform/s5p-tv/sdo_drv.c
2831 delete mode 100644 drivers/media/platform/s5p-tv/sii9234_drv.c
2832 delete mode 100644 drivers/media/platform/soc_camera/sh_mobile_csi2.c
2833 create mode 100644 drivers/media/platform/sti/hva/Makefile
2834 create mode 100644 drivers/media/platform/sti/hva/hva-h264.c
2835 create mode 100644 drivers/media/platform/sti/hva/hva-hw.c
2836 create mode 100644 drivers/media/platform/sti/hva/hva-hw.h
2837 create mode 100644 drivers/media/platform/sti/hva/hva-mem.c
2838 create mode 100644 drivers/media/platform/sti/hva/hva-mem.h
2839 create mode 100644 drivers/media/platform/sti/hva/hva-v4l2.c
2840 create mode 100644 drivers/media/platform/sti/hva/hva.h
2841 delete mode 100644 drivers/staging/media/tw686x-kh/Kconfig
2842 delete mode 100644 drivers/staging/media/tw686x-kh/Makefile
2843 delete mode 100644 drivers/staging/media/tw686x-kh/TODO
2844 delete mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh-core.c
2845 delete mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh-regs.h
2846 delete mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh-video.c
2847 delete mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh.h
2848 delete mode 100644 include/media/drv-intf/sh_mobile_csi2.h
2849 Merging pm/linux-next (2fa1df91aff2 Merge branches 'pnp' and 'device-properties' into linux-next)
2850 $ git merge pm/linux-next
2851 Removing tools/power/acpi/os_specific/service_layers/oslibcfs.c
2852 Merge made by the 'recursive' strategy.
2853 Documentation/acpi/acpi-lid.txt | 96 +++
2854 arch/x86/kernel/acpi/Makefile | 1 +
2855 arch/x86/kernel/acpi/cppc_msr.c | 58 ++
2856 drivers/acpi/Kconfig | 1 -
2857 drivers/acpi/acpi_apd.c | 21 +
2858 drivers/acpi/acpi_lpss.c | 17 +
2859 drivers/acpi/acpica/Makefile | 1 +
2860 drivers/acpi/acpica/acapps.h | 10 +-
2861 drivers/acpi/acpica/acdebug.h | 2 +-
2862 drivers/acpi/acpica/acevents.h | 3 +
2863 drivers/acpi/acpica/acglobal.h | 2 +
2864 drivers/acpi/acpica/aclocal.h | 2 +
2865 drivers/acpi/acpica/acnamesp.h | 8 +
2866 drivers/acpi/acpica/acparser.h | 2 +
2867 drivers/acpi/acpica/actables.h | 12 +-
2868 drivers/acpi/acpica/acutils.h | 53 +-
2869 drivers/acpi/acpica/dbconvert.c | 7 +-
2870 drivers/acpi/acpica/dbexec.c | 62 +-
2871 drivers/acpi/acpica/dbfileio.c | 20 +-
2872 drivers/acpi/acpica/dbinput.c | 2 +
2873 drivers/acpi/acpica/dbmethod.c | 132 ++++
2874 drivers/acpi/acpica/dbobject.c | 4 +-
2875 drivers/acpi/acpica/dsmethod.c | 14 +-
2876 drivers/acpi/acpica/dsutils.c | 17 +-
2877 drivers/acpi/acpica/dswexec.c | 3 +-
2878 drivers/acpi/acpica/dswload2.c | 7 +-
2879 drivers/acpi/acpica/evgpe.c | 57 ++
2880 drivers/acpi/acpica/evgpeinit.c | 7 +-
2881 drivers/acpi/acpica/evrgnini.c | 3 +-
2882 drivers/acpi/acpica/evxfgpe.c | 43 ++
2883 drivers/acpi/acpica/exconcat.c | 2 +-
2884 drivers/acpi/acpica/exconfig.c | 118 +---
2885 drivers/acpi/acpica/exconvrt.c | 8 +-
2886 drivers/acpi/acpica/exmisc.c | 4 +-
2887 drivers/acpi/acpica/exoparg1.c | 23 +-
2888 drivers/acpi/acpica/exresop.c | 11 +-
2889 drivers/acpi/acpica/extrace.c | 25 -
2890 drivers/acpi/acpica/exutils.c | 8 +
2891 drivers/acpi/acpica/hwgpe.c | 23 +-
2892 drivers/acpi/acpica/nsaccess.c | 6 +-
2893 drivers/acpi/acpica/nsconvert.c | 1 -
2894 drivers/acpi/acpica/nsdump.c | 2 +-
2895 drivers/acpi/acpica/nsload.c | 30 +-
2896 drivers/acpi/acpica/nsparse.c | 165 ++++-
2897 drivers/acpi/acpica/nsutils.c | 66 +-
2898 drivers/acpi/acpica/psparse.c | 6 +-
2899 drivers/acpi/acpica/psxface.c | 73 +++
2900 drivers/acpi/acpica/tbdata.c | 140 +++++
2901 drivers/acpi/acpica/tbfadt.c | 136 ++---
2902 drivers/acpi/acpica/tbfind.c | 10 +-
2903 drivers/acpi/acpica/tbinstal.c | 73 +--
2904 drivers/acpi/acpica/tbutils.c | 3 +-
2905 drivers/acpi/acpica/tbxface.c | 4 +-
2906 drivers/acpi/acpica/tbxfload.c | 57 +-
2907 drivers/acpi/acpica/tbxfroot.c | 5 +-
2908 drivers/acpi/acpica/utaddress.c | 8 -
2909 drivers/acpi/acpica/utbuffer.c | 30 +-
2910 drivers/acpi/acpica/utdebug.c | 61 +-
2911 drivers/acpi/acpica/utdecode.c | 2 +-
2912 drivers/acpi/acpica/uthex.c | 46 +-
2913 drivers/acpi/acpica/utinit.c | 2 +-
2914 drivers/acpi/acpica/utnonansi.c | 357 +----------
2915 drivers/acpi/acpica/utosi.c | 22 +-
2916 drivers/acpi/acpica/utpredef.c | 2 -
2917 drivers/acpi/acpica/utprint.c | 105 +++-
2918 drivers/acpi/acpica/utstrtoul64.c | 348 +++++++++++
2919 drivers/acpi/acpica/uttrack.c | 4 +-
2920 drivers/acpi/acpica/utxface.c | 2 +-
2921 drivers/acpi/acpica/utxfinit.c | 9 +-
2922 drivers/acpi/battery.c | 10 +-
2923 drivers/acpi/button.c | 85 ++-
2924 drivers/acpi/cppc_acpi.c | 661 ++++++++++++++++-----
2925 drivers/acpi/ec.c | 468 ++++++++++++---
2926 drivers/acpi/internal.h | 5 +-
2927 drivers/acpi/pci_irq.c | 10 +-
2928 drivers/acpi/processor_driver.c | 4 +-
2929 drivers/acpi/scan.c | 1 +
2930 drivers/acpi/sleep.c | 6 +-
2931 drivers/acpi/sysfs.c | 33 +-
2932 drivers/acpi/tables.c | 15 +-
2933 drivers/base/core.c | 1 +
2934 drivers/base/power/domain.c | 4 +-
2935 drivers/cpufreq/Kconfig | 5 +-
2936 drivers/cpufreq/cppc_cpufreq.c | 15 +-
2937 drivers/cpufreq/cpufreq-dt-platdev.c | 1 +
2938 drivers/cpufreq/cpufreq.c | 4 -
2939 drivers/cpufreq/cpufreq_governor.c | 2 +-
2940 drivers/cpufreq/intel_pstate.c | 2 +-
2941 drivers/cpufreq/scpi-cpufreq.c | 1 -
2942 drivers/cpuidle/cpuidle-arm.c | 1 +
2943 drivers/mailbox/pcc.c | 316 +++++++---
2944 drivers/pnp/isapnp/core.c | 5 +-
2945 drivers/tty/serial/8250/8250_dw.c | 15 +-
2946 include/acpi/acconfig.h | 4 +
2947 include/acpi/acoutput.h | 6 +-
2948 include/acpi/acpiosxf.h | 43 +-
2949 include/acpi/acpixf.h | 44 +-
2950 include/acpi/actbl.h | 164 ++---
2951 include/acpi/actypes.h | 64 +-
2952 include/acpi/cppc_acpi.h | 18 +-
2953 include/acpi/platform/acenv.h | 90 ++-
2954 include/acpi/platform/acenvex.h | 21 +-
2955 include/acpi/platform/acgcc.h | 17 +-
2956 include/acpi/platform/acgccex.h | 58 ++
2957 include/acpi/platform/aclinux.h | 22 +-
2958 include/acpi/platform/aclinuxex.h | 2 +-
2959 include/linux/acpi.h | 7 +
2960 include/linux/sched.h | 12 +-
2961 kernel/sched/cpufreq.c | 2 +-
2962 kernel/sched/cpufreq_schedutil.c | 69 ++-
2963 kernel/sched/deadline.c | 5 +-
2964 kernel/sched/fair.c | 15 +-
2965 kernel/sched/rt.c | 5 +-
2966 kernel/sched/sched.h | 40 +-
2967 tools/power/acpi/common/cmfsize.c | 13 +-
2968 tools/power/acpi/common/getopt.c | 4 +-
2969 .../acpi/os_specific/service_layers/oslibcfs.c | 217 -------
2970 .../acpi/os_specific/service_layers/osunixxf.c | 3 -
2971 tools/power/acpi/tools/acpidump/Makefile | 3 +-
2972 tools/power/acpi/tools/acpidump/acpidump.h | 12 +-
2973 tools/power/acpi/tools/acpidump/apdump.c | 75 +--
2974 tools/power/acpi/tools/acpidump/apfiles.c | 56 +-
2975 tools/power/acpi/tools/acpidump/apmain.c | 37 +-
2976 123 files changed, 3506 insertions(+), 1956 deletions(-)
2977 create mode 100644 Documentation/acpi/acpi-lid.txt
2978 create mode 100644 arch/x86/kernel/acpi/cppc_msr.c
2979 create mode 100644 drivers/acpi/acpica/utstrtoul64.c
2980 create mode 100644 include/acpi/platform/acgccex.h
2981 delete mode 100644 tools/power/acpi/os_specific/service_layers/oslibcfs.c
2982 Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
2983 $ git merge idle/next
2985 Merging thermal/next (1876b0a39af2 Merge branches 'release' and 'for-rc' into next)
2986 $ git merge thermal/next
2987 Merge made by the 'recursive' strategy.
2988 .../bindings/thermal/max77620_thermal.txt | 70 +++++
2989 .../bindings/thermal/mediatek-thermal.txt | 4 +-
2990 .../devicetree/bindings/thermal/qcom-tsens.txt | 21 ++
2991 Documentation/thermal/sysfs-api.txt | 19 ++
2992 drivers/thermal/Kconfig | 37 ++-
2993 drivers/thermal/Makefile | 4 +
2994 drivers/thermal/devfreq_cooling.c | 2 +-
2995 drivers/thermal/gov_bang_bang.c | 2 +-
2996 drivers/thermal/intel_bxt_pmic_thermal.c | 299 +++++++++++++++++++
2997 drivers/thermal/max77620_thermal.c | 165 +++++++++++
2998 drivers/thermal/mtk_thermal.c | 215 ++++++++++----
2999 drivers/thermal/of-thermal.c | 44 +--
3000 drivers/thermal/qcom/Kconfig | 11 +
3001 drivers/thermal/qcom/Makefile | 2 +
3002 drivers/thermal/qcom/tsens-8916.c | 113 +++++++
3003 drivers/thermal/qcom/tsens-8960.c | 292 ++++++++++++++++++
3004 drivers/thermal/qcom/tsens-8974.c | 244 +++++++++++++++
3005 drivers/thermal/qcom/tsens-8996.c | 84 ++++++
3006 drivers/thermal/qcom/tsens-common.c | 141 +++++++++
3007 drivers/thermal/qcom/tsens.c | 200 +++++++++++++
3008 drivers/thermal/qcom/tsens.h | 94 ++++++
3009 drivers/thermal/qoriq_thermal.c | 328 +++++++++++++++++++++
3010 drivers/thermal/rcar_thermal.c | 23 +-
3011 drivers/thermal/rockchip_thermal.c | 104 +++++--
3012 drivers/thermal/tango_thermal.c | 19 +-
3013 drivers/thermal/thermal_core.c | 85 ++++++
3014 drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 25 +-
3015 include/linux/thermal.h | 24 +-
3016 28 files changed, 2543 insertions(+), 128 deletions(-)
3017 create mode 100644 Documentation/devicetree/bindings/thermal/max77620_thermal.txt
3018 create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt
3019 create mode 100644 drivers/thermal/intel_bxt_pmic_thermal.c
3020 create mode 100644 drivers/thermal/max77620_thermal.c
3021 create mode 100644 drivers/thermal/qcom/Kconfig
3022 create mode 100644 drivers/thermal/qcom/Makefile
3023 create mode 100644 drivers/thermal/qcom/tsens-8916.c
3024 create mode 100644 drivers/thermal/qcom/tsens-8960.c
3025 create mode 100644 drivers/thermal/qcom/tsens-8974.c
3026 create mode 100644 drivers/thermal/qcom/tsens-8996.c
3027 create mode 100644 drivers/thermal/qcom/tsens-common.c
3028 create mode 100644 drivers/thermal/qcom/tsens.c
3029 create mode 100644 drivers/thermal/qcom/tsens.h
3030 create mode 100644 drivers/thermal/qoriq_thermal.c
3031 Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
3032 $ git merge thermal-soc/next
3034 Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
3035 $ git merge ieee1394/for-next
3037 Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
3038 $ git merge dlm/next
3040 Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
3041 $ git merge swiotlb/linux-next
3043 Merging slave-dma/next (33d6c9c24120 Merge branch 'topic/dmatest' into next)
3044 $ git merge slave-dma/next
3045 Merge made by the 'recursive' strategy.
3046 .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 +
3047 Documentation/dmaengine/provider.txt | 11 +
3048 drivers/dma/Kconfig | 2 +-
3049 drivers/dma/at_hdmac.c | 11 +-
3050 drivers/dma/at_xdmac.c | 8 +-
3051 drivers/dma/coh901318.c | 9 +-
3052 drivers/dma/cppi41.c | 142 ++++++++++---
3053 drivers/dma/dmaengine.c | 7 +
3054 drivers/dma/dmaengine.h | 84 ++++++++
3055 drivers/dma/dmatest.c | 19 +-
3056 drivers/dma/dw/core.c | 14 +-
3057 drivers/dma/ep93xx_dma.c | 10 +-
3058 drivers/dma/fsl_raid.c | 10 +-
3059 drivers/dma/fsldma.c | 8 +-
3060 drivers/dma/imx-dma.c | 4 +-
3061 drivers/dma/imx-sdma.c | 35 ++-
3062 drivers/dma/ioat/dma.c | 213 ++++++++++++++++---
3063 drivers/dma/ioat/init.c | 2 +-
3064 drivers/dma/ioat/registers.h | 2 +
3065 drivers/dma/iop-adma.c | 3 +-
3066 drivers/dma/ipu/ipu_idmac.c | 18 +-
3067 drivers/dma/ipu/ipu_irq.c | 9 +-
3068 drivers/dma/k3dma.c | 215 +++++++++++++++----
3069 drivers/dma/mic_x100_dma.c | 6 +-
3070 drivers/dma/mmp_pdma.c | 14 +-
3071 drivers/dma/mmp_tdma.c | 4 +-
3072 drivers/dma/moxart-dma.c | 2 +-
3073 drivers/dma/mpc512x_dma.c | 3 +-
3074 drivers/dma/mv_xor.c | 7 +-
3075 drivers/dma/mxs-dma.c | 13 +-
3076 drivers/dma/nbpfaxi.c | 9 +-
3077 drivers/dma/omap-dma.c | 234 ++++++++++++++++++---
3078 drivers/dma/pch_dma.c | 7 +-
3079 drivers/dma/pl330.c | 25 ++-
3080 drivers/dma/ppc4xx/adma.c | 7 +-
3081 drivers/dma/qcom/hidma.c | 57 +++--
3082 drivers/dma/qcom/hidma.h | 2 +-
3083 drivers/dma/qcom/hidma_ll.c | 32 +--
3084 drivers/dma/sh/rcar-dmac.c | 16 +-
3085 drivers/dma/sh/shdma-base.c | 12 +-
3086 drivers/dma/sirf-dma.c | 9 +-
3087 drivers/dma/ste_dma40.c | 10 +-
3088 drivers/dma/tegra20-apb-dma.c | 10 +-
3089 drivers/dma/tegra210-adma.c | 14 +-
3090 drivers/dma/timb_dma.c | 9 +-
3091 drivers/dma/txx9dmac.c | 9 +-
3092 drivers/dma/virt-dma.c | 17 +-
3093 drivers/dma/xgene-dma.c | 6 +-
3094 drivers/dma/xilinx/xilinx_dma.c | 10 +-
3095 drivers/ntb/ntb_transport.c | 193 +++++++++++++----
3096 include/linux/dmaengine.h | 16 ++
3097 51 files changed, 1180 insertions(+), 410 deletions(-)
3098 Merging net-next/master (b20b378d4992 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
3099 $ git merge net-next/master
3100 Auto-merging net/netfilter/nft_set_rbtree.c
3101 Auto-merging net/netfilter/nf_nat_core.c
3102 Auto-merging net/mac80211/tx.c
3103 Auto-merging net/mac80211/sta_info.c
3104 Auto-merging net/mac80211/mesh_hwmp.c
3105 Auto-merging net/ipv6/ip6_vti.c
3106 Removing net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
3107 Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
3108 Auto-merging MAINTAINERS
3109 Merge made by the 'recursive' strategy.
3110 .../devicetree/bindings/net/apm-xgene-enet.txt | 3 +
3111 .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 45 +-
3112 Documentation/devicetree/bindings/net/macb.txt | 1 +
3113 .../devicetree/bindings/net/qcom-emac.txt | 111 +
3114 .../devicetree/bindings/net/rockchip-dwmac.txt | 8 +-
3115 Documentation/devicetree/bindings/net/smsc911x.txt | 15 +-
3116 .../devicetree/bindings/net/stm32-dwmac.txt | 32 +
3117 .../devicetree/bindings/net/xilinx_gmii2rgmii.txt | 35 +
3118 Documentation/networking/00-INDEX | 2 +
3119 Documentation/networking/batman-adv.txt | 17 +-
3120 Documentation/networking/dsa/dsa.txt | 33 +-
3121 Documentation/networking/ena.txt | 305 +
3122 Documentation/networking/ip-sysctl.txt | 45 +-
3123 Documentation/networking/rxrpc.txt | 90 +-
3124 Documentation/networking/strparser.txt | 136 +
3125 Documentation/networking/switchdev.txt | 13 +-
3127 arch/arm64/boot/dts/apm/apm-mustang.dts | 1 +
3128 arch/arm64/boot/dts/apm/apm-storm.dtsi | 2 +-
3129 drivers/atm/eni.c | 5 +-
3130 drivers/atm/fore200e.c | 6 +-
3131 drivers/atm/he.c | 10 +-
3132 drivers/atm/iphase.c | 13 +-
3133 drivers/atm/nicstar.c | 15 +-
3134 drivers/atm/zatm.c | 16 +-
3135 drivers/crypto/Kconfig | 2 +
3136 drivers/crypto/Makefile | 1 +
3137 drivers/crypto/chelsio/Kconfig | 19 +
3138 drivers/crypto/chelsio/Makefile | 4 +
3139 drivers/crypto/chelsio/chcr_algo.c | 1525 +++++
3140 drivers/crypto/chelsio/chcr_algo.h | 471 ++
3141 drivers/crypto/chelsio/chcr_core.c | 240 +
3142 drivers/crypto/chelsio/chcr_core.h | 80 +
3143 drivers/crypto/chelsio/chcr_crypto.h | 203 +
3144 drivers/infiniband/hw/mlx5/cq.c | 110 +-
3145 drivers/infiniband/hw/mlx5/main.c | 13 +-
3146 drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +-
3147 drivers/infiniband/hw/mlx5/mr.c | 184 +-
3148 drivers/infiniband/hw/mlx5/qp.c | 189 +-
3149 drivers/isdn/hardware/mISDN/avmfritz.c | 6 +-
3150 drivers/isdn/hardware/mISDN/hfcmulti.c | 24 +-
3151 drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +-
3152 drivers/isdn/hardware/mISDN/w6692.c | 2 +-
3153 drivers/net/bonding/bond_main.c | 2 +-
3154 drivers/net/can/usb/ems_usb.c | 9 +-
3155 drivers/net/can/usb/esd_usb2.c | 3 -
3156 drivers/net/can/usb/gs_usb.c | 9 +-
3157 drivers/net/can/usb/kvaser_usb.c | 7 +-
3158 drivers/net/can/usb/peak_usb/pcan_usb_core.c | 6 +-
3159 drivers/net/can/usb/usb_8dev.c | 5 +-
3160 drivers/net/dsa/Kconfig | 1 +
3161 drivers/net/dsa/b53/b53_common.c | 162 +-
3162 drivers/net/dsa/b53/b53_mdio.c | 2 +-
3163 drivers/net/dsa/b53/b53_mmap.c | 2 +-
3164 drivers/net/dsa/b53/b53_priv.h | 10 +-
3165 drivers/net/dsa/b53/b53_regs.h | 3 +
3166 drivers/net/dsa/b53/b53_spi.c | 4 +-
3167 drivers/net/dsa/b53/b53_srab.c | 2 +-
3168 drivers/net/dsa/bcm_sf2.c | 1036 +--
3169 drivers/net/dsa/bcm_sf2.h | 82 +-
3170 drivers/net/dsa/bcm_sf2_regs.h | 122 -
3171 drivers/net/dsa/mv88e6060.c | 17 +-
3172 drivers/net/dsa/mv88e6xxx/Kconfig | 12 +
3173 drivers/net/dsa/mv88e6xxx/Makefile | 4 +-
3174 drivers/net/dsa/mv88e6xxx/chip.c | 1202 ++--
3175 drivers/net/dsa/mv88e6xxx/global2.c | 471 ++
3176 drivers/net/dsa/mv88e6xxx/global2.h | 88 +
3177 drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 139 +-
3178 drivers/net/ethernet/Kconfig | 1 +
3179 drivers/net/ethernet/Makefile | 1 +
3180 drivers/net/ethernet/adi/bfin_mac.c | 8 +-
3181 drivers/net/ethernet/aeroflex/greth.c | 42 +-
3182 drivers/net/ethernet/aeroflex/greth.h | 1 -
3183 drivers/net/ethernet/agere/et131x.c | 2 +-
3184 drivers/net/ethernet/amazon/Kconfig | 27 +
3185 drivers/net/ethernet/amazon/Makefile | 5 +
3186 drivers/net/ethernet/amazon/ena/Makefile | 7 +
3187 drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 973 +++
3188 drivers/net/ethernet/amazon/ena/ena_com.c | 2666 ++++++++
3189 drivers/net/ethernet/amazon/ena/ena_com.h | 1038 +++
3190 drivers/net/ethernet/amazon/ena/ena_common_defs.h | 48 +
3191 drivers/net/ethernet/amazon/ena/ena_eth_com.c | 501 ++
3192 drivers/net/ethernet/amazon/ena/ena_eth_com.h | 160 +
3193 drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h | 416 ++
3194 drivers/net/ethernet/amazon/ena/ena_ethtool.c | 895 +++
3195 drivers/net/ethernet/amazon/ena/ena_netdev.c | 3272 ++++++++++
3196 drivers/net/ethernet/amazon/ena/ena_netdev.h | 324 +
3197 drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h | 67 +
3198 drivers/net/ethernet/amazon/ena/ena_regs_defs.h | 133 +
3199 drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +-
3200 drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 4 +-
3201 drivers/net/ethernet/amd/xgbe/xgbe-main.c | 8 +-
3202 drivers/net/ethernet/amd/xgbe/xgbe.h | 5 +-
3203 drivers/net/ethernet/apm/xgene/Kconfig | 1 +
3204 drivers/net/ethernet/apm/xgene/xgene_enet_cle.c | 17 +-
3205 drivers/net/ethernet/apm/xgene/xgene_enet_cle.h | 10 +-
3206 drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 14 +-
3207 drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 6 +
3208 drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 73 +-
3209 drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 +
3210 drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 59 +-
3211 drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 4 +
3212 drivers/net/ethernet/arc/emac_mdio.c | 2 +-
3213 drivers/net/ethernet/atheros/alx/alx.h | 10 +-
3214 drivers/net/ethernet/atheros/alx/hw.c | 14 +
3215 drivers/net/ethernet/atheros/alx/hw.h | 1 +
3216 drivers/net/ethernet/atheros/alx/main.c | 310 +-
3217 drivers/net/ethernet/broadcom/bcmsysport.c | 4 +-
3218 drivers/net/ethernet/broadcom/bgmac-bcma.c | 19 +-
3219 drivers/net/ethernet/broadcom/bgmac.c | 28 +-
3220 drivers/net/ethernet/broadcom/bgmac.h | 19 +
3221 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 62 +-
3222 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 191 +-
3223 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 12 +-
3224 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 24 +-
3225 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 -
3226 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
3227 drivers/net/ethernet/brocade/bna/bnad.c | 27 +-
3228 drivers/net/ethernet/brocade/bna/bnad.h | 1 -
3229 drivers/net/ethernet/cadence/macb.c | 95 +-
3230 drivers/net/ethernet/cadence/macb.h | 14 +-
3231 drivers/net/ethernet/cavium/Kconfig | 12 +-
3232 drivers/net/ethernet/cavium/liquidio/Makefile | 24 +-
3233 .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 1237 ++++
3234 .../ethernet/cavium/liquidio/cn23xx_pf_device.h | 59 +
3235 .../net/ethernet/cavium/liquidio/cn23xx_pf_regs.h | 604 ++
3236 .../net/ethernet/cavium/liquidio/cn66xx_device.c | 45 +-
3237 .../net/ethernet/cavium/liquidio/cn66xx_device.h | 7 +-
3238 .../net/ethernet/cavium/liquidio/cn68xx_device.c | 1 -
3239 drivers/net/ethernet/cavium/liquidio/lio_core.c | 266 +
3240 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 513 +-
3241 drivers/net/ethernet/cavium/liquidio/lio_main.c | 1128 ++--
3242 .../net/ethernet/cavium/liquidio/liquidio_common.h | 34 +-
3243 .../net/ethernet/cavium/liquidio/octeon_config.h | 59 +-
3244 .../net/ethernet/cavium/liquidio/octeon_console.c | 117 +-
3245 .../net/ethernet/cavium/liquidio/octeon_device.c | 352 +-
3246 .../net/ethernet/cavium/liquidio/octeon_device.h | 114 +-
3247 drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 46 +-
3248 drivers/net/ethernet/cavium/liquidio/octeon_droq.h | 2 +
3249 drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 +
3250 drivers/net/ethernet/cavium/liquidio/octeon_main.h | 32 +-
3251 .../net/ethernet/cavium/liquidio/octeon_mem_ops.c | 1 -
3252 .../net/ethernet/cavium/liquidio/octeon_network.h | 12 +-
3253 drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 35 +-
3254 drivers/net/ethernet/cavium/liquidio/octeon_nic.h | 6 +-
3255 .../net/ethernet/cavium/liquidio/request_manager.c | 170 +-
3256 .../ethernet/cavium/liquidio/response_manager.c | 9 +-
3257 drivers/net/ethernet/cavium/thunder/Makefile | 1 +
3258 drivers/net/ethernet/cavium/thunder/nic.h | 85 +-
3259 drivers/net/ethernet/cavium/thunder/nic_main.c | 433 +-
3260 drivers/net/ethernet/cavium/thunder/nic_reg.h | 15 +
3261 drivers/net/ethernet/cavium/thunder/nicvf_main.c | 67 +-
3262 drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 59 +-
3263 drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 5 +-
3264 drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 460 +-
3265 drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 33 +-
3266 drivers/net/ethernet/cavium/thunder/thunder_xcv.c | 235 +
3267 drivers/net/ethernet/chelsio/cxgb4/Makefile | 2 +-
3268 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 125 +-
3269 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 494 +-
3270 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 554 ++
3271 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 34 +-
3272 drivers/net/ethernet/chelsio/cxgb4/sched.c | 556 ++
3273 drivers/net/ethernet/chelsio/cxgb4/sched.h | 110 +
3274 drivers/net/ethernet/chelsio/cxgb4/sge.c | 4 +-
3275 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 74 +-
3276 drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 437 ++
3277 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 164 +-
3278 .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 26 +-
3279 drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 3 +
3280 drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 63 +-
3281 drivers/net/ethernet/dec/tulip/de4x5.c | 4 +-
3282 drivers/net/ethernet/dec/tulip/de4x5.h | 4 +-
3283 drivers/net/ethernet/emulex/benet/be.h | 92 +-
3284 drivers/net/ethernet/emulex/benet/be_cmds.c | 268 +-
3285 drivers/net/ethernet/emulex/benet/be_cmds.h | 45 +-
3286 drivers/net/ethernet/emulex/benet/be_ethtool.c | 40 +
3287 drivers/net/ethernet/emulex/benet/be_hw.h | 7 +-
3288 drivers/net/ethernet/emulex/benet/be_main.c | 759 ++-
3289 drivers/net/ethernet/freescale/fec_main.c | 6 +-
3290 .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 344 +-
3291 drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 16 +-
3292 drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 57 +-
3293 drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 57 +-
3294 drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 57 +-
3295 drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
3296 drivers/net/ethernet/freescale/xgmac_mdio.c | 7 +-
3297 drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +-
3298 drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +-
3299 drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +-
3300 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 3 +-
3301 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 100 +-
3302 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 30 +
3303 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 36 +
3304 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 12 +
3305 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 2 +-
3306 drivers/net/ethernet/ibm/ibmvnic.c | 53 +-
3307 drivers/net/ethernet/ibm/ibmvnic.h | 2 +
3308 drivers/net/ethernet/intel/fm10k/fm10k.h | 10 +-
3309 drivers/net/ethernet/intel/fm10k/fm10k_common.c | 3 +
3310 drivers/net/ethernet/intel/fm10k/fm10k_common.h | 4 +-
3311 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 +-
3312 drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 4 +-
3313 drivers/net/ethernet/intel/fm10k/fm10k_main.c | 29 +-
3314 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 193 +-
3315 drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 30 +-
3316 drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 46 +-
3317 drivers/net/ethernet/intel/fm10k/fm10k_type.h | 1 +
3318 drivers/net/ethernet/intel/i40e/i40e.h | 138 +-
3319 drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 59 +-
3320 drivers/net/ethernet/intel/i40e/i40e_client.c | 39 +-
3321 drivers/net/ethernet/intel/i40e/i40e_client.h | 6 +-
3322 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 258 +-
3323 drivers/net/ethernet/intel/i40e/i40e_main.c | 162 +-
3324 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 6 +-
3325 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 +-
3326 .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 59 +-
3327 drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 6 +-
3328 drivers/net/ethernet/intel/i40evf/i40evf.h | 58 +-
3329 drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 26 +-
3330 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 9 +-
3331 .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 55 +-
3332 drivers/net/ethernet/intel/igb/e1000_82575.h | 5 +
3333 drivers/net/ethernet/intel/igb/e1000_defines.h | 4 +
3334 drivers/net/ethernet/intel/igb/e1000_regs.h | 1 +
3335 drivers/net/ethernet/intel/igb/igb.h | 50 +
3336 drivers/net/ethernet/intel/igb/igb_ethtool.c | 345 +
3337 drivers/net/ethernet/intel/igb/igb_main.c | 45 +
3338 drivers/net/ethernet/intel/igb/igb_ptp.c | 4 +-
3339 drivers/net/ethernet/intel/ixgbe/ixgbe.h | 6 +-
3340 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 1 +
3341 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 +-
3342 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 193 +-
3343 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 11 +
3344 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 78 +-
3345 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 11 +-
3346 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 3 +-
3347 drivers/net/ethernet/intel/ixgbevf/vf.c | 21 +-
3348 drivers/net/ethernet/marvell/mvneta.c | 60 +-
3349 drivers/net/ethernet/marvell/sky2.c | 2 +-
3350 drivers/net/ethernet/mediatek/mtk_eth_soc.c | 129 +-
3351 drivers/net/ethernet/mediatek/mtk_eth_soc.h | 31 +-
3352 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 13 +-
3353 drivers/net/ethernet/mellanox/mlx4/en_rx.c | 15 +-
3354 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +-
3355 drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
3356 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 290 +-
3357 drivers/net/ethernet/mellanox/mlx5/core/cq.c | 109 +-
3358 drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 50 +-
3359 drivers/net/ethernet/mellanox/mlx5/core/dev.c | 345 +
3360 drivers/net/ethernet/mellanox/mlx5/core/en.h | 41 +-
3361 .../net/ethernet/mellanox/mlx5/core/en_common.c | 23 +-
3362 .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 +-
3363 drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 38 +-
3364 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 252 +-
3365 drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 37 +-
3366 drivers/net/ethernet/mellanox/mlx5/core/eq.c | 80 +-
3367 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 363 +-
3368 drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 18 +-
3369 drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 232 +-
3370 drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 8 +
3371 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 118 +-
3372 drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 10 +
3373 drivers/net/ethernet/mellanox/mlx5/core/fw.c | 43 +-
3374 drivers/net/ethernet/mellanox/mlx5/core/lag.c | 588 ++
3375 drivers/net/ethernet/mellanox/mlx5/core/mad.c | 41 +-
3376 drivers/net/ethernet/mellanox/mlx5/core/main.c | 479 +-
3377 drivers/net/ethernet/mellanox/mlx5/core/mcg.c | 72 +-
3378 .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 53 +-
3379 drivers/net/ethernet/mellanox/mlx5/core/mr.c | 189 +-
3380 .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 167 +-
3381 drivers/net/ethernet/mellanox/mlx5/core/pd.c | 61 +-
3382 drivers/net/ethernet/mellanox/mlx5/core/port.c | 181 +-
3383 drivers/net/ethernet/mellanox/mlx5/core/qp.c | 299 +-
3384 drivers/net/ethernet/mellanox/mlx5/core/rl.c | 11 +-
3385 drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 226 +-
3386 drivers/net/ethernet/mellanox/mlx5/core/srq.c | 49 +-
3387 drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 183 +-
3388 drivers/net/ethernet/mellanox/mlx5/core/uar.c | 67 +-
3389 drivers/net/ethernet/mellanox/mlx5/core/vport.c | 94 +-
3390 drivers/net/ethernet/mellanox/mlx5/core/vxlan.c | 29 +-
3391 drivers/net/ethernet/mellanox/mlxsw/core.h | 1 +
3392 drivers/net/ethernet/mellanox/mlxsw/reg.h | 7 +
3393 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 180 +-
3394 drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 3 +
3395 .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 128 +-
3396 drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +-
3397 drivers/net/ethernet/qlogic/qed/Makefile | 2 +-
3398 drivers/net/ethernet/qlogic/qed/qed.h | 28 +-
3399 drivers/net/ethernet/qlogic/qed/qed_cxt.c | 67 +-
3400 drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 24 +-
3401 drivers/net/ethernet/qlogic/qed/qed_debug.c | 6898 ++++++++++++++++++++
3402 drivers/net/ethernet/qlogic/qed/qed_debug.h | 54 +
3403 drivers/net/ethernet/qlogic/qed/qed_dev.c | 229 +-
3404 drivers/net/ethernet/qlogic/qed/qed_hsi.h | 2497 +++++--
3405 drivers/net/ethernet/qlogic/qed/qed_hw.c | 149 +-
3406 drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 99 +-
3407 drivers/net/ethernet/qlogic/qed/qed_int.c | 153 +-
3408 drivers/net/ethernet/qlogic/qed/qed_l2.c | 259 +-
3409 drivers/net/ethernet/qlogic/qed/qed_l2.h | 7 +-
3410 drivers/net/ethernet/qlogic/qed/qed_main.c | 172 +-
3411 drivers/net/ethernet/qlogic/qed/qed_mcp.c | 234 +-
3412 drivers/net/ethernet/qlogic/qed/qed_mcp.h | 96 +-
3413 drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 906 +++
3414 drivers/net/ethernet/qlogic/qed/qed_selftest.c | 1 +
3415 drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 15 +-
3416 drivers/net/ethernet/qlogic/qed/qed_spq.c | 123 +-
3417 drivers/net/ethernet/qlogic/qed/qed_sriov.c | 233 +-
3418 drivers/net/ethernet/qlogic/qed/qed_vf.c | 249 +-
3419 drivers/net/ethernet/qlogic/qed/qed_vf.h | 7 +-
3420 drivers/net/ethernet/qlogic/qede/qede.h | 39 +-
3421 drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 314 +-
3422 drivers/net/ethernet/qlogic/qede/qede_main.c | 477 +-
3423 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 7 +-
3424 drivers/net/ethernet/qualcomm/Kconfig | 12 +
3425 drivers/net/ethernet/qualcomm/Makefile | 2 +
3426 drivers/net/ethernet/qualcomm/emac/Makefile | 7 +
3427 drivers/net/ethernet/qualcomm/emac/emac-mac.c | 1528 +++++
3428 drivers/net/ethernet/qualcomm/emac/emac-mac.h | 248 +
3429 drivers/net/ethernet/qualcomm/emac/emac-phy.c | 204 +
3430 drivers/net/ethernet/qualcomm/emac/emac-phy.h | 33 +
3431 drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 721 ++
3432 drivers/net/ethernet/qualcomm/emac/emac-sgmii.h | 24 +
3433 drivers/net/ethernet/qualcomm/emac/emac.c | 743 +++
3434 drivers/net/ethernet/qualcomm/emac/emac.h | 335 +
3435 drivers/net/ethernet/renesas/ravb.h | 1 -
3436 drivers/net/ethernet/renesas/ravb_main.c | 123 +-
3437 drivers/net/ethernet/renesas/sh_eth.c | 43 +-
3438 drivers/net/ethernet/renesas/sh_eth.h | 1 -
3439 drivers/net/ethernet/rocker/rocker_main.c | 2 +-
3440 drivers/net/ethernet/rocker/rocker_ofdpa.c | 4 -
3441 drivers/net/ethernet/sfc/ef10.c | 247 +-
3442 drivers/net/ethernet/sfc/efx.c | 108 +-
3443 drivers/net/ethernet/sfc/efx.h | 2 +
3444 drivers/net/ethernet/sfc/falcon.c | 9 +-
3445 drivers/net/ethernet/sfc/farch.c | 3 +-
3446 drivers/net/ethernet/sfc/mcdi.c | 5 +-
3447 drivers/net/ethernet/sfc/mcdi_pcol.h | 530 +-
3448 drivers/net/ethernet/sfc/net_driver.h | 17 +-
3449 drivers/net/ethernet/sfc/nic.c | 4 +-
3450 drivers/net/ethernet/sfc/nic.h | 9 +-
3451 drivers/net/ethernet/sfc/ptp.c | 2 +-
3452 drivers/net/ethernet/sfc/selftest.c | 10 +-
3453 drivers/net/ethernet/sfc/selftest.h | 2 +-
3454 drivers/net/ethernet/sfc/siena.c | 14 +-
3455 drivers/net/ethernet/sfc/workarounds.h | 4 +
3456 drivers/net/ethernet/smsc/smsc911x.c | 9 +
3457 drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 +
3458 drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
3459 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 254 +-
3460 drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 193 +
3461 .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +-
3462 .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 +
3463 drivers/net/ethernet/synopsys/dwc_eth_qos.c | 2 +-
3464 drivers/net/ethernet/ti/cpmac.c | 5 +-
3465 drivers/net/ethernet/ti/cpsw.c | 1306 ++--
3466 drivers/net/ethernet/ti/davinci_cpdma.c | 91 +-
3467 drivers/net/ethernet/ti/davinci_cpdma.h | 13 +-
3468 drivers/net/ethernet/ti/davinci_emac.c | 22 +-
3469 drivers/net/ethernet/via/via-velocity.c | 21 +-
3470 drivers/net/ethernet/xilinx/Kconfig | 4 +-
3471 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
3472 drivers/net/fjes/fjes_main.c | 1 -
3473 drivers/net/hyperv/hyperv_net.h | 31 +-
3474 drivers/net/hyperv/netvsc.c | 329 +-
3475 drivers/net/hyperv/netvsc_drv.c | 223 +-
3476 drivers/net/hyperv/rndis_filter.c | 41 +-
3477 drivers/net/macsec.c | 1 +
3478 drivers/net/phy/Kconfig | 435 +-
3479 drivers/net/phy/Makefile | 76 +-
3480 drivers/net/phy/mscc.c | 161 +
3481 drivers/net/phy/xilinx_gmii2rgmii.c | 112 +
3482 drivers/net/ppp/ppp_generic.c | 63 +-
3483 drivers/net/ppp/pptp.c | 64 +-
3484 drivers/net/tun.c | 16 +-
3485 drivers/net/usb/asix.h | 40 +-
3486 drivers/net/usb/asix_common.c | 212 +-
3487 drivers/net/usb/asix_devices.c | 450 +-
3488 drivers/net/usb/ax88172a.c | 29 +-
3489 drivers/net/usb/hso.c | 138 +-
3490 drivers/net/usb/kaweth.c | 15 -
3491 drivers/net/usb/lan78xx.c | 28 +-
3492 drivers/net/usb/pegasus.c | 3 +-
3493 drivers/net/usb/r8152.c | 13 +-
3494 drivers/net/usb/smsc95xx.c | 109 +-
3495 drivers/net/usb/smsc95xx.h | 8 +
3496 drivers/net/usb/usbnet.c | 5 +-
3497 drivers/net/veth.c | 3 +-
3498 drivers/net/vmxnet3/vmxnet3_drv.c | 2 +-
3499 drivers/net/vrf.c | 291 +-
3500 drivers/net/vxlan.c | 22 +-
3501 drivers/net/wan/fsl_ucc_hdlc.c | 2 +-
3502 drivers/net/wan/sbni.c | 4 +-
3503 drivers/net/wimax/i2400m/usb-notif.c | 1 -
3504 drivers/net/wireless/ath/ar5523/ar5523.c | 9 +-
3505 .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 8 +-
3506 .../net/wireless/intersil/orinoco/orinoco_usb.c | 4 +-
3507 drivers/net/wireless/marvell/libertas_tf/if_usb.c | 12 +-
3508 drivers/net/wireless/marvell/mwifiex/usb.c | 19 +-
3509 drivers/net/wireless/realtek/rtlwifi/usb.c | 8 +-
3510 drivers/net/xen-netback/common.h | 4 +
3511 drivers/net/xen-netback/hash.c | 81 +-
3512 drivers/net/xen-netback/xenbus.c | 37 +-
3513 drivers/ptp/ptp_ixp46x.c | 15 +-
3514 drivers/staging/octeon/ethernet-mdio.c | 63 +-
3515 drivers/staging/octeon/ethernet-rgmii.c | 2 +-
3516 drivers/staging/octeon/ethernet.c | 12 +-
3517 drivers/staging/octeon/octeon-ethernet.h | 1 -
3518 fs/afs/callback.c | 4 +-
3519 fs/afs/cmservice.c | 168 +-
3520 fs/afs/flock.c | 4 +-
3521 fs/afs/fsclient.c | 148 +-
3522 fs/afs/internal.h | 38 +-
3524 fs/afs/rxrpc.c | 522 +-
3525 fs/afs/server.c | 11 +-
3526 fs/afs/vlclient.c | 7 +-
3527 fs/afs/vlocation.c | 4 +-
3528 fs/proc/generic.c | 2 +
3529 fs/proc/proc_net.c | 13 +
3530 fs/proc/proc_sysctl.c | 5 +
3531 include/linux/bcma/bcma.h | 3 +
3532 include/linux/bcma/bcma_regs.h | 1 +
3533 include/linux/bpf.h | 4 +
3534 include/linux/cgroup.h | 23 +
3535 include/linux/filter.h | 64 +
3536 include/linux/hyperv.h | 7 +
3537 include/linux/if_bridge.h | 1 +
3538 include/linux/if_vlan.h | 34 +-
3539 include/linux/inet_diag.h | 4 +-
3540 include/linux/mlx5/cq.h | 6 +-
3541 include/linux/mlx5/device.h | 441 +-
3542 include/linux/mlx5/driver.h | 35 +-
3543 include/linux/mlx5/fs.h | 6 +
3544 include/linux/mlx5/mlx5_ifc.h | 297 +-
3545 include/linux/mlx5/port.h | 40 +-
3546 include/linux/mlx5/qp.h | 128 +-
3547 include/linux/mlx5/vport.h | 2 +
3548 include/linux/net.h | 6 +
3549 include/linux/netdevice.h | 13 +-
3550 include/linux/perf_event.h | 9 +
3551 include/linux/qed/common_hsi.h | 358 +-
3552 include/linux/qed/eth_common.h | 155 +-
3553 include/linux/qed/iscsi_common.h | 28 +-
3554 include/linux/qed/qed_chain.h | 13 -
3555 include/linux/qed/qed_eth_if.h | 3 +
3556 include/linux/qed/qed_if.h | 27 +-
3557 include/linux/qed/tcp_common.h | 16 +-
3558 include/linux/rhashtable.h | 84 +-
3559 include/linux/rtnetlink.h | 2 +-
3560 include/linux/skbuff.h | 58 +-
3561 include/linux/sysctl.h | 4 +
3562 include/linux/tcp.h | 7 +-
3563 include/net/af_rxrpc.h | 53 +-
3564 include/net/devlink.h | 1 -
3565 include/net/dsa.h | 50 +-
3566 include/net/dst_metadata.h | 52 +-
3567 include/net/flow.h | 3 +-
3568 include/net/flow_dissector.h | 14 +-
3569 include/net/gre.h | 10 +-
3570 include/net/ip_tunnels.h | 19 +
3571 include/net/kcm.h | 37 +-
3572 include/net/l3mdev.h | 131 +-
3573 include/net/lwtunnel.h | 44 +
3574 include/net/netfilter/nf_conntrack.h | 56 +-
3575 include/net/netfilter/nf_conntrack_core.h | 3 -
3576 include/net/netfilter/nf_conntrack_ecache.h | 17 +-
3577 include/net/netfilter/nf_conntrack_l4proto.h | 8 -
3578 include/net/netfilter/nf_log.h | 3 +-
3579 include/net/netfilter/nf_tables.h | 3 +-
3580 include/net/netns/conntrack.h | 8 -
3581 include/net/netns/ipv4.h | 1 -
3582 include/net/netns/xfrm.h | 12 +-
3583 include/net/pkt_cls.h | 6 +-
3584 include/net/pkt_sched.h | 4 +-
3585 include/net/pptp.h | 23 +
3586 include/net/route.h | 10 -
3587 include/net/sch_generic.h | 4 +-
3588 include/net/sock.h | 13 +-
3589 include/net/strparser.h | 142 +
3590 include/net/switchdev.h | 12 +-
3591 include/net/tc_act/tc_tunnel_key.h | 30 +
3592 include/net/tc_act/tc_vlan.h | 1 +
3593 include/net/tcp.h | 10 +-
3594 include/net/udp.h | 1 +
3595 include/net/vxlan.h | 18 -
3596 include/net/xfrm.h | 2 +-
3597 include/rxrpc/packet.h | 16 +-
3598 include/trace/events/rxrpc.h | 153 +
3599 include/uapi/linux/Kbuild | 1 +
3600 include/uapi/linux/batman_adv.h | 94 +
3601 include/uapi/linux/bpf.h | 23 +
3602 include/uapi/linux/bpf_perf_event.h | 18 +
3603 include/uapi/linux/ethtool.h | 11 +-
3604 include/uapi/linux/if_bridge.h | 2 +-
3605 include/uapi/linux/if_link.h | 1 +
3606 include/uapi/linux/if_tunnel.h | 15 +-
3607 include/uapi/linux/inet_diag.h | 7 +
3608 include/uapi/linux/mii.h | 1 +
3609 include/uapi/linux/netfilter/nf_tables.h | 65 +-
3610 include/uapi/linux/openvswitch.h | 17 +-
3611 include/uapi/linux/pkt_cls.h | 14 +
3612 include/uapi/linux/snmp.h | 1 +
3613 include/uapi/linux/tc_act/tc_tunnel_key.h | 41 +
3614 include/uapi/linux/tc_act/tc_vlan.h | 1 +
3615 include/uapi/linux/tipc_netlink.h | 4 +
3616 kernel/bpf/arraymap.c | 2 +-
3617 kernel/bpf/core.c | 2 +-
3618 kernel/bpf/helpers.c | 52 +-
3619 kernel/bpf/stackmap.c | 5 +-
3620 kernel/bpf/verifier.c | 151 +-
3621 kernel/events/core.c | 89 +-
3622 kernel/trace/bpf_trace.c | 160 +-
3623 lib/rhashtable.c | 56 +-
3626 net/appletalk/ddp.c | 2 +-
3627 net/atm/lec.c | 12 +-
3628 net/atm/mpc.c | 2 +-
3629 net/batman-adv/Kconfig | 15 +-
3630 net/batman-adv/Makefile | 4 +-
3631 net/batman-adv/bat_algo.c | 70 +
3632 net/batman-adv/bat_algo.h | 3 +
3633 net/batman-adv/bat_iv_ogm.c | 837 ++-
3634 net/batman-adv/bat_v.c | 734 ++-
3635 net/batman-adv/bat_v_ogm.c | 5 +-
3636 net/batman-adv/bridge_loop_avoidance.c | 348 +-
3637 net/batman-adv/bridge_loop_avoidance.h | 17 +-
3638 net/batman-adv/debugfs.c | 18 +
3639 net/batman-adv/debugfs.h | 2 +-
3640 net/batman-adv/distributed-arp-table.c | 4 +-
3641 net/batman-adv/gateway_client.c | 285 +-
3642 net/batman-adv/gateway_client.h | 7 +
3643 net/batman-adv/gateway_common.c | 5 +-
3644 net/batman-adv/hard-interface.c | 84 +-
3645 net/batman-adv/icmp_socket.h | 18 +-
3646 net/batman-adv/main.c | 19 +-
3647 net/batman-adv/main.h | 2 +-
3648 net/batman-adv/multicast.c | 4 +-
3649 net/batman-adv/netlink.c | 221 +-
3650 net/batman-adv/netlink.h | 6 +
3651 net/batman-adv/network-coding.c | 11 +-
3652 net/batman-adv/originator.c | 172 +-
3653 net/batman-adv/originator.h | 4 +
3654 net/batman-adv/packet.h | 36 -
3655 net/batman-adv/routing.c | 43 +-
3656 net/batman-adv/send.c | 136 +-
3657 net/batman-adv/send.h | 6 +
3658 net/batman-adv/soft-interface.c | 51 +-
3659 net/batman-adv/sysfs.c | 183 +-
3660 net/batman-adv/translation-table.c | 556 +-
3661 net/batman-adv/translation-table.h | 7 +
3662 net/batman-adv/tvlv.c | 9 +
3663 net/batman-adv/types.h | 69 +-
3664 net/bridge/Makefile | 2 +
3665 net/bridge/br_device.c | 8 +-
3666 net/bridge/br_fdb.c | 23 +-
3667 net/bridge/br_forward.c | 10 +-
3668 net/bridge/br_if.c | 12 +-
3669 net/bridge/br_input.c | 42 +-
3670 net/bridge/br_netlink.c | 132 +-
3671 net/bridge/br_private.h | 46 +-
3672 net/bridge/br_switchdev.c | 57 +
3673 net/bridge/br_sysfs_if.c | 1 +
3674 net/bridge/netfilter/nf_log_bridge.c | 3 +-
3675 net/core/dev.c | 84 +-
3676 net/core/drop_monitor.c | 2 +-
3677 net/core/filter.c | 320 +-
3678 net/core/flow_dissector.c | 164 +-
3679 net/core/lwtunnel.c | 35 +
3680 net/core/neighbour.c | 3 +-
3681 net/core/net_namespace.c | 60 +-
3682 net/core/rtnetlink.c | 111 +-
3683 net/core/skbuff.c | 19 +
3684 net/core/sock.c | 26 +-
3685 net/dsa/dsa.c | 80 +-
3686 net/dsa/dsa2.c | 18 +-
3687 net/dsa/slave.c | 201 +-
3688 net/ipv4/af_inet.c | 23 +-
3689 net/ipv4/fib_frontend.c | 7 -
3690 net/ipv4/fib_rules.c | 3 +
3691 net/ipv4/fib_semantics.c | 3 +-
3692 net/ipv4/fib_trie.c | 10 +-
3693 net/ipv4/fou.c | 2 +-
3694 net/ipv4/igmp.c | 10 +
3695 net/ipv4/inet_diag.c | 107 +-
3696 net/ipv4/ip_gre.c | 23 +-
3697 net/ipv4/ip_output.c | 21 +-
3698 net/ipv4/ip_sockglue.c | 7 +-
3699 net/ipv4/ip_tunnel_core.c | 2 +-
3700 net/ipv4/ipconfig.c | 71 +-
3701 net/ipv4/netfilter/Kconfig | 11 -
3702 net/ipv4/netfilter/Makefile | 5 -
3703 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 70 -
3704 .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 492 --
3705 net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 39 +-
3706 net/ipv4/netfilter/nf_dup_ipv4.c | 10 +-
3707 net/ipv4/netfilter/nf_log_arp.c | 5 +-
3708 net/ipv4/netfilter/nf_log_ipv4.c | 3 +-
3709 net/ipv4/proc.c | 1 +
3710 net/ipv4/raw.c | 6 -
3711 net/ipv4/route.c | 28 +-
3712 net/ipv4/tcp.c | 27 +-
3713 net/ipv4/tcp_input.c | 375 +-
3714 net/ipv4/tcp_ipv4.c | 37 +-
3715 net/ipv4/tcp_metrics.c | 2 +-
3716 net/ipv4/tcp_minisocks.c | 1 -
3717 net/ipv4/tcp_output.c | 3 +-
3718 net/ipv4/udp.c | 23 +-
3719 net/ipv4/udp_diag.c | 89 +-
3720 net/ipv4/udplite.c | 1 -
3721 net/ipv4/xfrm4_policy.c | 2 +-
3722 net/ipv6/af_inet6.c | 2 +
3723 net/ipv6/fib6_rules.c | 3 +
3724 net/ipv6/ila/ila_common.c | 1 -
3725 net/ipv6/ila/ila_lwt.c | 2 +-
3726 net/ipv6/ila/ila_xlat.c | 2 +-
3727 net/ipv6/ip6_fib.c | 6 +-
3728 net/ipv6/ip6_gre.c | 12 +-
3729 net/ipv6/ip6_output.c | 27 +-
3730 net/ipv6/ip6_tunnel.c | 10 +-
3731 net/ipv6/ip6_vti.c | 10 +-
3732 net/ipv6/mcast.c | 10 +
3733 net/ipv6/ndisc.c | 11 +-
3734 net/ipv6/netfilter/nf_log_ipv6.c | 3 +-
3735 net/ipv6/output_core.c | 7 +
3736 net/ipv6/raw.c | 7 +
3737 net/ipv6/route.c | 34 +-
3738 net/ipv6/sit.c | 12 +-
3739 net/ipv6/tcp_ipv6.c | 27 +-
3740 net/ipv6/udp.c | 13 +-
3741 net/ipv6/udp_impl.h | 2 -
3742 net/ipv6/udplite.c | 1 -
3743 net/ipv6/xfrm6_policy.c | 2 +-
3744 net/irda/af_irda.c | 3 -
3745 net/kcm/Kconfig | 1 +
3746 net/kcm/kcmproc.c | 58 +-
3747 net/kcm/kcmsock.c | 483 +-
3748 net/l2tp/l2tp_core.h | 2 +-
3749 net/l2tp/l2tp_eth.c | 4 +-
3750 net/l2tp/l2tp_netlink.c | 2 +-
3751 net/l2tp/l2tp_ppp.c | 24 +-
3752 net/l3mdev/l3mdev.c | 105 +-
3753 net/mac80211/driver-ops.h | 8 +-
3754 net/mac80211/mesh_hwmp.c | 27 +-
3755 net/mac80211/sta_info.c | 25 +-
3756 net/mac80211/sta_info.h | 2 +
3757 net/mac80211/tx.c | 28 +-
3758 net/mpls/af_mpls.c | 5 -
3759 net/mpls/mpls_gso.c | 40 +-
3760 net/mpls/mpls_iptunnel.c | 13 +-
3761 net/netfilter/Kconfig | 22 +-
3762 net/netfilter/Makefile | 7 +-
3763 net/netfilter/ipvs/ip_vs_nfct.c | 7 +-
3764 net/netfilter/nf_conntrack_core.c | 229 +-
3765 net/netfilter/nf_conntrack_ecache.c | 22 +-
3766 net/netfilter/nf_conntrack_ftp.c | 2 +-
3767 net/netfilter/nf_conntrack_netlink.c | 44 +-
3768 net/netfilter/nf_conntrack_pptp.c | 3 +-
3769 net/netfilter/nf_conntrack_proto.c | 81 +-
3770 net/netfilter/nf_conntrack_proto_dccp.c | 3 +-
3771 net/netfilter/nf_conntrack_proto_generic.c | 39 +-
3772 net/netfilter/nf_conntrack_proto_sctp.c | 89 +-
3773 net/netfilter/nf_conntrack_proto_tcp.c | 131 +-
3774 net/netfilter/nf_conntrack_proto_udp.c | 53 +-
3775 net/netfilter/nf_conntrack_proto_udplite.c | 3 +-
3776 net/netfilter/nf_conntrack_standalone.c | 3 +-
3777 net/netfilter/nf_log.c | 8 +-
3778 net/netfilter/nf_nat_core.c | 6 -
3779 net/netfilter/nf_tables_api.c | 203 +-
3780 net/netfilter/nft_hash.c | 417 +-
3781 net/netfilter/nft_numgen.c | 192 +
3782 net/netfilter/nft_quota.c | 121 +
3783 net/netfilter/nft_set_hash.c | 404 ++
3784 net/netfilter/{nft_rbtree.c => nft_set_rbtree.c} | 12 +-
3785 net/netfilter/xt_conntrack.c | 4 +-
3786 net/netfilter/xt_physdev.c | 4 +-
3787 net/netlink/diag.c | 102 +-
3788 net/netlink/genetlink.c | 4 +-
3789 net/openvswitch/actions.c | 25 +-
3790 net/openvswitch/conntrack.c | 2 +-
3791 net/openvswitch/datapath.c | 4 +
3792 net/openvswitch/flow.c | 65 +-
3793 net/openvswitch/flow.h | 8 +-
3794 net/openvswitch/flow_netlink.c | 310 +-
3795 net/openvswitch/vport.c | 7 +-
3798 net/rxrpc/Makefile | 1 +
3799 net/rxrpc/af_rxrpc.c | 127 +-
3800 net/rxrpc/ar-internal.h | 559 +-
3801 net/rxrpc/call_accept.c | 698 +-
3802 net/rxrpc/call_event.c | 1391 +---
3803 net/rxrpc/call_object.c | 738 +--
3804 net/rxrpc/conn_client.c | 952 ++-
3805 net/rxrpc/conn_event.c | 261 +-
3806 net/rxrpc/conn_object.c | 129 +-
3807 net/rxrpc/conn_service.c | 113 +-
3808 net/rxrpc/input.c | 1050 +--
3809 net/rxrpc/insecure.c | 26 +-
3810 net/rxrpc/local_event.c | 3 +-
3811 net/rxrpc/local_object.c | 11 +-
3812 net/rxrpc/misc.c | 7 +-
3813 net/rxrpc/output.c | 795 +--
3814 net/rxrpc/peer_event.c | 30 +-
3815 net/rxrpc/peer_object.c | 97 +-
3816 net/rxrpc/proc.c | 52 +-
3817 net/rxrpc/recvmsg.c | 808 ++-
3818 net/rxrpc/rxkad.c | 198 +-
3819 net/rxrpc/security.c | 12 +-
3820 net/rxrpc/sendmsg.c | 616 ++
3821 net/rxrpc/skbuff.c | 158 +-
3822 net/rxrpc/sysctl.c | 35 +-
3823 net/sched/Kconfig | 11 +
3824 net/sched/Makefile | 1 +
3825 net/sched/act_tunnel_key.c | 351 +
3826 net/sched/act_vlan.c | 13 +-
3827 net/sched/cls_basic.c | 12 +-
3828 net/sched/cls_bpf.c | 27 +-
3829 net/sched/cls_cgroup.c | 13 +-
3830 net/sched/cls_flow.c | 32 +-
3831 net/sched/cls_flower.c | 208 +-
3832 net/sched/cls_fw.c | 18 +-
3833 net/sched/cls_route.c | 14 +-
3834 net/sched/cls_rsvp.h | 17 +-
3835 net/sched/cls_tcindex.c | 90 +-
3836 net/sched/cls_u32.c | 21 +-
3837 net/sched/sch_api.c | 45 +-
3838 net/sched/sch_generic.c | 8 +-
3839 net/sched/sch_hfsc.c | 51 +-
3840 net/sched/sch_mq.c | 2 +-
3841 net/sched/sch_mqprio.c | 2 +-
3842 net/sctp/auth.c | 2 +-
3843 net/sctp/sctp_diag.c | 20 +-
3844 net/strparser/Kconfig | 4 +
3845 net/strparser/Makefile | 1 +
3846 net/strparser/strparser.c | 510 ++
3847 net/switchdev/switchdev.c | 97 +-
3848 net/sysctl_net.c | 29 +-
3849 net/tipc/bcast.c | 8 +-
3850 net/tipc/bcast.h | 4 +-
3851 net/tipc/bearer.c | 130 +-
3852 net/tipc/bearer.h | 2 +
3853 net/tipc/link.c | 149 +-
3854 net/tipc/link.h | 6 +-
3855 net/tipc/msg.h | 10 +
3856 net/tipc/net.h | 2 +
3857 net/tipc/netlink.c | 18 +
3858 net/tipc/node.c | 95 +-
3859 net/tipc/node.h | 12 +-
3860 net/tipc/udp_media.c | 521 +-
3861 net/tipc/udp_media.h | 46 +
3862 net/wireless/core.c | 6 +
3863 net/wireless/nl80211.c | 94 +-
3864 net/wireless/nl80211.h | 3 +
3865 net/wireless/util.c | 2 +-
3866 net/x25/af_x25.c | 4 -
3867 net/xfrm/xfrm_algo.c | 2 +-
3868 net/xfrm/xfrm_policy.c | 145 +-
3869 net/xfrm/xfrm_replay.c | 6 +-
3870 net/xfrm/xfrm_state.c | 121 +-
3871 net/xfrm/xfrm_sysctl.c | 4 +-
3872 samples/bpf/Makefile | 14 +
3873 samples/bpf/bpf_helpers.h | 16 +-
3874 samples/bpf/bpf_load.c | 7 +-
3875 samples/bpf/sampleip_kern.c | 38 +
3876 samples/bpf/sampleip_user.c | 196 +
3877 samples/bpf/tcbpf2_kern.c | 191 +
3878 samples/bpf/test_current_task_under_cgroup_kern.c | 43 +
3879 samples/bpf/test_current_task_under_cgroup_user.c | 145 +
3880 samples/bpf/test_tunnel_bpf.sh | 127 +
3881 samples/bpf/test_verifier.c | 216 +-
3882 samples/bpf/trace_event_kern.c | 65 +
3883 samples/bpf/trace_event_user.c | 213 +
3884 774 files changed, 68220 insertions(+), 21089 deletions(-)
3885 create mode 100644 Documentation/devicetree/bindings/net/qcom-emac.txt
3886 create mode 100644 Documentation/devicetree/bindings/net/stm32-dwmac.txt
3887 create mode 100644 Documentation/devicetree/bindings/net/xilinx_gmii2rgmii.txt
3888 create mode 100644 Documentation/networking/ena.txt
3889 create mode 100644 Documentation/networking/strparser.txt
3890 create mode 100644 drivers/crypto/chelsio/Kconfig
3891 create mode 100644 drivers/crypto/chelsio/Makefile
3892 create mode 100644 drivers/crypto/chelsio/chcr_algo.c
3893 create mode 100644 drivers/crypto/chelsio/chcr_algo.h
3894 create mode 100644 drivers/crypto/chelsio/chcr_core.c
3895 create mode 100644 drivers/crypto/chelsio/chcr_core.h
3896 create mode 100644 drivers/crypto/chelsio/chcr_crypto.h
3897 create mode 100644 drivers/net/dsa/mv88e6xxx/global2.c
3898 create mode 100644 drivers/net/dsa/mv88e6xxx/global2.h
3899 create mode 100644 drivers/net/ethernet/amazon/Kconfig
3900 create mode 100644 drivers/net/ethernet/amazon/Makefile
3901 create mode 100644 drivers/net/ethernet/amazon/ena/Makefile
3902 create mode 100644 drivers/net/ethernet/amazon/ena/ena_admin_defs.h
3903 create mode 100644 drivers/net/ethernet/amazon/ena/ena_com.c
3904 create mode 100644 drivers/net/ethernet/amazon/ena/ena_com.h
3905 create mode 100644 drivers/net/ethernet/amazon/ena/ena_common_defs.h
3906 create mode 100644 drivers/net/ethernet/amazon/ena/ena_eth_com.c
3907 create mode 100644 drivers/net/ethernet/amazon/ena/ena_eth_com.h
3908 create mode 100644 drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h
3909 create mode 100644 drivers/net/ethernet/amazon/ena/ena_ethtool.c
3910 create mode 100644 drivers/net/ethernet/amazon/ena/ena_netdev.c
3911 create mode 100644 drivers/net/ethernet/amazon/ena/ena_netdev.h
3912 create mode 100644 drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h
3913 create mode 100644 drivers/net/ethernet/amazon/ena/ena_regs_defs.h
3914 create mode 100644 drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
3915 create mode 100644 drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h
3916 create mode 100644 drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h
3917 create mode 100644 drivers/net/ethernet/cavium/liquidio/lio_core.c
3918 create mode 100644 drivers/net/ethernet/cavium/thunder/thunder_xcv.c
3919 create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
3920 create mode 100644 drivers/net/ethernet/chelsio/cxgb4/sched.c
3921 create mode 100644 drivers/net/ethernet/chelsio/cxgb4/sched.h
3922 create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/dev.c
3923 create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag.c
3924 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_debug.c
3925 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_debug.h
3926 create mode 100644 drivers/net/ethernet/qualcomm/emac/Makefile
3927 create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-mac.c
3928 create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-mac.h
3929 create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-phy.c
3930 create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-phy.h
3931 create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
3932 create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-sgmii.h
3933 create mode 100644 drivers/net/ethernet/qualcomm/emac/emac.c
3934 create mode 100644 drivers/net/ethernet/qualcomm/emac/emac.h
3935 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
3936 create mode 100644 drivers/net/phy/mscc.c
3937 create mode 100644 drivers/net/phy/xilinx_gmii2rgmii.c
3938 create mode 100644 include/net/pptp.h
3939 create mode 100644 include/net/strparser.h
3940 create mode 100644 include/net/tc_act/tc_tunnel_key.h
3941 create mode 100644 include/trace/events/rxrpc.h
3942 create mode 100644 include/uapi/linux/bpf_perf_event.h
3943 create mode 100644 include/uapi/linux/tc_act/tc_tunnel_key.h
3944 create mode 100644 net/bridge/br_switchdev.c
3945 delete mode 100644 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
3946 create mode 100644 net/netfilter/nft_numgen.c
3947 create mode 100644 net/netfilter/nft_quota.c
3948 create mode 100644 net/netfilter/nft_set_hash.c
3949 rename net/netfilter/{nft_rbtree.c => nft_set_rbtree.c} (97%)
3950 create mode 100644 net/rxrpc/sendmsg.c
3951 create mode 100644 net/sched/act_tunnel_key.c
3952 create mode 100644 net/strparser/Kconfig
3953 create mode 100644 net/strparser/Makefile
3954 create mode 100644 net/strparser/strparser.c
3955 create mode 100644 net/tipc/udp_media.h
3956 create mode 100644 samples/bpf/sampleip_kern.c
3957 create mode 100644 samples/bpf/sampleip_user.c
3958 create mode 100644 samples/bpf/tcbpf2_kern.c
3959 create mode 100644 samples/bpf/test_current_task_under_cgroup_kern.c
3960 create mode 100644 samples/bpf/test_current_task_under_cgroup_user.c
3961 create mode 100755 samples/bpf/test_tunnel_bpf.sh
3962 create mode 100644 samples/bpf/trace_event_kern.c
3963 create mode 100644 samples/bpf/trace_event_user.c
3964 Merging ipsec-next/master (34a3d4b2d1f1 xfrm: fix header file comment reference to struct xfrm_replay_state_esn)
3965 $ git merge ipsec-next/master
3966 Merge made by the 'recursive' strategy.
3967 include/uapi/linux/xfrm.h | 2 +-
3968 1 file changed, 1 insertion(+), 1 deletion(-)
3969 Merging netfilter-next/master (2e917d602acd netfilter: nft_numgen: fix race between num generate and store it)
3970 $ git merge netfilter-next/master
3971 Recorded preimage for 'net/netfilter/nf_tables_netdev.c'
3972 Auto-merging net/netfilter/nft_meta.c
3973 Auto-merging net/netfilter/nf_tables_netdev.c
3974 CONFLICT (content): Merge conflict in net/netfilter/nf_tables_netdev.c
3975 Auto-merging net/ipv6/netfilter/nft_chain_route_ipv6.c
3976 Removing include/net/netfilter/nf_tables_bridge.h
3977 Automatic merge failed; fix conflicts and then commit the result.
3979 Recorded resolution for 'net/netfilter/nf_tables_netdev.c'.
3980 [master a058a35a6a31] Merge remote-tracking branch 'netfilter-next/master'
3981 $ git diff -M --stat --summary HEAD^..
3982 include/linux/netfilter/nf_conntrack_common.h | 4 -
3983 include/linux/netfilter/nf_conntrack_proto_gre.h | 64 +------------
3984 include/net/netfilter/nf_conntrack_l3proto.h | 4 -
3985 include/net/netfilter/nf_queue.h | 4 -
3986 include/net/netfilter/nf_tables.h | 18 ++++
3987 include/net/netfilter/nf_tables_bridge.h | 7 --
3988 include/net/netfilter/nf_tables_ipv4.h | 43 +++++++++
3989 include/net/netfilter/nf_tables_ipv6.h | 53 ++++++++++-
3990 include/uapi/linux/if_tunnel.h | 1 +
3991 include/uapi/linux/netfilter/nf_tables.h | 12 ++-
3992 include/uapi/linux/netfilter/nfnetlink_conntrack.h | 8 +-
3993 net/bridge/netfilter/nf_tables_bridge.c | 92 ++++---------------
3994 net/bridge/netfilter/nft_reject_bridge.c | 44 ++++++++-
3995 net/ipv4/netfilter/nf_nat_proto_gre.c | 13 +--
3996 net/ipv4/netfilter/nf_tables_arp.c | 7 +-
3997 net/ipv4/netfilter/nf_tables_ipv4.c | 5 +-
3998 net/ipv6/netfilter/nf_tables_ipv6.c | 9 +-
3999 net/ipv6/netfilter/nft_chain_route_ipv6.c | 4 +-
4000 net/netfilter/nf_conntrack_core.c | 14 +--
4001 net/netfilter/nf_conntrack_ftp.c | 15 +--
4002 net/netfilter/nf_conntrack_helper.c | 15 ++-
4003 net/netfilter/nf_conntrack_netlink.c | 6 +-
4004 net/netfilter/nf_conntrack_proto_gre.c | 14 +--
4005 net/netfilter/nf_conntrack_sip.c | 10 +-
4006 net/netfilter/nf_conntrack_standalone.c | 8 +-
4007 net/netfilter/nf_tables_inet.c | 5 +-
4008 net/netfilter/nf_tables_netdev.c | 101 ++++-----------------
4009 net/netfilter/nfnetlink_queue.c | 9 +-
4010 net/netfilter/nft_dynset.c | 20 +++-
4011 net/netfilter/nft_hash.c | 17 +++-
4012 net/netfilter/nft_meta.c | 2 +
4013 net/netfilter/nft_numgen.c | 32 +++----
4014 net/netfilter/nft_queue.c | 11 +++
4015 net/netfilter/nft_quota.c | 8 +-
4016 net/netfilter/xt_TEE.c | 8 +-
4017 35 files changed, 340 insertions(+), 347 deletions(-)
4018 delete mode 100644 include/net/netfilter/nf_tables_bridge.h
4019 $ git am -3 ../patches/0001-netfilter-merge-fixup-for-nf_tables_netdev-remove-re.patch
4020 Applying: netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
4022 Unstaged changes after reset:
4023 M include/net/netfilter/nf_tables_ipv4.h
4025 $ git commit -v -a --amend
4026 [master 8e2704f14305] Merge remote-tracking branch 'netfilter-next/master'
4027 Date: Tue Sep 13 10:08:18 2016 +1000
4028 Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
4029 $ git merge ipvs-next/master
4030 Merge made by the 'recursive' strategy.
4031 net/netfilter/ipvs/ip_vs_ctl.c | 2 +-
4032 1 file changed, 1 insertion(+), 1 deletion(-)
4033 Merging wireless-drivers-next/master (b71165761694 mwifiex: scan: Simplify code)
4034 $ git merge wireless-drivers-next/master
4035 Removing drivers/net/wireless/mediatek/mt7601u/util.h
4036 Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
4037 Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
4038 Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
4039 Merge made by the 'recursive' strategy.
4040 drivers/bcma/driver_chipcommon.c | 32 +-
4041 drivers/bcma/main.c | 6 +-
4042 drivers/net/wireless/ath/ath5k/debug.c | 6 +-
4043 .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 +
4044 .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +-
4045 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 14 +-
4046 .../broadcom/brcm80211/brcmfmac/tracepoint.c | 1 +
4047 .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 4 +
4048 .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 +
4049 drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 83 +++--
4050 drivers/net/wireless/intel/iwlwifi/iwl-config.h | 6 +-
4051 drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 15 +-
4052 drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 19 +-
4053 .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 31 +-
4054 drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h | 12 +-
4055 drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 8 +-
4056 drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 28 +-
4057 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 18 +-
4058 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 26 +-
4059 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 +-
4060 drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 342 +++++++++++++++++++--
4061 drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 +
4062 drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 38 ++-
4063 drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 24 +-
4064 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 41 +--
4065 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 45 ++-
4066 drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 13 +-
4067 .../net/wireless/intersil/hostap/hostap_ioctl.c | 20 +-
4068 drivers/net/wireless/marvell/mwifiex/11h.c | 27 +-
4069 drivers/net/wireless/marvell/mwifiex/11n.h | 7 +-
4070 .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 78 ++++-
4071 .../net/wireless/marvell/mwifiex/11n_rxreorder.h | 3 +-
4072 drivers/net/wireless/marvell/mwifiex/cfg80211.c | 141 +++++++--
4073 drivers/net/wireless/marvell/mwifiex/cmdevt.c | 26 +-
4074 drivers/net/wireless/marvell/mwifiex/debugfs.c | 2 +
4075 drivers/net/wireless/marvell/mwifiex/fw.h | 73 ++++-
4076 drivers/net/wireless/marvell/mwifiex/init.c | 22 +-
4077 drivers/net/wireless/marvell/mwifiex/join.c | 3 +-
4078 drivers/net/wireless/marvell/mwifiex/main.c | 270 ++++++++++++++--
4079 drivers/net/wireless/marvell/mwifiex/main.h | 7 +
4080 drivers/net/wireless/marvell/mwifiex/pcie.c | 147 ++++++++-
4081 drivers/net/wireless/marvell/mwifiex/pcie.h | 1 +
4082 drivers/net/wireless/marvell/mwifiex/scan.c | 28 +-
4083 drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +-
4084 drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 61 ++--
4085 drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 134 +++++++-
4086 drivers/net/wireless/marvell/mwifiex/sta_event.c | 144 ++++++++-
4087 drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 6 +-
4088 drivers/net/wireless/marvell/mwifiex/uap_event.c | 7 +-
4089 drivers/net/wireless/marvell/mwifiex/usb.c | 2 +-
4090 drivers/net/wireless/marvell/mwifiex/util.c | 1 +
4091 drivers/net/wireless/mediatek/mt7601u/dma.c | 2 +-
4092 drivers/net/wireless/mediatek/mt7601u/dma.h | 10 +-
4093 drivers/net/wireless/mediatek/mt7601u/eeprom.c | 12 +-
4094 drivers/net/wireless/mediatek/mt7601u/init.c | 10 +-
4095 drivers/net/wireless/mediatek/mt7601u/mac.c | 38 +--
4096 drivers/net/wireless/mediatek/mt7601u/main.c | 1 -
4097 drivers/net/wireless/mediatek/mt7601u/mcu.c | 20 +-
4098 drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 4 +-
4099 drivers/net/wireless/mediatek/mt7601u/phy.c | 44 +--
4100 drivers/net/wireless/mediatek/mt7601u/regs.h | 4 -
4101 drivers/net/wireless/mediatek/mt7601u/tx.c | 19 +-
4102 drivers/net/wireless/mediatek/mt7601u/util.h | 77 -----
4103 drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 4 +-
4104 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 22 +-
4105 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 5 +
4106 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 2 +
4107 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 5 +
4108 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 7 +
4109 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 319 ++++++++++---------
4110 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 60 ++++
4111 drivers/net/wireless/realtek/rtlwifi/core.c | 2 +-
4112 drivers/net/wireless/realtek/rtlwifi/regd.c | 4 +-
4113 .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 3 +-
4114 .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 6 +-
4115 .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 2 +-
4116 drivers/net/wireless/ti/wl18xx/acx.c | 29 ++
4117 drivers/net/wireless/ti/wl18xx/acx.h | 13 +
4118 drivers/net/wireless/ti/wl18xx/event.c | 1 +
4119 drivers/net/wireless/ti/wlcore/main.c | 1 -
4120 drivers/net/wireless/ti/wlcore/spi.c | 2 +-
4121 drivers/net/wireless/ti/wlcore/wlcore.h | 3 +
4122 drivers/net/wireless/ti/wlcore/wlcore_i.h | 1 -
4123 drivers/net/wireless/wl3501_cs.c | 7 +-
4124 drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 2 +-
4125 include/linux/bitfield.h | 93 ++++++
4126 include/linux/bug.h | 3 +
4127 include/linux/mmc/sdio_ids.h | 1 +
4128 88 files changed, 2241 insertions(+), 638 deletions(-)
4129 delete mode 100644 drivers/net/wireless/mediatek/mt7601u/util.h
4130 create mode 100644 include/linux/bitfield.h
4131 Merging bluetooth/master (7b4ecaab00f1 Bluetooth: btrtl: Add RTL8822BE Bluetooth device)
4132 $ git merge bluetooth/master
4133 Merge made by the 'recursive' strategy.
4134 drivers/bluetooth/Kconfig | 12 ++
4135 drivers/bluetooth/Makefile | 1 +
4136 drivers/bluetooth/bcm203x.c | 4 +-
4137 drivers/bluetooth/btqca.c | 8 +-
4138 drivers/bluetooth/btqcomsmd.c | 182 ++++++++++++++++++
4139 drivers/bluetooth/btrtl.c | 107 ++++++++--
4140 drivers/bluetooth/btusb.c | 13 +-
4141 drivers/bluetooth/hci_intel.c | 6 +-
4142 drivers/bluetooth/hci_qca.c | 2 +-
4143 drivers/net/ieee802154/fakelb.c | 14 +-
4144 include/net/bluetooth/bluetooth.h | 4 +-
4145 include/net/bluetooth/hci.h | 7 +-
4146 include/net/bluetooth/hci_core.h | 10 +-
4147 include/net/bluetooth/hci_mon.h | 4 +
4148 include/net/bluetooth/mgmt.h | 18 ++
4149 net/6lowpan/ndisc.c | 2 -
4150 net/bluetooth/af_bluetooth.c | 15 +-
4151 net/bluetooth/hci_core.c | 1 +
4152 net/bluetooth/hci_request.c | 13 +-
4153 net/bluetooth/hci_request.h | 5 +-
4154 net/bluetooth/hci_sock.c | 396 +++++++++++++++++++++++++++++++++++++-
4155 net/bluetooth/leds.c | 27 +++
4156 net/bluetooth/leds.h | 10 +
4157 net/bluetooth/mgmt.c | 158 +++++++++++----
4158 net/bluetooth/mgmt_util.c | 66 ++++++-
4159 net/bluetooth/smp.c | 5 +-
4160 net/mac802154/iface.c | 1 +
4161 net/mac802154/rx.c | 9 +-
4162 28 files changed, 995 insertions(+), 105 deletions(-)
4163 create mode 100644 drivers/bluetooth/btqcomsmd.c
4164 Merging mac80211-next/master (53f249747d5e mac80211: send delBA on unexpected BlockAck Request)
4165 $ git merge mac80211-next/master
4166 Auto-merging net/mac80211/tx.c
4167 Auto-merging net/mac80211/sta_info.c
4168 Auto-merging include/net/cfg80211.h
4169 Merge made by the 'recursive' strategy.
4170 include/net/cfg80211.h | 3 +-
4171 include/net/ieee80211_radiotap.h | 21 ++++++++++++
4172 include/net/mac80211.h | 16 ++++++++++
4173 net/mac80211/agg-rx.c | 11 +++++--
4174 net/mac80211/cfg.c | 31 +++++++++++++++---
4175 net/mac80211/driver-ops.c | 2 +-
4176 net/mac80211/driver-ops.h | 3 +-
4177 net/mac80211/ieee80211_i.h | 9 ++++--
4178 net/mac80211/iface.c | 21 +++++++-----
4179 net/mac80211/main.c | 3 ++
4180 net/mac80211/rx.c | 69 ++++++++++++++++++++++++++++++++++++++--
4181 net/mac80211/sta_info.c | 3 ++
4182 net/mac80211/sta_info.h | 3 ++
4183 net/mac80211/status.c | 2 +-
4184 net/mac80211/tx.c | 2 +-
4185 net/mac80211/util.c | 2 +-
4186 net/wireless/core.c | 2 +-
4187 net/wireless/nl80211.c | 29 +++++++++++++++++
4188 18 files changed, 204 insertions(+), 28 deletions(-)
4189 Merging rdma/for-next (64278fe89b72 Merge branch 'hns-roce' into k.o/for-4.9)
4190 $ git merge rdma/for-next
4191 Auto-merging drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
4192 Auto-merging MAINTAINERS
4193 Merge made by the 'recursive' strategy.
4194 .../bindings/infiniband/hisilicon-hns-roce.txt | 107 +
4196 drivers/infiniband/Kconfig | 1 +
4197 drivers/infiniband/hw/Makefile | 1 +
4198 drivers/infiniband/hw/hns/Kconfig | 10 +
4199 drivers/infiniband/hw/hns/Makefile | 8 +
4200 drivers/infiniband/hw/hns/hns_roce_ah.c | 128 +
4201 drivers/infiniband/hw/hns/hns_roce_alloc.c | 257 ++
4202 drivers/infiniband/hw/hns/hns_roce_cmd.c | 368 +++
4203 drivers/infiniband/hw/hns/hns_roce_cmd.h | 80 +
4204 drivers/infiniband/hw/hns/hns_roce_common.h | 325 +++
4205 drivers/infiniband/hw/hns/hns_roce_cq.c | 446 ++++
4206 drivers/infiniband/hw/hns/hns_roce_device.h | 734 +++++
4207 drivers/infiniband/hw/hns/hns_roce_eq.c | 762 ++++++
4208 drivers/infiniband/hw/hns/hns_roce_eq.h | 130 +
4209 drivers/infiniband/hw/hns/hns_roce_hem.c | 476 ++++
4210 drivers/infiniband/hw/hns/hns_roce_hem.h | 131 +
4211 drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2800 ++++++++++++++++++++
4212 drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 981 +++++++
4213 drivers/infiniband/hw/hns/hns_roce_main.c | 1142 ++++++++
4214 drivers/infiniband/hw/hns/hns_roce_mr.c | 614 +++++
4215 drivers/infiniband/hw/hns/hns_roce_pd.c | 144 +
4216 drivers/infiniband/hw/hns/hns_roce_qp.c | 855 ++++++
4217 drivers/infiniband/hw/hns/hns_roce_user.h | 53 +
4218 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 17 +-
4219 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 47 +-
4220 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 9 +-
4221 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 53 +-
4222 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h | 3 +-
4223 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 4 +-
4224 30 files changed, 10653 insertions(+), 41 deletions(-)
4225 create mode 100644 Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt
4226 create mode 100644 drivers/infiniband/hw/hns/Kconfig
4227 create mode 100644 drivers/infiniband/hw/hns/Makefile
4228 create mode 100644 drivers/infiniband/hw/hns/hns_roce_ah.c
4229 create mode 100644 drivers/infiniband/hw/hns/hns_roce_alloc.c
4230 create mode 100644 drivers/infiniband/hw/hns/hns_roce_cmd.c
4231 create mode 100644 drivers/infiniband/hw/hns/hns_roce_cmd.h
4232 create mode 100644 drivers/infiniband/hw/hns/hns_roce_common.h
4233 create mode 100644 drivers/infiniband/hw/hns/hns_roce_cq.c
4234 create mode 100644 drivers/infiniband/hw/hns/hns_roce_device.h
4235 create mode 100644 drivers/infiniband/hw/hns/hns_roce_eq.c
4236 create mode 100644 drivers/infiniband/hw/hns/hns_roce_eq.h
4237 create mode 100644 drivers/infiniband/hw/hns/hns_roce_hem.c
4238 create mode 100644 drivers/infiniband/hw/hns/hns_roce_hem.h
4239 create mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v1.c
4240 create mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v1.h
4241 create mode 100644 drivers/infiniband/hw/hns/hns_roce_main.c
4242 create mode 100644 drivers/infiniband/hw/hns/hns_roce_mr.c
4243 create mode 100644 drivers/infiniband/hw/hns/hns_roce_pd.c
4244 create mode 100644 drivers/infiniband/hw/hns/hns_roce_qp.c
4245 create mode 100644 drivers/infiniband/hw/hns/hns_roce_user.h
4246 Merging rdma-leon/rdma-next (c6935931c189 Linux 4.8-rc5)
4247 $ git merge rdma-leon/rdma-next
4249 Merging rdma-leon-test/testing/rdma-next (c6935931c189 Linux 4.8-rc5)
4250 $ git merge rdma-leon-test/testing/rdma-next
4252 Merging mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
4253 $ git merge mtd/master
4254 Merge made by the 'recursive' strategy.
4255 drivers/mtd/nand/davinci_nand.c | 3 +++
4256 drivers/mtd/nand/omap2.c | 2 +-
4257 2 files changed, 4 insertions(+), 1 deletion(-)
4258 Merging l2-mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
4259 $ git merge l2-mtd/master
4261 Merging nand/nand/next (ae77057af25c mtd: nand: remove unnecessary 'extern' from function declarations)
4262 $ git merge nand/nand/next
4263 Auto-merging MAINTAINERS
4264 Merge made by the 'recursive' strategy.
4266 drivers/mtd/nand/Kconfig | 12 +--
4267 drivers/mtd/nand/bf5xx_nand.c | 3 +-
4268 drivers/mtd/nand/brcmnand/brcmnand.c | 15 ++-
4269 drivers/mtd/nand/brcmnand/brcmnand.h | 13 ++-
4270 drivers/mtd/nand/brcmnand/iproc_nand.c | 18 +++-
4271 drivers/mtd/nand/docg4.c | 3 +-
4272 drivers/mtd/nand/fsl_elbc_nand.c | 3 +-
4273 drivers/mtd/nand/fsl_ifc_nand.c | 3 +-
4274 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 3 +-
4275 drivers/mtd/nand/jz4780_nand.c | 3 +-
4276 drivers/mtd/nand/nand_base.c | 30 +++---
4277 drivers/mtd/nand/nand_bbt.c | 161 ++++++++++++++++++++++++---------
4278 drivers/mtd/nand/nand_timings.c | 14 +--
4279 drivers/mtd/nand/ndfc.c | 3 +-
4280 drivers/mtd/nand/pxa3xx_nand.c | 3 +-
4281 drivers/mtd/nand/qcom_nandc.c | 3 +-
4282 drivers/mtd/nand/s3c2410.c | 7 +-
4283 drivers/mtd/nand/sh_flctl.c | 8 +-
4284 drivers/mtd/nand/sunxi_nand.c | 3 +-
4285 drivers/mtd/nand/txx9ndfmc.c | 3 +-
4286 include/linux/mtd/nand.h | 37 +++++---
4287 22 files changed, 227 insertions(+), 127 deletions(-)
4288 Merging crypto/master (71f89917ff96 crypto: arm/ghash - change internal cra_name to "__ghash")
4289 $ git merge crypto/master
4290 Auto-merging drivers/pci/quirks.c
4291 Auto-merging drivers/crypto/caam/caamalg.c
4292 Auto-merging drivers/char/hw_random/Kconfig
4293 Merge made by the 'recursive' strategy.
4294 Documentation/DocBook/crypto-API.tmpl | 38 +-
4295 arch/arm/crypto/ghash-ce-glue.c | 26 +-
4296 arch/arm/crypto/sha1-armv7-neon.S | 1 -
4297 crypto/algif_hash.c | 73 +-
4298 crypto/crypto_engine.c | 187 +++-
4299 crypto/drbg.c | 31 +-
4300 crypto/rsa_helper.c | 4 +-
4301 crypto/testmgr.c | 19 +-
4302 crypto/testmgr.h | 4 +
4303 crypto/xor.c | 41 +-
4305 drivers/char/hw_random/Kconfig | 13 +
4306 drivers/char/hw_random/Makefile | 1 +
4307 drivers/char/hw_random/amd-rng.c | 150 ++--
4308 drivers/char/hw_random/bcm2835-rng.c | 5 +-
4309 drivers/char/hw_random/cavium-rng-vf.c | 99 +++
4310 drivers/char/hw_random/cavium-rng.c | 94 ++
4311 drivers/char/hw_random/meson-rng.c | 3 -
4312 drivers/char/hw_random/omap3-rom-rng.c | 10 +-
4313 drivers/char/hw_random/pasemi-rng.c | 37 +-
4314 drivers/char/hw_random/pic32-rng.c | 1 -
4315 drivers/char/hw_random/st-rng.c | 3 -
4316 drivers/char/hw_random/tx4939-rng.c | 11 +-
4317 drivers/crypto/caam/caamalg.c | 82 +-
4318 drivers/crypto/caam/caamhash.c | 540 ++++++------
4319 drivers/crypto/caam/ctrl.c | 3 +
4320 drivers/crypto/caam/desc_constr.h | 17 +
4321 drivers/crypto/caam/intern.h | 1 -
4322 drivers/crypto/caam/jr.c | 25 +-
4323 drivers/crypto/ccp/Makefile | 1 +
4324 drivers/crypto/ccp/ccp-crypto-sha.c | 18 +-
4325 drivers/crypto/ccp/ccp-dev-v3.c | 177 ++--
4326 drivers/crypto/ccp/ccp-dev-v5.c | 1011 ++++++++++++++++++++++
4327 drivers/crypto/ccp/ccp-dev.c | 60 +-
4328 drivers/crypto/ccp/ccp-dev.h | 310 +++++--
4329 drivers/crypto/ccp/ccp-dmaengine.c | 7 +-
4330 drivers/crypto/ccp/ccp-ops.c | 576 ++++++------
4331 drivers/crypto/ccp/ccp-pci.c | 23 +-
4332 drivers/crypto/img-hash.c | 108 ++-
4333 drivers/crypto/ixp4xx_crypto.c | 9 +-
4334 drivers/crypto/marvell/cesa.c | 1 +
4335 drivers/crypto/marvell/hash.c | 44 +-
4336 drivers/crypto/marvell/tdma.c | 1 +
4337 drivers/crypto/mv_cesa.c | 7 +-
4338 drivers/crypto/mxc-scc.c | 4 +-
4339 drivers/crypto/omap-aes.c | 9 +-
4340 drivers/crypto/omap-des.c | 9 +-
4341 drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 2 +-
4342 drivers/crypto/qat/qat_common/adf_admin.c | 20 +-
4343 drivers/crypto/rockchip/rk3288_crypto.c | 6 +-
4344 drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 6 +-
4345 drivers/crypto/sunxi-ss/sun4i-ss-core.c | 68 +-
4346 drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 165 ++--
4347 drivers/crypto/sunxi-ss/sun4i-ss.h | 2 +-
4348 drivers/pci/quirks.c | 11 +
4349 include/crypto/algapi.h | 70 --
4350 include/crypto/engine.h | 107 +++
4351 include/linux/ccp.h | 3 -
4352 include/linux/hw_random.h | 4 +-
4353 59 files changed, 3168 insertions(+), 1192 deletions(-)
4354 create mode 100644 drivers/char/hw_random/cavium-rng-vf.c
4355 create mode 100644 drivers/char/hw_random/cavium-rng.c
4356 create mode 100644 drivers/crypto/ccp/ccp-dev-v5.c
4357 create mode 100644 include/crypto/engine.h
4358 Merging drm/drm-next (8506912b969b Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next)
4359 $ git merge drm/drm-next
4360 Resolved 'Documentation/gpu/index.rst' using previous resolution.
4361 Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu.h' using previous resolution.
4362 Resolved 'drivers/gpu/drm/drm_crtc.c' using previous resolution.
4363 Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution.
4364 Resolved 'drivers/gpu/drm/i915/intel_ddi.c' using previous resolution.
4365 Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution.
4366 Auto-merging include/linux/fence.h
4367 Auto-merging drivers/gpu/drm/vc4/vc4_gem.c
4368 Auto-merging drivers/gpu/drm/vc4/vc4_drv.c
4369 Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c
4370 Auto-merging drivers/gpu/drm/radeon/atombios_crtc.c
4371 Auto-merging drivers/gpu/drm/qxl/qxl_fb.c
4372 Auto-merging drivers/gpu/drm/imx/ipuv3-crtc.c
4373 Auto-merging drivers/gpu/drm/imx/imx-drm-core.c
4374 Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
4375 Auto-merging drivers/gpu/drm/i915/intel_pm.c
4376 Auto-merging drivers/gpu/drm/i915/intel_fbc.c
4377 Auto-merging drivers/gpu/drm/i915/intel_drv.h
4378 Auto-merging drivers/gpu/drm/i915/intel_display.c
4379 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
4380 Auto-merging drivers/gpu/drm/i915/intel_ddi.c
4381 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
4382 Auto-merging drivers/gpu/drm/i915/intel_csr.c
4383 Auto-merging drivers/gpu/drm/i915/intel_audio.c
4384 Auto-merging drivers/gpu/drm/i915/i915_vgpu.c
4385 Auto-merging drivers/gpu/drm/i915/i915_reg.h
4386 Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
4387 Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
4388 Removing drivers/gpu/drm/i915/i915_gem_debug.c
4389 Auto-merging drivers/gpu/drm/i915/i915_gem.c
4390 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
4391 Auto-merging drivers/gpu/drm/i915/i915_drv.h
4392 Auto-merging drivers/gpu/drm/drm_fb_helper.c
4393 Auto-merging drivers/gpu/drm/drm_dp_helper.c
4394 Auto-merging drivers/gpu/drm/drm_crtc_helper_internal.h
4395 Auto-merging drivers/gpu/drm/drm_crtc.c
4396 CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
4397 Auto-merging drivers/gpu/drm/drm_atomic.c
4398 Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
4399 Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
4400 Auto-merging drivers/gpu/drm/amd/amdgpu/cik_sdma.c
4401 Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
4402 Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
4403 Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
4404 Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
4405 Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
4406 Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
4407 CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
4408 Auto-merging MAINTAINERS
4409 Auto-merging Documentation/gpu/vgaarbiter.rst
4410 Auto-merging Documentation/gpu/index.rst
4411 CONFLICT (content): Merge conflict in Documentation/gpu/index.rst
4412 Automatic merge failed; fix conflicts and then commit the result.
4414 [master f11de90edd7f] Merge remote-tracking branch 'drm/drm-next'
4415 $ git diff -M --stat --summary HEAD^..
4416 .../devicetree/bindings/display/bridge/tda998x.txt | 18 +
4417 .../bindings/display/rockchip/rockchip-vop.txt | 4 +-
4418 .../bindings/display/sunxi/sun4i-drm.txt | 43 +-
4419 .../devicetree/bindings/display/tilcdc/tilcdc.txt | 26 +
4420 Documentation/gpu/drm-internals.rst | 9 +-
4421 Documentation/gpu/drm-kms-helpers.rst | 211 +-
4422 Documentation/gpu/drm-kms.rst | 429 +-
4423 Documentation/gpu/drm-mm.rst | 58 +-
4424 Documentation/gpu/drm-uapi.rst | 107 +
4425 Documentation/gpu/i915.rst | 3 +
4426 Documentation/gpu/index.rst | 1 +
4427 .../{vgaarbiter.txt => gpu/vgaarbiter.rst} | 161 +-
4428 Documentation/sync_file.txt | 14 +
4430 arch/arm/boot/dts/am335x-boneblack.dts | 71 +-
4431 arch/x86/kernel/early-quirks.c | 9 +-
4432 drivers/char/agp/intel-gtt.c | 2 +
4433 drivers/dma-buf/dma-buf.c | 23 +
4434 drivers/dma-buf/fence-array.c | 7 +-
4435 drivers/dma-buf/reservation.c | 2 +-
4436 drivers/dma-buf/sync_file.c | 204 +-
4437 drivers/gpu/drm/Kconfig | 146 +-
4438 drivers/gpu/drm/Makefile | 8 +-
4439 drivers/gpu/drm/amd/amdgpu/Kconfig | 2 +
4440 drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
4441 drivers/gpu/drm/amd/amdgpu/ObjectID.h | 7 +
4442 drivers/gpu/drm/amd/amdgpu/amdgpu.h | 96 +-
4443 drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 27 +
4444 drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 +
4445 drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 3 +-
4446 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 91 +
4447 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 95 +-
4448 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 266 +-
4449 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 101 +-
4450 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 +-
4451 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 -
4452 drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 8 -
4453 drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 4 +-
4454 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
4455 drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 27 +-
4456 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 +
4457 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 +-
4458 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 12 +-
4459 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 423 +-
4460 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 32 +-
4461 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 58 +-
4462 drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 10 +-
4463 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 27 +-
4464 drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +-
4465 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 104 +-
4466 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 80 +
4467 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 58 +-
4468 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +-
4469 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 454 +-
4470 drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 22 +-
4471 drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 5 +-
4472 drivers/gpu/drm/amd/amdgpu/cik.c | 417 +-
4473 drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 113 +-
4474 drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 47 +-
4475 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 74 +-
4476 drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 2 +
4477 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 65 +-
4478 drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 2 +
4479 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 91 +-
4480 drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 2 +
4481 drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 806 +++
4482 drivers/gpu/drm/amd/amdgpu/dce_virtual.h | 31 +
4483 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 21 +-
4484 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 628 +--
4485 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 2 -
4486 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 17 +-
4487 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 76 +-
4488 drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 6 +-
4489 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 113 +-
4490 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 195 +-
4491 drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 49 +-
4492 drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +-
4493 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +-
4494 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 121 +-
4495 drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 160 +-
4496 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 293 +-
4497 drivers/gpu/drm/amd/amdgpu/vi.c | 438 +-
4498 drivers/gpu/drm/amd/include/amd_shared.h | 6 +
4499 .../gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_d.h | 1 +
4500 .../gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_d.h | 1 +
4501 .../gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h | 1 +
4502 drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 5 +-
4503 drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 6 +-
4504 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 58 +-
4505 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 4 -
4506 .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c | 7 +-
4507 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 64 +-
4508 .../amd/powerplay/hwmgr/iceland_clockpowergating.c | 119 +
4509 .../amd/powerplay/hwmgr/iceland_clockpowergating.h | 38 +
4510 .../drm/amd/powerplay/hwmgr/iceland_dyn_defaults.h | 41 +
4511 .../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c | 5692 ++++++++++++++++++++
4512 .../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.h | 424 ++
4513 .../drm/amd/powerplay/hwmgr/iceland_powertune.c | 490 ++
4514 .../drm/amd/powerplay/hwmgr/iceland_powertune.h | 74 +
4515 .../gpu/drm/amd/powerplay/hwmgr/iceland_thermal.c | 595 ++
4516 .../gpu/drm/amd/powerplay/hwmgr/iceland_thermal.h | 58 +
4517 .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 33 +-
4518 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 1 -
4519 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 25 +-
4520 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 11 +-
4521 .../gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c | 498 ++
4522 .../gpu/drm/amd/powerplay/hwmgr/tonga_powertune.h | 22 +-
4523 .../amd/powerplay/hwmgr/tonga_processpptables.c | 1 -
4524 drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 4 +-
4525 drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 112 +-
4526 drivers/gpu/drm/amd/powerplay/inc/smu71.h | 510 ++
4527 drivers/gpu/drm/amd/powerplay/inc/smu71_discrete.h | 631 +++
4528 drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 3 +-
4529 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 713 +++
4530 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 64 +
4531 .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 4 +-
4532 drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 4 +
4533 drivers/gpu/drm/arc/arcpgu_crtc.c | 2 -
4534 drivers/gpu/drm/arm/malidp_drv.c | 3 +-
4535 drivers/gpu/drm/arm/malidp_drv.h | 2 +-
4536 drivers/gpu/drm/arm/malidp_planes.c | 20 +-
4537 drivers/gpu/drm/armada/armada_drv.c | 2 +-
4538 drivers/gpu/drm/armada/armada_fbdev.c | 1 -
4539 drivers/gpu/drm/armada/armada_overlay.c | 2 +-
4540 drivers/gpu/drm/ast/ast_fb.c | 1 -
4541 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +-
4542 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 26 +-
4543 drivers/gpu/drm/bochs/bochs.h | 1 -
4544 drivers/gpu/drm/bochs/bochs_drv.c | 3 +-
4545 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 182 +-
4546 drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 8 +
4547 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 51 +
4548 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 34 +
4549 drivers/gpu/drm/bridge/dw-hdmi-ahb-audio.c | 1 -
4550 drivers/gpu/drm/bridge/dw-hdmi.c | 7 +-
4551 drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
4552 drivers/gpu/drm/cirrus/cirrus_drv.c | 2 +-
4553 drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 -
4554 drivers/gpu/drm/drm_agpsupport.c | 6 +-
4555 drivers/gpu/drm/drm_atomic.c | 16 +-
4556 drivers/gpu/drm/drm_atomic_helper.c | 83 +-
4557 drivers/gpu/drm/drm_auth.c | 2 +-
4558 drivers/gpu/drm/drm_blend.c | 8 +-
4559 drivers/gpu/drm/drm_bridge.c | 29 +-
4560 drivers/gpu/drm/drm_bufs.c | 22 +-
4561 drivers/gpu/drm/drm_connector.c | 1123 ++++
4562 drivers/gpu/drm/drm_context.c | 24 +-
4563 drivers/gpu/drm/drm_crtc.c | 3841 +------------
4564 drivers/gpu/drm/drm_crtc_helper.c | 56 -
4565 .../gpu/drm/drm_crtc_helper_internal.h | 36 +-
4566 drivers/gpu/drm/drm_crtc_internal.h | 132 +-
4567 drivers/gpu/drm/drm_dma.c | 6 +-
4568 drivers/gpu/drm/drm_dp_aux_dev.c | 19 +-
4569 drivers/gpu/drm/drm_dp_helper.c | 17 +-
4570 drivers/gpu/drm/drm_drv.c | 44 +-
4571 drivers/gpu/drm/drm_edid.c | 25 +-
4572 drivers/gpu/drm/drm_encoder.c | 232 +
4573 drivers/gpu/drm/drm_fb_helper.c | 75 +-
4574 drivers/gpu/drm/drm_fops.c | 6 +-
4575 drivers/gpu/drm/drm_fourcc.c | 62 +-
4576 drivers/gpu/drm/drm_framebuffer.c | 831 +++
4577 drivers/gpu/drm/drm_hashtab.c | 2 +-
4578 drivers/gpu/drm/drm_ioc32.c | 1 +
4579 drivers/gpu/drm/drm_ioctl.c | 17 +-
4580 drivers/gpu/drm/drm_irq.c | 29 +-
4581 drivers/gpu/drm/drm_kms_helper_common.c | 3 +-
4582 drivers/gpu/drm/drm_lock.c | 4 +-
4583 drivers/gpu/drm/drm_mm.c | 142 +-
4584 drivers/gpu/drm/drm_mode_object.c | 437 ++
4585 drivers/gpu/drm/drm_modes.c | 30 +-
4586 drivers/gpu/drm/drm_modeset_helper.c | 153 +
4587 drivers/gpu/drm/drm_pci.c | 8 +-
4588 drivers/gpu/drm/drm_plane_helper.c | 207 +-
4589 drivers/gpu/drm/drm_probe_helper.c | 8 +-
4590 drivers/gpu/drm/drm_property.c | 912 ++++
4591 drivers/gpu/drm/drm_rect.c | 30 +-
4592 drivers/gpu/drm/drm_scatter.c | 6 +-
4593 drivers/gpu/drm/drm_simple_kms_helper.c | 87 +-
4594 drivers/gpu/drm/drm_vma_manager.c | 43 +-
4595 drivers/gpu/drm/etnaviv/etnaviv_drv.c | 5 +-
4596 drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +-
4597 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 15 -
4598 drivers/gpu/drm/gma500/accel_2d.c | 1 -
4599 drivers/gpu/drm/gma500/cdv_intel_lvds.c | 8 -
4600 drivers/gpu/drm/gma500/framebuffer.c | 1 -
4601 drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 -
4602 drivers/gpu/drm/gma500/opregion.c | 5 +-
4603 drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 -
4604 drivers/gpu/drm/gma500/psb_intel_modes.c | 1 -
4605 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 21 +-
4606 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +-
4607 drivers/gpu/drm/i2c/Kconfig | 1 +
4608 drivers/gpu/drm/i2c/tda998x_drv.c | 297 +-
4609 drivers/gpu/drm/i810/i810_drv.c | 4 +-
4610 drivers/gpu/drm/i915/Makefile | 9 +-
4611 drivers/gpu/drm/i915/i915_cmd_parser.c | 381 +-
4612 drivers/gpu/drm/i915/i915_debugfs.c | 534 +-
4613 drivers/gpu/drm/i915/i915_drv.c | 90 +-
4614 drivers/gpu/drm/i915/i915_drv.h | 992 ++--
4615 drivers/gpu/drm/i915/i915_gem.c | 3244 +++++------
4616 drivers/gpu/drm/i915/i915_gem_batch_pool.c | 34 +-
4617 drivers/gpu/drm/i915/i915_gem_batch_pool.h | 6 +-
4618 drivers/gpu/drm/i915/i915_gem_context.c | 239 +-
4619 drivers/gpu/drm/i915/i915_gem_debug.c | 70 -
4620 drivers/gpu/drm/i915/i915_gem_dmabuf.c | 73 +-
4621 drivers/gpu/drm/i915/i915_gem_evict.c | 192 +-
4622 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 884 +--
4623 drivers/gpu/drm/i915/i915_gem_fence.c | 477 +-
4624 drivers/gpu/drm/i915/i915_gem_gtt.c | 755 +--
4625 drivers/gpu/drm/i915/i915_gem_gtt.h | 238 +-
4626 drivers/gpu/drm/i915/i915_gem_render_state.c | 132 +-
4627 drivers/gpu/drm/i915/i915_gem_render_state.h | 20 +-
4628 drivers/gpu/drm/i915/i915_gem_request.c | 785 +++
4629 drivers/gpu/drm/i915/i915_gem_request.h | 677 +++
4630 drivers/gpu/drm/i915/i915_gem_shrinker.c | 78 +-
4631 drivers/gpu/drm/i915/i915_gem_stolen.c | 46 +-
4632 drivers/gpu/drm/i915/i915_gem_tiling.c | 112 +-
4633 drivers/gpu/drm/i915/i915_gem_userptr.c | 74 +-
4634 drivers/gpu/drm/i915/i915_gpu_error.c | 839 +--
4635 drivers/gpu/drm/i915/i915_guc_submission.c | 264 +-
4636 drivers/gpu/drm/i915/i915_irq.c | 83 +-
4637 drivers/gpu/drm/i915/i915_memcpy.c | 101 +
4638 drivers/gpu/drm/i915/i915_mm.c | 84 +
4639 drivers/gpu/drm/i915/i915_params.c | 6 +
4640 drivers/gpu/drm/i915/i915_params.h | 1 +
4641 drivers/gpu/drm/i915/i915_pci.c | 1 +
4642 drivers/gpu/drm/i915/i915_reg.h | 171 +-
4643 drivers/gpu/drm/i915/i915_suspend.c | 41 -
4644 drivers/gpu/drm/i915/i915_sysfs.c | 78 +-
4645 drivers/gpu/drm/i915/i915_trace.h | 35 +-
4646 drivers/gpu/drm/i915/i915_vgpu.c | 45 +-
4647 drivers/gpu/drm/i915/intel_atomic_plane.c | 26 +-
4648 drivers/gpu/drm/i915/intel_audio.c | 6 +-
4649 drivers/gpu/drm/i915/intel_breadcrumbs.c | 108 +-
4650 drivers/gpu/drm/i915/intel_csr.c | 7 -
4651 drivers/gpu/drm/i915/intel_ddi.c | 170 +-
4652 drivers/gpu/drm/i915/intel_display.c | 1389 +++--
4653 drivers/gpu/drm/i915/intel_dp.c | 316 +-
4654 drivers/gpu/drm/i915/intel_dp_mst.c | 4 +-
4655 drivers/gpu/drm/i915/intel_drv.h | 90 +-
4656 drivers/gpu/drm/i915/intel_engine_cs.c | 323 ++
4657 drivers/gpu/drm/i915/intel_fbc.c | 93 +-
4658 drivers/gpu/drm/i915/intel_fbdev.c | 33 +-
4659 drivers/gpu/drm/i915/intel_frontbuffer.c | 128 +-
4660 drivers/gpu/drm/i915/intel_frontbuffer.h | 91 +
4661 drivers/gpu/drm/i915/intel_guc.h | 19 +-
4662 drivers/gpu/drm/i915/intel_guc_fwif.h | 5 +-
4663 drivers/gpu/drm/i915/intel_guc_loader.c | 66 +-
4664 drivers/gpu/drm/i915/intel_hotplug.c | 4 +-
4665 drivers/gpu/drm/i915/intel_lrc.c | 968 +---
4666 drivers/gpu/drm/i915/intel_lrc.h | 52 +-
4667 drivers/gpu/drm/i915/intel_lvds.c | 162 +-
4668 drivers/gpu/drm/i915/intel_mocs.c | 61 +-
4669 drivers/gpu/drm/i915/intel_mocs.h | 2 +-
4670 drivers/gpu/drm/i915/intel_modes.c | 1 -
4671 drivers/gpu/drm/i915/intel_overlay.c | 235 +-
4672 drivers/gpu/drm/i915/intel_pm.c | 413 +-
4673 drivers/gpu/drm/i915/intel_psr.c | 26 +-
4674 drivers/gpu/drm/i915/intel_renderstate.h | 16 +-
4675 drivers/gpu/drm/i915/intel_ringbuffer.c | 1538 +++---
4676 drivers/gpu/drm/i915/intel_ringbuffer.h | 303 +-
4677 drivers/gpu/drm/i915/intel_runtime_pm.c | 8 +-
4678 drivers/gpu/drm/i915/intel_sprite.c | 208 +-
4679 drivers/gpu/drm/i915/intel_uncore.c | 14 +-
4680 drivers/gpu/drm/imx/imx-drm-core.c | 28 +-
4681 drivers/gpu/drm/imx/imx-drm.h | 6 -
4682 drivers/gpu/drm/imx/imx-ldb.c | 151 +-
4683 drivers/gpu/drm/imx/ipuv3-crtc.c | 3 +-
4684 drivers/gpu/drm/imx/parallel-display.c | 10 +-
4685 drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 3 +-
4686 drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 3 +-
4687 drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 49 +-
4688 drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 4 +-
4689 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 151 +-
4690 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 18 +-
4691 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 19 +-
4692 drivers/gpu/drm/mediatek/mtk_drm_plane.c | 120 +-
4693 drivers/gpu/drm/mediatek/mtk_drm_plane.h | 15 +-
4694 drivers/gpu/drm/mga/mga_drv.c | 2 +-
4695 drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +-
4696 drivers/gpu/drm/mgag200/mgag200_fb.c | 6 +-
4697 drivers/gpu/drm/mgag200/mgag200_main.c | 2 +-
4698 drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 4 +-
4699 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 14 +-
4700 drivers/gpu/drm/msm/msm_atomic.c | 2 +-
4701 drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +-
4702 drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
4703 drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 -
4704 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1 -
4705 .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 1 -
4706 .../drm/omapdrm/displays/panel-sony-acx565akm.c | 1 -
4707 drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +-
4708 drivers/gpu/drm/omapdrm/omap_drv.c | 8 +-
4709 drivers/gpu/drm/omapdrm/omap_fb.c | 14 +-
4710 drivers/gpu/drm/omapdrm/omap_plane.c | 14 +-
4711 drivers/gpu/drm/qxl/qxl_fb.c | 1 -
4712 drivers/gpu/drm/qxl/qxl_ttm.c | 4 +-
4713 drivers/gpu/drm/r128/r128_drv.c | 2 +-
4714 drivers/gpu/drm/radeon/atombios_crtc.c | 20 +-
4715 drivers/gpu/drm/radeon/atombios_dp.c | 21 +-
4716 drivers/gpu/drm/radeon/cik.c | 12 +-
4717 drivers/gpu/drm/radeon/cikd.h | 1 +
4718 drivers/gpu/drm/radeon/evergreen.c | 5 +-
4719 drivers/gpu/drm/radeon/evergreend.h | 1 +
4720 drivers/gpu/drm/radeon/ni.c | 2 +-
4721 drivers/gpu/drm/radeon/nid.h | 1 +
4722 drivers/gpu/drm/radeon/r600.c | 2 +-
4723 drivers/gpu/drm/radeon/r600d.h | 1 +
4724 drivers/gpu/drm/radeon/radeon.h | 1 +
4725 drivers/gpu/drm/radeon/radeon_display.c | 89 +-
4726 drivers/gpu/drm/radeon/radeon_dp_auxch.c | 1 -
4727 drivers/gpu/drm/radeon/radeon_drv.c | 6 +-
4728 drivers/gpu/drm/radeon/radeon_fb.c | 3 +-
4729 drivers/gpu/drm/radeon/radeon_i2c.c | 8 +-
4730 drivers/gpu/drm/radeon/radeon_ttm.c | 7 +-
4731 drivers/gpu/drm/radeon/radeon_uvd.c | 7 +-
4732 drivers/gpu/drm/radeon/rv515.c | 3 +-
4733 drivers/gpu/drm/radeon/rv770.c | 2 +-
4734 drivers/gpu/drm/radeon/rv770d.h | 1 +
4735 drivers/gpu/drm/radeon/si.c | 12 +-
4736 drivers/gpu/drm/radeon/sid.h | 1 +
4737 drivers/gpu/drm/rcar-du/rcar_du_kms.c | 3 +-
4738 drivers/gpu/drm/rockchip/Makefile | 2 +-
4739 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 71 +-
4740 drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 +
4741 drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 6 +
4742 drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 15 +-
4743 drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 245 +
4744 drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 26 +
4745 drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 288 +-
4746 drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +
4747 drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 243 +-
4748 drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 193 +
4749 drivers/gpu/drm/savage/savage_drv.c | 2 +-
4750 drivers/gpu/drm/savage/savage_state.c | 12 +-
4751 drivers/gpu/drm/sis/sis_drv.c | 2 +-
4752 drivers/gpu/drm/sti/sti_drv.c | 4 +-
4753 drivers/gpu/drm/sun4i/Makefile | 2 +-
4754 drivers/gpu/drm/sun4i/sun4i_backend.c | 61 +
4755 drivers/gpu/drm/sun4i/sun4i_backend.h | 3 +
4756 drivers/gpu/drm/sun4i/sun4i_dotclock.c | 1 +
4757 drivers/gpu/drm/sun4i/sun4i_drv.c | 15 +-
4758 drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 +
4759 drivers/gpu/drm/sun4i/sun4i_rgb.c | 71 +-
4760 drivers/gpu/drm/sun4i/sun4i_tcon.c | 98 +-
4761 drivers/gpu/drm/sun4i/sun4i_tcon.h | 6 +
4762 drivers/gpu/drm/sun4i/sun6i_drc.c | 118 +
4763 drivers/gpu/drm/tdfx/tdfx_drv.c | 1 +
4764 drivers/gpu/drm/tegra/dc.c | 17 -
4765 drivers/gpu/drm/tegra/drm.c | 3 +-
4766 drivers/gpu/drm/tilcdc/Makefile | 1 +
4767 drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 387 +-
4768 drivers/gpu/drm/tilcdc/tilcdc_drv.c | 260 +-
4769 drivers/gpu/drm/tilcdc/tilcdc_drv.h | 17 +-
4770 drivers/gpu/drm/tilcdc/tilcdc_external.c | 22 +-
4771 drivers/gpu/drm/tilcdc/tilcdc_external.h | 2 +-
4772 drivers/gpu/drm/tilcdc/tilcdc_panel.c | 13 +-
4773 drivers/gpu/drm/tilcdc/tilcdc_plane.c | 129 +
4774 drivers/gpu/drm/tilcdc/tilcdc_regs.h | 14 +
4775 drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 10 +-
4776 drivers/gpu/drm/ttm/ttm_bo.c | 6 +-
4777 drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +-
4778 drivers/gpu/drm/ttm/ttm_memory.c | 6 +
4779 drivers/gpu/drm/udl/udl_connector.c | 3 -
4780 drivers/gpu/drm/udl/udl_drv.c | 16 +
4781 drivers/gpu/drm/udl/udl_drv.h | 2 +
4782 drivers/gpu/drm/udl/udl_main.c | 25 +
4783 drivers/gpu/drm/udl/udl_modeset.c | 16 +-
4784 drivers/gpu/drm/vc4/vc4_drv.c | 3 +-
4785 drivers/gpu/drm/vc4/vc4_gem.c | 4 -
4786 drivers/gpu/drm/vc4/vc4_kms.c | 2 +-
4787 drivers/gpu/drm/vc4/vc4_plane.c | 2 -
4788 drivers/gpu/drm/via/via_drv.c | 2 +-
4789 drivers/gpu/drm/virtio/virtgpu_display.c | 3 +-
4790 drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 3 +-
4791 drivers/gpu/drm/virtio/virtgpu_ioctl.c | 13 +-
4792 drivers/gpu/drm/vmwgfx/Kconfig | 1 +
4793 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 9 -
4794 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 11 -
4795 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 7 -
4796 drivers/gpu/ipu-v3/ipu-common.c | 12 +-
4797 drivers/gpu/ipu-v3/ipu-cpmem.c | 13 +
4798 drivers/gpu/ipu-v3/ipu-csi.c | 26 +-
4799 drivers/gpu/ipu-v3/ipu-ic.c | 40 +-
4800 drivers/gpu/ipu-v3/ipu-prv.h | 1 +
4801 drivers/gpu/vga/vgaarb.c | 110 +-
4802 drivers/staging/android/sync_debug.c | 12 +-
4803 include/drm/bridge/analogix_dp.h | 3 +
4804 include/drm/drmP.h | 137 +-
4805 include/drm/drm_atomic_helper.h | 13 +-
4806 include/drm/drm_connector.h | 747 +++
4807 include/drm/drm_crtc.h | 1086 +---
4808 include/drm/drm_crtc_helper.h | 6 +-
4809 include/drm/drm_encoder.h | 227 +
4810 include/drm/drm_fb_helper.h | 28 +-
4811 include/drm/drm_fourcc.h | 3 +-
4812 include/drm/drm_framebuffer.h | 250 +
4813 include/drm/drm_gem.h | 4 +-
4814 include/drm/drm_mm.h | 12 +
4815 include/drm/drm_mode_object.h | 124 +
4816 include/drm/drm_modes.h | 23 +-
4817 include/drm/drm_modeset_helper.h | 36 +
4818 include/drm/drm_modeset_helper_vtables.h | 57 +-
4819 include/drm/drm_plane_helper.h | 9 +-
4820 include/drm/drm_property.h | 294 +
4821 include/drm/drm_simple_kms_helper.h | 11 +
4822 include/drm/drm_vma_manager.h | 2 -
4823 include/drm/i2c/tda998x.h | 29 +-
4824 include/drm/i915_drm.h | 2 +-
4825 include/drm/ttm/ttm_bo_driver.h | 7 +-
4826 include/drm/ttm/ttm_memory.h | 1 +
4827 include/dt-bindings/display/tda998x.h | 7 +
4828 include/linux/fence-array.h | 10 +
4829 include/linux/fence.h | 2 +-
4830 include/linux/io-mapping.h | 98 +-
4831 include/linux/sync_file.h | 20 +-
4832 include/linux/vgaarb.h | 128 +-
4833 include/uapi/drm/amdgpu_drm.h | 6 +
4834 include/uapi/drm/drm.h | 1 +
4835 include/uapi/drm/drm_mode.h | 39 +-
4836 include/uapi/drm/i915_drm.h | 58 +-
4837 include/video/imx-ipu-v3.h | 18 +
4838 422 files changed, 35048 insertions(+), 18087 deletions(-)
4839 rename Documentation/{vgaarbiter.txt => gpu/vgaarbiter.rst} (65%)
4840 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
4841 create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.c
4842 create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.h
4843 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_clockpowergating.c
4844 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_clockpowergating.h
4845 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_dyn_defaults.h
4846 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c
4847 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.h
4848 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_powertune.c
4849 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_powertune.h
4850 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_thermal.c
4851 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_thermal.h
4852 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c
4853 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu71.h
4854 create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu71_discrete.h
4855 create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
4856 create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h
4857 create mode 100644 drivers/gpu/drm/drm_connector.c
4858 rename include/drm/drm_dp_aux_dev.h => drivers/gpu/drm/drm_crtc_helper_internal.h (63%)
4859 create mode 100644 drivers/gpu/drm/drm_encoder.c
4860 create mode 100644 drivers/gpu/drm/drm_framebuffer.c
4861 create mode 100644 drivers/gpu/drm/drm_mode_object.c
4862 create mode 100644 drivers/gpu/drm/drm_modeset_helper.c
4863 create mode 100644 drivers/gpu/drm/drm_property.c
4864 delete mode 100644 drivers/gpu/drm/i915/i915_gem_debug.c
4865 create mode 100644 drivers/gpu/drm/i915/i915_gem_request.c
4866 create mode 100644 drivers/gpu/drm/i915/i915_gem_request.h
4867 create mode 100644 drivers/gpu/drm/i915/i915_memcpy.c
4868 create mode 100644 drivers/gpu/drm/i915/i915_mm.c
4869 create mode 100644 drivers/gpu/drm/i915/intel_engine_cs.c
4870 create mode 100644 drivers/gpu/drm/i915/intel_frontbuffer.h
4871 create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.c
4872 create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.h
4873 create mode 100644 drivers/gpu/drm/sun4i/sun6i_drc.c
4874 create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_plane.c
4875 create mode 100644 include/drm/drm_connector.h
4876 create mode 100644 include/drm/drm_encoder.h
4877 create mode 100644 include/drm/drm_framebuffer.h
4878 create mode 100644 include/drm/drm_mode_object.h
4879 create mode 100644 include/drm/drm_modeset_helper.h
4880 create mode 100644 include/drm/drm_property.h
4881 create mode 100644 include/dt-bindings/display/tda998x.h
4882 Merging drm-panel/drm/panel/for-next (a42f6e3f8f03 drm/panel: simple: Add delay timing for Sharp LQ123P1JX31)
4883 $ git merge drm-panel/drm/panel/for-next
4884 Merge made by the 'recursive' strategy.
4885 drivers/gpu/drm/drm_mipi_dsi.c | 63 ++++++++++++++++++++++++++++++++----
4886 drivers/gpu/drm/panel/panel-simple.c | 5 +++
4887 include/drm/drm_mipi_dsi.h | 6 +++-
4888 3 files changed, 66 insertions(+), 8 deletions(-)
4889 Merging drm-intel/for-linux-next (82daabae9e85 drm/i915: remove writeq ifdeffery)
4890 $ git merge drm-intel/for-linux-next
4891 Resolved 'drivers/gpu/drm/i915/intel_drv.h' using previous resolution.
4892 Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution.
4893 Resolved 'include/drm/drmP.h' using previous resolution.
4894 Auto-merging include/drm/drmP.h
4895 CONFLICT (content): Merge conflict in include/drm/drmP.h
4896 Auto-merging drivers/gpu/drm/i915/intel_pm.c
4897 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
4898 Auto-merging drivers/gpu/drm/i915/intel_lvds.c
4899 Auto-merging drivers/gpu/drm/i915/intel_dvo.c
4900 Auto-merging drivers/gpu/drm/i915/intel_drv.h
4901 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
4902 Auto-merging drivers/gpu/drm/i915/intel_display.c
4903 Auto-merging drivers/gpu/drm/i915/intel_audio.c
4904 Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
4905 Auto-merging drivers/gpu/drm/i915/i915_drv.h
4906 Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
4907 Automatic merge failed; fix conflicts and then commit the result.
4909 [master 1b86f0b8b3a3] Merge remote-tracking branch 'drm-intel/for-linux-next'
4910 $ git diff -M --stat --summary HEAD^..
4911 arch/x86/kernel/early-quirks.c | 9 +-
4912 drivers/gpu/drm/i915/Makefile | 1 +
4913 drivers/gpu/drm/i915/i915_debugfs.c | 1012 ++++++++++++-------------
4914 drivers/gpu/drm/i915/i915_drv.c | 300 ++++----
4915 drivers/gpu/drm/i915/i915_drv.h | 218 +++---
4916 drivers/gpu/drm/i915/i915_gem.c | 321 ++++----
4917 drivers/gpu/drm/i915/i915_gem_context.c | 16 -
4918 drivers/gpu/drm/i915/i915_gem_evict.c | 8 +-
4919 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 29 +-
4920 drivers/gpu/drm/i915/i915_gem_gtt.c | 132 ++--
4921 drivers/gpu/drm/i915/i915_gem_gtt.h | 6 +-
4922 drivers/gpu/drm/i915/i915_gem_request.c | 229 +++++-
4923 drivers/gpu/drm/i915/i915_gem_request.h | 76 +-
4924 drivers/gpu/drm/i915/i915_gem_shrinker.c | 4 +-
4925 drivers/gpu/drm/i915/i915_gem_stolen.c | 19 +-
4926 drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +-
4927 drivers/gpu/drm/i915/i915_gpu_error.c | 36 +-
4928 drivers/gpu/drm/i915/i915_guc_submission.c | 63 +-
4929 drivers/gpu/drm/i915/i915_irq.c | 122 ++-
4930 drivers/gpu/drm/i915/i915_pci.c | 285 +++----
4931 drivers/gpu/drm/i915/i915_suspend.c | 6 +-
4932 drivers/gpu/drm/i915/i915_sw_fence.c | 362 +++++++++
4933 drivers/gpu/drm/i915/i915_sw_fence.h | 65 ++
4934 drivers/gpu/drm/i915/i915_sysfs.c | 171 ++---
4935 drivers/gpu/drm/i915/intel_audio.c | 57 +-
4936 drivers/gpu/drm/i915/intel_breadcrumbs.c | 3 +
4937 drivers/gpu/drm/i915/intel_color.c | 24 +-
4938 drivers/gpu/drm/i915/intel_crt.c | 48 +-
4939 drivers/gpu/drm/i915/intel_ddi.c | 276 ++++---
4940 drivers/gpu/drm/i915/intel_device_info.c | 140 ++--
4941 drivers/gpu/drm/i915/intel_display.c | 606 ++++++++++-----
4942 drivers/gpu/drm/i915/intel_dp.c | 206 ++---
4943 drivers/gpu/drm/i915/intel_dp_link_training.c | 139 ++--
4944 drivers/gpu/drm/i915/intel_dp_mst.c | 97 +--
4945 drivers/gpu/drm/i915/intel_dpll_mgr.c | 458 ++++++-----
4946 drivers/gpu/drm/i915/intel_dpll_mgr.h | 15 +
4947 drivers/gpu/drm/i915/intel_drv.h | 79 +-
4948 drivers/gpu/drm/i915/intel_dsi.c | 40 +-
4949 drivers/gpu/drm/i915/intel_dvo.c | 27 +-
4950 drivers/gpu/drm/i915/intel_engine_cs.c | 15 +-
4951 drivers/gpu/drm/i915/intel_fbc.c | 6 +-
4952 drivers/gpu/drm/i915/intel_fbdev.c | 3 +-
4953 drivers/gpu/drm/i915/intel_guc.h | 2 +
4954 drivers/gpu/drm/i915/intel_guc_loader.c | 37 +-
4955 drivers/gpu/drm/i915/intel_hdmi.c | 118 +--
4956 drivers/gpu/drm/i915/intel_i2c.c | 134 ++--
4957 drivers/gpu/drm/i915/intel_lrc.c | 538 ++++++-------
4958 drivers/gpu/drm/i915/intel_lrc.h | 5 +-
4959 drivers/gpu/drm/i915/intel_lvds.c | 52 +-
4960 drivers/gpu/drm/i915/intel_panel.c | 40 +-
4961 drivers/gpu/drm/i915/intel_pm.c | 238 ++----
4962 drivers/gpu/drm/i915/intel_ringbuffer.c | 78 +-
4963 drivers/gpu/drm/i915/intel_ringbuffer.h | 26 +-
4964 drivers/gpu/drm/i915/intel_runtime_pm.c | 57 +-
4965 drivers/gpu/drm/i915/intel_sdvo.c | 56 +-
4966 drivers/gpu/drm/i915/intel_sprite.c | 14 +
4967 drivers/gpu/drm/i915/intel_tv.c | 15 +-
4968 drivers/gpu/drm/i915/intel_uncore.c | 18 +-
4969 include/drm/drmP.h | 23 +-
4970 include/drm/i915_pciids.h | 38 +-
4971 include/uapi/drm/i915_drm.h | 1 +
4972 61 files changed, 4118 insertions(+), 3103 deletions(-)
4973 create mode 100644 drivers/gpu/drm/i915/i915_sw_fence.c
4974 create mode 100644 drivers/gpu/drm/i915/i915_sw_fence.h
4975 Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
4976 $ git merge drm-tegra/drm/tegra/for-next
4977 Auto-merging drivers/gpu/drm/tegra/dc.c
4978 Merge made by the 'recursive' strategy.
4979 drivers/gpu/drm/tegra/dc.c | 9 ++++++++-
4980 1 file changed, 8 insertions(+), 1 deletion(-)
4981 Merging drm-misc/topic/drm-misc (f6ce410a59a4 drm/fence: allow fence waiting to be interrupted by userspace)
4982 $ git merge drm-misc/topic/drm-misc
4983 Auto-merging drivers/gpu/drm/drm_atomic.c
4984 Merge made by the 'recursive' strategy.
4985 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 ++++----
4986 drivers/gpu/drm/bridge/adv7511/adv7533.c | 5 ++--
4987 drivers/gpu/drm/drm_atomic.c | 13 ++-------
4988 drivers/gpu/drm/drm_atomic_helper.c | 41 ++++++++++++++++++++++------
4989 drivers/gpu/drm/drm_crtc_internal.h | 2 ++
4990 drivers/gpu/drm/drm_mode_object.c | 31 +++++++++++----------
4991 drivers/gpu/drm/msm/msm_atomic.c | 2 +-
4992 include/drm/drm_atomic_helper.h | 5 ++--
4993 8 files changed, 64 insertions(+), 47 deletions(-)
4994 Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
4995 $ git merge drm-exynos/exynos-drm/for-next
4997 Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference())
4998 $ git merge drm-msm/msm-next
5000 Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
5001 $ git merge hdlcd/for-upstream/hdlcd
5003 Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
5004 $ git merge mali-dp/for-upstream/mali-dp
5006 Merging sunxi/sunxi/for-next (d035f1204017 Merge branches 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/config64-for-4.9', tags 'sunxi-clk-fixes-for-4.8' and 'sunxi-fixes-for-4.8' into sunxi/for-next)
5007 $ git merge sunxi/sunxi/for-next
5008 Auto-merging arch/arm64/Kconfig.platforms
5009 Auto-merging arch/arm/boot/dts/Makefile
5010 Auto-merging MAINTAINERS
5011 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
5012 Auto-merging Documentation/arm/sunxi/README
5013 Merge made by the 'recursive' strategy.
5014 Documentation/arm/sunxi/README | 2 +
5015 Documentation/devicetree/bindings/arm/sunxi.txt | 1 +
5016 .../devicetree/bindings/clock/sunxi-ccu.txt | 5 +-
5017 .../devicetree/bindings/vendor-prefixes.txt | 1 +
5019 arch/arm/boot/dts/Makefile | 9 +
5020 arch/arm/boot/dts/axp209.dtsi | 6 +
5021 arch/arm/boot/dts/ntc-gr8-evb.dts | 342 ++++++
5022 arch/arm/boot/dts/ntc-gr8.dtsi | 1087 +++++++++++++++++
5023 arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 4 -
5024 .../boot/dts/sun5i-a13-empire-electronix-m712.dts | 51 +
5025 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts | 164 +--
5026 arch/arm/boot/dts/sun5i-r8-chip.dts | 10 +
5027 arch/arm/boot/dts/sun6i-a31.dtsi | 424 ++-----
5028 arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 138 +--
5029 arch/arm/boot/dts/sun6i-a31s-inet-q972.dts | 100 ++
5030 .../boot/dts/sun6i-reference-design-tablet.dtsi | 193 +++
5031 arch/arm/boot/dts/sun8i-a23-a33.dtsi | 296 ++---
5032 arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts | 192 +--
5033 .../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 42 +
5034 .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 42 +
5035 arch/arm/boot/dts/sun8i-a23.dtsi | 80 +-
5036 arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 18 +
5037 arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 88 ++
5038 arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 226 ++++
5039 arch/arm/boot/dts/sun8i-a33.dtsi | 236 ++--
5040 arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 125 ++
5041 arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 10 +
5042 arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 178 +++
5043 arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 88 ++
5044 arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +-
5045 arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 53 +
5046 arch/arm/boot/dts/sun8i-h3.dtsi | 8 +
5047 arch/arm/boot/dts/sun8i-q8-common.dtsi | 49 +
5048 .../boot/dts/sun8i-reference-design-tablet.dtsi | 26 +
5049 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 29 +
5050 arch/arm/boot/dts/sun9i-a80-optimus.dts | 29 +
5051 arch/arm/boot/dts/sun9i-a80.dtsi | 14 +-
5052 arch/arm/mach-sunxi/Kconfig | 1 +
5053 arch/arm/mach-sunxi/sunxi.c | 1 +
5054 arch/arm64/Kconfig.platforms | 2 +
5055 drivers/clk/sunxi-ng/Kconfig | 39 +
5056 drivers/clk/sunxi-ng/Makefile | 4 +
5057 drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 1235 ++++++++++++++++++++
5058 drivers/clk/sunxi-ng/ccu-sun6i-a31.h | 72 ++
5059 drivers/clk/sunxi-ng/ccu-sun8i-a23-a33.h | 63 +
5060 drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 737 ++++++++++++
5061 drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 780 +++++++++++++
5062 drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 26 +-
5063 drivers/clk/sunxi-ng/ccu_div.h | 66 +-
5064 drivers/clk/sunxi-ng/ccu_mp.c | 23 +-
5065 drivers/clk/sunxi-ng/ccu_mp.h | 2 +-
5066 drivers/clk/sunxi-ng/ccu_mult.c | 133 +++
5067 drivers/clk/sunxi-ng/ccu_mult.h | 35 +
5068 drivers/clk/sunxi-ng/ccu_mux.c | 56 +-
5069 drivers/clk/sunxi-ng/ccu_mux.h | 68 +-
5070 drivers/clk/sunxi-ng/ccu_nk.c | 6 +-
5071 drivers/clk/sunxi-ng/ccu_nkm.c | 44 +-
5072 drivers/clk/sunxi-ng/ccu_nkm.h | 23 +
5073 drivers/clk/sunxi-ng/ccu_nkmp.c | 21 +-
5074 drivers/clk/sunxi-ng/ccu_nm.c | 16 +-
5075 drivers/clk/sunxi/clk-a10-pll2.c | 4 +-
5076 drivers/clk/sunxi/clk-sun8i-mbus.c | 2 +-
5077 include/dt-bindings/clock/sun6i-a31-ccu.h | 187 +++
5078 include/dt-bindings/clock/sun8i-a23-a33-ccu.h | 127 ++
5079 include/dt-bindings/reset/sun6i-a31-ccu.h | 106 ++
5080 include/dt-bindings/reset/sun8i-a23-a33-ccu.h | 87 ++
5081 67 files changed, 7074 insertions(+), 1261 deletions(-)
5082 create mode 100644 arch/arm/boot/dts/ntc-gr8-evb.dts
5083 create mode 100644 arch/arm/boot/dts/ntc-gr8.dtsi
5084 create mode 100644 arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dts
5085 create mode 100644 arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
5086 create mode 100644 arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
5087 create mode 100644 arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
5088 create mode 100644 arch/arm/boot/dts/sun8i-a33-olinuxino.dts
5089 create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
5090 create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
5091 create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
5092 create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts
5093 create mode 100644 drivers/clk/sunxi-ng/ccu-sun6i-a31.c
5094 create mode 100644 drivers/clk/sunxi-ng/ccu-sun6i-a31.h
5095 create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a23-a33.h
5096 create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a23.c
5097 create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a33.c
5098 create mode 100644 drivers/clk/sunxi-ng/ccu_mult.c
5099 create mode 100644 include/dt-bindings/clock/sun6i-a31-ccu.h
5100 create mode 100644 include/dt-bindings/clock/sun8i-a23-a33-ccu.h
5101 create mode 100644 include/dt-bindings/reset/sun6i-a31-ccu.h
5102 create mode 100644 include/dt-bindings/reset/sun8i-a23-a33-ccu.h
5103 Merging kbuild/for-next (fbe6e37dab97 kbuild: add arch specific post-link Makefile)
5104 $ git merge kbuild/for-next
5105 Resolved 'arch/Kconfig' using previous resolution.
5106 Auto-merging include/linux/compiler.h
5107 Removing arch/x86/um/ksyms.c
5108 Auto-merging arch/x86/lib/hweight.S
5109 Removing arch/x86/kernel/x8664_ksyms_64.c
5110 Removing arch/x86/kernel/i386_ksyms_32.c
5111 Auto-merging arch/x86/entry/entry_64.S
5112 Removing arch/sparc/lib/ksyms.c
5113 Removing arch/sparc/kernel/sparc_ksyms_64.c
5114 Removing arch/sparc/kernel/sparc_ksyms_32.c
5115 Removing arch/s390/kernel/s390_ksyms.c
5116 Removing arch/powerpc/lib/ppc_ksyms.c
5117 Auto-merging arch/powerpc/lib/checksum_32.S
5118 Auto-merging arch/powerpc/kernel/setup_32.c
5119 Removing arch/powerpc/kernel/ppc_ksyms_32.c
5120 Removing arch/powerpc/kernel/ppc_ksyms.c
5121 Auto-merging arch/powerpc/kernel/pci-common.c
5122 Auto-merging arch/powerpc/kernel/entry_64.S
5123 Auto-merging arch/powerpc/kernel/Makefile
5124 Removing arch/m68k/kernel/m68k_ksyms.c
5125 Auto-merging arch/m68k/kernel/Makefile
5126 Removing arch/arm/mach-imx/ssi-fiq-ksym.c
5127 Auto-merging arch/arm/mach-imx/Makefile
5128 Auto-merging arch/arm/lib/delay.c
5129 Removing arch/arm/kernel/armksyms.c
5130 Removing arch/alpha/kernel/alpha_ksyms.c
5131 Auto-merging arch/Kconfig
5132 CONFLICT (content): Merge conflict in arch/Kconfig
5133 Auto-merging Makefile
5134 Automatic merge failed; fix conflicts and then commit the result.
5136 [master c262deafc3fd] Merge remote-tracking branch 'kbuild/for-next'
5137 $ git diff -M --stat --summary HEAD^..
5138 Documentation/kbuild/makefiles.txt | 16 +++
5140 arch/Kconfig | 19 ++++
5141 arch/alpha/include/asm/Kbuild | 1 +
5142 arch/alpha/kernel/Makefile | 2 +-
5143 arch/alpha/kernel/alpha_ksyms.c | 102 -------------------
5144 arch/alpha/kernel/machvec_impl.h | 6 +-
5145 arch/alpha/kernel/setup.c | 1 +
5146 arch/alpha/lib/callback_srm.S | 5 +
5147 arch/alpha/lib/checksum.c | 3 +
5148 arch/alpha/lib/clear_page.S | 3 +-
5149 arch/alpha/lib/clear_user.S | 2 +
5150 arch/alpha/lib/copy_page.S | 3 +-
5151 arch/alpha/lib/copy_user.S | 3 +
5152 arch/alpha/lib/csum_ipv6_magic.S | 2 +
5153 arch/alpha/lib/csum_partial_copy.c | 2 +
5154 arch/alpha/lib/dec_and_lock.c | 2 +
5155 arch/alpha/lib/divide.S | 3 +
5156 arch/alpha/lib/ev6-clear_page.S | 3 +-
5157 arch/alpha/lib/ev6-clear_user.S | 3 +-
5158 arch/alpha/lib/ev6-copy_page.S | 3 +-
5159 arch/alpha/lib/ev6-copy_user.S | 3 +-
5160 arch/alpha/lib/ev6-csum_ipv6_magic.S | 2 +
5161 arch/alpha/lib/ev6-divide.S | 3 +
5162 arch/alpha/lib/ev6-memchr.S | 3 +-
5163 arch/alpha/lib/ev6-memcpy.S | 3 +-
5164 arch/alpha/lib/ev6-memset.S | 7 +-
5165 arch/alpha/lib/ev67-strcat.S | 3 +-
5166 arch/alpha/lib/ev67-strchr.S | 3 +-
5167 arch/alpha/lib/ev67-strlen.S | 3 +-
5168 arch/alpha/lib/ev67-strncat.S | 3 +-
5169 arch/alpha/lib/ev67-strrchr.S | 3 +-
5170 arch/alpha/lib/fpreg.c | 7 ++
5171 arch/alpha/lib/memchr.S | 3 +-
5172 arch/alpha/lib/memcpy.c | 5 +-
5173 arch/alpha/lib/memmove.S | 3 +-
5174 arch/alpha/lib/memset.S | 7 +-
5175 arch/alpha/lib/strcat.S | 2 +
5176 arch/alpha/lib/strchr.S | 3 +-
5177 arch/alpha/lib/strcpy.S | 3 +-
5178 arch/alpha/lib/strlen.S | 3 +-
5179 arch/alpha/lib/strncat.S | 3 +-
5180 arch/alpha/lib/strncpy.S | 3 +-
5181 arch/alpha/lib/strrchr.S | 3 +-
5182 arch/arm/include/asm/Kbuild | 1 +
5183 arch/arm/kernel/Makefile | 2 +-
5184 arch/arm/kernel/armksyms.c | 183 ----------------------------------
5185 arch/arm/kernel/entry-ftrace.S | 3 +
5186 arch/arm/kernel/head.S | 3 +
5187 arch/arm/kernel/smccc-call.S | 3 +
5188 arch/arm/lib/ashldi3.S | 3 +
5189 arch/arm/lib/ashrdi3.S | 3 +
5190 arch/arm/lib/bitops.h | 5 +
5191 arch/arm/lib/bswapsdi2.S | 3 +
5192 arch/arm/lib/clear_user.S | 4 +
5193 arch/arm/lib/copy_from_user.S | 2 +
5194 arch/arm/lib/copy_page.S | 2 +
5195 arch/arm/lib/copy_to_user.S | 4 +
5196 arch/arm/lib/csumipv6.S | 3 +-
5197 arch/arm/lib/csumpartial.S | 2 +
5198 arch/arm/lib/csumpartialcopy.S | 1 +
5199 arch/arm/lib/csumpartialcopygeneric.S | 2 +
5200 arch/arm/lib/csumpartialcopyuser.S | 1 +
5201 arch/arm/lib/delay.c | 2 +
5202 arch/arm/lib/div64.S | 2 +
5203 arch/arm/lib/findbit.S | 9 ++
5204 arch/arm/lib/getuser.S | 9 ++
5205 arch/arm/lib/io-readsb.S | 2 +
5206 arch/arm/lib/io-readsl.S | 2 +
5207 arch/arm/lib/io-readsw-armv3.S | 3 +-
5208 arch/arm/lib/io-readsw-armv4.S | 2 +
5209 arch/arm/lib/io-writesb.S | 2 +
5210 arch/arm/lib/io-writesl.S | 2 +
5211 arch/arm/lib/io-writesw-armv3.S | 2 +
5212 arch/arm/lib/io-writesw-armv4.S | 2 +
5213 arch/arm/lib/lib1funcs.S | 9 ++
5214 arch/arm/lib/lshrdi3.S | 3 +
5215 arch/arm/lib/memchr.S | 2 +
5216 arch/arm/lib/memcpy.S | 3 +
5217 arch/arm/lib/memmove.S | 2 +
5218 arch/arm/lib/memset.S | 3 +
5219 arch/arm/lib/memzero.S | 2 +
5220 arch/arm/lib/muldi3.S | 3 +
5221 arch/arm/lib/putuser.S | 5 +
5222 arch/arm/lib/strchr.S | 2 +
5223 arch/arm/lib/strrchr.S | 2 +
5224 arch/arm/lib/uaccess_with_memcpy.c | 3 +
5225 arch/arm/lib/ucmpdi2.S | 3 +
5226 arch/arm/mach-imx/Makefile | 1 -
5227 arch/arm/mach-imx/ssi-fiq-ksym.c | 20 ----
5228 arch/arm/mach-imx/ssi-fiq.S | 7 +-
5229 arch/ia64/hp/sim/boot/Makefile | 2 +-
5230 arch/ia64/include/asm/export.h | 3 +
5231 arch/ia64/kernel/entry.S | 3 +
5232 arch/ia64/kernel/esi_stub.S | 2 +
5233 arch/ia64/kernel/head.S | 2 +
5234 arch/ia64/kernel/ia64_ksyms.c | 94 +----------------
5235 arch/ia64/kernel/ivt.S | 2 +
5236 arch/ia64/kernel/pal.S | 7 ++
5237 arch/ia64/kernel/setup.c | 4 +
5238 arch/ia64/lib/Makefile | 8 +-
5239 arch/ia64/lib/clear_page.S | 2 +
5240 arch/ia64/lib/clear_user.S | 2 +
5241 arch/ia64/lib/copy_page.S | 2 +
5242 arch/ia64/lib/copy_page_mck.S | 2 +
5243 arch/ia64/lib/copy_user.S | 2 +
5244 arch/ia64/lib/flush.S | 2 +
5245 arch/ia64/lib/idiv32.S | 2 +
5246 arch/ia64/lib/idiv64.S | 2 +
5247 arch/ia64/lib/ip_fast_csum.S | 3 +
5248 arch/ia64/lib/memcpy.S | 2 +
5249 arch/ia64/lib/memcpy_mck.S | 3 +
5250 arch/ia64/lib/memset.S | 2 +
5251 arch/ia64/lib/strlen.S | 2 +
5252 arch/ia64/lib/strlen_user.S | 2 +
5253 arch/ia64/lib/strncpy_from_user.S | 2 +
5254 arch/ia64/lib/strnlen_user.S | 2 +
5255 arch/ia64/lib/xor.S | 5 +
5256 arch/m68k/include/asm/export.h | 3 +
5257 arch/m68k/kernel/Makefile | 2 +-
5258 arch/m68k/kernel/m68k_ksyms.c | 32 ------
5259 arch/m68k/lib/ashldi3.c | 4 +
5260 arch/m68k/lib/ashrdi3.c | 4 +
5261 arch/m68k/lib/divsi3.S | 3 +
5262 arch/m68k/lib/lshrdi3.c | 4 +
5263 arch/m68k/lib/modsi3.S | 3 +
5264 arch/m68k/lib/muldi3.c | 4 +
5265 arch/m68k/lib/mulsi3.S | 4 +-
5266 arch/m68k/lib/udivsi3.S | 4 +-
5267 arch/m68k/lib/umodsi3.S | 4 +-
5268 arch/powerpc/include/asm/Kbuild | 1 +
5269 arch/powerpc/kernel/Makefile | 4 -
5270 arch/powerpc/kernel/entry_32.S | 2 +
5271 arch/powerpc/kernel/entry_64.S | 3 +
5272 arch/powerpc/kernel/epapr_hcalls.S | 2 +
5273 arch/powerpc/kernel/fpu.S | 3 +
5274 arch/powerpc/kernel/head_32.S | 5 +
5275 arch/powerpc/kernel/head_40x.S | 2 +
5276 arch/powerpc/kernel/head_44x.S | 2 +
5277 arch/powerpc/kernel/head_64.S | 2 +
5278 arch/powerpc/kernel/head_8xx.S | 2 +
5279 arch/powerpc/kernel/head_fsl_booke.S | 2 +
5280 arch/powerpc/kernel/misc.S | 2 +
5281 arch/powerpc/kernel/misc_32.S | 11 ++
5282 arch/powerpc/kernel/misc_64.S | 4 +
5283 arch/powerpc/kernel/pci-common.c | 1 +
5284 arch/powerpc/kernel/pci_32.c | 2 +
5285 arch/powerpc/kernel/ppc_ksyms.c | 37 -------
5286 arch/powerpc/kernel/ppc_ksyms_32.c | 60 -----------
5287 arch/powerpc/kernel/setup_32.c | 6 ++
5288 arch/powerpc/kernel/time.c | 1 +
5289 arch/powerpc/kernel/vector.S | 3 +
5290 arch/powerpc/lib/Makefile | 2 +-
5291 arch/powerpc/lib/checksum_32.S | 3 +
5292 arch/powerpc/lib/checksum_64.S | 3 +
5293 arch/powerpc/lib/copy_32.S | 5 +
5294 arch/powerpc/lib/copypage_64.S | 2 +
5295 arch/powerpc/lib/copyuser_64.S | 2 +
5296 arch/powerpc/lib/hweight_64.S | 5 +
5297 arch/powerpc/lib/mem_64.S | 3 +
5298 arch/powerpc/lib/memcmp_64.S | 2 +
5299 arch/powerpc/lib/memcpy_64.S | 2 +
5300 arch/powerpc/lib/ppc_ksyms.c | 29 ------
5301 arch/powerpc/lib/string.S | 6 ++
5302 arch/powerpc/lib/string_64.S | 2 +
5303 arch/powerpc/mm/hash_low_32.S | 3 +
5304 arch/powerpc/sysdev/dcr-low.S | 3 +
5305 arch/s390/include/asm/Kbuild | 1 +
5306 arch/s390/kernel/Makefile | 2 +-
5307 arch/s390/kernel/entry.S | 6 ++
5308 arch/s390/kernel/mcount.S | 3 +
5309 arch/s390/kernel/s390_ksyms.c | 15 ---
5310 arch/s390/lib/mem.S | 3 +
5311 arch/sparc/include/asm/Kbuild | 1 +
5312 arch/sparc/include/asm/string.h | 34 +++++++
5313 arch/sparc/include/asm/string_32.h | 56 -----------
5314 arch/sparc/include/asm/string_64.h | 44 --------
5315 arch/sparc/kernel/Makefile | 2 +-
5316 arch/sparc/kernel/entry.S | 3 +
5317 arch/sparc/kernel/head_32.S | 3 +
5318 arch/sparc/kernel/head_64.S | 7 +-
5319 arch/sparc/kernel/helpers.S | 2 +
5320 arch/sparc/kernel/hvcalls.S | 5 +
5321 arch/sparc/kernel/sparc_ksyms.c | 12 +++
5322 arch/sparc/kernel/sparc_ksyms_32.c | 31 ------
5323 arch/sparc/kernel/sparc_ksyms_64.c | 53 ----------
5324 arch/sparc/lib/Makefile | 1 -
5325 arch/sparc/lib/U1memcpy.S | 2 +
5326 arch/sparc/lib/VISsave.S | 2 +
5327 arch/sparc/lib/ashldi3.S | 2 +
5328 arch/sparc/lib/ashrdi3.S | 2 +
5329 arch/sparc/lib/atomic_64.S | 16 ++-
5330 arch/sparc/lib/bitops.S | 7 ++
5331 arch/sparc/lib/blockops.S | 3 +
5332 arch/sparc/lib/bzero.S | 4 +
5333 arch/sparc/lib/checksum_32.S | 3 +
5334 arch/sparc/lib/checksum_64.S | 2 +
5335 arch/sparc/lib/clear_page.S | 3 +
5336 arch/sparc/lib/copy_in_user.S | 2 +
5337 arch/sparc/lib/copy_page.S | 2 +
5338 arch/sparc/lib/copy_user.S | 2 +
5339 arch/sparc/lib/csum_copy.S | 3 +
5340 arch/sparc/lib/divdi3.S | 2 +
5341 arch/sparc/lib/ffs.S | 3 +
5342 arch/sparc/lib/hweight.S | 5 +
5343 arch/sparc/lib/ipcsum.S | 2 +
5344 arch/sparc/lib/ksyms.c | 174 --------------------------------
5345 arch/sparc/lib/locks.S | 5 +
5346 arch/sparc/lib/lshrdi3.S | 2 +
5347 arch/sparc/lib/mcount.S | 2 +
5348 arch/sparc/lib/memcmp.S | 2 +
5349 arch/sparc/lib/memcpy.S | 86 +---------------
5350 arch/sparc/lib/memmove.S | 2 +
5351 arch/sparc/lib/memscan_32.S | 4 +
5352 arch/sparc/lib/memscan_64.S | 4 +
5353 arch/sparc/lib/memset.S | 3 +
5354 arch/sparc/lib/muldi3.S | 2 +
5355 arch/sparc/lib/strlen.S | 2 +
5356 arch/sparc/lib/strncmp_32.S | 2 +
5357 arch/sparc/lib/strncmp_64.S | 2 +
5358 arch/sparc/lib/xor.S | 9 ++
5359 arch/x86/entry/entry_32.S | 2 +
5360 arch/x86/entry/entry_64.S | 2 +
5361 arch/x86/entry/thunk_32.S | 3 +
5362 arch/x86/entry/thunk_64.S | 3 +
5363 arch/x86/include/asm/export.h | 4 +
5364 arch/x86/kernel/Makefile | 4 +-
5365 arch/x86/kernel/head_32.S | 2 +
5366 arch/x86/kernel/head_64.S | 3 +
5367 arch/x86/kernel/i386_ksyms_32.c | 47 ---------
5368 arch/x86/kernel/mcount_64.S | 2 +
5369 arch/x86/kernel/x8664_ksyms_64.c | 85 ----------------
5370 arch/x86/lib/checksum_32.S | 3 +
5371 arch/x86/lib/clear_page_64.S | 2 +
5372 arch/x86/lib/cmpxchg8b_emu.S | 2 +
5373 arch/x86/lib/copy_page_64.S | 2 +
5374 arch/x86/lib/copy_user_64.S | 8 ++
5375 arch/x86/lib/csum-partial_64.c | 1 +
5376 arch/x86/lib/getuser.S | 5 +
5377 arch/x86/lib/hweight.S | 3 +
5378 arch/x86/lib/memcpy_64.S | 4 +
5379 arch/x86/lib/memmove_64.S | 3 +
5380 arch/x86/lib/memset_64.S | 3 +
5381 arch/x86/lib/putuser.S | 5 +
5382 arch/x86/lib/strstr_32.c | 3 +-
5383 arch/x86/um/Makefile | 2 +-
5384 arch/x86/um/checksum_32.S | 2 +
5385 arch/x86/um/ksyms.c | 13 ---
5386 include/asm-generic/export.h | 94 +++++++++++++++++
5387 include/asm-generic/vmlinux.lds.h | 52 +++++-----
5388 include/linux/compiler.h | 23 +++++
5389 include/linux/export.h | 30 +++---
5390 include/linux/init.h | 38 +++----
5392 scripts/Makefile.build | 43 +++++++-
5393 scripts/Makefile.modpost | 14 ++-
5394 scripts/basic/fixdep.c | 86 ++++++----------
5395 scripts/genksyms/lex.l | 35 ++++---
5396 scripts/genksyms/lex.lex.c_shipped | 35 ++++---
5397 scripts/link-vmlinux.sh | 71 +++++++++++--
5398 260 files changed, 1081 insertions(+), 1401 deletions(-)
5399 delete mode 100644 arch/alpha/kernel/alpha_ksyms.c
5400 delete mode 100644 arch/arm/kernel/armksyms.c
5401 delete mode 100644 arch/arm/mach-imx/ssi-fiq-ksym.c
5402 create mode 100644 arch/ia64/include/asm/export.h
5403 create mode 100644 arch/m68k/include/asm/export.h
5404 delete mode 100644 arch/m68k/kernel/m68k_ksyms.c
5405 delete mode 100644 arch/powerpc/kernel/ppc_ksyms.c
5406 delete mode 100644 arch/powerpc/kernel/ppc_ksyms_32.c
5407 delete mode 100644 arch/powerpc/lib/ppc_ksyms.c
5408 delete mode 100644 arch/s390/kernel/s390_ksyms.c
5409 create mode 100644 arch/sparc/kernel/sparc_ksyms.c
5410 delete mode 100644 arch/sparc/kernel/sparc_ksyms_32.c
5411 delete mode 100644 arch/sparc/kernel/sparc_ksyms_64.c
5412 delete mode 100644 arch/sparc/lib/ksyms.c
5413 create mode 100644 arch/x86/include/asm/export.h
5414 delete mode 100644 arch/x86/kernel/i386_ksyms_32.c
5415 delete mode 100644 arch/x86/kernel/x8664_ksyms_64.c
5416 delete mode 100644 arch/x86/um/ksyms.c
5417 create mode 100644 include/asm-generic/export.h
5418 $ git am -3 ../patches/0001-Revert-ppc-move-exports-to-definitions.patch
5419 Applying: Revert "ppc: move exports to definitions"
5421 Unstaged changes after reset:
5422 M arch/powerpc/include/asm/Kbuild
5423 M arch/powerpc/kernel/Makefile
5424 M arch/powerpc/kernel/entry_32.S
5425 M arch/powerpc/kernel/entry_64.S
5426 M arch/powerpc/kernel/epapr_hcalls.S
5427 M arch/powerpc/kernel/fpu.S
5428 M arch/powerpc/kernel/head_32.S
5429 M arch/powerpc/kernel/head_40x.S
5430 M arch/powerpc/kernel/head_44x.S
5431 M arch/powerpc/kernel/head_64.S
5432 M arch/powerpc/kernel/head_8xx.S
5433 M arch/powerpc/kernel/head_fsl_booke.S
5434 M arch/powerpc/kernel/misc.S
5435 M arch/powerpc/kernel/misc_32.S
5436 M arch/powerpc/kernel/misc_64.S
5437 M arch/powerpc/kernel/pci-common.c
5438 M arch/powerpc/kernel/pci_32.c
5439 M arch/powerpc/kernel/setup_32.c
5440 M arch/powerpc/kernel/time.c
5441 M arch/powerpc/kernel/vector.S
5442 M arch/powerpc/lib/Makefile
5443 M arch/powerpc/lib/checksum_32.S
5444 M arch/powerpc/lib/checksum_64.S
5445 M arch/powerpc/lib/copy_32.S
5446 M arch/powerpc/lib/copypage_64.S
5447 M arch/powerpc/lib/copyuser_64.S
5448 M arch/powerpc/lib/hweight_64.S
5449 M arch/powerpc/lib/mem_64.S
5450 M arch/powerpc/lib/memcmp_64.S
5451 M arch/powerpc/lib/memcpy_64.S
5452 M arch/powerpc/lib/string.S
5453 M arch/powerpc/lib/string_64.S
5454 M arch/powerpc/mm/hash_low_32.S
5455 M arch/powerpc/sysdev/dcr-low.S
5457 $ git commit -v -a --amend
5458 [master 4c4a8a5d34b7] Merge remote-tracking branch 'kbuild/for-next'
5459 Date: Tue Sep 13 10:41:10 2016 +1000
5460 Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
5461 $ git merge kspp/for-next/kspp
5462 Auto-merging net/core/dev.c
5463 Auto-merging mm/page_alloc.c
5464 Auto-merging kernel/time/timer.c
5465 Auto-merging kernel/sched/fair.c
5466 Auto-merging kernel/fork.c
5467 Auto-merging include/linux/init.h
5468 Auto-merging include/linux/compiler.h
5469 Auto-merging include/linux/compiler-gcc.h
5470 Auto-merging fs/namespace.c
5471 Auto-merging arch/powerpc/kernel/Makefile
5472 Auto-merging arch/Kconfig
5473 Auto-merging Documentation/kernel-parameters.txt
5474 Merge made by the 'recursive' strategy.
5475 Documentation/kernel-parameters.txt | 5 +
5477 arch/powerpc/kernel/Makefile | 5 +
5478 block/blk-softirq.c | 2 +-
5479 drivers/char/random.c | 4 +-
5480 fs/namespace.c | 1 +
5481 include/linux/compiler-gcc.h | 7 +
5482 include/linux/compiler.h | 4 +
5483 include/linux/fdtable.h | 2 +-
5484 include/linux/genhd.h | 2 +-
5485 include/linux/init.h | 5 +-
5486 include/linux/random.h | 15 +-
5488 kernel/fork.c | 7 +-
5489 kernel/rcu/tiny.c | 2 +-
5490 kernel/rcu/tree.c | 2 +-
5491 kernel/sched/fair.c | 2 +-
5492 kernel/softirq.c | 4 +-
5493 kernel/time/timer.c | 2 +-
5494 lib/irq_poll.c | 2 +-
5495 lib/random32.c | 2 +-
5496 mm/page_alloc.c | 26 ++
5497 net/core/dev.c | 4 +-
5498 scripts/Makefile.gcc-plugins | 9 +-
5499 scripts/gcc-plugins/latent_entropy_plugin.c | 639 ++++++++++++++++++++++++++++
5500 25 files changed, 750 insertions(+), 22 deletions(-)
5501 create mode 100644 scripts/gcc-plugins/latent_entropy_plugin.c
5502 Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
5503 $ git merge kconfig/for-next
5505 Merging regmap/for-next (faa52daec60c Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
5506 $ git merge regmap/for-next
5507 Merge made by the 'recursive' strategy.
5508 drivers/base/regmap/internal.h | 1 +
5509 drivers/base/regmap/regmap-debugfs.c | 16 +++++++++++++---
5510 drivers/base/regmap/regmap.c | 23 +++++++++++++++++++++++
5511 3 files changed, 37 insertions(+), 3 deletions(-)
5512 Merging sound/for-next (071f1344f479 ALSA: pci: constify local structures)
5513 $ git merge sound/for-next
5514 Auto-merging sound/firewire/bebob/bebob_yamaha_terratec.c
5515 Merge made by the 'recursive' strategy.
5516 include/sound/hda_register.h | 36 +
5517 include/sound/hdaudio.h | 13 +
5518 include/sound/hdaudio_ext.h | 12 -
5519 sound/aoa/fabrics/layout.c | 15 +-
5520 sound/aoa/soundbus/i2sbus/core.c | 2 +-
5521 sound/core/compress_offload.c | 10 +-
5522 sound/core/pcm_native.c | 4 +-
5523 sound/core/seq/seq_clientmgr.c | 722 +++++++++------------
5524 sound/core/seq/seq_compat.c | 7 +-
5525 sound/firewire/bebob/Makefile | 5 +-
5526 sound/firewire/bebob/bebob.c | 8 +-
5527 sound/firewire/bebob/bebob.h | 3 +-
5528 sound/firewire/bebob/bebob_terratec.c | 31 -
5529 .../{bebob_yamaha.c => bebob_yamaha_terratec.c} | 9 +-
5530 sound/firewire/dice/dice-pcm.c | 4 +-
5531 sound/firewire/digi00x/digi00x-pcm.c | 4 +-
5532 sound/firewire/oxfw/oxfw-pcm.c | 4 +-
5533 sound/firewire/tascam/tascam-pcm.c | 4 +-
5534 sound/hda/ext/hdac_ext_controller.c | 91 +--
5535 sound/hda/ext/hdac_ext_stream.c | 46 +-
5536 sound/hda/hdac_controller.c | 75 +++
5537 sound/pci/ad1889.c | 4 +-
5538 sound/pci/als300.c | 4 +-
5539 sound/pci/als4000.c | 4 +-
5540 sound/pci/asihpi/asihpi.c | 4 +-
5541 sound/pci/asihpi/hpifunc.c | 7 +-
5542 sound/pci/atiixp.c | 6 +-
5543 sound/pci/atiixp_modem.c | 4 +-
5544 sound/pci/aw2/aw2-alsa.c | 4 +-
5545 sound/pci/azt3328.c | 6 +-
5546 sound/pci/bt87x.c | 2 +-
5547 sound/pci/ca0106/ca0106_main.c | 16 +-
5548 sound/pci/cmipci.c | 10 +-
5549 sound/pci/cs4281.c | 4 +-
5550 sound/pci/cs46xx/cs46xx_lib.c | 4 +-
5551 sound/pci/cs46xx/dsp_spos.c | 2 +-
5552 sound/pci/cs5535audio/cs5535audio_pcm.c | 4 +-
5553 sound/pci/ctxfi/ctatc.c | 2 +-
5554 sound/pci/ctxfi/ctpcm.c | 4 +-
5555 sound/pci/ctxfi/ctvmem.c | 6 +-
5556 sound/pci/emu10k1/emu10k1x.c | 4 +-
5557 sound/pci/emu10k1/emupcm.c | 12 +-
5558 sound/pci/emu10k1/p16v.c | 20 +-
5559 sound/pci/ens1370.c | 6 +-
5560 sound/pci/es1938.c | 4 +-
5561 sound/pci/es1968.c | 4 +-
5562 sound/pci/fm801.c | 4 +-
5563 sound/pci/hda/hda_controller.c | 205 +++++-
5564 sound/pci/hda/hda_controller.h | 3 +
5565 sound/pci/hda/hda_intel.c | 17 +
5566 sound/pci/hda/patch_ca0132.c | 10 +-
5567 sound/pci/hda/patch_realtek.c | 2 +
5568 sound/pci/ice1712/ice1712.c | 10 +-
5569 sound/pci/ice1712/ice1724.c | 14 +-
5570 sound/pci/korg1212/korg1212.c | 4 +-
5571 sound/pci/lola/lola_pcm.c | 2 +-
5572 sound/pci/lx6464es/lx6464es.c | 4 +-
5573 sound/pci/maestro3.c | 4 +-
5574 sound/pci/mixart/mixart.c | 4 +-
5575 sound/pci/nm256/nm256.c | 4 +-
5576 sound/pci/oxygen/oxygen_pcm.c | 12 +-
5577 sound/pci/pcxhr/pcxhr.c | 2 +-
5578 sound/pci/riptide/riptide.c | 6 +-
5579 sound/pci/rme32.c | 16 +-
5580 sound/pci/rme96.c | 8 +-
5581 sound/pci/rme9652/hdsp.c | 4 +-
5582 sound/pci/rme9652/hdspm.c | 4 +-
5583 sound/pci/rme9652/rme9652.c | 4 +-
5584 sound/pci/sonicvibes.c | 4 +-
5585 sound/pci/trident/trident_main.c | 12 +-
5586 sound/pci/via82xx.c | 10 +-
5587 sound/pci/via82xx_modem.c | 4 +-
5588 sound/pci/ymfpci/ymfpci_main.c | 10 +-
5589 sound/ppc/snd_ps3.c | 4 +-
5590 sound/soc/intel/baytrail/sst-baytrail-ipc.c | 12 +-
5591 sound/soc/intel/skylake/skl-messages.c | 4 +-
5592 sound/soc/intel/skylake/skl-pcm.c | 8 +-
5593 sound/soc/intel/skylake/skl.c | 6 +-
5594 sound/usb/caiaq/audio.c | 1 -
5595 sound/usb/card.h | 2 +-
5596 sound/usb/endpoint.c | 13 +-
5597 sound/usb/format.c | 4 +-
5598 sound/usb/quirks.c | 6 +
5599 83 files changed, 906 insertions(+), 789 deletions(-)
5600 rename sound/firewire/bebob/{bebob_yamaha.c => bebob_yamaha_terratec.c} (85%)
5601 Merging sound-asoc/for-next (44552e3fbdb9 Merge remote-tracking branches 'asoc/topic/ux500' and 'asoc/topic/wm8962' into asoc-next)
5602 $ git merge sound-asoc/for-next
5603 Removing sound/soc/sh/rcar/rsrc-card.c
5604 Auto-merging arch/arm/mach-s3c24xx/mach-mini2440.c
5605 Removing Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
5606 Merge made by the 'recursive' strategy.
5607 .../devicetree/bindings/sound/nau8810.txt | 16 +
5608 .../bindings/sound/nvidia,tegra-audio-sgtl5000.txt | 42 +
5609 .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 30 +
5610 .../bindings/sound/renesas,rsrc-card.txt | 75 --
5611 .../bindings/sound/rockchip,rk3399-gru-sound.txt | 15 +
5612 Documentation/devicetree/bindings/sound/rt5659.txt | 3 +
5613 .../devicetree/bindings/sound/simple-scu-card.txt | 110 +++
5614 .../bindings/sound/sunxi,sun4i-spdif.txt | 3 +
5615 arch/arm/mach-s3c24xx/mach-mini2440.c | 19 +
5616 include/sound/l3.h | 15 +-
5617 include/sound/s3c24xx_uda134x.h | 1 -
5618 include/sound/simple_card_utils.h | 35 +
5619 include/sound/soc.h | 19 -
5620 include/uapi/sound/Kbuild | 1 +
5621 include/uapi/sound/asoc.h | 35 +-
5622 include/uapi/sound/snd_sst_tokens.h | 214 +++++
5623 sound/soc/amd/acp-pcm-dma.c | 2 +-
5624 sound/soc/atmel/atmel-classd.c | 6 +-
5625 sound/soc/atmel/atmel-pcm-pdc.c | 2 +-
5626 sound/soc/atmel/atmel-pdmic.c | 20 +-
5627 sound/soc/codecs/88pm860x-codec.c | 14 +-
5628 sound/soc/codecs/Kconfig | 5 +
5629 sound/soc/codecs/Makefile | 2 +
5630 sound/soc/codecs/ab8500-codec.c | 24 +-
5631 sound/soc/codecs/ac97.c | 10 +-
5632 sound/soc/codecs/ad1836.c | 14 +-
5633 sound/soc/codecs/ad193x.c | 14 +-
5634 sound/soc/codecs/ad1980.c | 14 +-
5635 sound/soc/codecs/ad73311.c | 10 +-
5636 sound/soc/codecs/adau1373.c | 14 +-
5637 sound/soc/codecs/adau1701.c | 15 +-
5638 sound/soc/codecs/adau1761.c | 14 +-
5639 sound/soc/codecs/adau1781.c | 14 +-
5640 sound/soc/codecs/adau1977.c | 14 +-
5641 sound/soc/codecs/adau7002.c | 10 +-
5642 sound/soc/codecs/adav80x.c | 14 +-
5643 sound/soc/codecs/ads117x.c | 10 +-
5644 sound/soc/codecs/ak4104.c | 10 +-
5645 sound/soc/codecs/ak4535.c | 14 +-
5646 sound/soc/codecs/ak4554.c | 10 +-
5647 sound/soc/codecs/ak4613.c | 14 +-
5648 sound/soc/codecs/ak4641.c | 14 +-
5649 sound/soc/codecs/ak4642.c | 14 +-
5650 sound/soc/codecs/ak4671.c | 14 +-
5651 sound/soc/codecs/ak5386.c | 10 +-
5652 sound/soc/codecs/alc5632.c | 14 +-
5653 sound/soc/codecs/arizona.c | 14 +-
5654 sound/soc/codecs/bt-sco.c | 10 +-
5655 sound/soc/codecs/cs35l32.c | 15 +-
5656 sound/soc/codecs/cs35l33.c | 15 +-
5657 sound/soc/codecs/cs4265.c | 15 +-
5658 sound/soc/codecs/cs4270.c | 14 +-
5659 sound/soc/codecs/cs4271.c | 14 +-
5660 sound/soc/codecs/cs42l51.c | 14 +-
5661 sound/soc/codecs/cs42l52.c | 15 +-
5662 sound/soc/codecs/cs42l56.c | 15 +-
5663 sound/soc/codecs/cs42l73.c | 19 +-
5664 sound/soc/codecs/cs42xx8.c | 14 +-
5665 sound/soc/codecs/cs4349.c | 15 +-
5666 sound/soc/codecs/cs47l24.c | 24 +-
5667 sound/soc/codecs/cs53l30.c | 23 +-
5668 sound/soc/codecs/cx20442.c | 10 +-
5669 sound/soc/codecs/da7210.c | 15 +-
5670 sound/soc/codecs/da7213.c | 145 ++--
5671 sound/soc/codecs/da7213.h | 12 +-
5672 sound/soc/codecs/da7218.c | 49 +-
5673 sound/soc/codecs/da7218.h | 2 -
5674 sound/soc/codecs/da7219-aad.c | 18 +-
5675 sound/soc/codecs/da7219.c | 33 +-
5676 sound/soc/codecs/da732x.c | 14 +-
5677 sound/soc/codecs/da9055.c | 15 +-
5678 sound/soc/codecs/dmic.c | 10 +-
5679 sound/soc/codecs/es8328.c | 14 +-
5680 sound/soc/codecs/gtm601.c | 10 +-
5681 sound/soc/codecs/hdac_hdmi.c | 2 +-
5682 sound/soc/codecs/hdmi-codec.c | 79 +-
5683 sound/soc/codecs/inno_rk3036.c | 14 +-
5684 sound/soc/codecs/isabelle.c | 14 +-
5685 sound/soc/codecs/jz4740.c | 14 +-
5686 sound/soc/codecs/l3.c | 71 +-
5687 sound/soc/codecs/lm49453.c | 14 +-
5688 sound/soc/codecs/max98088.c | 14 +-
5689 sound/soc/codecs/max98095.c | 14 +-
5690 sound/soc/codecs/max98357a.c | 10 +-
5691 sound/soc/codecs/max98371.c | 1 -
5692 sound/soc/codecs/max9850.c | 14 +-
5693 sound/soc/codecs/max9860.c | 14 +-
5694 sound/soc/codecs/max9867.c | 14 +-
5695 sound/soc/codecs/max98925.c | 14 +-
5696 sound/soc/codecs/max98926.c | 14 +-
5697 sound/soc/codecs/mc13783.c | 14 +-
5698 sound/soc/codecs/ml26124.c | 14 +-
5699 sound/soc/codecs/nau8810.c | 884 ++++++++++++++++++++
5700 sound/soc/codecs/nau8810.h | 281 +++++++
5701 sound/soc/codecs/nau8825.c | 14 +-
5702 sound/soc/codecs/pcm1681.c | 14 +-
5703 sound/soc/codecs/pcm179x.c | 14 +-
5704 sound/soc/codecs/pcm3008.c | 10 +-
5705 sound/soc/codecs/pcm3168a.c | 14 +-
5706 sound/soc/codecs/pcm512x.c | 14 +-
5707 sound/soc/codecs/rt286.c | 14 +-
5708 sound/soc/codecs/rt298.c | 14 +-
5709 sound/soc/codecs/rt5514-spi.c | 2 +-
5710 sound/soc/codecs/rt5514.c | 20 +-
5711 sound/soc/codecs/rt5514.h | 4 +-
5712 sound/soc/codecs/rt5616.c | 14 +-
5713 sound/soc/codecs/rt5631.c | 14 +-
5714 sound/soc/codecs/rt5640.c | 17 +-
5715 sound/soc/codecs/rt5640.h | 1 +
5716 sound/soc/codecs/rt5645.c | 14 +-
5717 sound/soc/codecs/rt5651.c | 14 +-
5718 sound/soc/codecs/rt5659.c | 41 +-
5719 sound/soc/codecs/rt5659.h | 1 +
5720 sound/soc/codecs/rt5670.c | 14 +-
5721 sound/soc/codecs/rt5677.c | 16 +-
5722 sound/soc/codecs/sgtl5000.c | 17 +-
5723 sound/soc/codecs/si476x.c | 10 +-
5724 sound/soc/codecs/sn95031.c | 14 +-
5725 sound/soc/codecs/spdif_receiver.c | 10 +-
5726 sound/soc/codecs/spdif_transmitter.c | 10 +-
5727 sound/soc/codecs/ssm2518.c | 14 +-
5728 sound/soc/codecs/ssm2602.c | 14 +-
5729 sound/soc/codecs/ssm4567.c | 14 +-
5730 sound/soc/codecs/sta32x.c | 14 +-
5731 sound/soc/codecs/sta350.c | 14 +-
5732 sound/soc/codecs/sta529.c | 6 +-
5733 sound/soc/codecs/stac9766.c | 6 +-
5734 sound/soc/codecs/sti-sas.c | 8 +-
5735 sound/soc/codecs/tas2552.c | 14 +-
5736 sound/soc/codecs/tas5086.c | 16 +-
5737 sound/soc/codecs/tas571x.c | 14 +-
5738 sound/soc/codecs/tas5720.c | 14 +-
5739 sound/soc/codecs/tfa9879.c | 15 +-
5740 sound/soc/codecs/tlv320aic23.c | 14 +-
5741 sound/soc/codecs/tlv320aic26.c | 14 +-
5742 sound/soc/codecs/tlv320aic31xx.c | 14 +-
5743 sound/soc/codecs/tlv320aic32x4.c | 14 +-
5744 sound/soc/codecs/tlv320aic3x.c | 14 +-
5745 sound/soc/codecs/tlv320dac33.c | 14 +-
5746 sound/soc/codecs/twl4030.c | 14 +-
5747 sound/soc/codecs/twl6040.c | 14 +-
5748 sound/soc/codecs/uda134x.c | 17 +-
5749 sound/soc/codecs/uda1380.c | 14 +-
5750 sound/soc/codecs/wl1273.c | 14 +-
5751 sound/soc/codecs/wm0010.c | 12 +-
5752 sound/soc/codecs/wm1250-ev1.c | 13 +-
5753 sound/soc/codecs/wm2000.c | 16 +-
5754 sound/soc/codecs/wm2200.c | 16 +-
5755 sound/soc/codecs/wm5100.c | 18 +-
5756 sound/soc/codecs/wm5102.c | 26 +-
5757 sound/soc/codecs/wm5110.c | 26 +-
5758 sound/soc/codecs/wm8350.c | 16 +-
5759 sound/soc/codecs/wm8400.c | 16 +-
5760 sound/soc/codecs/wm8510.c | 16 +-
5761 sound/soc/codecs/wm8523.c | 16 +-
5762 sound/soc/codecs/wm8580.c | 16 +-
5763 sound/soc/codecs/wm8711.c | 16 +-
5764 sound/soc/codecs/wm8727.c | 12 +-
5765 sound/soc/codecs/wm8728.c | 16 +-
5766 sound/soc/codecs/wm8731.c | 16 +-
5767 sound/soc/codecs/wm8737.c | 16 +-
5768 sound/soc/codecs/wm8741.c | 12 +-
5769 sound/soc/codecs/wm8750.c | 16 +-
5770 sound/soc/codecs/wm8753.c | 16 +-
5771 sound/soc/codecs/wm8770.c | 16 +-
5772 sound/soc/codecs/wm8776.c | 16 +-
5773 sound/soc/codecs/wm8782.c | 12 +-
5774 sound/soc/codecs/wm8804.c | 10 +-
5775 sound/soc/codecs/wm8900.c | 16 +-
5776 sound/soc/codecs/wm8903.c | 18 +-
5777 sound/soc/codecs/wm8904.c | 2 +-
5778 sound/soc/codecs/wm8940.c | 16 +-
5779 sound/soc/codecs/wm8955.c | 16 +-
5780 sound/soc/codecs/wm8960.c | 2 +-
5781 sound/soc/codecs/wm8961.c | 16 +-
5782 sound/soc/codecs/wm8962.c | 6 +-
5783 sound/soc/codecs/wm8971.c | 16 +-
5784 sound/soc/codecs/wm8974.c | 16 +-
5785 sound/soc/codecs/wm8978.c | 16 +-
5786 sound/soc/codecs/wm8983.c | 16 +-
5787 sound/soc/codecs/wm8985.c | 16 +-
5788 sound/soc/codecs/wm8988.c | 14 +-
5789 sound/soc/codecs/wm8990.c | 16 +-
5790 sound/soc/codecs/wm8991.c | 16 +-
5791 sound/soc/codecs/wm8993.c | 2 +-
5792 sound/soc/codecs/wm8994.c | 2 +-
5793 sound/soc/codecs/wm8995.c | 14 +-
5794 sound/soc/codecs/wm8996.c | 18 +-
5795 sound/soc/codecs/wm8997.c | 16 +-
5796 sound/soc/codecs/wm8998.c | 26 +-
5797 sound/soc/codecs/wm9081.c | 16 +-
5798 sound/soc/codecs/wm9090.c | 2 +-
5799 sound/soc/codecs/wm9705.c | 16 +-
5800 sound/soc/codecs/wm9712.c | 16 +-
5801 sound/soc/codecs/wm9713.c | 16 +-
5802 sound/soc/davinci/davinci-mcasp.c | 2 +-
5803 sound/soc/dwc/designware_i2s.c | 2 -
5804 sound/soc/fsl/fsl_asrc.c | 10 +-
5805 sound/soc/fsl/fsl_asrc_dma.c | 2 +-
5806 sound/soc/fsl/fsl_esai.c | 6 +-
5807 sound/soc/fsl/fsl_sai.c | 6 +-
5808 sound/soc/generic/Kconfig | 8 +
5809 sound/soc/generic/Makefile | 2 +
5810 sound/soc/generic/simple-card-utils.c | 141 ++++
5811 sound/soc/generic/simple-card.c | 273 ++-----
5812 sound/soc/generic/simple-scu-card.c | 345 ++++++++
5813 sound/soc/img/pistachio-internal-dac.c | 14 +-
5814 sound/soc/intel/Kconfig | 1 +
5815 sound/soc/intel/atom/sst-atom-controls.c | 32 +-
5816 sound/soc/intel/atom/sst-atom-controls.h | 6 +
5817 sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +-
5818 sound/soc/intel/atom/sst/sst.c | 5 +-
5819 sound/soc/intel/atom/sst/sst_acpi.c | 82 +-
5820 sound/soc/intel/atom/sst/sst_ipc.c | 3 +
5821 sound/soc/intel/atom/sst/sst_pvt.c | 14 +-
5822 sound/soc/intel/boards/bytcr_rt5640.c | 507 ++++++++++--
5823 sound/soc/intel/haswell/sst-haswell-pcm.c | 2 +-
5824 sound/soc/intel/skylake/bxt-sst.c | 114 ++-
5825 sound/soc/intel/skylake/skl-messages.c | 39 +-
5826 sound/soc/intel/skylake/skl-pcm.c | 51 +-
5827 sound/soc/intel/skylake/skl-sst-dsp.h | 12 +-
5828 sound/soc/intel/skylake/skl-sst-ipc.c | 29 +
5829 sound/soc/intel/skylake/skl-sst-ipc.h | 12 +-
5830 sound/soc/intel/skylake/skl-sst-utils.c | 24 +-
5831 sound/soc/intel/skylake/skl-sst.c | 43 +-
5832 sound/soc/intel/skylake/skl-topology.c | 886 ++++++++++++++++++---
5833 sound/soc/intel/skylake/skl-topology.h | 4 +-
5834 sound/soc/intel/skylake/skl-tplg-interface.h | 92 +--
5835 sound/soc/intel/skylake/skl.h | 2 +
5836 sound/soc/kirkwood/kirkwood-dma.c | 2 +-
5837 sound/soc/mediatek/common/mtk-afe-fe-dai.c | 5 +-
5838 sound/soc/omap/mcbsp.c | 3 +-
5839 sound/soc/omap/omap-abe-twl6040.c | 14 +-
5840 sound/soc/omap/omap-pcm.c | 2 +-
5841 sound/soc/qcom/apq8016_sbc.c | 20 +
5842 sound/soc/qcom/lpass-platform.c | 16 +-
5843 sound/soc/qcom/lpass.h | 2 +
5844 sound/soc/rockchip/Kconfig | 12 +
5845 sound/soc/rockchip/Makefile | 2 +
5846 sound/soc/rockchip/rk3399_gru_sound.c | 374 +++++++++
5847 sound/soc/rockchip/rockchip_i2s.c | 10 +-
5848 sound/soc/rockchip/rockchip_spdif.c | 12 +-
5849 sound/soc/samsung/ac97.c | 28 +-
5850 sound/soc/samsung/dma.h | 20 +-
5851 sound/soc/samsung/dmaengine.c | 31 -
5852 sound/soc/samsung/i2s.c | 56 +-
5853 sound/soc/samsung/idma.c | 1 -
5854 sound/soc/samsung/pcm.c | 26 +-
5855 sound/soc/samsung/s3c-i2s-v2.c | 3 +-
5856 sound/soc/samsung/s3c-i2s-v2.h | 4 +-
5857 sound/soc/samsung/s3c2412-i2s.c | 24 +-
5858 sound/soc/samsung/s3c24xx-i2s.c | 24 +-
5859 sound/soc/samsung/s3c24xx_uda134x.c | 134 +---
5860 sound/soc/samsung/smdk_wm8580pcm.c | 1 -
5861 sound/soc/samsung/smdk_wm8994pcm.c | 1 -
5862 sound/soc/samsung/spdif.c | 12 +-
5863 sound/soc/sh/Kconfig | 6 -
5864 sound/soc/sh/rcar/Makefile | 3 -
5865 sound/soc/sh/rcar/core.c | 2 +
5866 sound/soc/sh/rcar/rsrc-card.c | 486 -----------
5867 sound/soc/sh/rcar/ssi.c | 2 +-
5868 sound/soc/soc-ac97.c | 2 +-
5869 sound/soc/soc-core.c | 15 +-
5870 sound/soc/soc-dapm.c | 23 +-
5871 sound/soc/soc-ops.c | 2 +-
5872 sound/soc/soc-topology.c | 115 ++-
5873 sound/soc/soc-utils.c | 2 +-
5874 sound/soc/sunxi/Kconfig | 1 +
5875 sound/soc/sunxi/sun4i-codec.c | 14 +-
5876 sound/soc/sunxi/sun4i-spdif.c | 17 +-
5877 sound/soc/tegra/Kconfig | 11 +
5878 sound/soc/tegra/Makefile | 2 +
5879 sound/soc/tegra/tegra_rt5640.c | 2 +-
5880 sound/soc/tegra/tegra_sgtl5000.c | 212 +++++
5881 sound/soc/ux500/ux500_msp_dai.c | 6 +-
5882 275 files changed, 6503 insertions(+), 2518 deletions(-)
5883 create mode 100644 Documentation/devicetree/bindings/sound/nau8810.txt
5884 create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt
5885 delete mode 100644 Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
5886 create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt
5887 create mode 100644 Documentation/devicetree/bindings/sound/simple-scu-card.txt
5888 create mode 100644 include/uapi/sound/snd_sst_tokens.h
5889 create mode 100644 sound/soc/codecs/nau8810.c
5890 create mode 100644 sound/soc/codecs/nau8810.h
5891 create mode 100644 sound/soc/generic/simple-scu-card.c
5892 create mode 100644 sound/soc/rockchip/rk3399_gru_sound.c
5893 delete mode 100644 sound/soc/sh/rcar/rsrc-card.c
5894 create mode 100644 sound/soc/tegra/tegra_sgtl5000.c
5895 Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit)
5896 $ git merge modules/modules-next
5898 Merging input/next (722dc54628ca Input: tps65218-pwrbutton - add support for tps65217 variant)
5899 $ git merge input/next
5900 Removing drivers/input/touchscreen/ft6236.c
5901 Auto-merging drivers/input/touchscreen/Kconfig
5902 Auto-merging drivers/input/misc/max77693-haptic.c
5903 Removing Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt
5904 Merge made by the 'recursive' strategy.
5905 .../devicetree/bindings/input/adc-keys.txt | 49 ++++
5906 .../devicetree/bindings/input/gpio-decoder.txt | 23 ++
5907 .../devicetree/bindings/input/gpio-keys-polled.txt | 5 +-
5908 .../bindings/input/touchscreen/edt-ft5x06.txt | 8 +
5909 .../input/touchscreen/focaltech-ft6236.txt | 35 ---
5910 .../bindings/input/tps65218-pwrbutton.txt | 17 +-
5911 arch/arm/mach-sa1100/jornada720.c | 16 +
5912 drivers/input/keyboard/Kconfig | 15 +
5913 drivers/input/keyboard/Makefile | 1 +
5914 drivers/input/keyboard/adc-keys.c | 210 +++++++++++++
5915 drivers/input/keyboard/jornada720_kbd.c | 59 +---
5916 drivers/input/misc/Kconfig | 16 +-
5917 drivers/input/misc/Makefile | 1 +
5918 drivers/input/misc/gpio_decoder.c | 137 +++++++++
5919 drivers/input/misc/max77693-haptic.c | 4 +-
5920 drivers/input/misc/tps65218-pwrbutton.c | 92 ++++--
5921 drivers/input/mouse/focaltech.c | 3 +-
5922 drivers/input/mouse/psmouse-base.c | 2 +-
5923 drivers/input/tablet/pegasus_notetaker.c | 1 +
5924 drivers/input/touchscreen/Kconfig | 13 -
5925 drivers/input/touchscreen/Makefile | 1 -
5926 drivers/input/touchscreen/edt-ft5x06.c | 8 +
5927 drivers/input/touchscreen/elants_i2c.c | 31 +-
5928 drivers/input/touchscreen/ft6236.c | 326 ---------------------
5929 drivers/input/touchscreen/jornada720_ts.c | 21 +-
5930 drivers/input/touchscreen/mc13783_ts.c | 24 +-
5931 drivers/input/touchscreen/pixcir_i2c_ts.c | 13 +-
5932 drivers/input/touchscreen/wdt87xx_i2c.c | 5 +-
5933 drivers/input/touchscreen/wm97xx-core.c | 2 +-
5934 29 files changed, 631 insertions(+), 507 deletions(-)
5935 create mode 100644 Documentation/devicetree/bindings/input/adc-keys.txt
5936 create mode 100644 Documentation/devicetree/bindings/input/gpio-decoder.txt
5937 delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt
5938 create mode 100644 drivers/input/keyboard/adc-keys.c
5939 create mode 100644 drivers/input/misc/gpio_decoder.c
5940 delete mode 100644 drivers/input/touchscreen/ft6236.c
5941 Merging block/for-next (f53f9c50eb50 Merge branch 'for-4.9/block' into for-next)
5942 $ git merge block/for-next
5943 Merge made by the 'recursive' strategy.
5944 block/blk-core.c | 8 +-
5945 block/blk-mq.c | 14 +-
5946 drivers/block/mtip32xx/mtip32xx.c | 2 +-
5947 drivers/block/nbd.c | 411 +++++++++++++++-----------------------
5948 include/linux/blk-mq.h | 11 +-
5949 include/linux/blkdev.h | 2 +-
5950 include/linux/workqueue.h | 1 +
5951 kernel/workqueue.c | 40 ++--
5952 8 files changed, 211 insertions(+), 278 deletions(-)
5953 Merging lightnvm/for-next (e9c12e6b8e7c lightnvm: NVM should depend on HAS_DMA)
5954 $ git merge lightnvm/for-next
5955 Merge made by the 'recursive' strategy.
5956 drivers/lightnvm/Kconfig | 2 +-
5957 1 file changed, 1 insertion(+), 1 deletion(-)
5958 Merging device-mapper/for-next (edd1ea2a8a25 dm bufio: remove use of deprecated create_singlethread_workqueue())
5959 $ git merge device-mapper/for-next
5961 Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
5962 $ git merge pcmcia/master
5964 Merging mmc-uh/next (1230e69ac8d9 mmc: sdhci-acpi: Set MMC_CAP_CMD_DURING_TFR for Intel eMMC controllers)
5965 $ git merge mmc-uh/next
5966 Auto-merging arch/arm/boot/dts/sun8i-h3.dtsi
5967 Auto-merging arch/arm/boot/dts/sun8i-a23-a33.dtsi
5968 Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi
5969 Auto-merging Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt
5970 Merge made by the 'recursive' strategy.
5971 ...cm,bcm7425-sdhci.txt => brcm,sdhci-brcmstb.txt} | 4 +-
5972 .../devicetree/bindings/mmc/mmc-pwrseq-simple.txt | 2 +
5973 Documentation/devicetree/bindings/mmc/mmc.txt | 15 +-
5974 Documentation/devicetree/bindings/mmc/sdhci-st.txt | 2 +-
5975 .../devicetree/bindings/mmc/sunxi-mmc.txt | 7 +-
5976 .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 4 +
5977 Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 +
5978 arch/arm/boot/dts/sun6i-a31.dtsi | 8 +-
5979 arch/arm/boot/dts/sun7i-a20.dtsi | 8 +-
5980 arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +-
5981 arch/arm/boot/dts/sun8i-h3.dtsi | 6 +-
5982 drivers/mmc/card/block.c | 27 +-
5983 drivers/mmc/card/mmc_test.c | 308 +++++++++++++++++++++
5984 drivers/mmc/core/core.c | 178 ++++++++++--
5985 drivers/mmc/core/mmc.c | 9 +-
5986 drivers/mmc/core/pwrseq_simple.c | 9 +
5987 drivers/mmc/core/sd.c | 37 +--
5988 drivers/mmc/core/sdio_io.c | 47 ++--
5989 drivers/mmc/core/sdio_ops.c | 9 +-
5990 drivers/mmc/host/davinci_mmc.c | 6 +-
5991 drivers/mmc/host/dw_mmc-exynos.c | 6 +-
5992 drivers/mmc/host/dw_mmc-k3.c | 6 +
5993 drivers/mmc/host/dw_mmc.c | 81 ++----
5994 drivers/mmc/host/moxart-mmc.c | 5 +-
5995 drivers/mmc/host/sdhci-acpi.c | 2 +-
5996 drivers/mmc/host/sdhci-bcm-kona.c | 6 +-
5997 drivers/mmc/host/sdhci-brcmstb.c | 4 +-
5998 drivers/mmc/host/sdhci-esdhc-imx.c | 7 +-
5999 drivers/mmc/host/sdhci-of-arasan.c | 109 +++++++-
6000 drivers/mmc/host/sdhci-of-esdhc.c | 2 +-
6001 drivers/mmc/host/sdhci-pci-core.c | 62 ++---
6002 drivers/mmc/host/sdhci-pci.h | 1 -
6003 drivers/mmc/host/sdhci-pltfm.c | 7 -
6004 drivers/mmc/host/sdhci-st.c | 15 +-
6005 drivers/mmc/host/sdhci-tegra.c | 27 +-
6006 drivers/mmc/host/sdhci.c | 23 +-
6007 drivers/mmc/host/sdhci.h | 1 -
6008 drivers/mmc/host/sh_mobile_sdhi.c | 17 +-
6009 drivers/mmc/host/sunxi-mmc.c | 265 +++++++++++++-----
6010 drivers/mmc/host/tmio_mmc.h | 1 +
6011 drivers/mmc/host/tmio_mmc_pio.c | 9 +-
6012 drivers/mmc/host/vub300.c | 2 -
6013 include/linux/mmc/card.h | 1 +
6014 include/linux/mmc/core.h | 7 +
6015 include/linux/mmc/dw_mmc.h | 2 +
6016 include/linux/mmc/host.h | 5 +
6017 46 files changed, 1046 insertions(+), 320 deletions(-)
6018 rename Documentation/devicetree/bindings/mmc/{brcm,bcm7425-sdhci.txt => brcm,sdhci-brcmstb.txt} (89%)
6019 Merging md/for-next (fcd4a4cc1359 raid5: allow arbitrary max_hw_sectors)
6020 $ git merge md/for-next
6021 Resolved 'include/linux/raid/pq.h' using previous resolution.
6022 Auto-merging lib/raid6/algos.c
6023 Auto-merging lib/raid6/Makefile
6024 Auto-merging include/linux/raid/pq.h
6025 CONFLICT (content): Merge conflict in include/linux/raid/pq.h
6026 Automatic merge failed; fix conflicts and then commit the result.
6028 [master 32050cf17b37] Merge remote-tracking branch 'md/for-next'
6029 $ git diff -M --stat --summary HEAD^..
6030 arch/x86/Makefile | 5 +-
6031 drivers/md/md-cluster.c | 99 ++++++---
6032 drivers/md/md.c | 39 ++--
6033 drivers/md/md.h | 5 +-
6034 drivers/md/raid5-cache.c | 46 ++--
6035 drivers/md/raid5.c | 16 +-
6036 include/linux/raid/pq.h | 4 +
6037 lib/raid6/Makefile | 2 +-
6038 lib/raid6/algos.c | 12 +
6039 lib/raid6/avx512.c | 569 +++++++++++++++++++++++++++++++++++++++++++++++
6040 lib/raid6/recov_avx512.c | 388 ++++++++++++++++++++++++++++++++
6041 lib/raid6/test/Makefile | 5 +-
6042 lib/raid6/x86.h | 10 +
6043 13 files changed, 1113 insertions(+), 87 deletions(-)
6044 create mode 100644 lib/raid6/avx512.c
6045 create mode 100644 lib/raid6/recov_avx512.c
6046 Merging mfd/for-mfd-next (1306cbaf4ee9 MAINTAINERS: Add MFD's DT bindings directory to MFD entry)
6047 $ git merge mfd/for-mfd-next
6048 Auto-merging drivers/gpio/Kconfig
6049 Auto-merging MAINTAINERS
6050 Merge made by the 'recursive' strategy.
6051 Documentation/devicetree/bindings/mfd/ac100.txt | 54 ++
6052 Documentation/devicetree/bindings/mfd/act8945a.txt | 22 +-
6053 Documentation/devicetree/bindings/mfd/axp20x.txt | 28 +-
6054 Documentation/devicetree/bindings/mfd/lp873x.txt | 59 ++
6055 Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 15 +
6056 Documentation/devicetree/bindings/mfd/rk808.txt | 37 +-
6057 .../bindings/mfd/samsung,exynos5433-lpass.txt | 70 +++
6058 Documentation/devicetree/bindings/mfd/stmpe.txt | 2 +-
6060 drivers/gpio/Kconfig | 10 +
6061 drivers/gpio/Makefile | 1 +
6062 drivers/gpio/gpio-lp873x.c | 193 +++++++
6063 drivers/gpio/gpio-stmpe.c | 167 ++++--
6064 drivers/input/keyboard/cros_ec_keyb.c | 135 +----
6065 drivers/mfd/Kconfig | 37 +-
6066 drivers/mfd/Makefile | 5 +
6067 drivers/mfd/ac100.c | 137 +++++
6068 drivers/mfd/act8945a.c | 1 +
6069 drivers/mfd/altera-a10sr.c | 2 +-
6070 drivers/mfd/arizona-core.c | 15 +-
6071 drivers/mfd/axp20x-rsb.c | 1 +
6072 drivers/mfd/axp20x.c | 75 +++
6073 drivers/mfd/cros_ec.c | 58 +-
6074 drivers/mfd/da9052-core.c | 51 ++
6075 drivers/mfd/da9063-core.c | 7 +-
6076 drivers/mfd/da9063-i2c.c | 2 +-
6077 drivers/mfd/da9063-irq.c | 2 +-
6078 drivers/mfd/dm355evm_msp.c | 17 +-
6079 drivers/mfd/exynos-lpass.c | 187 ++++++
6080 drivers/mfd/intel-lpss-pci.c | 23 +
6081 drivers/mfd/intel_soc_pmic_bxtwc.c | 23 +-
6082 drivers/mfd/lp873x.c | 99 ++++
6083 drivers/mfd/max14577.c | 4 +-
6084 drivers/mfd/pm8921-core.c | 1 +
6085 drivers/mfd/qcom_rpm.c | 72 +++
6086 drivers/mfd/rk808.c | 226 +++++++-
6087 drivers/mfd/rtsx_usb.c | 10 +-
6088 drivers/mfd/stmpe-i2c.c | 2 +
6089 drivers/mfd/stmpe.c | 161 +++++-
6090 drivers/mfd/stmpe.h | 85 ++-
6091 drivers/mfd/twl6040.c | 1 +
6092 drivers/mfd/ucb1x00-core.c | 6 +-
6093 drivers/platform/chrome/cros_ec_proto.c | 92 +++
6094 drivers/regulator/Kconfig | 6 +-
6095 drivers/regulator/qcom_rpm-regulator.c | 66 +++
6096 drivers/regulator/rk808-regulator.c | 143 ++++-
6097 drivers/rtc/Kconfig | 14 +-
6098 drivers/rtc/Makefile | 1 +
6099 drivers/rtc/rtc-ac100.c | 627 +++++++++++++++++++++
6100 include/dt-bindings/mfd/qcom-rpm.h | 22 +
6101 include/linux/mfd/88pm80x.h | 4 +-
6102 include/linux/mfd/ac100.h | 178 ++++++
6103 include/linux/mfd/axp20x.h | 60 ++
6104 include/linux/mfd/cros_ec.h | 18 +
6105 include/linux/mfd/cros_ec_commands.h | 34 ++
6106 include/linux/mfd/da9063/core.h | 4 +-
6107 include/linux/mfd/da9063/pdata.h | 4 +-
6108 include/linux/mfd/da9063/registers.h | 4 +-
6109 include/linux/mfd/lp873x.h | 269 +++++++++
6110 include/linux/mfd/max14577-private.h | 2 +-
6111 include/linux/mfd/max14577.h | 2 +-
6112 include/linux/mfd/rk808.h | 154 ++++-
6113 include/linux/mfd/stmpe.h | 21 +
6114 include/linux/mfd/syscon/exynos5-pmu.h | 4 +-
6115 64 files changed, 3529 insertions(+), 304 deletions(-)
6116 create mode 100644 Documentation/devicetree/bindings/mfd/ac100.txt
6117 create mode 100644 Documentation/devicetree/bindings/mfd/lp873x.txt
6118 create mode 100644 Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.txt
6119 create mode 100644 drivers/gpio/gpio-lp873x.c
6120 create mode 100644 drivers/mfd/ac100.c
6121 create mode 100644 drivers/mfd/exynos-lpass.c
6122 create mode 100644 drivers/mfd/lp873x.c
6123 create mode 100644 drivers/rtc/rtc-ac100.c
6124 create mode 100644 include/linux/mfd/ac100.h
6125 create mode 100644 include/linux/mfd/lp873x.h
6126 Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
6127 $ git merge backlight/for-backlight-next
6129 Merging battery/for-next (9edeaada19a2 power: supply: sbs-battery: simplify DT parsing)
6130 $ git merge battery/for-next
6131 Auto-merging drivers/power/supply/z2_battery.c
6132 Auto-merging drivers/power/supply/wm97xx_battery.c
6133 Auto-merging drivers/power/supply/tps65217_charger.c
6134 Auto-merging drivers/power/supply/sbs-battery.c
6135 Auto-merging drivers/power/supply/pm2301_charger.c
6136 Auto-merging drivers/power/supply/max77693_charger.c
6137 Auto-merging drivers/power/supply/max14577_charger.c
6138 Auto-merging drivers/power/supply/ipaq_micro_battery.c
6139 Auto-merging drivers/power/supply/intel_mid_battery.c
6140 Auto-merging drivers/power/supply/ds2781_battery.c
6141 Auto-merging drivers/power/supply/ds2780_battery.c
6142 Auto-merging drivers/power/supply/ds2760_battery.c
6143 Auto-merging drivers/power/supply/bq27xxx_battery.c
6144 Auto-merging drivers/power/supply/bq24735-charger.c
6145 Auto-merging drivers/power/supply/axp288_fuel_gauge.c
6146 Auto-merging drivers/power/supply/axp288_charger.c
6147 Auto-merging drivers/power/supply/abx500_chargalg.c
6148 Auto-merging drivers/power/supply/ab8500_fg.c
6149 Auto-merging drivers/power/supply/ab8500_charger.c
6150 Auto-merging drivers/power/supply/ab8500_btemp.c
6151 Removing drivers/power/act8945a_charger.c
6152 Auto-merging MAINTAINERS
6153 Removing Documentation/devicetree/bindings/power/act8945a-charger.txt
6154 Merge made by the 'recursive' strategy.
6156 Documentation/ABI/testing/sysfs-class-power | 8 +-
6157 .../devicetree/bindings/power/act8945a-charger.txt | 35 --
6158 .../{power_supply => power/reset}/axxia-reset.txt | 0
6159 .../reset}/imx-snvs-poweroff.txt | 0
6160 .../{power_supply => power/reset}/msm-poweroff.txt | 0
6161 .../reset}/qnap-poweroff.txt | 0
6162 .../reset}/restart-poweroff.txt | 0
6163 .../supply}/ab8500/btemp.txt | 0
6164 .../supply}/ab8500/chargalg.txt | 0
6165 .../supply}/ab8500/charger.txt | 0
6166 .../{power_supply => power/supply}/ab8500/fg.txt | 0
6167 .../bindings/power/supply/act8945a-charger.txt | 48 ++
6168 .../supply}/axp20x_usb_power.txt | 0
6169 .../bindings/power/{ => supply}/bq2415x.txt | 0
6170 .../bindings/power/{ => supply}/bq24257.txt | 0
6171 .../bindings/power/{ => supply}/bq25890.txt | 0
6172 .../supply}/charger-manager.txt | 0
6173 .../bindings/power/{ => supply}/da9150-charger.txt | 0
6174 .../bindings/power/{ => supply}/da9150-fg.txt | 0
6175 .../supply}/gpio-charger.txt | 0
6176 .../bindings/power/{ => supply}/isp1704.txt | 0
6177 .../supply}/lp8727_charger.txt | 0
6178 .../bindings/power/{ => supply}/ltc2941.txt | 0
6179 .../supply}/max17042_battery.txt | 0
6180 .../supply}/max8925_batter.txt | 0
6181 .../supply}/olpc_battery.txt | 0
6182 .../supply}/power_supply.txt | 0
6183 .../power/{ => supply}/qcom,coincell-charger.txt | 0
6184 .../{power_supply => power/supply}/qcom_smbb.txt | 0
6185 .../bindings/power/{ => supply}/rt9455_charger.txt | 0
6186 .../bindings/power/{ => supply}/rx51-battery.txt | 0
6187 .../supply}/sbs_sbs-battery.txt | 0
6188 .../{power_supply => power/supply}/ti,bq24735.txt | 0
6189 .../{power_supply => power/supply}/tps65090.txt | 0
6190 .../supply}/tps65217_charger.txt | 0
6191 .../bindings/power/{ => supply}/twl-charger.txt | 0
6192 Documentation/driver-model/devres.txt | 4 +
6193 Documentation/power/power_supply_class.txt | 4 +-
6195 drivers/power/Kconfig | 518 +---------------
6196 drivers/power/Makefile | 75 +--
6197 drivers/power/act8945a_charger.c | 359 -----------
6198 drivers/power/reset/reboot-mode.c | 59 ++
6199 drivers/power/reset/reboot-mode.h | 4 +
6200 drivers/power/reset/syscon-reboot-mode.c | 12 +-
6201 drivers/power/{ => supply}/88pm860x_battery.c | 0
6202 drivers/power/{ => supply}/88pm860x_charger.c | 0
6203 drivers/power/supply/Kconfig | 514 ++++++++++++++++
6204 drivers/power/supply/Makefile | 74 +++
6205 drivers/power/{ => supply}/ab8500_bmdata.c | 0
6206 drivers/power/{ => supply}/ab8500_btemp.c | 2 +-
6207 drivers/power/{ => supply}/ab8500_charger.c | 4 +-
6208 drivers/power/{ => supply}/ab8500_fg.c | 2 +-
6209 drivers/power/{ => supply}/abx500_chargalg.c | 4 +-
6210 drivers/power/supply/act8945a_charger.c | 666 +++++++++++++++++++++
6211 drivers/power/{ => supply}/apm_power.c | 0
6212 drivers/power/{ => supply}/axp20x_usb_power.c | 0
6213 drivers/power/{ => supply}/axp288_charger.c | 1 -
6214 drivers/power/{ => supply}/axp288_fuel_gauge.c | 1 -
6215 drivers/power/{ => supply}/bq2415x_charger.c | 0
6216 drivers/power/{ => supply}/bq24190_charger.c | 0
6217 drivers/power/{ => supply}/bq24257_charger.c | 0
6218 drivers/power/{ => supply}/bq24735-charger.c | 45 +-
6219 drivers/power/{ => supply}/bq25890_charger.c | 0
6220 drivers/power/{ => supply}/bq27xxx_battery.c | 5 +-
6221 drivers/power/{ => supply}/bq27xxx_battery_i2c.c | 0
6222 drivers/power/{ => supply}/charger-manager.c | 0
6223 drivers/power/{ => supply}/collie_battery.c | 0
6224 drivers/power/{ => supply}/da9030_battery.c | 0
6225 drivers/power/{ => supply}/da9052-battery.c | 0
6226 drivers/power/{ => supply}/da9150-charger.c | 0
6227 drivers/power/{ => supply}/da9150-fg.c | 0
6228 drivers/power/{ => supply}/ds2760_battery.c | 7 +-
6229 drivers/power/{ => supply}/ds2780_battery.c | 4 +-
6230 drivers/power/{ => supply}/ds2781_battery.c | 4 +-
6231 drivers/power/{ => supply}/ds2782_battery.c | 0
6232 drivers/power/{ => supply}/generic-adc-battery.c | 0
6233 drivers/power/{ => supply}/goldfish_battery.c | 0
6234 drivers/power/{ => supply}/gpio-charger.c | 0
6235 drivers/power/{ => supply}/intel_mid_battery.c | 3 +-
6236 drivers/power/{ => supply}/ipaq_micro_battery.c | 2 +-
6237 drivers/power/{ => supply}/isp1704_charger.c | 0
6238 drivers/power/{ => supply}/jz4740-battery.c | 0
6239 drivers/power/{ => supply}/lp8727_charger.c | 0
6240 drivers/power/{ => supply}/lp8788-charger.c | 0
6241 drivers/power/{ => supply}/ltc2941-battery-gauge.c | 0
6242 drivers/power/{ => supply}/max14577_charger.c | 4 +-
6243 drivers/power/{ => supply}/max17040_battery.c | 0
6244 drivers/power/{ => supply}/max17042_battery.c | 0
6245 drivers/power/{ => supply}/max77693_charger.c | 4 +-
6246 drivers/power/{ => supply}/max8903_charger.c | 0
6247 drivers/power/{ => supply}/max8925_power.c | 0
6248 drivers/power/{ => supply}/max8997_charger.c | 0
6249 drivers/power/{ => supply}/max8998_charger.c | 0
6250 drivers/power/{ => supply}/olpc_battery.c | 0
6251 drivers/power/{ => supply}/pcf50633-charger.c | 0
6252 drivers/power/{ => supply}/pda_power.c | 0
6253 drivers/power/{ => supply}/pm2301_charger.c | 3 +-
6254 drivers/power/{ => supply}/pm2301_charger.h | 0
6255 drivers/power/{ => supply}/pmu_battery.c | 0
6256 drivers/power/{ => supply}/power_supply.h | 0
6257 drivers/power/{ => supply}/power_supply_core.c | 0
6258 drivers/power/{ => supply}/power_supply_leds.c | 0
6259 drivers/power/{ => supply}/power_supply_sysfs.c | 0
6260 drivers/power/{ => supply}/qcom_smbb.c | 0
6261 drivers/power/{ => supply}/rt5033_battery.c | 0
6262 drivers/power/{ => supply}/rt9455_charger.c | 0
6263 drivers/power/{ => supply}/rx51_battery.c | 0
6264 drivers/power/{ => supply}/s3c_adc_battery.c | 0
6265 drivers/power/{ => supply}/sbs-battery.c | 217 +++----
6266 drivers/power/{ => supply}/smb347-charger.c | 0
6267 drivers/power/{ => supply}/test_power.c | 0
6268 drivers/power/{ => supply}/tosa_battery.c | 0
6269 drivers/power/{ => supply}/tps65090-charger.c | 0
6270 drivers/power/{ => supply}/tps65217_charger.c | 40 +-
6271 drivers/power/{ => supply}/twl4030_charger.c | 0
6272 drivers/power/{ => supply}/twl4030_madc_battery.c | 0
6273 drivers/power/{ => supply}/wm831x_backup.c | 0
6274 drivers/power/{ => supply}/wm831x_power.c | 0
6275 drivers/power/{ => supply}/wm8350_power.c | 0
6276 drivers/power/{ => supply}/wm97xx_battery.c | 2 -
6277 drivers/power/{ => supply}/z2_battery.c | 1 -
6278 include/linux/power/bq24735-charger.h | 4 -
6279 include/linux/power/sbs-battery.h | 4 -
6280 125 files changed, 1561 insertions(+), 1232 deletions(-)
6281 delete mode 100644 Documentation/devicetree/bindings/power/act8945a-charger.txt
6282 rename Documentation/devicetree/bindings/{power_supply => power/reset}/axxia-reset.txt (100%)
6283 rename Documentation/devicetree/bindings/{power_supply => power/reset}/imx-snvs-poweroff.txt (100%)
6284 rename Documentation/devicetree/bindings/{power_supply => power/reset}/msm-poweroff.txt (100%)
6285 rename Documentation/devicetree/bindings/{power_supply => power/reset}/qnap-poweroff.txt (100%)
6286 rename Documentation/devicetree/bindings/{power_supply => power/reset}/restart-poweroff.txt (100%)
6287 rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/btemp.txt (100%)
6288 rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/chargalg.txt (100%)
6289 rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/charger.txt (100%)
6290 rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/fg.txt (100%)
6291 create mode 100644 Documentation/devicetree/bindings/power/supply/act8945a-charger.txt
6292 rename Documentation/devicetree/bindings/{power_supply => power/supply}/axp20x_usb_power.txt (100%)
6293 rename Documentation/devicetree/bindings/power/{ => supply}/bq2415x.txt (100%)
6294 rename Documentation/devicetree/bindings/power/{ => supply}/bq24257.txt (100%)
6295 rename Documentation/devicetree/bindings/power/{ => supply}/bq25890.txt (100%)
6296 rename Documentation/devicetree/bindings/{power_supply => power/supply}/charger-manager.txt (100%)
6297 rename Documentation/devicetree/bindings/power/{ => supply}/da9150-charger.txt (100%)
6298 rename Documentation/devicetree/bindings/power/{ => supply}/da9150-fg.txt (100%)
6299 rename Documentation/devicetree/bindings/{power_supply => power/supply}/gpio-charger.txt (100%)
6300 rename Documentation/devicetree/bindings/power/{ => supply}/isp1704.txt (100%)
6301 rename Documentation/devicetree/bindings/{power_supply => power/supply}/lp8727_charger.txt (100%)
6302 rename Documentation/devicetree/bindings/power/{ => supply}/ltc2941.txt (100%)
6303 rename Documentation/devicetree/bindings/{power_supply => power/supply}/max17042_battery.txt (100%)
6304 rename Documentation/devicetree/bindings/{power_supply => power/supply}/max8925_batter.txt (100%)
6305 rename Documentation/devicetree/bindings/{power_supply => power/supply}/olpc_battery.txt (100%)
6306 rename Documentation/devicetree/bindings/{power_supply => power/supply}/power_supply.txt (100%)
6307 rename Documentation/devicetree/bindings/power/{ => supply}/qcom,coincell-charger.txt (100%)
6308 rename Documentation/devicetree/bindings/{power_supply => power/supply}/qcom_smbb.txt (100%)
6309 rename Documentation/devicetree/bindings/power/{ => supply}/rt9455_charger.txt (100%)
6310 rename Documentation/devicetree/bindings/power/{ => supply}/rx51-battery.txt (100%)
6311 rename Documentation/devicetree/bindings/{power_supply => power/supply}/sbs_sbs-battery.txt (100%)
6312 rename Documentation/devicetree/bindings/{power_supply => power/supply}/ti,bq24735.txt (100%)
6313 rename Documentation/devicetree/bindings/{power_supply => power/supply}/tps65090.txt (100%)
6314 rename Documentation/devicetree/bindings/{power_supply => power/supply}/tps65217_charger.txt (100%)
6315 rename Documentation/devicetree/bindings/power/{ => supply}/twl-charger.txt (100%)
6316 delete mode 100644 drivers/power/act8945a_charger.c
6317 rename drivers/power/{ => supply}/88pm860x_battery.c (100%)
6318 rename drivers/power/{ => supply}/88pm860x_charger.c (100%)
6319 create mode 100644 drivers/power/supply/Kconfig
6320 create mode 100644 drivers/power/supply/Makefile
6321 rename drivers/power/{ => supply}/ab8500_bmdata.c (100%)
6322 rename drivers/power/{ => supply}/ab8500_btemp.c (99%)
6323 rename drivers/power/{ => supply}/ab8500_charger.c (99%)
6324 rename drivers/power/{ => supply}/ab8500_fg.c (99%)
6325 rename drivers/power/{ => supply}/abx500_chargalg.c (99%)
6326 create mode 100644 drivers/power/supply/act8945a_charger.c
6327 rename drivers/power/{ => supply}/apm_power.c (100%)
6328 rename drivers/power/{ => supply}/axp20x_usb_power.c (100%)
6329 rename drivers/power/{ => supply}/axp288_charger.c (99%)
6330 rename drivers/power/{ => supply}/axp288_fuel_gauge.c (99%)
6331 rename drivers/power/{ => supply}/bq2415x_charger.c (100%)
6332 rename drivers/power/{ => supply}/bq24190_charger.c (100%)
6333 rename drivers/power/{ => supply}/bq24257_charger.c (100%)
6334 rename drivers/power/{ => supply}/bq24735-charger.c (92%)
6335 rename drivers/power/{ => supply}/bq25890_charger.c (100%)
6336 rename drivers/power/{ => supply}/bq27xxx_battery.c (99%)
6337 rename drivers/power/{ => supply}/bq27xxx_battery_i2c.c (100%)
6338 rename drivers/power/{ => supply}/charger-manager.c (100%)
6339 rename drivers/power/{ => supply}/collie_battery.c (100%)
6340 rename drivers/power/{ => supply}/da9030_battery.c (100%)
6341 rename drivers/power/{ => supply}/da9052-battery.c (100%)
6342 rename drivers/power/{ => supply}/da9150-charger.c (100%)
6343 rename drivers/power/{ => supply}/da9150-fg.c (100%)
6344 rename drivers/power/{ => supply}/ds2760_battery.c (99%)
6345 rename drivers/power/{ => supply}/ds2780_battery.c (99%)
6346 rename drivers/power/{ => supply}/ds2781_battery.c (99%)
6347 rename drivers/power/{ => supply}/ds2782_battery.c (100%)
6348 rename drivers/power/{ => supply}/generic-adc-battery.c (100%)
6349 rename drivers/power/{ => supply}/goldfish_battery.c (100%)
6350 rename drivers/power/{ => supply}/gpio-charger.c (100%)
6351 rename drivers/power/{ => supply}/intel_mid_battery.c (99%)
6352 rename drivers/power/{ => supply}/ipaq_micro_battery.c (99%)
6353 rename drivers/power/{ => supply}/isp1704_charger.c (100%)
6354 rename drivers/power/{ => supply}/jz4740-battery.c (100%)
6355 rename drivers/power/{ => supply}/lp8727_charger.c (100%)
6356 rename drivers/power/{ => supply}/lp8788-charger.c (100%)
6357 rename drivers/power/{ => supply}/ltc2941-battery-gauge.c (100%)
6358 rename drivers/power/{ => supply}/max14577_charger.c (99%)
6359 rename drivers/power/{ => supply}/max17040_battery.c (100%)
6360 rename drivers/power/{ => supply}/max17042_battery.c (100%)
6361 rename drivers/power/{ => supply}/max77693_charger.c (99%)
6362 rename drivers/power/{ => supply}/max8903_charger.c (100%)
6363 rename drivers/power/{ => supply}/max8925_power.c (100%)
6364 rename drivers/power/{ => supply}/max8997_charger.c (100%)
6365 rename drivers/power/{ => supply}/max8998_charger.c (100%)
6366 rename drivers/power/{ => supply}/olpc_battery.c (100%)
6367 rename drivers/power/{ => supply}/pcf50633-charger.c (100%)
6368 rename drivers/power/{ => supply}/pda_power.c (100%)
6369 rename drivers/power/{ => supply}/pm2301_charger.c (99%)
6370 rename drivers/power/{ => supply}/pm2301_charger.h (100%)
6371 rename drivers/power/{ => supply}/pmu_battery.c (100%)
6372 rename drivers/power/{ => supply}/power_supply.h (100%)
6373 rename drivers/power/{ => supply}/power_supply_core.c (100%)
6374 rename drivers/power/{ => supply}/power_supply_leds.c (100%)
6375 rename drivers/power/{ => supply}/power_supply_sysfs.c (100%)
6376 rename drivers/power/{ => supply}/qcom_smbb.c (100%)
6377 rename drivers/power/{ => supply}/rt5033_battery.c (100%)
6378 rename drivers/power/{ => supply}/rt9455_charger.c (100%)
6379 rename drivers/power/{ => supply}/rx51_battery.c (100%)
6380 rename drivers/power/{ => supply}/s3c_adc_battery.c (100%)
6381 rename drivers/power/{ => supply}/sbs-battery.c (85%)
6382 rename drivers/power/{ => supply}/smb347-charger.c (100%)
6383 rename drivers/power/{ => supply}/test_power.c (100%)
6384 rename drivers/power/{ => supply}/tosa_battery.c (100%)
6385 rename drivers/power/{ => supply}/tps65090-charger.c (100%)
6386 rename drivers/power/{ => supply}/tps65217_charger.c (89%)
6387 rename drivers/power/{ => supply}/twl4030_charger.c (100%)
6388 rename drivers/power/{ => supply}/twl4030_madc_battery.c (100%)
6389 rename drivers/power/{ => supply}/wm831x_backup.c (100%)
6390 rename drivers/power/{ => supply}/wm831x_power.c (100%)
6391 rename drivers/power/{ => supply}/wm8350_power.c (100%)
6392 rename drivers/power/{ => supply}/wm97xx_battery.c (99%)
6393 rename drivers/power/{ => supply}/z2_battery.c (99%)
6394 Merging omap_dss2/for-next (ee65e18206f5 fb: adv7393: off by one in probe function)
6395 $ git merge omap_dss2/for-next
6396 Merge made by the 'recursive' strategy.
6397 drivers/video/fbdev/Kconfig | 6 +-
6398 drivers/video/fbdev/Makefile | 1 +
6399 drivers/video/fbdev/amba-clcd-nomadik.c | 259 ++++++++++++++
6400 drivers/video/fbdev/amba-clcd-nomadik.h | 24 ++
6401 drivers/video/fbdev/amba-clcd-versatile.c | 395 +++++++++++++++++++++
6402 drivers/video/fbdev/amba-clcd-versatile.h | 17 +
6403 drivers/video/fbdev/amba-clcd.c | 190 +++++++++-
6404 drivers/video/fbdev/bfin_adv7393fb.c | 5 +-
6405 drivers/video/fbdev/efifb.c | 6 +-
6406 drivers/video/fbdev/mb862xx/mb862xx-i2c.c | 9 +-
6407 drivers/video/fbdev/mx3fb.c | 2 +-
6408 drivers/video/fbdev/mxsfb.c | 9 +-
6409 drivers/video/fbdev/omap/lcd_mipid.c | 9 +-
6410 .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 14 +-
6411 .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 7 +-
6412 drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 8 -
6413 drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 8 -
6414 drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 8 -
6415 drivers/video/fbdev/pxafb.c | 3 +-
6416 drivers/video/fbdev/s3c2410fb.c | 2 +-
6417 drivers/video/fbdev/s3c2410fb.h | 2 +-
6418 include/linux/amba/clcd.h | 63 +++-
6419 22 files changed, 960 insertions(+), 87 deletions(-)
6420 create mode 100644 drivers/video/fbdev/amba-clcd-nomadik.c
6421 create mode 100644 drivers/video/fbdev/amba-clcd-nomadik.h
6422 create mode 100644 drivers/video/fbdev/amba-clcd-versatile.h
6423 Merging regulator/for-next (b8ec4737c4a4 Merge remote-tracking branches 'regulator/topic/tps65218' and 'regulator/topic/tps80031' into regulator-next)
6424 $ git merge regulator/for-next
6425 Auto-merging drivers/regulator/rk808-regulator.c
6426 Auto-merging drivers/regulator/Kconfig
6427 Merge made by the 'recursive' strategy.
6428 .../devicetree/bindings/regulator/ltc3676.txt | 94 +++++
6429 .../devicetree/bindings/regulator/regulator.txt | 2 +-
6430 drivers/mfd/tps65218.c | 9 +
6431 drivers/regulator/Kconfig | 10 +-
6432 drivers/regulator/Makefile | 1 +
6433 drivers/regulator/core.c | 6 +-
6434 drivers/regulator/devres.c | 7 +-
6435 drivers/regulator/hi6421-regulator.c | 3 +-
6436 drivers/regulator/ltc3676.c | 420 +++++++++++++++++++++
6437 drivers/regulator/rk808-regulator.c | 3 +-
6438 drivers/regulator/tps65218-regulator.c | 8 +
6439 include/linux/mfd/tps65218.h | 6 +
6440 include/linux/regulator/consumer.h | 3 -
6441 13 files changed, 555 insertions(+), 17 deletions(-)
6442 create mode 100644 Documentation/devicetree/bindings/regulator/ltc3676.txt
6443 create mode 100644 drivers/regulator/ltc3676.c
6444 Merging security/next (8ccc7d6bad84 seccomp: Remove 2-phase API documentation)
6445 $ git merge security/next
6446 Merge made by the 'recursive' strategy.
6447 include/linux/lsm_hooks.h | 1 -
6448 include/linux/security.h | 1 -
6449 2 files changed, 2 deletions(-)
6450 Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
6451 $ git merge integrity/next
6452 Merge made by the 'recursive' strategy.
6453 Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
6454 $ git merge keys/keys-next
6455 Merge made by the 'recursive' strategy.
6456 Documentation/crypto/asymmetric-keys.txt | 26 ++-
6457 Documentation/security/keys.txt | 217 ++++++++++++++++++++
6458 certs/Kconfig | 18 ++
6459 certs/Makefile | 6 +
6460 certs/blacklist.c | 174 ++++++++++++++++
6461 certs/blacklist.h | 3 +
6462 certs/blacklist_hashes.c | 6 +
6463 certs/blacklist_nohashes.c | 5 +
6464 crypto/asymmetric_keys/Kconfig | 10 +
6465 crypto/asymmetric_keys/Makefile | 13 ++
6466 crypto/asymmetric_keys/asymmetric_keys.h | 3 +
6467 crypto/asymmetric_keys/asymmetric_type.c | 59 +++++-
6468 crypto/asymmetric_keys/pkcs7_parser.c | 1 +
6469 crypto/asymmetric_keys/pkcs7_parser.h | 1 +
6470 crypto/asymmetric_keys/pkcs7_verify.c | 32 ++-
6471 crypto/asymmetric_keys/pkcs8.asn1 | 24 +++
6472 crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++
6473 crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++--
6474 crypto/asymmetric_keys/signature.c | 95 +++++++++
6475 crypto/asymmetric_keys/x509_cert_parser.c | 21 +-
6476 crypto/asymmetric_keys/x509_parser.h | 1 +
6477 crypto/asymmetric_keys/x509_public_key.c | 15 ++
6478 include/crypto/public_key.h | 14 +-
6479 include/keys/asymmetric-subtype.h | 9 +
6480 include/keys/system_keyring.h | 12 ++
6481 include/linux/key-type.h | 11 +
6482 include/linux/keyctl.h | 46 +++++
6483 include/uapi/linux/keyctl.h | 30 +++
6484 security/keys/Makefile | 1 +
6485 security/keys/compat.c | 18 ++
6486 security/keys/internal.h | 39 ++++
6487 security/keys/keyctl.c | 24 +++
6488 security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++
6489 33 files changed, 1584 insertions(+), 52 deletions(-)
6490 create mode 100644 certs/blacklist.c
6491 create mode 100644 certs/blacklist.h
6492 create mode 100644 certs/blacklist_hashes.c
6493 create mode 100644 certs/blacklist_nohashes.c
6494 create mode 100644 crypto/asymmetric_keys/pkcs8.asn1
6495 create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c
6496 create mode 100644 include/linux/keyctl.h
6497 create mode 100644 security/keys/keyctl_pkey.c
6498 Merging selinux/next (7c686af071ad selinux: fix overflow and 0 length allocations)
6499 $ git merge selinux/next
6500 Auto-merging include/linux/security.h
6501 Auto-merging include/linux/lsm_hooks.h
6502 Auto-merging fs/overlayfs/dir.c
6503 Auto-merging fs/overlayfs/copy_up.c
6504 Merge made by the 'recursive' strategy.
6505 fs/overlayfs/copy_up.c | 22 +++++++++
6506 fs/overlayfs/dir.c | 10 +++++
6507 include/linux/lsm_hooks.h | 36 +++++++++++++++
6508 include/linux/security.h | 24 ++++++++++
6509 security/lsm_audit.c | 4 +-
6510 security/security.c | 27 +++++++++++
6511 security/selinux/Kconfig | 38 ----------------
6512 security/selinux/hooks.c | 90 ++++++++++++++++++++++++++++++-------
6513 security/selinux/include/security.h | 4 --
6514 security/selinux/ss/conditional.c | 2 +
6515 security/selinux/ss/ebitmap.c | 3 ++
6516 security/selinux/ss/policydb.c | 11 +++--
6517 security/smack/smack_netfilter.c | 4 +-
6518 13 files changed, 210 insertions(+), 65 deletions(-)
6519 Merging tpmdd/next (a307518add94 Merge tag 'tpmdd-next-20160902' into next)
6520 $ git merge tpmdd/next
6521 Merge made by the 'recursive' strategy.
6522 Merging watchdog/master (29b4817d4018 Linux 4.8-rc1)
6523 $ git merge watchdog/master
6525 Merging iommu/next (b13a5606c4b2 Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek' and 'arm/renesas' into next)
6526 $ git merge iommu/next
6527 Auto-merging Documentation/kernel-parameters.txt
6528 Merge made by the 'recursive' strategy.
6529 Documentation/kernel-parameters.txt | 9 +
6530 arch/x86/configs/x86_64_defconfig | 1 -
6531 drivers/iommu/amd_iommu.c | 487 +++++++++++++++++++++++---
6532 drivers/iommu/amd_iommu_init.c | 181 +++++++++-
6533 drivers/iommu/amd_iommu_proto.h | 7 +-
6534 drivers/iommu/amd_iommu_types.h | 149 ++++++++
6535 drivers/iommu/exynos-iommu.c | 4 +-
6536 drivers/iommu/intel-iommu.c | 103 ++++--
6537 drivers/iommu/ipmmu-vmsa.c | 2 +-
6538 include/dt-bindings/memory/mt2701-larb-port.h | 2 +-
6539 include/linux/amd-iommu.h | 43 ++-
6540 11 files changed, 882 insertions(+), 106 deletions(-)
6541 Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
6542 $ git merge dwmw2-iommu/master
6544 Merging vfio/next (8138dabbab26 vfio/pci: Fix typos in comments)
6545 $ git merge vfio/next
6546 Merge made by the 'recursive' strategy.
6547 drivers/vfio/pci/vfio_pci_config.c | 8 ++++----
6548 1 file changed, 4 insertions(+), 4 deletions(-)
6549 Merging jc_docs/docs-next (eb69548f5b9b Merge branch 'doc/4.9' into docs-next)
6550 $ git merge jc_docs/docs-next
6551 Auto-merging Documentation/kernel-parameters.txt
6552 Merge made by the 'recursive' strategy.
6553 Documentation/ioctl/botching-up-ioctls.txt | 13 ++++++++-----
6554 Documentation/kernel-parameters.txt | 2 --
6555 Documentation/scsi/scsi-parameters.txt | 2 --
6556 Documentation/x86/x86_64/mm.txt | 6 +++---
6557 scripts/kernel-doc | 5 ++++-
6558 5 files changed, 15 insertions(+), 13 deletions(-)
6559 Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
6560 $ git merge trivial/for-next
6562 Merging audit/next (fa2bea2f5cca audit: consistently record PIDs with task_tgid_nr())
6563 $ git merge audit/next
6564 Auto-merging security/lsm_audit.c
6565 Auto-merging kernel/auditsc.c
6566 Auto-merging kernel/audit.c
6567 Merge made by the 'recursive' strategy.
6568 kernel/audit.c | 8 +++++++-
6569 kernel/auditsc.c | 12 ++++++------
6570 security/lsm_audit.c | 4 ++--
6571 3 files changed, 15 insertions(+), 9 deletions(-)
6572 Merging devicetree/for-next (5839783247f4 Documentation: devicetree: Fix max77693 spelling errors)
6573 $ git merge devicetree/for-next
6574 Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution.
6575 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
6576 CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
6577 Automatic merge failed; fix conflicts and then commit the result.
6579 [master ac4f3c1cf1df] Merge remote-tracking branch 'devicetree/for-next'
6580 $ git diff -M --stat --summary HEAD^..
6581 Documentation/devicetree/bindings/mfd/max77693.txt | 12 ++++-----
6582 .../bindings/net/wireless/esp,esp8089.txt | 31 ++++++++++++++++++++++
6583 .../devicetree/bindings/pci/xilinx-nwl-pcie.txt | 5 ++--
6584 Documentation/devicetree/bindings/spi/spi-bus.txt | 2 +-
6585 .../devicetree/bindings/vendor-prefixes.txt | 29 +++++++++++---------
6586 Documentation/devicetree/changesets.txt | 19 ++++---------
6587 6 files changed, 62 insertions(+), 36 deletions(-)
6588 create mode 100644 Documentation/devicetree/bindings/net/wireless/esp,esp8089.txt
6589 Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
6590 $ git merge mailbox/mailbox-for-next
6591 Merge made by the 'recursive' strategy.
6592 .../devicetree/bindings/mailbox/meson-mhu.txt | 34 ++++
6593 drivers/mailbox/Kconfig | 10 +
6594 drivers/mailbox/Makefile | 2 +
6595 drivers/mailbox/platform_mhu.c | 205 +++++++++++++++++++++
6596 4 files changed, 251 insertions(+)
6597 create mode 100644 Documentation/devicetree/bindings/mailbox/meson-mhu.txt
6598 create mode 100644 drivers/mailbox/platform_mhu.c
6599 Merging spi/for-next (00f0039bb0c9 Merge remote-tracking branches 'spi/topic/spidev-test', 'spi/topic/ti-qspi', 'spi/topic/tools', 'spi/topic/txx9' and 'spi/topic/xlp' into spi-next)
6600 $ git merge spi/for-next
6601 Auto-merging MAINTAINERS
6602 Merge made by the 'recursive' strategy.
6603 .../devicetree/bindings/spi/jcore,spi.txt | 34 ++
6604 .../devicetree/bindings/spi/spi-meson.txt | 2 +-
6606 drivers/spi/Kconfig | 16 +-
6607 drivers/spi/Makefile | 3 +
6608 drivers/spi/spi-cavium-thunderx.c | 120 +++++++
6609 drivers/spi/spi-cavium.h | 3 +
6610 drivers/spi/spi-dw.c | 15 +-
6611 drivers/spi/spi-dw.h | 1 +
6612 drivers/spi/spi-fsl-dspi.c | 16 +-
6613 drivers/spi/spi-fsl-espi.c | 357 +++++++--------------
6614 drivers/spi/spi-fsl-lib.h | 1 +
6615 drivers/spi/spi-jcore.c | 231 +++++++++++++
6616 drivers/spi/spi-loopback-test.c | 2 +-
6617 drivers/spi/spi-meson-spifc.c | 1 +
6618 drivers/spi/spi-pic32-sqi.c | 6 +-
6619 drivers/spi/spi-pxa2xx-dma.c | 7 +-
6620 drivers/spi/spi-pxa2xx.c | 114 ++++---
6621 drivers/spi/spi-pxa2xx.h | 2 -
6622 drivers/spi/spi-qup.c | 6 +-
6623 drivers/spi/spi-rspi.c | 14 +-
6624 drivers/spi/spi-sc18is602.c | 9 +
6625 drivers/spi/spi-ti-qspi.c | 139 +++++++-
6626 drivers/spi/spi-txx9.c | 6 +-
6627 drivers/spi/spi-xlp.c | 13 +-
6628 drivers/spi/spi.c | 17 +-
6629 include/linux/pxa2xx_ssp.h | 20 +-
6630 include/linux/spi/spi.h | 25 +-
6631 tools/spi/Makefile | 2 +
6632 tools/spi/spidev_test.c | 1 +
6633 30 files changed, 828 insertions(+), 356 deletions(-)
6634 create mode 100644 Documentation/devicetree/bindings/spi/jcore,spi.txt
6635 create mode 100644 drivers/spi/spi-cavium-thunderx.c
6636 create mode 100644 drivers/spi/spi-jcore.c
6637 Merging tip/auto-latest (3c84aabde9cc Merge branch 'x86/apic')
6638 $ git merge tip/auto-latest
6639 Resolved 'arch/x86/lib/memcpy_64.S' using previous resolution.
6640 Resolved 'include/linux/jump_label.h' using previous resolution.
6641 Auto-merging kernel/softirq.c
6642 Auto-merging kernel/sched/sched.h
6643 Auto-merging kernel/sched/fair.c
6644 Auto-merging kernel/sched/deadline.c
6645 Auto-merging kernel/fork.c
6646 Auto-merging kernel/events/core.c
6647 Auto-merging kernel/cpu.c
6648 Auto-merging include/linux/sched.h
6649 Auto-merging include/linux/perf_event.h
6650 Auto-merging include/linux/perf/arm_pmu.h
6651 Auto-merging include/linux/jump_label.h
6652 CONFLICT (content): Merge conflict in include/linux/jump_label.h
6653 Auto-merging include/linux/cpuhotplug.h
6654 Auto-merging include/linux/cpu.h
6655 Auto-merging include/linux/compiler.h
6656 Auto-merging include/linux/acpi.h
6657 Auto-merging drivers/perf/arm_pmu.c
6658 Auto-merging drivers/net/ethernet/marvell/mvneta.c
6659 Auto-merging drivers/md/raid5.c
6660 Auto-merging drivers/acpi/internal.h
6661 Auto-merging arch/x86/lib/memcpy_64.S
6662 CONFLICT (content): Merge conflict in arch/x86/lib/memcpy_64.S
6663 CONFLICT (modify/delete): arch/x86/kernel/x8664_ksyms_64.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/x86/kernel/x8664_ksyms_64.c left in tree.
6664 Auto-merging arch/x86/kernel/head_64.S
6665 Auto-merging arch/x86/kernel/head_32.S
6666 Auto-merging arch/x86/entry/entry_64.S
6667 Auto-merging arch/x86/entry/entry_32.S
6668 Auto-merging arch/Kconfig
6669 Auto-merging MAINTAINERS
6670 Auto-merging Documentation/kernel-parameters.txt
6671 Automatic merge failed; fix conflicts and then commit the result.
6672 $ git rm -f arch/x86/kernel/x8664_ksyms_64.c
6673 arch/x86/kernel/x8664_ksyms_64.c: needs merge
6674 rm 'arch/x86/kernel/x8664_ksyms_64.c'
6676 [master d0b40e192946] Merge remote-tracking branch 'tip/auto-latest'
6677 $ git diff -M --stat --summary HEAD^..
6678 Documentation/kernel-parameters.txt | 5 +
6679 Documentation/ko_KR/memory-barriers.txt | 3135 ++++++++++++++++++++
6680 Documentation/memory-barriers.txt | 5 +-
6681 Documentation/scheduler/sched-deadline.txt | 18 +
6682 Documentation/trace/ftrace-design.txt | 11 +
6683 Documentation/trace/kprobetrace.txt | 9 +-
6684 Documentation/trace/uprobetracer.txt | 9 +-
6685 Documentation/x86/protection-keys.txt | 62 +
6688 arch/alpha/include/uapi/asm/mman.h | 5 +
6689 arch/arm/kernel/ftrace.c | 2 +-
6690 arch/arm64/kernel/entry-ftrace.S | 2 +-
6691 arch/arm64/kernel/ftrace.c | 2 +-
6692 arch/blackfin/kernel/ftrace-entry.S | 4 +-
6693 arch/blackfin/kernel/ftrace.c | 2 +-
6694 arch/ia64/include/asm/thread_info.h | 2 +-
6695 arch/microblaze/kernel/ftrace.c | 2 +-
6696 arch/mips/include/uapi/asm/mman.h | 5 +
6697 arch/mips/kernel/ftrace.c | 4 +-
6698 arch/parisc/include/uapi/asm/mman.h | 5 +
6699 arch/parisc/kernel/ftrace.c | 2 +-
6700 arch/powerpc/kernel/ftrace.c | 3 +-
6701 arch/powerpc/mm/mmu_context_nohash.c | 56 +-
6702 arch/powerpc/platforms/powermac/smp.c | 50 +-
6703 arch/s390/kernel/ftrace.c | 3 +-
6704 arch/sh/kernel/ftrace.c | 2 +-
6705 arch/sparc/Kconfig | 1 -
6706 arch/sparc/include/asm/ftrace.h | 4 +
6707 arch/sparc/kernel/ftrace.c | 2 +-
6708 arch/sparc/kernel/smp_32.c | 2 -
6709 arch/tile/kernel/ftrace.c | 2 +-
6710 arch/x86/Kconfig | 2 +-
6711 arch/x86/boot/compressed/eboot.c | 134 +-
6712 arch/x86/entry/entry_32.S | 68 +-
6713 arch/x86/entry/entry_64.S | 81 +-
6714 arch/x86/entry/syscalls/syscall_32.tbl | 5 +
6715 arch/x86/entry/syscalls/syscall_64.tbl | 5 +
6716 arch/x86/events/amd/uncore.c | 22 +-
6717 arch/x86/events/core.c | 27 +-
6718 arch/x86/events/intel/bts.c | 123 +-
6719 arch/x86/events/intel/core.c | 31 +-
6720 arch/x86/events/intel/cqm.c | 9 +
6721 arch/x86/events/intel/ds.c | 127 +-
6722 arch/x86/events/intel/lbr.c | 70 +-
6723 arch/x86/events/intel/rapl.c | 4 +
6724 arch/x86/events/intel/uncore.c | 11 +-
6725 arch/x86/events/intel/uncore.h | 7 +
6726 arch/x86/events/intel/uncore_snb.c | 2 +
6727 arch/x86/events/intel/uncore_snbep.c | 626 +++-
6728 arch/x86/events/perf_event.h | 13 +-
6729 arch/x86/include/asm/cpufeatures.h | 1 -
6730 arch/x86/include/asm/desc.h | 2 +-
6731 arch/x86/include/asm/fpu/xstate.h | 3 +-
6732 arch/x86/include/asm/ftrace.h | 3 +
6733 arch/x86/include/asm/hypervisor.h | 4 +
6734 arch/x86/include/asm/intel-family.h | 4 +-
6735 arch/x86/include/asm/intel-mid.h | 2 +
6736 arch/x86/include/asm/intel_scu_ipc.h | 2 +
6737 arch/x86/include/asm/kaslr.h | 1 +
6738 arch/x86/include/asm/kdebug.h | 2 -
6739 arch/x86/include/asm/mmu.h | 8 +
6740 arch/x86/include/asm/mmu_context.h | 25 +-
6741 arch/x86/include/asm/pgtable_64_types.h | 4 +-
6742 arch/x86/include/asm/pkeys.h | 73 +-
6743 arch/x86/include/asm/pmem.h | 5 +-
6744 arch/x86/include/asm/processor.h | 13 +-
6745 arch/x86/include/asm/realmode.h | 2 +-
6746 arch/x86/include/asm/smp.h | 3 -
6747 arch/x86/include/asm/stacktrace.h | 43 +-
6748 arch/x86/include/asm/string_64.h | 19 +-
6749 arch/x86/include/asm/switch_to.h | 164 +-
6750 arch/x86/include/asm/thread_info.h | 2 -
6751 arch/x86/include/asm/traps.h | 6 +
6752 arch/x86/kernel/acpi/boot.c | 21 +-
6753 arch/x86/kernel/acpi/sleep.c | 2 +-
6754 arch/x86/kernel/apic/apic.c | 7 +-
6755 arch/x86/kernel/apic/apic_flat_64.c | 6 +-
6756 arch/x86/kernel/apic/apic_noop.c | 2 +-
6757 arch/x86/kernel/apic/bigsmp_32.c | 2 +-
6758 arch/x86/kernel/apic/msi.c | 2 +-
6759 arch/x86/kernel/apic/probe_32.c | 4 +-
6760 arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
6761 arch/x86/kernel/apic/x2apic_phys.c | 2 +-
6762 arch/x86/kernel/apic/x2apic_uv_x.c | 2 +-
6763 arch/x86/kernel/asm-offsets.c | 6 +
6764 arch/x86/kernel/asm-offsets_32.c | 5 +
6765 arch/x86/kernel/asm-offsets_64.c | 5 +
6766 arch/x86/kernel/cpu/common.c | 18 +-
6767 arch/x86/kernel/cpu/hypervisor.c | 11 +
6768 arch/x86/kernel/cpu/mcheck/mce.c | 19 +-
6769 arch/x86/kernel/cpu/microcode/amd.c | 13 +-
6770 arch/x86/kernel/cpu/mtrr/main.c | 4 +-
6771 arch/x86/kernel/cpu/mtrr/mtrr.h | 2 +-
6772 arch/x86/kernel/dumpstack.c | 92 +-
6773 arch/x86/kernel/dumpstack_32.c | 27 +-
6774 arch/x86/kernel/dumpstack_64.c | 46 +-
6775 arch/x86/kernel/e820.c | 4 +-
6776 arch/x86/kernel/fpu/core.c | 4 +
6777 arch/x86/kernel/fpu/xstate.c | 5 +-
6778 arch/x86/kernel/ftrace.c | 2 +-
6779 arch/x86/kernel/head_32.S | 8 +-
6780 arch/x86/kernel/head_64.S | 12 +-
6781 arch/x86/kernel/hpet.c | 94 +
6782 arch/x86/kernel/kgdb.c | 8 +-
6783 arch/x86/kernel/ksysfs.c | 2 +-
6784 arch/x86/kernel/kvm.c | 43 +-
6785 arch/x86/kernel/kvmclock.c | 2 +-
6786 arch/x86/kernel/mpparse.c | 3 +
6787 arch/x86/kernel/paravirt.c | 2 +-
6788 arch/x86/kernel/process.c | 14 +-
6789 arch/x86/kernel/process_32.c | 31 +-
6790 arch/x86/kernel/process_64.c | 21 +-
6791 arch/x86/kernel/ptrace.c | 10 +-
6792 arch/x86/kernel/quirks.c | 31 +
6793 arch/x86/kernel/reboot.c | 2 +-
6794 arch/x86/kernel/setup.c | 7 +-
6795 arch/x86/kernel/setup_percpu.c | 4 +-
6796 arch/x86/kernel/smpboot.c | 17 +-
6797 arch/x86/kernel/traps.c | 61 +
6798 arch/x86/kernel/x86_init.c | 6 +-
6799 arch/x86/kvm/svm.c | 2 +-
6800 arch/x86/kvm/vmx.c | 2 +-
6801 arch/x86/lib/memcpy_64.S | 8 +-
6802 arch/x86/mm/amdtopology.c | 22 +-
6803 arch/x86/mm/fault.c | 41 +
6804 arch/x86/mm/kaslr.c | 26 +-
6805 arch/x86/mm/pkeys.c | 142 +-
6806 arch/x86/mm/tlb.c | 15 +
6807 arch/x86/oprofile/backtrace.c | 12 +-
6808 arch/x86/pci/pcbios.c | 7 +-
6809 arch/x86/platform/atom/punit_atom_debug.c | 2 +-
6810 arch/x86/platform/intel-mid/device_libs/Makefile | 4 +
6811 .../intel-mid/device_libs/platform_bcm43xx.c | 95 +
6812 .../intel-mid/device_libs/platform_mrfld_sd.c | 47 +
6813 arch/x86/platform/intel-mid/intel-mid.c | 5 +
6814 arch/x86/platform/intel-mid/pwr.c | 76 +-
6815 arch/x86/xen/enlighten.c | 40 +
6816 arch/xtensa/include/uapi/asm/mman.h | 5 +
6817 drivers/acpi/internal.h | 2 -
6818 drivers/acpi/ioapic.c | 46 +-
6819 drivers/acpi/pci_root.c | 12 +-
6820 drivers/bus/arm-cci.c | 45 +-
6821 drivers/bus/arm-ccn.c | 54 +-
6822 drivers/bus/mips_cdmm.c | 70 +-
6823 drivers/cpuidle/coupled.c | 75 +-
6824 drivers/cpuidle/cpuidle-powernv.c | 51 +-
6825 drivers/cpuidle/cpuidle-pseries.c | 51 +-
6826 drivers/firmware/dcdbas.c | 51 +-
6827 drivers/firmware/efi/efi.c | 7 +-
6828 drivers/firmware/efi/libstub/efi-stub-helper.c | 169 +-
6829 drivers/firmware/efi/libstub/fdt.c | 54 +-
6830 drivers/firmware/efi/libstub/random.c | 12 +-
6831 drivers/hwmon/dell-smm-hwmon.c | 36 +-
6832 drivers/md/raid5.c | 84 +-
6833 drivers/md/raid5.h | 4 +-
6834 drivers/net/ethernet/marvell/mvneta.c | 232 +-
6835 drivers/net/virtio_net.c | 110 +-
6836 drivers/pci/pci-mid.c | 7 +-
6837 drivers/pci/setup-bus.c | 8 +-
6838 drivers/perf/arm_pmu.c | 44 +-
6839 drivers/powercap/intel_rapl.c | 4 +-
6840 fs/proc/base.c | 2 +-
6841 include/linux/acpi.h | 6 +
6842 include/linux/bitmap.h | 18 +
6843 include/linux/compiler.h | 7 +-
6844 include/linux/cpu.h | 12 -
6845 include/linux/cpuhotplug.h | 123 +-
6846 include/linux/efi.h | 27 +-
6847 include/linux/ftrace.h | 17 +-
6848 include/linux/hypervisor.h | 17 +
6849 include/linux/irq.h | 18 +-
6850 include/linux/jump_label.h | 6 +
6851 include/linux/ktime.h | 7 +
6852 include/linux/percpu-rwsem.h | 84 +-
6853 include/linux/perf/arm_pmu.h | 2 +-
6854 include/linux/perf_event.h | 24 +-
6855 include/linux/pkeys.h | 41 +-
6856 include/linux/rcu_sync.h | 1 +
6857 include/linux/relay.h | 23 +-
6858 include/linux/sched.h | 27 +-
6859 include/linux/slab.h | 8 +
6860 include/linux/smp.h | 3 +
6861 include/linux/syscalls.h | 8 +
6862 include/linux/time64.h | 1 +
6863 include/trace/events/cpuhp.h | 28 +
6864 include/uapi/asm-generic/mman-common.h | 5 +
6865 include/uapi/asm-generic/unistd.h | 12 +-
6866 include/xen/interface/sched.h | 100 +-
6867 kernel/cgroup.c | 6 +
6868 kernel/cpu.c | 512 ++--
6869 kernel/events/core.c | 144 +-
6870 kernel/events/ring_buffer.c | 15 +-
6871 kernel/events/uprobes.c | 36 +-
6872 kernel/fork.c | 96 +-
6873 kernel/futex.c | 15 +-
6874 kernel/hung_task.c | 2 +-
6875 kernel/irq/chip.c | 19 +-
6876 kernel/irq/generic-chip.c | 72 +-
6877 kernel/irq/irqdomain.c | 11 +-
6878 kernel/irq/manage.c | 5 +-
6879 kernel/locking/percpu-rwsem.c | 228 +-
6880 kernel/locking/qspinlock_paravirt.h | 24 +-
6881 kernel/locking/qspinlock_stat.h | 4 +-
6882 kernel/locking/rwsem-xadd.c | 92 +-
6883 kernel/rcu/sync.c | 14 +
6884 kernel/relay.c | 124 +-
6885 kernel/sched/core.c | 157 +-
6886 kernel/sched/cpudeadline.c | 153 +-
6887 kernel/sched/cpudeadline.h | 3 +-
6888 kernel/sched/cputime.c | 33 +-
6889 kernel/sched/deadline.c | 78 +-
6890 kernel/sched/debug.c | 103 +-
6891 kernel/sched/fair.c | 414 +--
6892 kernel/sched/idle_task.c | 2 +-
6893 kernel/sched/sched.h | 3 +-
6894 kernel/sched/stats.h | 24 +-
6896 kernel/softirq.c | 27 +-
6897 kernel/time/clocksource.c | 15 +-
6898 kernel/time/hrtimer.c | 6 +-
6899 kernel/time/time.c | 2 +-
6900 kernel/time/timekeeping_debug.c | 2 +
6901 kernel/trace/Kconfig | 5 -
6902 kernel/trace/trace.c | 24 +
6903 kernel/trace/trace_functions_graph.c | 67 +-
6904 kernel/trace/trace_kprobe.c | 4 +
6905 kernel/trace/trace_probe.c | 30 +-
6906 kernel/trace/trace_probe.h | 11 +-
6907 kernel/trace/trace_uprobe.c | 4 +
6909 lib/dma-debug.c | 36 +-
6910 mm/mprotect.c | 90 +-
6911 mm/page-writeback.c | 26 +-
6914 tools/include/linux/coresight-pmu.h | 39 +
6915 tools/include/linux/time64.h | 12 +
6916 tools/lguest/lguest.c | 6 +-
6917 tools/lib/api/fs/fs.c | 15 +
6918 tools/lib/api/fs/fs.h | 1 +
6919 tools/perf/Documentation/perf-config.txt | 12 +
6920 tools/perf/Documentation/perf-probe.txt | 14 +-
6921 tools/perf/Documentation/perfconfig.example | 9 +
6922 tools/perf/MANIFEST | 2 +
6923 tools/perf/Makefile.perf | 5 +-
6924 tools/perf/arch/arm/include/dwarf-regs-table.h | 9 +
6925 tools/perf/arch/arm64/include/dwarf-regs-table.h | 13 +
6926 tools/perf/arch/powerpc/include/dwarf-regs-table.h | 27 +
6927 tools/perf/arch/powerpc/util/sym-handling.c | 2 +-
6928 tools/perf/arch/s390/include/dwarf-regs-table.h | 8 +
6929 tools/perf/arch/sh/include/dwarf-regs-table.h | 25 +
6930 tools/perf/arch/sparc/include/dwarf-regs-table.h | 18 +
6931 tools/perf/arch/x86/include/dwarf-regs-table.h | 14 +
6932 tools/perf/arch/xtensa/include/dwarf-regs-table.h | 8 +
6933 tools/perf/bench/futex-requeue.c | 5 +-
6934 tools/perf/bench/futex-wake-parallel.c | 5 +-
6935 tools/perf/bench/futex-wake.c | 5 +-
6936 tools/perf/bench/mem-functions.c | 3 +-
6937 tools/perf/bench/numa.c | 53 +-
6938 tools/perf/bench/sched-messaging.c | 5 +-
6939 tools/perf/bench/sched-pipe.c | 9 +-
6940 tools/perf/builtin-annotate.c | 111 +-
6941 tools/perf/builtin-diff.c | 4 +-
6942 tools/perf/builtin-inject.c | 2 +-
6943 tools/perf/builtin-kmem.c | 10 +-
6944 tools/perf/builtin-kvm.c | 11 +-
6945 tools/perf/builtin-probe.c | 35 +-
6946 tools/perf/builtin-record.c | 8 +-
6947 tools/perf/builtin-report.c | 10 +-
6948 tools/perf/builtin-sched.c | 37 +-
6949 tools/perf/builtin-script.c | 11 +-
6950 tools/perf/builtin-stat.c | 19 +-
6951 tools/perf/builtin-timechart.c | 13 +-
6952 tools/perf/builtin-top.c | 39 +-
6953 tools/perf/builtin-trace.c | 1 +
6954 tools/perf/perf-sys.h | 1 -
6955 tools/perf/perf.h | 7 -
6956 tools/perf/tests/backward-ring-buffer.c | 2 +-
6957 tools/perf/tests/bpf.c | 2 +-
6958 tools/perf/tests/code-reading.c | 4 +-
6959 tools/perf/tests/vmlinux-kallsyms.c | 61 +-
6960 tools/perf/ui/browsers/annotate.c | 2 +-
6961 tools/perf/ui/browsers/hists.c | 50 +-
6962 tools/perf/ui/browsers/map.c | 4 +-
6963 tools/perf/ui/gtk/hists.c | 2 +-
6964 tools/perf/ui/hist.c | 4 +-
6965 tools/perf/ui/stdio/hist.c | 45 +-
6966 tools/perf/util/Build | 2 +
6967 tools/perf/util/annotate.c | 189 +-
6968 tools/perf/util/annotate.h | 2 +-
6969 tools/perf/util/block-range.c | 328 ++
6970 tools/perf/util/block-range.h | 71 +
6971 tools/perf/util/bpf-loader.c | 2 +-
6972 tools/perf/util/debug.c | 10 +-
6973 tools/perf/util/dwarf-aux.c | 179 ++
6974 tools/perf/util/dwarf-aux.h | 8 +
6975 tools/perf/util/dwarf-regs.c | 59 +
6976 tools/perf/util/event.c | 21 +-
6977 tools/perf/util/evlist.c | 8 +-
6978 tools/perf/util/evsel_fprintf.c | 4 +-
6979 tools/perf/util/header.c | 3 +-
6980 tools/perf/util/hist.h | 3 +-
6981 tools/perf/util/include/dwarf-regs.h | 6 +
6982 tools/perf/util/intel-bts.c | 2 +-
6983 tools/perf/util/intel-pt.c | 4 +-
6984 tools/perf/util/lzma.c | 15 +-
6985 tools/perf/util/machine.c | 38 +-
6986 tools/perf/util/machine.h | 34 +-
6987 tools/perf/util/map.c | 50 +-
6988 tools/perf/util/map.h | 32 +-
6989 tools/perf/util/pmu.c | 15 +-
6990 tools/perf/util/probe-event.c | 116 +-
6991 tools/perf/util/probe-event.h | 3 +
6992 tools/perf/util/probe-file.c | 62 +-
6993 tools/perf/util/probe-file.h | 10 +
6994 tools/perf/util/probe-finder.c | 79 +-
6995 tools/perf/util/probe-finder.h | 1 +
6996 .../perf/util/scripting-engines/trace-event-perl.c | 5 +-
6997 .../util/scripting-engines/trace-event-python.c | 5 +-
6998 tools/perf/util/sort.c | 9 +-
6999 tools/perf/util/sort.h | 2 +-
7000 tools/perf/util/svghelper.c | 11 +-
7001 tools/perf/util/symbol-elf.c | 118 +-
7002 tools/perf/util/symbol-minimal.c | 4 +-
7003 tools/perf/util/symbol.c | 164 +-
7004 tools/perf/util/symbol.h | 25 +-
7005 tools/perf/util/util.c | 1 +
7006 tools/perf/util/util.h | 4 -
7007 tools/testing/radix-tree/linux/cpu.h | 13 -
7008 tools/testing/selftests/x86/Makefile | 3 +-
7009 tools/testing/selftests/x86/pkey-helpers.h | 219 ++
7010 tools/testing/selftests/x86/protection_keys.c | 1410 +++++++++
7011 tools/testing/selftests/x86/ptrace_syscall.c | 4 +-
7012 334 files changed, 12241 insertions(+), 3225 deletions(-)
7013 create mode 100644 Documentation/ko_KR/memory-barriers.txt
7014 create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c
7015 create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_sd.c
7016 create mode 100644 include/linux/hypervisor.h
7017 create mode 100644 tools/include/linux/coresight-pmu.h
7018 create mode 100644 tools/include/linux/time64.h
7019 create mode 100644 tools/perf/arch/arm/include/dwarf-regs-table.h
7020 create mode 100644 tools/perf/arch/arm64/include/dwarf-regs-table.h
7021 create mode 100644 tools/perf/arch/powerpc/include/dwarf-regs-table.h
7022 create mode 100644 tools/perf/arch/s390/include/dwarf-regs-table.h
7023 create mode 100644 tools/perf/arch/sh/include/dwarf-regs-table.h
7024 create mode 100644 tools/perf/arch/sparc/include/dwarf-regs-table.h
7025 create mode 100644 tools/perf/arch/x86/include/dwarf-regs-table.h
7026 create mode 100644 tools/perf/arch/xtensa/include/dwarf-regs-table.h
7027 create mode 100644 tools/perf/util/block-range.c
7028 create mode 100644 tools/perf/util/block-range.h
7029 create mode 100644 tools/perf/util/dwarf-regs.c
7030 create mode 100644 tools/testing/selftests/x86/pkey-helpers.h
7031 create mode 100644 tools/testing/selftests/x86/protection_keys.c
7032 Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
7033 $ git merge clockevents/clockevents/next
7035 Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
7036 $ git merge edac/linux_next
7038 Merging edac-amd/for-next (c7c35407cd86 EDAC, sb_edac: Remove NULL pointer check on array pci_tad)
7039 $ git merge edac-amd/for-next
7040 Auto-merging drivers/edac/sb_edac.c
7041 Auto-merging drivers/edac/Makefile
7042 Auto-merging drivers/edac/Kconfig
7043 Auto-merging arch/arm64/Kconfig.platforms
7044 Auto-merging MAINTAINERS
7045 Auto-merging Documentation/devicetree/bindings/memory-controllers/fsl/ddr.txt
7046 Auto-merging CREDITS
7047 Merge made by the 'recursive' strategy.
7049 .../bindings/arm/altera/socfpga-eccmgr.txt | 98 +++
7050 .../fsl/ddr.txt} | 2 +
7052 arch/arm/boot/dts/socfpga_arria10.dtsi | 16 +
7053 arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 12 +
7054 arch/arm64/Kconfig.platforms | 1 +
7055 drivers/edac/Kconfig | 42 ++
7056 drivers/edac/Makefile | 8 +-
7057 drivers/edac/altera_edac.c | 330 +++++++++-
7058 drivers/edac/altera_edac.h | 6 +-
7059 drivers/edac/amd64_edac.c | 15 +-
7060 drivers/edac/fsl_ddr_edac.c | 633 +++++++++++++++++++
7061 drivers/edac/fsl_ddr_edac.h | 79 +++
7062 drivers/edac/layerscape_edac.c | 73 +++
7063 drivers/edac/mpc85xx_edac.c | 685 ++-------------------
7064 drivers/edac/mpc85xx_edac.h | 66 --
7065 drivers/edac/mv64x60_edac.c | 4 -
7066 drivers/edac/ppc4xx_edac.c | 4 +-
7067 drivers/edac/sb_edac.c | 5 +-
7068 drivers/edac/wq.c | 2 +-
7069 21 files changed, 1355 insertions(+), 749 deletions(-)
7070 rename Documentation/devicetree/bindings/{powerpc/fsl/mem-ctrlr.txt => memory-controllers/fsl/ddr.txt} (86%)
7071 create mode 100644 drivers/edac/fsl_ddr_edac.c
7072 create mode 100644 drivers/edac/fsl_ddr_edac.h
7073 create mode 100644 drivers/edac/layerscape_edac.c
7074 Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
7075 $ git merge irqchip/irqchip/for-next
7076 Auto-merging drivers/irqchip/irq-mips-gic.c
7077 Auto-merging drivers/irqchip/Makefile
7078 Auto-merging arch/arm64/Kconfig.platforms
7079 Merge made by the 'recursive' strategy.
7080 .../bindings/interrupt-controller/jcore,aic.txt | 26 +++
7081 .../interrupt-controller/marvell,armada-8k-pic.txt | 25 +++
7082 .../marvell,odmi-controller.txt | 2 +-
7083 arch/arm64/Kconfig.platforms | 1 +
7084 arch/sh/Makefile | 2 +-
7085 drivers/irqchip/Kconfig | 10 ++
7086 drivers/irqchip/Makefile | 2 +
7087 drivers/irqchip/irq-jcore-aic.c | 95 ++++++++++
7088 drivers/irqchip/irq-keystone.c | 2 +-
7089 drivers/irqchip/irq-mips-gic.c | 7 +-
7090 drivers/irqchip/irq-mvebu-pic.c | 197 +++++++++++++++++++++
7091 11 files changed, 360 insertions(+), 9 deletions(-)
7092 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/jcore,aic.txt
7093 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,armada-8k-pic.txt
7094 create mode 100644 drivers/irqchip/irq-jcore-aic.c
7095 create mode 100644 drivers/irqchip/irq-mvebu-pic.c
7096 Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
7097 $ git merge ftrace/for-next
7098 Resolved 'include/linux/ftrace.h' using previous resolution.
7099 Resolved 'kernel/trace/trace_functions_graph.c' using previous resolution.
7100 Auto-merging kernel/trace/trace_uprobe.c
7101 Auto-merging kernel/trace/trace_functions_graph.c
7102 CONFLICT (content): Merge conflict in kernel/trace/trace_functions_graph.c
7103 Auto-merging kernel/trace/trace.c
7104 Auto-merging kernel/trace/Kconfig
7105 Auto-merging include/linux/ftrace.h
7106 CONFLICT (content): Merge conflict in include/linux/ftrace.h
7107 Auto-merging arch/sh/kernel/ftrace.c
7108 Automatic merge failed; fix conflicts and then commit the result.
7110 [master 53818e1f2281] Merge remote-tracking branch 'ftrace/for-next'
7111 $ git diff -M --stat --summary HEAD^..
7112 Documentation/trace/ftrace.txt | 10 +-
7113 Documentation/trace/hwlat_detector.txt | 79 ++++
7114 arch/sh/kernel/ftrace.c | 4 +-
7115 include/linux/ftrace.h | 2 +
7116 include/linux/ftrace_irq.h | 31 +-
7117 kernel/trace/Kconfig | 35 ++
7118 kernel/trace/Makefile | 1 +
7119 kernel/trace/ftrace.c | 6 +
7120 kernel/trace/trace.c | 8 +-
7121 kernel/trace/trace.h | 5 +
7122 kernel/trace/trace_entries.h | 27 ++
7123 kernel/trace/trace_functions_graph.c | 6 +-
7124 kernel/trace/trace_hwlat.c | 633 +++++++++++++++++++++++++++++++++
7125 kernel/trace/trace_output.c | 66 ++++
7126 kernel/trace/trace_uprobe.c | 4 -
7127 15 files changed, 897 insertions(+), 20 deletions(-)
7128 create mode 100644 Documentation/trace/hwlat_detector.txt
7129 create mode 100644 kernel/trace/trace_hwlat.c
7130 Merging rcu/rcu/next (f8e66fbaed01 rcu: Remove obsolete comment from __call_rcu())
7131 $ git merge rcu/rcu/next
7132 Auto-merging lib/Kconfig.debug
7133 Auto-merging kernel/sched/core.c
7134 Auto-merging kernel/rcu/tree.c
7135 Auto-merging kernel/cpu.c
7136 Auto-merging include/linux/bug.h
7137 Merge made by the 'recursive' strategy.
7138 .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++
7139 .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++
7140 .../Expedited-Grace-Periods.html | 476 ++++++++++++
7141 .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++
7142 .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++
7143 .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++
7144 .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++
7145 .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++
7146 .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++
7147 .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++
7148 .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++
7149 .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++
7150 .../RCU/Design/Requirements/Requirements.html | 22 +
7151 Documentation/RCU/torture.txt | 15 -
7152 drivers/misc/lkdtm.h | 2 +
7153 drivers/misc/lkdtm_bugs.c | 68 ++
7154 drivers/misc/lkdtm_core.c | 2 +
7155 include/linux/bug.h | 17 +
7156 include/linux/list.h | 44 +-
7157 include/linux/rculist.h | 8 +-
7158 include/linux/rcupdate.h | 1 +
7159 include/linux/torture.h | 2 +-
7161 kernel/rcu/Makefile | 3 +-
7162 kernel/rcu/rcuperf.c | 7 +-
7163 kernel/rcu/rcutorture.c | 62 +-
7164 kernel/rcu/tree.c | 61 +-
7165 kernel/rcu/tree.h | 1 +
7166 kernel/rcu/tree_exp.h | 124 +--
7167 kernel/rcu/tree_plugin.h | 1 +
7168 kernel/rcu/tree_trace.c | 7 +-
7169 kernel/rcu/update.c | 3 +-
7170 kernel/rcu/waketorture.c | 537 +++++++++++++
7171 kernel/sched/core.c | 7 +
7172 kernel/torture.c | 27 +-
7173 lib/Kconfig.debug | 32 +-
7174 lib/list_debug.c | 99 +--
7175 .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 +
7176 .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +-
7177 tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +-
7178 .../selftests/rcutorture/configs/wake/CFLIST | 1 +
7179 .../selftests/rcutorture/configs/wake/CFcommon | 2 +
7180 tools/testing/selftests/rcutorture/configs/wake/SH | 19 +
7181 .../selftests/rcutorture/configs/wake/SH.boot | 1 +
7182 .../testing/selftests/rcutorture/configs/wake/STI | 19 +
7183 .../selftests/rcutorture/configs/wake/STI.boot | 1 +
7184 .../rcutorture/configs/wake/ver_functions.sh | 43 ++
7185 47 files changed, 5985 insertions(+), 240 deletions(-)
7186 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg
7187 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg
7188 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html
7189 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg
7190 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg
7191 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg
7192 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg
7193 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg
7194 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg
7195 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg
7196 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg
7197 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg
7198 create mode 100644 kernel/rcu/waketorture.c
7199 create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh
7200 create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST
7201 create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon
7202 create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH
7203 create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot
7204 create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI
7205 create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot
7206 create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh
7207 Merging kvm/linux-next (6f90f1d1d2d8 Merge tag 'kvm-s390-next-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
7208 $ git merge kvm/linux-next
7209 Auto-merging arch/x86/kvm/vmx.c
7210 Auto-merging arch/x86/kvm/svm.c
7211 Auto-merging arch/s390/kvm/kvm-s390.c
7212 Merge made by the 'recursive' strategy.
7213 arch/s390/include/asm/kvm_host.h | 2 +-
7214 arch/s390/kernel/asm-offsets.c | 1 +
7215 arch/s390/kvm/gaccess.c | 37 ++--
7216 arch/s390/kvm/guestdbg.c | 59 +++---
7217 arch/s390/kvm/intercept.c | 1 +
7218 arch/s390/kvm/interrupt.c | 98 +++++++---
7219 arch/s390/kvm/kvm-s390.c | 65 +++----
7220 arch/s390/kvm/kvm-s390.h | 14 +-
7221 arch/s390/kvm/priv.c | 21 ++
7222 arch/x86/include/asm/kvm_host.h | 2 +
7223 arch/x86/kvm/cpuid.c | 3 +-
7224 arch/x86/kvm/lapic.c | 5 +-
7225 arch/x86/kvm/mmu.c | 12 +-
7226 arch/x86/kvm/svm.c | 406 +++++++++++++++++++++++++++++++++++++--
7227 arch/x86/kvm/vmx.c | 36 ++--
7228 arch/x86/kvm/x86.c | 1 -
7229 virt/kvm/arm/arch_timer.c | 11 +-
7230 virt/kvm/eventfd.c | 22 +--
7231 virt/kvm/kvm_main.c | 6 -
7232 19 files changed, 615 insertions(+), 187 deletions(-)
7233 Merging kvm-arm/next (5d947a1447f9 KVM: ARM: cleanup kvm_timer_hyp_init)
7234 $ git merge kvm-arm/next
7235 Auto-merging virt/kvm/arm/aarch32.c
7236 Auto-merging arch/arm64/include/asm/kvm_mmu.h
7237 Merge made by the 'recursive' strategy.
7238 Documentation/virtual/kvm/devices/arm-vgic-its.txt | 38 ++++
7239 Documentation/virtual/kvm/devices/arm-vgic-v3.txt | 206 +++++++++++++++++++++
7240 Documentation/virtual/kvm/devices/arm-vgic.txt | 52 ++----
7241 arch/arm/include/asm/kvm_asm.h | 4 +
7242 arch/arm/include/asm/kvm_emulate.h | 35 +++-
7243 arch/arm/include/asm/kvm_mmu.h | 28 +--
7244 arch/arm/kvm/Makefile | 1 +
7245 arch/arm/kvm/emulate.c | 111 ++---------
7246 arch/arm/kvm/handle_exit.c | 49 +++--
7247 arch/arm/kvm/hyp/entry.S | 31 ++++
7248 arch/arm/kvm/hyp/hyp-entry.S | 16 +-
7249 arch/arm/kvm/hyp/switch.c | 13 +-
7250 arch/arm/kvm/hyp/tlb.c | 15 +-
7251 arch/arm/kvm/mmio.c | 6 -
7252 arch/arm/kvm/mmu.c | 7 +-
7253 arch/arm64/include/asm/kvm_arm.h | 4 +-
7254 arch/arm64/include/asm/kvm_asm.h | 9 +-
7255 arch/arm64/include/asm/kvm_emulate.h | 11 ++
7256 arch/arm64/include/asm/kvm_hyp.h | 1 +
7257 arch/arm64/include/asm/kvm_mmu.h | 6 -
7258 arch/arm64/kvm/Makefile | 3 +-
7259 arch/arm64/kvm/handle_exit.c | 23 +++
7260 arch/arm64/kvm/hyp/debug-sr.c | 4 +-
7261 arch/arm64/kvm/hyp/entry.S | 128 ++++++++-----
7262 arch/arm64/kvm/hyp/hyp-entry.S | 73 +++++---
7263 arch/arm64/kvm/hyp/switch.c | 63 ++++++-
7264 arch/arm64/kvm/hyp/tlb.c | 13 +-
7265 arch/arm64/kvm/hyp/vgic-v3-sr.c | 4 +-
7266 arch/arm64/kvm/inject_fault.c | 12 ++
7267 include/kvm/arm_vgic.h | 6 +
7268 arch/arm64/kvm/emulate.c => virt/kvm/arm/aarch32.c | 25 +--
7269 virt/kvm/arm/arch_timer.c | 6 +-
7270 virt/kvm/arm/hyp/vgic-v2-sr.c | 57 ++++++
7271 virt/kvm/arm/vgic/vgic-irqfd.c | 6 -
7272 virt/kvm/arm/vgic/vgic-kvm-device.c | 122 ++++++++----
7273 virt/kvm/arm/vgic/vgic-v2.c | 71 ++++---
7274 36 files changed, 841 insertions(+), 418 deletions(-)
7275 create mode 100644 Documentation/virtual/kvm/devices/arm-vgic-its.txt
7276 create mode 100644 Documentation/virtual/kvm/devices/arm-vgic-v3.txt
7277 rename arch/arm64/kvm/emulate.c => virt/kvm/arm/aarch32.c (90%)
7278 Merging kvm-mips/next (d5888477d31c KVM: MIPS: Emulate MMIO via TLB miss for EVA)
7279 $ git merge kvm-mips/next
7280 Merge made by the 'recursive' strategy.
7281 arch/mips/include/asm/kvm_host.h | 14 ++++++++++++++
7282 arch/mips/kvm/trap_emul.c | 18 ++++++++++++++++++
7283 2 files changed, 32 insertions(+)
7284 Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
7285 $ git merge kvm-ppc/kvm-ppc-next
7287 Merging kvm-ppc-paulus/kvm-ppc-next (90235dc19e5c KVM: PPC: e500: Use kmalloc_array() in kvmppc_e500_tlb_init())
7288 $ git merge kvm-ppc-paulus/kvm-ppc-next
7289 Auto-merging virt/kvm/kvm_main.c
7290 Auto-merging arch/x86/include/asm/kvm_host.h
7291 Auto-merging arch/s390/include/asm/kvm_host.h
7292 Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c
7293 Auto-merging arch/powerpc/kvm/Makefile
7294 Auto-merging arch/mips/include/asm/kvm_host.h
7295 Merge made by the 'recursive' strategy.
7296 arch/arm/include/asm/kvm_host.h | 12 +-
7297 arch/arm64/include/asm/kvm_host.h | 12 +-
7298 arch/mips/include/asm/kvm_host.h | 46 +--
7299 arch/powerpc/include/asm/book3s/64/mmu-hash.h | 37 +++
7300 arch/powerpc/include/asm/io.h | 29 ++
7301 arch/powerpc/include/asm/kvm_asm.h | 10 +
7302 arch/powerpc/include/asm/kvm_book3s.h | 37 +++
7303 arch/powerpc/include/asm/kvm_book3s_64.h | 87 +-----
7304 arch/powerpc/include/asm/kvm_host.h | 123 ++++----
7305 arch/powerpc/include/asm/kvm_ppc.h | 28 ++
7306 arch/powerpc/include/asm/mmu.h | 1 +
7307 arch/powerpc/include/asm/opal.h | 1 +
7308 arch/powerpc/include/asm/pnv-pci.h | 3 +
7309 arch/powerpc/kvm/Kconfig | 3 +
7310 arch/powerpc/kvm/Makefile | 19 +-
7311 arch/powerpc/kvm/book3s.c | 7 +
7312 arch/powerpc/kvm/book3s_hv.c | 401 ++++++++++++++++++++++---
7313 arch/powerpc/kvm/book3s_hv_builtin.c | 156 ++++++++++
7314 arch/powerpc/kvm/book3s_hv_rm_xics.c | 120 ++++++++
7315 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 183 ++++++-----
7316 arch/powerpc/kvm/book3s_xics.c | 57 +++-
7317 arch/powerpc/kvm/book3s_xics.h | 2 +
7318 arch/powerpc/kvm/e500_mmu.c | 62 ++--
7319 arch/powerpc/kvm/powerpc.c | 51 ++++
7320 arch/powerpc/kvm/trace_hv.h | 22 ++
7321 arch/powerpc/mm/hash_native_64.c | 42 +--
7322 arch/powerpc/mm/hash_utils_64.c | 55 ++++
7323 arch/powerpc/platforms/powernv/opal-wrappers.S | 1 +
7324 arch/powerpc/platforms/powernv/pci-ioda.c | 24 +-
7325 arch/s390/include/asm/kvm_host.h | 134 ++++-----
7326 arch/x86/include/asm/kvm_host.h | 72 ++---
7327 virt/kvm/kvm_main.c | 4 +-
7328 32 files changed, 1351 insertions(+), 490 deletions(-)
7329 Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
7330 $ git merge kvms390/next
7332 Merging xen-tip/linux-next (b489c14e922f arm/xen: fix SMP guests boot)
7333 $ git merge xen-tip/linux-next
7334 Merge made by the 'recursive' strategy.
7335 arch/arm/xen/enlighten.c | 7 +++----
7336 1 file changed, 3 insertions(+), 4 deletions(-)
7337 Merging percpu/for-next (a67823c1ed10 percpu-refcount: init ->confirm_switch member properly)
7338 $ git merge percpu/for-next
7339 Merge made by the 'recursive' strategy.
7340 lib/percpu-refcount.c | 169 ++++++++++++++++++++++++++++----------------------
7341 1 file changed, 95 insertions(+), 74 deletions(-)
7342 Merging workqueues/for-next (278930ada88c workqueue: dump workqueue state on sanity check failures in destroy_workqueue())
7343 $ git merge workqueues/for-next
7344 Auto-merging kernel/workqueue.c
7345 Merge made by the 'recursive' strategy.
7346 kernel/workqueue.c | 2 ++
7347 1 file changed, 2 insertions(+)
7348 Merging drivers-x86/for-next (fa1bc2a09f5f platform/x86: toshiba_acpi: Fix typo in *_cooling_method_set function)
7349 $ git merge drivers-x86/for-next
7350 Merge made by the 'recursive' strategy.
7351 drivers/platform/x86/toshiba_acpi.c | 257 +++++++++++++++++++++---------------
7352 1 file changed, 152 insertions(+), 105 deletions(-)
7353 Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
7354 $ git merge chrome-platform/for-next
7355 Merge made by the 'recursive' strategy.
7356 Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
7357 $ git merge hsi/for-next
7358 Merge made by the 'recursive' strategy.
7359 include/uapi/linux/hsi/hsi_char.h | 17 +++++++++--------
7360 1 file changed, 9 insertions(+), 8 deletions(-)
7361 Merging leds/for-next (40d2db7cfced leds: Introduce userspace LED class driver)
7362 $ git merge leds/for-next
7363 Auto-merging include/uapi/linux/Kbuild
7364 Auto-merging MAINTAINERS
7365 Merge made by the 'recursive' strategy.
7366 Documentation/ABI/testing/sysfs-class-led | 3 +-
7367 .../ABI/testing/sysfs-class-led-trigger-oneshot | 36 ++
7368 Documentation/devicetree/bindings/leds/common.txt | 7 +
7369 .../devicetree/bindings/leds/leds-bcm6328.txt | 2 +-
7370 .../devicetree/bindings/leds/leds-bcm6358.txt | 2 +-
7371 .../devicetree/bindings/leds/leds-gpio.txt | 9 +-
7372 .../devicetree/bindings/leds/leds-is31fl319x.txt | 59 +++
7373 .../devicetree/bindings/leds/leds-pm8058.txt | 67 +++
7374 .../devicetree/bindings/leds/register-bit-led.txt | 9 +-
7375 Documentation/leds/leds-mlxcpld.txt | 110 +++++
7376 Documentation/leds/ledtrig-oneshot.txt | 20 +-
7377 Documentation/leds/uleds.txt | 105 +++++
7379 drivers/leds/Kconfig | 36 ++
7380 drivers/leds/Makefile | 6 +
7381 drivers/leds/led-triggers.c | 18 +-
7382 drivers/leds/leds-is31fl319x.c | 450 +++++++++++++++++++++
7383 drivers/leds/leds-mlxcpld.c | 431 ++++++++++++++++++++
7384 drivers/leds/leds-pm8058.c | 191 +++++++++
7385 drivers/leds/uleds.c | 224 ++++++++++
7386 include/uapi/linux/Kbuild | 1 +
7387 include/uapi/linux/uleds.h | 23 ++
7388 22 files changed, 1772 insertions(+), 45 deletions(-)
7389 create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-oneshot
7390 create mode 100644 Documentation/devicetree/bindings/leds/leds-is31fl319x.txt
7391 create mode 100644 Documentation/devicetree/bindings/leds/leds-pm8058.txt
7392 create mode 100644 Documentation/leds/leds-mlxcpld.txt
7393 create mode 100644 Documentation/leds/uleds.txt
7394 create mode 100644 drivers/leds/leds-is31fl319x.c
7395 create mode 100644 drivers/leds/leds-mlxcpld.c
7396 create mode 100644 drivers/leds/leds-pm8058.c
7397 create mode 100644 drivers/leds/uleds.c
7398 create mode 100644 include/uapi/linux/uleds.h
7399 Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
7400 $ git merge ipmi/for-next
7401 Merge made by the 'recursive' strategy.
7402 Merging driver-core/driver-core-next (2f5bb02ff224 Merge 4.8-rc5 into driver-core-next)
7403 $ git merge driver-core/driver-core-next
7404 Auto-merging drivers/base/core.c
7405 Merge made by the 'recursive' strategy.
7406 drivers/base/Kconfig | 10 ++++++++++
7407 drivers/base/attribute_container.c | 2 +-
7408 drivers/base/core.c | 39 ++++++++++++++++++++++++++++----------
7409 drivers/base/cpu.c | 11 ++++++-----
7410 drivers/base/dd.c | 33 +++++++++++++++++++++++---------
7411 drivers/base/dma-coherent.c | 2 +-
7412 drivers/base/dma-mapping.c | 11 +++++++----
7413 drivers/base/platform.c | 7 +++----
7414 drivers/base/soc.c | 9 ---------
7415 fs/debugfs/internal.h | 4 ----
7416 10 files changed, 81 insertions(+), 47 deletions(-)
7417 Merging tty/tty-next (b53761e36a50 Merge 4.8-rc5 into tty-next)
7418 $ git merge tty/tty-next
7419 Resolved 'drivers/dma/imx-sdma.c' using previous resolution.
7420 Auto-merging drivers/tty/serial/8250/8250_dw.c
7421 Auto-merging drivers/dma/imx-sdma.c
7422 CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c
7423 Auto-merging drivers/dma/dw/core.c
7424 Automatic merge failed; fix conflicts and then commit the result.
7426 [master 9a937a382b98] Merge remote-tracking branch 'tty/tty-next'
7427 $ git diff -M --stat --summary HEAD^..
7428 drivers/dma/dw/core.c | 39 +-
7429 drivers/dma/dw/regs.h | 5 +-
7430 drivers/dma/hsu/hsu.c | 9 +-
7431 drivers/dma/hsu/pci.c | 6 +-
7432 drivers/dma/imx-sdma.c | 54 +-
7433 drivers/tty/serial/8250/8250.h | 5 +
7434 drivers/tty/serial/8250/8250_core.c | 2 +-
7435 drivers/tty/serial/8250/8250_dma.c | 14 +-
7436 drivers/tty/serial/8250/8250_dw.c | 48 +-
7437 drivers/tty/serial/8250/8250_lpss.c | 378 ++++++++++++++
7438 drivers/tty/serial/8250/8250_mid.c | 8 +-
7439 drivers/tty/serial/8250/8250_mtk.c | 6 +-
7440 drivers/tty/serial/8250/8250_pci.c | 257 +--------
7441 drivers/tty/serial/8250/8250_port.c | 37 +-
7442 drivers/tty/serial/8250/Kconfig | 16 +-
7443 drivers/tty/serial/8250/Makefile | 1 +
7444 drivers/tty/serial/altera_jtaguart.c | 2 +-
7445 drivers/tty/serial/altera_uart.c | 2 +-
7446 drivers/tty/serial/amba-pl011.c | 59 ++-
7447 drivers/tty/serial/arc_uart.c | 2 +-
7448 drivers/tty/serial/atmel_serial.c | 51 +-
7449 drivers/tty/serial/bcm63xx_uart.c | 2 +-
7450 drivers/tty/serial/earlycon-arm-semihost.c | 3 +-
7451 drivers/tty/serial/earlycon.c | 7 +-
7452 drivers/tty/serial/fsl_lpuart.c | 814 +++++++++++++++++------------
7453 drivers/tty/serial/imx.c | 192 ++++---
7454 drivers/tty/serial/jsm/jsm_tty.c | 2 +-
7455 drivers/tty/serial/max3100.c | 2 +-
7456 drivers/tty/serial/men_z135_uart.c | 2 +-
7457 drivers/tty/serial/mxs-auart.c | 2 +-
7458 drivers/tty/serial/pch_uart.c | 2 +-
7459 drivers/tty/serial/samsung.c | 2 +-
7460 drivers/tty/serial/samsung.h | 2 +-
7461 drivers/tty/serial/sc16is7xx.c | 20 +
7462 drivers/tty/serial/serial_core.c | 138 ++---
7463 drivers/tty/serial/sh-sci.c | 2 +-
7464 drivers/tty/serial/st-asc.c | 2 +-
7465 drivers/tty/serial/timbuart.c | 2 +-
7466 drivers/tty/serial/uartlite.c | 2 +-
7467 drivers/tty/serial/vt8500_serial.c | 8 +-
7468 drivers/tty/serial/xilinx_uartps.c | 2 +-
7469 include/linux/amba/bus.h | 6 +
7470 include/linux/amba/serial.h | 9 +
7471 include/linux/atmel_serial.h | 1 +
7472 include/linux/dma/dw.h | 5 +
7473 include/linux/dma/hsu.h | 9 +-
7474 include/linux/platform_data/dma-dw.h | 4 +
7475 include/linux/serial_core.h | 2 +-
7476 48 files changed, 1332 insertions(+), 913 deletions(-)
7477 create mode 100644 drivers/tty/serial/8250/8250_lpss.c
7478 Merging usb/usb-next (6406c3d22637 usb: Kconfig: let USB_ULPI_BUS depends on USB_COMMON)
7479 $ git merge usb/usb-next
7480 Auto-merging include/linux/bcma/bcma_regs.h
7481 Auto-merging MAINTAINERS
7482 Merge made by the 'recursive' strategy.
7483 Documentation/devicetree/bindings/usb/usb4604.txt | 19 ++
7485 drivers/usb/Kconfig | 21 ++
7486 drivers/usb/atm/cxacru.c | 6 +-
7487 drivers/usb/atm/speedtch.c | 1 -
7488 drivers/usb/atm/ueagle-atm.c | 13 +-
7489 drivers/usb/atm/usbatm.c | 8 +-
7490 drivers/usb/class/cdc-acm.c | 20 +-
7491 drivers/usb/class/cdc-wdm.c | 165 ++++++++++--
7492 drivers/usb/class/usbtmc.c | 8 +-
7493 drivers/usb/common/ulpi.c | 5 +-
7494 drivers/usb/core/Kconfig | 21 --
7495 drivers/usb/core/Makefile | 3 +-
7496 drivers/usb/core/hcd.c | 6 +-
7497 drivers/usb/core/hub.c | 9 +-
7498 drivers/usb/core/message.c | 5 +-
7499 drivers/usb/core/of.c | 1 +
7500 drivers/usb/core/otg_whitelist.h | 2 +-
7501 drivers/usb/core/urb.c | 4 +-
7502 drivers/usb/dwc2/gadget.c | 8 +-
7503 drivers/usb/dwc2/hcd.c | 2 +-
7504 drivers/usb/dwc3/Kconfig | 2 +-
7505 drivers/usb/gadget/udc/fsl_qe_udc.c | 16 +-
7506 drivers/usb/gadget/udc/goku_udc.c | 3 +-
7507 drivers/usb/gadget/udc/omap_udc.c | 2 +-
7508 drivers/usb/gadget/udc/udc-xilinx.c | 4 +-
7509 drivers/usb/host/bcma-hcd.c | 101 +++++++-
7510 drivers/usb/host/ehci-platform.c | 2 +-
7511 drivers/usb/host/fhci-hcd.c | 4 +-
7512 drivers/usb/host/fsl-mph-dr-of.c | 18 +-
7513 drivers/usb/host/max3421-hcd.c | 8 +-
7514 drivers/usb/host/ohci-at91.c | 69 ++++-
7515 drivers/usb/host/ohci-omap.c | 1 -
7516 drivers/usb/host/ohci-sa1111.c | 4 +-
7517 drivers/usb/host/uhci-hcd.c | 5 +-
7518 drivers/usb/host/whci/init.c | 2 +-
7519 drivers/usb/host/xhci-tegra.c | 1 -
7520 drivers/usb/host/xhci.c | 4 +-
7521 drivers/usb/misc/Kconfig | 6 +
7522 drivers/usb/misc/Makefile | 1 +
7523 drivers/usb/misc/adutux.c | 21 +-
7524 drivers/usb/misc/appledisplay.c | 17 +-
7525 drivers/usb/misc/cypress_cy7c63.c | 5 +-
7526 drivers/usb/misc/cytherm.c | 32 +--
7527 drivers/usb/misc/ftdi-elan.c | 67 +----
7528 drivers/usb/misc/idmouse.c | 1 -
7529 drivers/usb/misc/iowarrior.c | 26 +-
7530 drivers/usb/misc/ldusb.c | 28 +-
7531 drivers/usb/misc/legousbtower.c | 24 +-
7532 drivers/usb/misc/lvstest.c | 25 +-
7533 drivers/usb/misc/sisusbvga/sisusb.c | 3 -
7534 drivers/usb/misc/trancevibrator.c | 3 +-
7535 drivers/usb/misc/usb4604.c | 175 +++++++++++++
7536 drivers/usb/misc/usblcd.c | 9 +-
7537 drivers/usb/misc/usbsevseg.c | 8 +-
7538 drivers/usb/misc/uss720.c | 5 +-
7539 drivers/usb/misc/yurex.c | 16 +-
7540 drivers/usb/musb/am35x.c | 4 +-
7541 drivers/usb/musb/da8xx.c | 4 +-
7542 drivers/usb/renesas_usbhs/mod_gadget.c | 6 +-
7543 drivers/usb/renesas_usbhs/mod_host.c | 10 +-
7544 drivers/usb/renesas_usbhs/pipe.c | 4 +-
7545 drivers/usb/storage/alauda.c | 11 +-
7546 drivers/usb/storage/sddr09.c | 14 +-
7547 drivers/usb/storage/usb.c | 10 +-
7548 drivers/usb/usb-skeleton.c | 14 +-
7549 drivers/usb/usbip/Kconfig | 21 ++
7550 drivers/usb/usbip/stub_rx.c | 1 -
7551 drivers/usb/usbip/vhci.h | 54 +++-
7552 drivers/usb/usbip/vhci_hcd.c | 285 ++++++++++++++-------
7553 drivers/usb/usbip/vhci_rx.c | 21 +-
7554 drivers/usb/usbip/vhci_sysfs.c | 296 +++++++++++++++++-----
7555 drivers/usb/usbip/vudc_dev.c | 2 +-
7556 drivers/usb/usbip/vudc_rx.c | 2 +-
7557 drivers/usb/wusbcore/crypto.c | 4 +-
7558 drivers/usb/wusbcore/security.c | 4 +-
7559 drivers/usb/wusbcore/wa-nep.c | 9 +-
7560 drivers/usb/wusbcore/wa-xfer.c | 4 +-
7561 drivers/uwb/hwa-rc.c | 4 +-
7562 drivers/watchdog/pcwd_usb.c | 4 +-
7563 include/linux/bcma/bcma_regs.h | 1 +
7564 include/linux/ulpi/driver.h | 6 +-
7565 include/soc/at91/atmel-sfr.h | 14 +
7566 83 files changed, 1189 insertions(+), 667 deletions(-)
7567 create mode 100644 Documentation/devicetree/bindings/usb/usb4604.txt
7568 create mode 100644 drivers/usb/misc/usb4604.c
7569 Merging usb-gadget/next (5e6c88d28ccb usb: dwc3: fix Clear Stall EP command failure)
7570 $ git merge usb-gadget/next
7571 Auto-merging include/linux/ulpi/driver.h
7572 Auto-merging drivers/usb/renesas_usbhs/mod_gadget.c
7573 Auto-merging drivers/usb/phy/phy-generic.c
7574 Auto-merging drivers/usb/gadget/udc/goku_udc.c
7575 Auto-merging drivers/usb/gadget/udc/core.c
7576 Auto-merging drivers/usb/dwc3/gadget.c
7577 Auto-merging drivers/usb/dwc3/core.c
7578 Auto-merging drivers/usb/dwc2/gadget.c
7579 Auto-merging drivers/usb/dwc2/core.h
7580 Auto-merging drivers/usb/common/ulpi.c
7581 Merge made by the 'recursive' strategy.
7582 .../devicetree/bindings/phy/mxs-usb-phy.txt | 10 +
7583 Documentation/devicetree/bindings/usb/dwc2.txt | 5 +-
7584 Documentation/devicetree/bindings/usb/dwc3.txt | 8 +-
7585 Documentation/devicetree/bindings/usb/generic.txt | 6 +
7586 .../devicetree/bindings/usb/renesas_usbhs.txt | 1 +
7587 .../devicetree/bindings/usb/rockchip,dwc3.txt | 59 +++++
7588 drivers/usb/common/ulpi.c | 11 +-
7589 drivers/usb/dwc2/core.c | 126 ++++++++--
7590 drivers/usb/dwc2/core.h | 8 +-
7591 drivers/usb/dwc2/gadget.c | 86 ++-----
7592 drivers/usb/dwc2/hw.h | 1 +
7593 drivers/usb/dwc3/core.c | 122 +++++++--
7594 drivers/usb/dwc3/core.h | 35 ++-
7595 drivers/usb/dwc3/dwc3-of-simple.c | 1 +
7596 drivers/usb/dwc3/gadget.c | 278 ++++++++-------------
7597 drivers/usb/dwc3/ulpi.c | 10 +-
7598 drivers/usb/gadget/Kconfig | 38 +--
7599 drivers/usb/gadget/composite.c | 16 +-
7600 drivers/usb/gadget/configfs.c | 5 +-
7601 drivers/usb/gadget/function/f_fs.c | 45 +++-
7602 drivers/usb/gadget/function/f_hid.c | 28 ++-
7603 drivers/usb/gadget/function/f_loopback.c | 14 +-
7604 drivers/usb/gadget/function/f_mass_storage.c | 28 ++-
7605 drivers/usb/gadget/function/f_mass_storage.h | 1 +
7606 drivers/usb/gadget/function/f_midi.c | 234 ++++++++++-------
7607 drivers/usb/gadget/function/f_ncm.c | 84 ++++++-
7608 drivers/usb/gadget/function/f_printer.c | 6 +-
7609 drivers/usb/gadget/function/f_sourcesink.c | 6 +-
7610 drivers/usb/gadget/function/f_uvc.c | 7 +
7611 drivers/usb/gadget/function/storage_common.c | 24 ++
7612 drivers/usb/gadget/function/storage_common.h | 10 +
7613 drivers/usb/gadget/function/u_ether.c | 15 +-
7614 drivers/usb/gadget/function/u_ether.h | 1 +
7615 drivers/usb/gadget/legacy/gmidi.c | 2 +-
7616 drivers/usb/gadget/u_f.c | 6 +-
7617 drivers/usb/gadget/u_f.h | 17 +-
7618 drivers/usb/gadget/udc/core.c | 4 +-
7619 drivers/usb/gadget/udc/goku_udc.c | 2 +
7620 drivers/usb/gadget/udc/net2280.c | 80 +++++-
7621 drivers/usb/gadget/udc/pxa27x_udc.c | 51 +++-
7622 drivers/usb/phy/phy-ab8500-usb.c | 8 +-
7623 drivers/usb/phy/phy-generic.c | 9 +-
7624 drivers/usb/phy/phy-mxs-usb.c | 61 +++++
7625 drivers/usb/renesas_usbhs/common.c | 4 +
7626 drivers/usb/renesas_usbhs/mod_gadget.c | 2 +
7627 include/linux/ulpi/driver.h | 2 +-
7628 include/linux/ulpi/interface.h | 9 +-
7629 include/linux/usb/composite.h | 3 +-
7630 include/linux/usb/gadget.h | 30 ++-
7631 include/uapi/linux/usb/functionfs.h | 2 +
7632 50 files changed, 1139 insertions(+), 482 deletions(-)
7633 create mode 100644 Documentation/devicetree/bindings/usb/rockchip,dwc3.txt
7634 Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables)
7635 $ git merge usb-serial/usb-next
7636 Merge made by the 'recursive' strategy.
7637 drivers/usb/serial/keyspan_pda.c | 4 +-
7638 drivers/usb/serial/ti_usb_3410_5052.c | 171 ++++++++++++----------------------
7639 2 files changed, 60 insertions(+), 115 deletions(-)
7640 Merging usb-chipidea-next/ci-for-usb-next (2bb20e897855 usb: chipidea: host: disable io watchdog)
7641 $ git merge usb-chipidea-next/ci-for-usb-next
7642 Auto-merging drivers/usb/chipidea/udc.c
7643 Merge made by the 'recursive' strategy.
7644 .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 2 ++
7645 .../devicetree/bindings/usb/usbmisc-imx.txt | 1 +
7646 drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++
7647 drivers/usb/chipidea/ci_hdrc_imx.h | 1 +
7648 drivers/usb/chipidea/host.c | 3 +++
7649 drivers/usb/chipidea/udc.c | 31 ++++++++++------------
7650 drivers/usb/chipidea/usbmisc_imx.c | 22 +++++++++++----
7651 7 files changed, 41 insertions(+), 22 deletions(-)
7652 Merging staging/staging-next (f6573adedb7d staging: unisys: visorbus: cleanup include listings)
7653 $ git merge staging/staging-next
7654 Removing drivers/staging/unisys/visorbus/vbusdeviceinfo.h
7655 Removing drivers/staging/unisys/visorbus/periodic_work.c
7656 Removing drivers/staging/unisys/visorbus/iovmcall_gnuc.h
7657 Removing drivers/staging/unisys/visorbus/controlvmcompletionstatus.h
7658 Removing drivers/staging/unisys/include/vbushelper.h
7659 Removing drivers/staging/unisys/include/periodic_work.h
7660 Removing drivers/staging/unisys/include/guestlinuxdebug.h
7661 Removing drivers/staging/unisys/include/diagchannel.h
7662 Removing drivers/staging/unisys/include/channel_guid.h
7663 Removing drivers/staging/rtl8723au/os_dep/xmit_linux.c
7664 Removing drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
7665 Removing drivers/staging/rtl8723au/os_dep/usb_intf.c
7666 Removing drivers/staging/rtl8723au/os_dep/recv_linux.c
7667 Removing drivers/staging/rtl8723au/os_dep/os_intfs.c
7668 Removing drivers/staging/rtl8723au/os_dep/mlme_linux.c
7669 Removing drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
7670 Removing drivers/staging/rtl8723au/include/xmit_osdep.h
7671 Removing drivers/staging/rtl8723au/include/wlan_bssdef.h
7672 Removing drivers/staging/rtl8723au/include/wifi.h
7673 Removing drivers/staging/rtl8723au/include/usb_ops_linux.h
7674 Removing drivers/staging/rtl8723au/include/usb_ops.h
7675 Removing drivers/staging/rtl8723au/include/sta_info.h
7676 Removing drivers/staging/rtl8723au/include/rtw_xmit.h
7677 Removing drivers/staging/rtl8723au/include/rtw_version.h
7678 Removing drivers/staging/rtl8723au/include/rtw_sreset.h
7679 Removing drivers/staging/rtl8723au/include/rtw_security.h
7680 Removing drivers/staging/rtl8723au/include/rtw_rf.h
7681 Removing drivers/staging/rtl8723au/include/rtw_recv.h
7682 Removing drivers/staging/rtl8723au/include/rtw_pwrctrl.h
7683 Removing drivers/staging/rtl8723au/include/rtw_mlme_ext.h
7684 Removing drivers/staging/rtl8723au/include/rtw_mlme.h
7685 Removing drivers/staging/rtl8723au/include/rtw_io.h
7686 Removing drivers/staging/rtl8723au/include/rtw_ht.h
7687 Removing drivers/staging/rtl8723au/include/rtw_event.h
7688 Removing drivers/staging/rtl8723au/include/rtw_efuse.h
7689 Removing drivers/staging/rtl8723au/include/rtw_eeprom.h
7690 Removing drivers/staging/rtl8723au/include/rtw_debug.h
7691 Removing drivers/staging/rtl8723au/include/rtw_cmd.h
7692 Removing drivers/staging/rtl8723au/include/rtw_ap.h
7693 Removing drivers/staging/rtl8723au/include/rtl8723a_xmit.h
7694 Removing drivers/staging/rtl8723au/include/rtl8723a_sreset.h
7695 Removing drivers/staging/rtl8723au/include/rtl8723a_spec.h
7696 Removing drivers/staging/rtl8723au/include/rtl8723a_rf.h
7697 Removing drivers/staging/rtl8723au/include/rtl8723a_recv.h
7698 Removing drivers/staging/rtl8723au/include/rtl8723a_pg.h
7699 Removing drivers/staging/rtl8723au/include/rtl8723a_hal.h
7700 Removing drivers/staging/rtl8723au/include/rtl8723a_dm.h
7701 Removing drivers/staging/rtl8723au/include/rtl8723a_cmd.h
7702 Removing drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
7703 Removing drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
7704 Removing drivers/staging/rtl8723au/include/recv_osdep.h
7705 Removing drivers/staging/rtl8723au/include/osdep_service.h
7706 Removing drivers/staging/rtl8723au/include/osdep_intf.h
7707 Removing drivers/staging/rtl8723au/include/odm_reg.h
7708 Removing drivers/staging/rtl8723au/include/odm_precomp.h
7709 Removing drivers/staging/rtl8723au/include/odm_interface.h
7710 Removing drivers/staging/rtl8723au/include/odm_debug.h
7711 Removing drivers/staging/rtl8723au/include/odm_RegDefine11N.h
7712 Removing drivers/staging/rtl8723au/include/odm_RegConfig8723A.h
7713 Removing drivers/staging/rtl8723au/include/odm_HWConfig.h
7714 Removing drivers/staging/rtl8723au/include/odm.h
7715 Removing drivers/staging/rtl8723au/include/mlme_osdep.h
7716 Removing drivers/staging/rtl8723au/include/ioctl_cfg80211.h
7717 Removing drivers/staging/rtl8723au/include/ieee80211.h
7718 Removing drivers/staging/rtl8723au/include/hal_intf.h
7719 Removing drivers/staging/rtl8723au/include/hal_com.h
7720 Removing drivers/staging/rtl8723au/include/drv_types.h
7721 Removing drivers/staging/rtl8723au/include/HalVerDef.h
7722 Removing drivers/staging/rtl8723au/include/HalPwrSeqCmd.h
7723 Removing drivers/staging/rtl8723au/include/HalHWImg8723A_RF.h
7724 Removing drivers/staging/rtl8723au/include/HalHWImg8723A_MAC.h
7725 Removing drivers/staging/rtl8723au/include/HalHWImg8723A_FW.h
7726 Removing drivers/staging/rtl8723au/include/HalHWImg8723A_BB.h
7727 Removing drivers/staging/rtl8723au/include/HalDMOutSrc8723A.h
7728 Removing drivers/staging/rtl8723au/include/Hal8723UHWImg_CE.h
7729 Removing drivers/staging/rtl8723au/include/Hal8723PwrSeq.h
7730 Removing drivers/staging/rtl8723au/include/Hal8723APhyReg.h
7731 Removing drivers/staging/rtl8723au/include/Hal8723APhyCfg.h
7732 Removing drivers/staging/rtl8723au/hal/usb_ops_linux.c
7733 Removing drivers/staging/rtl8723au/hal/usb_halinit.c
7734 Removing drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
7735 Removing drivers/staging/rtl8723au/hal/rtl8723au_recv.c
7736 Removing drivers/staging/rtl8723au/hal/rtl8723a_sreset.c
7737 Removing drivers/staging/rtl8723au/hal/rtl8723a_rxdesc.c
7738 Removing drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c
7739 Removing drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
7740 Removing drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
7741 Removing drivers/staging/rtl8723au/hal/rtl8723a_dm.c
7742 Removing drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
7743 Removing drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
7744 Removing drivers/staging/rtl8723au/hal/odm_interface.c
7745 Removing drivers/staging/rtl8723au/hal/odm_debug.c
7746 Removing drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c
7747 Removing drivers/staging/rtl8723au/hal/odm_HWConfig.c
7748 Removing drivers/staging/rtl8723au/hal/odm.c
7749 Removing drivers/staging/rtl8723au/hal/hal_intf.c
7750 Removing drivers/staging/rtl8723au/hal/hal_com.c
7751 Removing drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c
7752 Removing drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c
7753 Removing drivers/staging/rtl8723au/hal/HalHWImg8723A_MAC.c
7754 Removing drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c
7755 Removing drivers/staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c
7756 Removing drivers/staging/rtl8723au/hal/Hal8723UHWImg_CE.c
7757 Removing drivers/staging/rtl8723au/hal/Hal8723PwrSeq.c
7758 Removing drivers/staging/rtl8723au/core/rtw_xmit.c
7759 Removing drivers/staging/rtl8723au/core/rtw_wlan_util.c
7760 Removing drivers/staging/rtl8723au/core/rtw_sta_mgt.c
7761 Removing drivers/staging/rtl8723au/core/rtw_sreset.c
7762 Removing drivers/staging/rtl8723au/core/rtw_security.c
7763 Removing drivers/staging/rtl8723au/core/rtw_recv.c
7764 Removing drivers/staging/rtl8723au/core/rtw_pwrctrl.c
7765 Removing drivers/staging/rtl8723au/core/rtw_mlme_ext.c
7766 Removing drivers/staging/rtl8723au/core/rtw_mlme.c
7767 Removing drivers/staging/rtl8723au/core/rtw_ieee80211.c
7768 Removing drivers/staging/rtl8723au/core/rtw_efuse.c
7769 Removing drivers/staging/rtl8723au/core/rtw_cmd.c
7770 Removing drivers/staging/rtl8723au/core/rtw_ap.c
7771 Removing drivers/staging/rtl8723au/TODO
7772 Removing drivers/staging/rtl8723au/Makefile
7773 Removing drivers/staging/rtl8723au/Kconfig
7774 Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_FW.h
7775 Auto-merging drivers/staging/octeon/octeon-ethernet.h
7776 Auto-merging drivers/staging/octeon/ethernet.c
7777 Auto-merging drivers/staging/octeon/ethernet-rgmii.c
7778 Auto-merging drivers/staging/lustre/lustre/llite/namei.c
7779 Auto-merging drivers/staging/lustre/lustre/llite/file.c
7780 Auto-merging drivers/staging/fsl-mc/include/mc-bus.h
7781 Auto-merging drivers/staging/fsl-mc/bus/fsl-mc-msi.c
7782 Auto-merging drivers/staging/fsl-mc/bus/fsl-mc-bus.c
7783 Auto-merging drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
7784 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
7785 Auto-merging drivers/dma-buf/sync_trace.h
7786 Auto-merging drivers/dma-buf/sync_debug.h
7787 Auto-merging drivers/dma-buf/sync_debug.c
7788 Auto-merging drivers/dma-buf/sw_sync.c
7789 Auto-merging MAINTAINERS
7790 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
7791 Removing Documentation/devicetree/bindings/soc/mediatek/auxadc.txt
7792 Merge made by the 'recursive' strategy.
7793 .../devicetree/bindings/i2c/trivial-devices.txt | 1 +
7794 .../devicetree/bindings/iio/accel/dmard06.txt | 19 +
7795 .../devicetree/bindings/iio/accel/kionix,kxsd9.txt | 22 +
7796 .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 29 +
7797 .../devicetree/bindings/iio/adc/ti-adc161s626.txt | 16 +
7798 .../bindings/iio/chemical/atlas,orp-sm.txt | 22 +
7799 .../bindings/iio/magnetometer/ak8974.txt | 29 +
7800 .../iio/temperature/maxim_thermocouple.txt | 21 +
7801 .../devicetree/bindings/soc/mediatek/auxadc.txt | 21 -
7802 .../devicetree/bindings/vendor-prefixes.txt | 1 +
7804 drivers/android/binder.c | 7 +-
7805 drivers/dma-buf/Kconfig | 13 +
7806 drivers/dma-buf/Makefile | 1 +
7807 drivers/{staging/android => dma-buf}/sw_sync.c | 37 +-
7808 drivers/{staging/android => dma-buf}/sync_debug.c | 2 +-
7809 drivers/{staging/android => dma-buf}/sync_debug.h | 2 +-
7810 .../android/trace/sync.h => dma-buf/sync_trace.h} | 6 +-
7811 drivers/iio/accel/Kconfig | 21 +
7812 drivers/iio/accel/Makefile | 2 +
7813 drivers/iio/accel/bma180.c | 9 +-
7814 drivers/iio/accel/dmard06.c | 241 +
7815 drivers/iio/accel/dmard09.c | 157 +
7816 drivers/iio/accel/kxcjk-1013.c | 1 +
7817 drivers/iio/adc/Kconfig | 25 +
7818 drivers/iio/adc/Makefile | 2 +
7819 drivers/iio/adc/ad7298.c | 20 +-
7820 drivers/iio/adc/ad7793.c | 10 +-
7821 drivers/iio/adc/mt6577_auxadc.c | 291 +
7822 drivers/iio/adc/nau7802.c | 2 +-
7823 drivers/iio/adc/ti-adc161s626.c | 248 +
7824 drivers/iio/buffer/industrialio-buffer-cb.c | 24 +-
7825 drivers/iio/chemical/Kconfig | 1 +
7826 drivers/iio/chemical/atlas-ph-sensor.c | 81 +-
7827 .../iio/common/hid-sensors/hid-sensor-trigger.c | 22 +-
7828 drivers/iio/dac/Kconfig | 9 +
7829 drivers/iio/dac/Makefile | 1 +
7830 drivers/iio/dac/cio-dac.c | 144 +
7831 drivers/iio/humidity/Kconfig | 8 +-
7832 drivers/iio/light/Kconfig | 6 +-
7833 drivers/iio/light/us5182d.c | 2 +-
7834 drivers/iio/light/vcnl4000.c | 72 +-
7835 drivers/iio/magnetometer/Kconfig | 16 +-
7836 drivers/iio/magnetometer/Makefile | 1 +
7837 drivers/iio/magnetometer/ak8974.c | 863 ++
7838 drivers/iio/magnetometer/mag3110.c | 23 +-
7839 drivers/iio/proximity/sx9500.c | 2 +-
7840 drivers/iio/temperature/Kconfig | 16 +
7841 drivers/iio/temperature/Makefile | 1 +
7842 drivers/iio/temperature/maxim_thermocouple.c | 281 +
7843 drivers/staging/Kconfig | 2 -
7844 drivers/staging/Makefile | 1 -
7845 drivers/staging/android/Kconfig | 13 -
7846 drivers/staging/android/Makefile | 1 -
7847 drivers/staging/android/ion/Kconfig | 11 +
7848 drivers/staging/android/ion/Makefile | 4 +-
7849 drivers/staging/android/ion/devicetree.txt | 51 +
7850 drivers/staging/android/ion/hisilicon/hi6220_ion.c | 195 +-
7851 drivers/staging/android/ion/ion-ioctl.c | 177 +
7852 drivers/staging/android/ion/ion.c | 388 +-
7853 drivers/staging/android/ion/ion.h | 41 -
7854 drivers/staging/android/ion/ion_carveout_heap.c | 33 +-
7855 drivers/staging/android/ion/ion_chunk_heap.c | 29 +-
7856 drivers/staging/android/ion/ion_cma_heap.c | 36 +-
7857 drivers/staging/android/ion/ion_dummy_driver.c | 10 +-
7858 drivers/staging/android/ion/ion_heap.c | 10 +-
7859 drivers/staging/android/ion/ion_of.c | 185 +
7860 drivers/staging/android/ion/ion_of.h | 37 +
7861 drivers/staging/android/ion/ion_page_pool.c | 12 +-
7862 drivers/staging/android/ion/ion_priv.h | 131 +-
7863 drivers/staging/android/ion/ion_system_heap.c | 239 +-
7864 drivers/staging/android/ion/ion_test.c | 23 +-
7865 drivers/staging/android/lowmemorykiller.c | 4 +-
7866 drivers/staging/android/uapi/ion.h | 45 +-
7867 .../comedi/drivers/addi-data/hwdrv_apci3501.c | 141 -
7868 drivers/staging/comedi/drivers/addi_apci_3501.c | 85 +-
7869 drivers/staging/comedi/drivers/cb_pcidas64.c | 577 +-
7870 drivers/staging/comedi/drivers/das08_cs.c | 73 +-
7871 drivers/staging/comedi/drivers/dt2811.c | 4 +-
7872 drivers/staging/comedi/drivers/dt9812.c | 4 +-
7873 drivers/staging/comedi/drivers/gsc_hpdi.c | 2 +-
7874 drivers/staging/comedi/drivers/jr3_pci.c | 15 +-
7875 drivers/staging/comedi/drivers/jr3_pci.h | 290 +-
7876 drivers/staging/comedi/drivers/ni_670x.c | 62 +-
7877 drivers/staging/comedi/drivers/ni_at_a2150.c | 273 +-
7878 drivers/staging/comedi/drivers/ni_atmio.c | 176 +-
7879 drivers/staging/comedi/drivers/ni_atmio16d.c | 106 +-
7880 drivers/staging/comedi/drivers/ni_daq_dio24.c | 58 +-
7881 drivers/staging/comedi/drivers/ni_mio_cs.c | 67 +-
7882 drivers/staging/comedi/drivers/ni_pcidio.c | 95 +-
7883 drivers/staging/comedi/drivers/ni_pcimio.c | 216 +-
7884 drivers/staging/comedi/drivers/ni_usb6501.c | 4 +-
7885 drivers/staging/comedi/drivers/plx9080.h | 95 +-
7886 drivers/staging/comedi/drivers/s626.c | 3 +-
7887 drivers/staging/comedi/drivers/s626.h | 4 +-
7888 drivers/staging/comedi/drivers/usbduxfast.c | 4 +-
7889 drivers/staging/comedi/drivers/vmk80xx.c | 12 +-
7890 drivers/staging/dgnc/dgnc_cls.c | 965 +-
7891 drivers/staging/dgnc/dgnc_driver.c | 58 +-
7892 drivers/staging/dgnc/dgnc_driver.h | 10 +-
7893 drivers/staging/dgnc/dgnc_neo.c | 14 -
7894 drivers/staging/dgnc/dgnc_sysfs.c | 183 +-
7895 drivers/staging/dgnc/dgnc_tty.c | 68 +-
7896 drivers/staging/emxx_udc/emxx_udc.c | 5 +-
7897 drivers/staging/fbtft/fb_agm1264k-fl.c | 4 +-
7898 drivers/staging/fbtft/fb_ili9320.c | 4 +-
7899 drivers/staging/fbtft/fb_ili9325.c | 10 +-
7900 drivers/staging/fbtft/fb_pcd8544.c | 4 +-
7901 drivers/staging/fbtft/fb_s6d02a1.c | 14 +-
7902 drivers/staging/fbtft/fb_s6d1121.c | 8 +-
7903 drivers/staging/fbtft/fb_ssd1289.c | 10 +-
7904 drivers/staging/fbtft/fb_ssd1306.c | 23 +-
7905 drivers/staging/fbtft/fb_ssd1331.c | 40 +-
7906 drivers/staging/fbtft/fb_ssd1351.c | 2 +-
7907 drivers/staging/fbtft/fb_st7735r.c | 43 +-
7908 drivers/staging/fbtft/fb_tls8204.c | 59 +-
7909 drivers/staging/fbtft/fb_uc1611.c | 12 +-
7910 drivers/staging/fbtft/fb_watterott.c | 8 +-
7911 drivers/staging/fbtft/fbtft-bus.c | 3 +-
7912 drivers/staging/fbtft/fbtft-core.c | 26 +-
7913 drivers/staging/fbtft/fbtft.h | 26 +-
7914 drivers/staging/fbtft/fbtft_device.c | 30 +-
7915 drivers/staging/fsl-mc/bus/Makefile | 7 +-
7916 drivers/staging/fsl-mc/bus/dpmcp.c | 1 +
7917 drivers/staging/fsl-mc/bus/dpmng-cmd.h | 15 +-
7918 drivers/staging/fsl-mc/bus/dpmng.c | 1 +
7919 drivers/staging/fsl-mc/bus/dprc-cmd.h | 15 +-
7920 drivers/staging/fsl-mc/bus/dprc-driver.c | 71 +-
7921 drivers/staging/fsl-mc/bus/dprc.c | 1 +
7922 .../bus/{mc-allocator.c => fsl-mc-allocator.c} | 206 +-
7923 .../staging/fsl-mc/bus/{mc-bus.c => fsl-mc-bus.c} | 78 +-
7924 .../staging/fsl-mc/bus/{mc-msi.c => fsl-mc-msi.c} | 4 +-
7925 drivers/staging/fsl-mc/bus/fsl-mc-private.h | 52 +
7926 .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 6 +-
7927 drivers/staging/fsl-mc/bus/mc-io.c | 320 +
7928 drivers/staging/fsl-mc/bus/mc-sys.c | 155 +-
7929 .../fsl-mc/include/{mc-private.h => mc-bus.h} | 91 +-
7930 drivers/staging/fsl-mc/include/mc-sys.h | 15 -
7931 drivers/staging/fsl-mc/include/mc.h | 13 -
7932 drivers/staging/gdm724x/gdm_lte.c | 2 +-
7933 drivers/staging/gdm724x/gdm_tty.c | 1 -
7934 drivers/staging/gdm724x/gdm_usb.c | 8 +-
7935 drivers/staging/gdm724x/netlink_k.c | 11 +-
7936 drivers/staging/i4l/act2000/act2000_isa.c | 4 +-
7937 drivers/staging/i4l/act2000/capi.c | 10 +-
7938 drivers/staging/i4l/act2000/capi.h | 10 +-
7939 drivers/staging/i4l/icn/icn.c | 186 +-
7940 drivers/staging/i4l/pcbit/capi.c | 4 +-
7941 drivers/staging/i4l/pcbit/drv.c | 16 +-
7942 drivers/staging/i4l/pcbit/edss1.c | 7 +-
7943 drivers/staging/i4l/pcbit/layer2.c | 8 +-
7944 drivers/staging/iio/light/isl29018.c | 134 +-
7945 drivers/staging/iio/light/isl29028.c | 103 +-
7946 drivers/staging/iio/meter/ade7854.c | 40 +-
7947 drivers/staging/ks7010/ks7010_sdio.c | 44 +-
7948 drivers/staging/ks7010/ks_hostif.c | 20 +-
7949 drivers/staging/ks7010/ks_wlan_net.c | 2 +-
7950 drivers/staging/ks7010/michael_mic.c | 20 +-
7951 .../staging/lustre/include/linux/libcfs/libcfs.h | 6 +-
7952 .../lustre/include/linux/libcfs/libcfs_debug.h | 10 +-
7953 .../lustre/include/linux/libcfs/libcfs_fail.h | 3 +
7954 .../lustre/include/linux/libcfs/libcfs_private.h | 9 -
7955 .../staging/lustre/include/linux/lnet/lib-lnet.h | 65 +-
7956 .../staging/lustre/include/linux/lnet/lib-types.h | 5 +-
7957 drivers/staging/lustre/include/linux/lnet/types.h | 16 +-
7958 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 16 +-
7959 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 18 +-
7960 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 207 +-
7961 .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 5 -
7962 .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 8 +-
7963 .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 44 +-
7964 .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 207 +-
7965 drivers/staging/lustre/lnet/libcfs/debug.c | 9 +-
7966 drivers/staging/lustre/lnet/libcfs/fail.c | 6 +-
7967 drivers/staging/lustre/lnet/libcfs/libcfs_string.c | 2 -
7968 .../lustre/lnet/libcfs/linux/linux-crypto.c | 4 +-
7969 drivers/staging/lustre/lnet/lnet/lib-md.c | 6 +-
7970 drivers/staging/lustre/lnet/lnet/lib-move.c | 352 +-
7971 drivers/staging/lustre/lnet/lnet/lib-msg.c | 18 +-
7972 drivers/staging/lustre/lnet/lnet/lib-socket.c | 21 +-
7973 drivers/staging/lustre/lnet/lnet/lo.c | 39 +-
7974 drivers/staging/lustre/lnet/lnet/router.c | 10 +-
7975 drivers/staging/lustre/lnet/selftest/brw_test.c | 4 +-
7976 drivers/staging/lustre/lnet/selftest/conrpc.c | 15 +-
7977 drivers/staging/lustre/lnet/selftest/framework.c | 4 +-
7978 drivers/staging/lustre/lnet/selftest/rpc.c | 8 +-
7979 drivers/staging/lustre/lustre/fld/fld_internal.h | 19 +
7980 drivers/staging/lustre/lustre/fld/fld_request.c | 55 +-
7981 drivers/staging/lustre/lustre/include/cl_object.h | 77 +-
7982 .../staging/lustre/lustre/include/lprocfs_status.h | 6 +
7983 drivers/staging/lustre/lustre/include/lu_object.h | 22 +-
7984 .../lustre/lustre/include/lustre/lustre_idl.h | 433 +-
7985 .../lustre/lustre/include/lustre/lustre_ioctl.h | 412 +
7986 .../lustre/lustre/include/lustre/lustre_user.h | 77 +-
7987 drivers/staging/lustre/lustre/include/lustre_dlm.h | 11 +-
7988 .../lustre/lustre/include/lustre_dlm_flags.h | 36 +-
7989 drivers/staging/lustre/lustre/include/lustre_fid.h | 32 +-
7990 .../staging/lustre/lustre/include/lustre_handles.h | 3 +-
7991 .../staging/lustre/lustre/include/lustre_import.h | 22 -
7992 drivers/staging/lustre/lustre/include/lustre_lib.h | 286 +-
7993 .../staging/lustre/lustre/include/lustre_lite.h | 14 +-
7994 drivers/staging/lustre/lustre/include/lustre_lmv.h | 121 +
7995 drivers/staging/lustre/lustre/include/lustre_log.h | 3 +-
7996 drivers/staging/lustre/lustre/include/lustre_mdc.h | 23 +-
7997 drivers/staging/lustre/lustre/include/lustre_mds.h | 3 -
7998 .../lustre/lustre/include/lustre_req_layout.h | 3 -
7999 drivers/staging/lustre/lustre/include/lustre_ver.h | 17 +-
8000 drivers/staging/lustre/lustre/include/obd.h | 209 +-
8001 drivers/staging/lustre/lustre/include/obd_class.h | 149 +-
8002 .../staging/lustre/lustre/include/obd_support.h | 25 +-
8003 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 4 +-
8004 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 106 +-
8005 drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 17 +-
8006 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 24 +-
8007 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 79 +-
8008 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 21 +-
8009 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 4 +-
8010 drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 43 +-
8011 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 38 +-
8012 drivers/staging/lustre/lustre/llite/dcache.c | 55 -
8013 drivers/staging/lustre/lustre/llite/dir.c | 872 +-
8014 drivers/staging/lustre/lustre/llite/file.c | 365 +-
8015 drivers/staging/lustre/lustre/llite/lcommon_cl.c | 2 +-
8016 .../staging/lustre/lustre/llite/llite_internal.h | 75 +-
8017 drivers/staging/lustre/lustre/llite/llite_lib.c | 482 +-
8018 drivers/staging/lustre/lustre/llite/llite_mmap.c | 6 +-
8019 drivers/staging/lustre/lustre/llite/llite_nfs.c | 69 +-
8020 drivers/staging/lustre/lustre/llite/lproc_llite.c | 123 +-
8021 drivers/staging/lustre/lustre/llite/namei.c | 193 +-
8022 drivers/staging/lustre/lustre/llite/rw.c | 13 +-
8023 drivers/staging/lustre/lustre/llite/rw26.c | 9 +-
8024 drivers/staging/lustre/lustre/llite/statahead.c | 98 +-
8025 drivers/staging/lustre/lustre/llite/super25.c | 4 +-
8026 drivers/staging/lustre/lustre/llite/symlink.c | 12 +-
8027 drivers/staging/lustre/lustre/llite/vvp_dev.c | 6 -
8028 drivers/staging/lustre/lustre/llite/vvp_internal.h | 6 +-
8029 drivers/staging/lustre/lustre/llite/vvp_object.c | 2 +-
8030 drivers/staging/lustre/lustre/llite/vvp_page.c | 4 +-
8031 drivers/staging/lustre/lustre/llite/vvp_req.c | 2 +
8032 drivers/staging/lustre/lustre/llite/xattr.c | 320 +-
8033 drivers/staging/lustre/lustre/llite/xattr_cache.c | 24 +-
8034 drivers/staging/lustre/lustre/lmv/lmv_intent.c | 371 +-
8035 drivers/staging/lustre/lustre/lmv/lmv_internal.h | 133 +-
8036 drivers/staging/lustre/lustre/lmv/lmv_obd.c | 1356 ++-
8037 drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 2 +-
8038 .../staging/lustre/lustre/lov/lov_cl_internal.h | 4 +-
8039 drivers/staging/lustre/lustre/lov/lov_ea.c | 3 +-
8040 drivers/staging/lustre/lustre/lov/lov_io.c | 22 +-
8041 drivers/staging/lustre/lustre/lov/lov_obd.c | 64 +-
8042 drivers/staging/lustre/lustre/lov/lov_object.c | 1 +
8043 drivers/staging/lustre/lustre/lov/lov_page.c | 12 +-
8044 drivers/staging/lustre/lustre/lov/lov_pool.c | 18 +-
8045 drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 17 +-
8046 drivers/staging/lustre/lustre/mdc/mdc_internal.h | 33 +-
8047 drivers/staging/lustre/lustre/mdc/mdc_lib.c | 207 +-
8048 drivers/staging/lustre/lustre/mdc/mdc_locks.c | 159 +-
8049 drivers/staging/lustre/lustre/mdc/mdc_reint.c | 17 +-
8050 drivers/staging/lustre/lustre/mdc/mdc_request.c | 654 +-
8051 drivers/staging/lustre/lustre/obdclass/cl_io.c | 10 +-
8052 drivers/staging/lustre/lustre/obdclass/cl_page.c | 14 +-
8053 drivers/staging/lustre/lustre/obdclass/class_obd.c | 35 +-
8054 drivers/staging/lustre/lustre/obdclass/debug.c | 4 +-
8055 drivers/staging/lustre/lustre/obdclass/genops.c | 140 +-
8056 .../lustre/lustre/obdclass/linux/linux-module.c | 3 +-
8057 .../lustre/lustre/obdclass/linux/linux-obdo.c | 2 +-
8058 .../lustre/lustre/obdclass/linux/linux-sysctl.c | 6 +-
8059 drivers/staging/lustre/lustre/obdclass/llog.c | 2 +-
8060 drivers/staging/lustre/lustre/obdclass/llog_cat.c | 4 +-
8061 drivers/staging/lustre/lustre/obdclass/llog_swab.c | 1 +
8062 .../lustre/lustre/obdclass/lprocfs_status.c | 148 +-
8063 drivers/staging/lustre/lustre/obdclass/lu_object.c | 125 +-
8064 .../lustre/lustre/obdclass/lustre_handles.c | 6 +-
8065 .../staging/lustre/lustre/obdclass/obd_config.c | 31 +-
8066 drivers/staging/lustre/lustre/obdclass/obd_mount.c | 35 +-
8067 drivers/staging/lustre/lustre/obdclass/obdo.c | 13 +-
8068 .../staging/lustre/lustre/obdecho/echo_client.c | 2 +-
8069 .../staging/lustre/lustre/obdecho/echo_internal.h | 4 +-
8070 drivers/staging/lustre/lustre/osc/lproc_osc.c | 10 +-
8071 drivers/staging/lustre/lustre/osc/osc_cache.c | 143 +-
8072 .../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +-
8073 drivers/staging/lustre/lustre/osc/osc_internal.h | 3 +-
8074 drivers/staging/lustre/lustre/osc/osc_io.c | 9 +-
8075 drivers/staging/lustre/lustre/osc/osc_page.c | 208 +-
8076 drivers/staging/lustre/lustre/osc/osc_request.c | 112 +-
8077 drivers/staging/lustre/lustre/ptlrpc/client.c | 14 +-
8078 drivers/staging/lustre/lustre/ptlrpc/import.c | 18 +-
8079 drivers/staging/lustre/lustre/ptlrpc/layout.c | 17 -
8080 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 4 +-
8081 drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 3 +-
8082 .../staging/lustre/lustre/ptlrpc/pack_generic.c | 104 +-
8083 drivers/staging/lustre/lustre/ptlrpc/pers.c | 6 +-
8084 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 4 +-
8085 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 11 +-
8086 drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 32 +-
8087 drivers/staging/lustre/lustre/ptlrpc/service.c | 42 +-
8088 drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 665 +-
8089 .../most/Documentation/ABI/sysfs-class-most.txt | 134 +
8090 drivers/staging/most/aim-cdev/cdev.c | 24 +-
8091 drivers/staging/most/aim-network/networking.c | 26 +-
8092 drivers/staging/most/aim-v4l2/video.c | 117 +-
8093 drivers/staging/most/hdm-dim2/dim2_hal.c | 71 +-
8094 drivers/staging/most/hdm-dim2/dim2_hal.h | 3 +-
8095 drivers/staging/most/hdm-dim2/dim2_hdm.c | 16 +-
8096 drivers/staging/most/hdm-dim2/dim2_reg.h | 8 +-
8097 drivers/staging/most/hdm-usb/hdm_usb.c | 438 +-
8098 drivers/staging/most/mostcore/core.c | 72 +-
8099 drivers/staging/netlogic/xlr_net.c | 2 +-
8100 drivers/staging/octeon-usb/Kconfig | 2 +-
8101 drivers/staging/octeon/ethernet-rgmii.c | 5 +-
8102 drivers/staging/octeon/ethernet-rx.c | 184 +-
8103 drivers/staging/octeon/ethernet-util.h | 7 +-
8104 drivers/staging/octeon/ethernet.c | 93 +-
8105 drivers/staging/octeon/octeon-ethernet.h | 2 +-
8106 drivers/staging/rtl8188eu/core/rtw_ap.c | 68 +-
8107 drivers/staging/rtl8188eu/core/rtw_cmd.c | 18 +-
8108 drivers/staging/rtl8188eu/core/rtw_debug.c | 731 --
8109 drivers/staging/rtl8188eu/core/rtw_efuse.c | 99 +-
8110 drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 245 +-
8111 drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 13 +-
8112 drivers/staging/rtl8188eu/core/rtw_mlme.c | 68 +-
8113 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 224 +-
8114 drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 20 +-
8115 drivers/staging/rtl8188eu/core/rtw_recv.c | 4 +-
8116 drivers/staging/rtl8188eu/core/rtw_sreset.c | 2 +-
8117 drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 48 +-
8118 drivers/staging/rtl8188eu/core/rtw_xmit.c | 20 +-
8119 drivers/staging/rtl8188eu/hal/hal_intf.c | 229 +-
8120 drivers/staging/rtl8188eu/hal/phy.c | 17 +-
8121 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 44 +-
8122 drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 17 +-
8123 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 34 +-
8124 drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 4 +-
8125 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 6 +-
8126 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 28 +-
8127 drivers/staging/rtl8188eu/hal/usb_halinit.c | 96 +-
8128 drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 18 -
8129 .../staging/rtl8188eu/include/HalHWImg8188E_FW.h | 29 -
8130 drivers/staging/rtl8188eu/include/drv_types.h | 55 -
8131 drivers/staging/rtl8188eu/include/hal_intf.h | 83 +-
8132 drivers/staging/rtl8188eu/include/ieee80211.h | 273 +-
8133 drivers/staging/rtl8188eu/include/odm.h | 16 -
8134 drivers/staging/rtl8188eu/include/osdep_intf.h | 1 -
8135 drivers/staging/rtl8188eu/include/osdep_service.h | 9 +-
8136 drivers/staging/rtl8188eu/include/phy.h | 6 +-
8137 drivers/staging/rtl8188eu/include/recv_osdep.h | 4 -
8138 drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 32 -
8139 drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 3 -
8140 drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 2 -
8141 drivers/staging/rtl8188eu/include/rtl8188e_led.h | 2 -
8142 drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 2 -
8143 drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 5 +-
8144 drivers/staging/rtl8188eu/include/rtw_ap.h | 1 -
8145 drivers/staging/rtl8188eu/include/rtw_cmd.h | 32 +-
8146 drivers/staging/rtl8188eu/include/rtw_debug.h | 121 -
8147 drivers/staging/rtl8188eu/include/rtw_efuse.h | 12 -
8148 drivers/staging/rtl8188eu/include/rtw_event.h | 21 +-
8149 drivers/staging/rtl8188eu/include/rtw_ht.h | 9 +-
8150 drivers/staging/rtl8188eu/include/rtw_ioctl.h | 15 -
8151 drivers/staging/rtl8188eu/include/rtw_mlme.h | 36 -
8152 drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 8 +-
8153 drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 17 +-
8154 drivers/staging/rtl8188eu/include/rtw_recv.h | 7 -
8155 drivers/staging/rtl8188eu/include/rtw_security.h | 6 -
8156 drivers/staging/rtl8188eu/include/rtw_sreset.h | 1 -
8157 drivers/staging/rtl8188eu/include/rtw_xmit.h | 8 -
8158 drivers/staging/rtl8188eu/include/usb_hal.h | 1 -
8159 drivers/staging/rtl8188eu/include/wifi.h | 30 -
8160 drivers/staging/rtl8188eu/include/wlan_bssdef.h | 83 -
8161 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 53 +-
8162 drivers/staging/rtl8188eu/os_dep/os_intfs.c | 422 +-
8163 drivers/staging/rtl8188eu/os_dep/osdep_service.c | 11 +-
8164 drivers/staging/rtl8188eu/os_dep/usb_intf.c | 34 +-
8165 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 8 +-
8166 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +-
8167 drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 6 +-
8168 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 4 +-
8169 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 42 +-
8170 drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 12 +-
8171 drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 8 +-
8172 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 120 +-
8173 drivers/staging/rtl8192e/rtl819x_Qos.h | 3 -
8174 drivers/staging/rtl8192e/rtl819x_TSProc.c | 5 +
8175 drivers/staging/rtl8192e/rtllib.h | 10 +-
8176 drivers/staging/rtl8192e/rtllib_softmac.c | 99 +-
8177 drivers/staging/rtl8192e/rtllib_softmac_wx.c | 34 +-
8178 drivers/staging/rtl8192e/rtllib_wx.c | 10 +-
8179 drivers/staging/rtl8192u/ieee80211/Makefile | 3 +-
8180 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +-
8181 drivers/staging/rtl8192u/r8192U.h | 4 +-
8182 drivers/staging/rtl8192u/r8192U_core.c | 19 +-
8183 drivers/staging/rtl8712/ieee80211.c | 25 +-
8184 drivers/staging/rtl8712/os_intfs.c | 6 +-
8185 drivers/staging/rtl8712/osdep_intf.h | 2 +-
8186 drivers/staging/rtl8712/osdep_service.h | 7 -
8187 drivers/staging/rtl8712/recv_linux.c | 1 -
8188 drivers/staging/rtl8712/rtl8712_cmd.c | 14 +-
8189 drivers/staging/rtl8712/rtl8712_led.c | 12 +-
8190 drivers/staging/rtl8712/rtl8712_recv.c | 54 +-
8191 drivers/staging/rtl8712/rtl8712_recv.h | 4 +-
8192 drivers/staging/rtl8712/rtl8712_spec.h | 3 +-
8193 drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 27 +-
8194 drivers/staging/rtl8712/rtl8712_xmit.c | 9 +-
8195 drivers/staging/rtl8712/rtl871x_cmd.c | 54 +-
8196 drivers/staging/rtl8712/rtl871x_cmd.h | 13 +-
8197 drivers/staging/rtl8712/rtl871x_ht.h | 3 +-
8198 drivers/staging/rtl8712/rtl871x_ioctl.h | 3 +-
8199 drivers/staging/rtl8712/rtl871x_ioctl_set.c | 12 +-
8200 drivers/staging/rtl8712/rtl871x_led.h | 15 +-
8201 drivers/staging/rtl8712/rtl871x_mlme.c | 30 +-
8202 drivers/staging/rtl8712/rtl871x_mlme.h | 12 +-
8203 drivers/staging/rtl8712/rtl871x_mp.c | 3 +-
8204 drivers/staging/rtl8712/rtl871x_mp.h | 3 +-
8205 drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 39 +-
8206 drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 33 +-
8207 drivers/staging/rtl8712/rtl871x_pwrctrl.c | 27 +-
8208 drivers/staging/rtl8712/rtl871x_pwrctrl.h | 10 +-
8209 drivers/staging/rtl8712/rtl871x_recv.c | 24 +-
8210 drivers/staging/rtl8712/rtl871x_recv.h | 9 +-
8211 drivers/staging/rtl8712/rtl871x_security.h | 24 +-
8212 drivers/staging/rtl8712/rtl871x_sta_mgt.c | 3 +-
8213 drivers/staging/rtl8712/rtl871x_xmit.c | 18 +-
8214 drivers/staging/rtl8712/rtl871x_xmit.h | 12 +-
8215 drivers/staging/rtl8712/usb_halinit.c | 3 +-
8216 drivers/staging/rtl8712/usb_intf.c | 12 +-
8217 drivers/staging/rtl8712/usb_ops_linux.c | 92 +-
8218 drivers/staging/rtl8712/wifi.h | 15 +-
8219 drivers/staging/rtl8712/wlan_bssdef.h | 6 +-
8220 drivers/staging/rtl8712/xmit_linux.c | 17 +-
8221 drivers/staging/rtl8723au/Kconfig | 33 -
8222 drivers/staging/rtl8723au/Makefile | 53 -
8223 drivers/staging/rtl8723au/TODO | 16 -
8224 drivers/staging/rtl8723au/core/rtw_ap.c | 1738 ---
8225 drivers/staging/rtl8723au/core/rtw_cmd.c | 1470 ---
8226 drivers/staging/rtl8723au/core/rtw_efuse.c | 538 -
8227 drivers/staging/rtl8723au/core/rtw_ieee80211.c | 855 --
8228 drivers/staging/rtl8723au/core/rtw_mlme.c | 2314 ----
8229 drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 6187 ----------
8230 drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 606 -
8231 drivers/staging/rtl8723au/core/rtw_recv.c | 2204 ----
8232 drivers/staging/rtl8723au/core/rtw_security.c | 1630 ---
8233 drivers/staging/rtl8723au/core/rtw_sreset.c | 214 -
8234 drivers/staging/rtl8723au/core/rtw_sta_mgt.c | 439 -
8235 drivers/staging/rtl8723au/core/rtw_wlan_util.c | 1537 ---
8236 drivers/staging/rtl8723au/core/rtw_xmit.c | 2341 ----
8237 drivers/staging/rtl8723au/hal/Hal8723PwrSeq.c | 80 -
8238 drivers/staging/rtl8723au/hal/Hal8723UHWImg_CE.c | 136 -
8239 .../staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c | 1097 --
8240 drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c | 565 -
8241 drivers/staging/rtl8723au/hal/HalHWImg8723A_MAC.c | 187 -
8242 drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c | 259 -
8243 drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c | 156 -
8244 drivers/staging/rtl8723au/hal/hal_com.c | 853 --
8245 drivers/staging/rtl8723au/hal/hal_intf.c | 42 -
8246 drivers/staging/rtl8723au/hal/odm.c | 1732 ---
8247 drivers/staging/rtl8723au/hal/odm_HWConfig.c | 396 -
8248 drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c | 88 -
8249 drivers/staging/rtl8723au/hal/odm_debug.c | 39 -
8250 drivers/staging/rtl8723au/hal/odm_interface.c | 49 -
8251 .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 11265 -------------------
8252 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 755 --
8253 drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 194 -
8254 drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 2076 ----
8255 drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 961 --
8256 drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 503 -
8257 drivers/staging/rtl8723au/hal/rtl8723a_rxdesc.c | 69 -
8258 drivers/staging/rtl8723au/hal/rtl8723a_sreset.c | 55 -
8259 drivers/staging/rtl8723au/hal/rtl8723au_recv.c | 267 -
8260 drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 520 -
8261 drivers/staging/rtl8723au/hal/usb_halinit.c | 1269 ---
8262 drivers/staging/rtl8723au/hal/usb_ops_linux.c | 690 --
8263 drivers/staging/rtl8723au/include/Hal8723APhyCfg.h | 162 -
8264 drivers/staging/rtl8723au/include/Hal8723APhyReg.h | 1078 --
8265 drivers/staging/rtl8723au/include/Hal8723PwrSeq.h | 126 -
8266 .../staging/rtl8723au/include/Hal8723UHWImg_CE.h | 29 -
8267 .../staging/rtl8723au/include/HalDMOutSrc8723A.h | 64 -
8268 .../staging/rtl8723au/include/HalHWImg8723A_BB.h | 38 -
8269 .../staging/rtl8723au/include/HalHWImg8723A_FW.h | 28 -
8270 .../staging/rtl8723au/include/HalHWImg8723A_MAC.h | 26 -
8271 .../staging/rtl8723au/include/HalHWImg8723A_RF.h | 25 -
8272 drivers/staging/rtl8723au/include/HalPwrSeqCmd.h | 130 -
8273 drivers/staging/rtl8723au/include/HalVerDef.h | 114 -
8274 drivers/staging/rtl8723au/include/drv_types.h | 274 -
8275 drivers/staging/rtl8723au/include/hal_com.h | 182 -
8276 drivers/staging/rtl8723au/include/hal_intf.h | 115 -
8277 drivers/staging/rtl8723au/include/ieee80211.h | 341 -
8278 drivers/staging/rtl8723au/include/ioctl_cfg80211.h | 66 -
8279 drivers/staging/rtl8723au/include/mlme_osdep.h | 24 -
8280 drivers/staging/rtl8723au/include/odm.h | 860 --
8281 drivers/staging/rtl8723au/include/odm_HWConfig.h | 153 -
8282 .../staging/rtl8723au/include/odm_RegConfig8723A.h | 27 -
8283 .../staging/rtl8723au/include/odm_RegDefine11N.h | 165 -
8284 drivers/staging/rtl8723au/include/odm_debug.h | 117 -
8285 drivers/staging/rtl8723au/include/odm_interface.h | 62 -
8286 drivers/staging/rtl8723au/include/odm_precomp.h | 49 -
8287 drivers/staging/rtl8723au/include/odm_reg.h | 111 -
8288 drivers/staging/rtl8723au/include/osdep_intf.h | 45 -
8289 drivers/staging/rtl8723au/include/osdep_service.h | 88 -
8290 drivers/staging/rtl8723au/include/recv_osdep.h | 36 -
8291 .../rtl8723au/include/rtl8723a_bt-coexist.h | 1627 ---
8292 .../staging/rtl8723au/include/rtl8723a_bt_intf.h | 69 -
8293 drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 158 -
8294 drivers/staging/rtl8723au/include/rtl8723a_dm.h | 137 -
8295 drivers/staging/rtl8723au/include/rtl8723a_hal.h | 538 -
8296 drivers/staging/rtl8723au/include/rtl8723a_pg.h | 98 -
8297 drivers/staging/rtl8723au/include/rtl8723a_recv.h | 65 -
8298 drivers/staging/rtl8723au/include/rtl8723a_rf.h | 58 -
8299 drivers/staging/rtl8723au/include/rtl8723a_spec.h | 2148 ----
8300 .../staging/rtl8723au/include/rtl8723a_sreset.h | 24 -
8301 drivers/staging/rtl8723au/include/rtl8723a_xmit.h | 225 -
8302 drivers/staging/rtl8723au/include/rtw_ap.h | 51 -
8303 drivers/staging/rtl8723au/include/rtw_cmd.h | 815 --
8304 drivers/staging/rtl8723au/include/rtw_debug.h | 191 -
8305 drivers/staging/rtl8723au/include/rtw_eeprom.h | 135 -
8306 drivers/staging/rtl8723au/include/rtw_efuse.h | 109 -
8307 drivers/staging/rtl8723au/include/rtw_event.h | 74 -
8308 drivers/staging/rtl8723au/include/rtw_ht.h | 42 -
8309 drivers/staging/rtl8723au/include/rtw_io.h | 237 -
8310 drivers/staging/rtl8723au/include/rtw_mlme.h | 340 -
8311 drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 683 --
8312 drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 241 -
8313 drivers/staging/rtl8723au/include/rtw_recv.h | 305 -
8314 drivers/staging/rtl8723au/include/rtw_rf.h | 102 -
8315 drivers/staging/rtl8723au/include/rtw_security.h | 331 -
8316 drivers/staging/rtl8723au/include/rtw_sreset.h | 36 -
8317 drivers/staging/rtl8723au/include/rtw_version.h | 1 -
8318 drivers/staging/rtl8723au/include/rtw_xmit.h | 385 -
8319 drivers/staging/rtl8723au/include/sta_info.h | 373 -
8320 drivers/staging/rtl8723au/include/usb_ops.h | 68 -
8321 drivers/staging/rtl8723au/include/usb_ops_linux.h | 41 -
8322 drivers/staging/rtl8723au/include/wifi.h | 84 -
8323 drivers/staging/rtl8723au/include/wlan_bssdef.h | 123 -
8324 drivers/staging/rtl8723au/include/xmit_osdep.h | 38 -
8325 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 3348 ------
8326 drivers/staging/rtl8723au/os_dep/mlme_linux.c | 81 -
8327 drivers/staging/rtl8723au/os_dep/os_intfs.c | 852 --
8328 drivers/staging/rtl8723au/os_dep/recv_linux.c | 165 -
8329 drivers/staging/rtl8723au/os_dep/usb_intf.c | 627 --
8330 drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 233 -
8331 drivers/staging/rtl8723au/os_dep/xmit_linux.c | 154 -
8332 drivers/staging/rts5208/ms.c | 29 +-
8333 drivers/staging/rts5208/ms.h | 1 -
8334 drivers/staging/rts5208/rtsx.c | 49 +-
8335 drivers/staging/rts5208/rtsx.h | 2 +-
8336 drivers/staging/rts5208/rtsx_card.c | 1 -
8337 drivers/staging/rts5208/rtsx_chip.h | 6 -
8338 drivers/staging/rts5208/rtsx_scsi.c | 6 +-
8339 drivers/staging/rts5208/rtsx_transport.h | 1 -
8340 drivers/staging/rts5208/sd.c | 4 -
8341 drivers/staging/rts5208/spi.h | 1 -
8342 drivers/staging/rts5208/xd.c | 4 -
8343 drivers/staging/slicoss/slic.h | 66 +-
8344 drivers/staging/slicoss/slichw.h | 409 +-
8345 drivers/staging/slicoss/slicoss.c | 633 +-
8346 drivers/staging/sm750fb/ddk750_chip.c | 14 +-
8347 drivers/staging/sm750fb/ddk750_display.c | 13 +-
8348 drivers/staging/sm750fb/ddk750_dvi.c | 8 +-
8349 drivers/staging/sm750fb/ddk750_mode.c | 2 +-
8350 drivers/staging/sm750fb/sm750_hw.c | 100 +-
8351 drivers/staging/speakup/devsynth.c | 2 +-
8352 drivers/staging/speakup/kobjects.c | 3 +
8353 drivers/staging/speakup/synth.c | 2 +-
8354 drivers/staging/unisys/include/channel.h | 41 +
8355 drivers/staging/unisys/include/channel_guid.h | 55 -
8356 drivers/staging/unisys/include/diagchannel.h | 38 -
8357 drivers/staging/unisys/include/guestlinuxdebug.h | 180 -
8358 drivers/staging/unisys/include/iochannel.h | 1 -
8359 drivers/staging/unisys/include/periodic_work.h | 40 -
8360 drivers/staging/unisys/include/vbushelper.h | 46 -
8361 drivers/staging/unisys/include/visorbus.h | 97 +-
8362 drivers/staging/unisys/visorbus/Makefile | 1 -
8363 drivers/staging/unisys/visorbus/controlvmchannel.h | 76 +
8364 .../unisys/visorbus/controlvmcompletionstatus.h | 101 -
8365 drivers/staging/unisys/visorbus/iovmcall_gnuc.h | 48 -
8366 drivers/staging/unisys/visorbus/periodic_work.c | 204 -
8367 drivers/staging/unisys/visorbus/vbuschannel.h | 212 +-
8368 drivers/staging/unisys/visorbus/vbusdeviceinfo.h | 213 -
8369 drivers/staging/unisys/visorbus/visorbus_main.c | 618 +-
8370 drivers/staging/unisys/visorbus/visorbus_private.h | 103 +-
8371 drivers/staging/unisys/visorbus/visorchannel.c | 456 +-
8372 drivers/staging/unisys/visorbus/visorchipset.c | 454 +-
8373 drivers/staging/unisys/visorbus/vmcallinterface.h | 190 +-
8374 .../staging/unisys/visorinput/ultrainputreport.h | 2 -
8375 drivers/staging/unisys/visorinput/visorinput.c | 142 +-
8376 drivers/staging/unisys/visornic/visornic_main.c | 4 +-
8377 drivers/staging/vt6655/channel.c | 3 +-
8378 drivers/staging/vt6655/device_main.c | 8 +-
8379 drivers/staging/vt6655/power.c | 12 +-
8380 drivers/staging/vt6655/rf.c | 19 +-
8381 drivers/staging/vt6655/rxtx.c | 41 +-
8382 drivers/staging/vt6656/baseband.h | 4 +-
8383 drivers/staging/vt6656/card.c | 75 +-
8384 drivers/staging/vt6656/dpc.c | 14 +-
8385 drivers/staging/vt6656/dpc.h | 2 +-
8386 drivers/staging/vt6656/main_usb.c | 12 +-
8387 drivers/staging/vt6656/usbpipe.c | 5 +-
8388 drivers/staging/wilc1000/TODO | 1 -
8389 drivers/staging/wilc1000/linux_wlan.c | 1 -
8390 drivers/staging/wilc1000/wilc_debugfs.c | 29 +-
8391 drivers/staging/wilc1000/wilc_spi.c | 2 +-
8392 drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 +-
8393 drivers/staging/wilc1000/wilc_wlan.h | 2 +-
8394 drivers/staging/wilc1000/wilc_wlan_if.h | 1 -
8395 drivers/staging/wlan-ng/cfg80211.c | 85 +-
8396 drivers/staging/wlan-ng/p80211metadef.h | 19 +-
8397 drivers/staging/wlan-ng/p80211req.c | 67 +-
8398 drivers/staging/wlan-ng/prism2mib.c | 514 +-
8399 drivers/staging/wlan-ng/prism2usb.c | 14 +-
8400 include/linux/hid-sensor-hub.h | 1 +
8401 include/linux/iio/consumer.h | 12 +
8402 tools/iio/lsiio.c | 3 +-
8403 610 files changed, 17079 insertions(+), 82278 deletions(-)
8404 create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard06.txt
8405 create mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.txt
8406 create mode 100644 Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt
8407 create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt
8408 create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt
8409 create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ak8974.txt
8410 create mode 100644 Documentation/devicetree/bindings/iio/temperature/maxim_thermocouple.txt
8411 delete mode 100644 Documentation/devicetree/bindings/soc/mediatek/auxadc.txt
8412 rename drivers/{staging/android => dma-buf}/sw_sync.c (87%)
8413 rename drivers/{staging/android => dma-buf}/sync_debug.c (99%)
8414 rename drivers/{staging/android => dma-buf}/sync_debug.h (97%)
8415 rename drivers/{staging/android/trace/sync.h => dma-buf/sync_trace.h} (84%)
8416 create mode 100644 drivers/iio/accel/dmard06.c
8417 create mode 100644 drivers/iio/accel/dmard09.c
8418 create mode 100644 drivers/iio/adc/mt6577_auxadc.c
8419 create mode 100644 drivers/iio/adc/ti-adc161s626.c
8420 create mode 100644 drivers/iio/dac/cio-dac.c
8421 create mode 100644 drivers/iio/magnetometer/ak8974.c
8422 create mode 100644 drivers/iio/temperature/maxim_thermocouple.c
8423 create mode 100644 drivers/staging/android/ion/devicetree.txt
8424 create mode 100644 drivers/staging/android/ion/ion-ioctl.c
8425 create mode 100644 drivers/staging/android/ion/ion_of.c
8426 create mode 100644 drivers/staging/android/ion/ion_of.h
8427 delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
8428 rename drivers/staging/fsl-mc/bus/{mc-allocator.c => fsl-mc-allocator.c} (80%)
8429 rename drivers/staging/fsl-mc/bus/{mc-bus.c => fsl-mc-bus.c} (93%)
8430 rename drivers/staging/fsl-mc/bus/{mc-msi.c => fsl-mc-msi.c} (98%)
8431 create mode 100644 drivers/staging/fsl-mc/bus/fsl-mc-private.h
8432 create mode 100644 drivers/staging/fsl-mc/bus/mc-io.c
8433 rename drivers/staging/fsl-mc/include/{mc-private.h => mc-bus.h} (53%)
8434 create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
8435 create mode 100644 drivers/staging/lustre/lustre/include/lustre_lmv.h
8436 delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_FW.h
8437 delete mode 100644 drivers/staging/rtl8723au/Kconfig
8438 delete mode 100644 drivers/staging/rtl8723au/Makefile
8439 delete mode 100644 drivers/staging/rtl8723au/TODO
8440 delete mode 100644 drivers/staging/rtl8723au/core/rtw_ap.c
8441 delete mode 100644 drivers/staging/rtl8723au/core/rtw_cmd.c
8442 delete mode 100644 drivers/staging/rtl8723au/core/rtw_efuse.c
8443 delete mode 100644 drivers/staging/rtl8723au/core/rtw_ieee80211.c
8444 delete mode 100644 drivers/staging/rtl8723au/core/rtw_mlme.c
8445 delete mode 100644 drivers/staging/rtl8723au/core/rtw_mlme_ext.c
8446 delete mode 100644 drivers/staging/rtl8723au/core/rtw_pwrctrl.c
8447 delete mode 100644 drivers/staging/rtl8723au/core/rtw_recv.c
8448 delete mode 100644 drivers/staging/rtl8723au/core/rtw_security.c
8449 delete mode 100644 drivers/staging/rtl8723au/core/rtw_sreset.c
8450 delete mode 100644 drivers/staging/rtl8723au/core/rtw_sta_mgt.c
8451 delete mode 100644 drivers/staging/rtl8723au/core/rtw_wlan_util.c
8452 delete mode 100644 drivers/staging/rtl8723au/core/rtw_xmit.c
8453 delete mode 100644 drivers/staging/rtl8723au/hal/Hal8723PwrSeq.c
8454 delete mode 100644 drivers/staging/rtl8723au/hal/Hal8723UHWImg_CE.c
8455 delete mode 100644 drivers/staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c
8456 delete mode 100644 drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c
8457 delete mode 100644 drivers/staging/rtl8723au/hal/HalHWImg8723A_MAC.c
8458 delete mode 100644 drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c
8459 delete mode 100644 drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c
8460 delete mode 100644 drivers/staging/rtl8723au/hal/hal_com.c
8461 delete mode 100644 drivers/staging/rtl8723au/hal/hal_intf.c
8462 delete mode 100644 drivers/staging/rtl8723au/hal/odm.c
8463 delete mode 100644 drivers/staging/rtl8723au/hal/odm_HWConfig.c
8464 delete mode 100644 drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c
8465 delete mode 100644 drivers/staging/rtl8723au/hal/odm_debug.c
8466 delete mode 100644 drivers/staging/rtl8723au/hal/odm_interface.c
8467 delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
8468 delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
8469 delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_dm.c
8470 delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
8471 delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
8472 delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c
8473 delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_rxdesc.c
8474 delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_sreset.c
8475 delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723au_recv.c
8476 delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
8477 delete mode 100644 drivers/staging/rtl8723au/hal/usb_halinit.c
8478 delete mode 100644 drivers/staging/rtl8723au/hal/usb_ops_linux.c
8479 delete mode 100644 drivers/staging/rtl8723au/include/Hal8723APhyCfg.h
8480 delete mode 100644 drivers/staging/rtl8723au/include/Hal8723APhyReg.h
8481 delete mode 100644 drivers/staging/rtl8723au/include/Hal8723PwrSeq.h
8482 delete mode 100644 drivers/staging/rtl8723au/include/Hal8723UHWImg_CE.h
8483 delete mode 100644 drivers/staging/rtl8723au/include/HalDMOutSrc8723A.h
8484 delete mode 100644 drivers/staging/rtl8723au/include/HalHWImg8723A_BB.h
8485 delete mode 100644 drivers/staging/rtl8723au/include/HalHWImg8723A_FW.h
8486 delete mode 100644 drivers/staging/rtl8723au/include/HalHWImg8723A_MAC.h
8487 delete mode 100644 drivers/staging/rtl8723au/include/HalHWImg8723A_RF.h
8488 delete mode 100644 drivers/staging/rtl8723au/include/HalPwrSeqCmd.h
8489 delete mode 100644 drivers/staging/rtl8723au/include/HalVerDef.h
8490 delete mode 100644 drivers/staging/rtl8723au/include/drv_types.h
8491 delete mode 100644 drivers/staging/rtl8723au/include/hal_com.h
8492 delete mode 100644 drivers/staging/rtl8723au/include/hal_intf.h
8493 delete mode 100644 drivers/staging/rtl8723au/include/ieee80211.h
8494 delete mode 100644 drivers/staging/rtl8723au/include/ioctl_cfg80211.h
8495 delete mode 100644 drivers/staging/rtl8723au/include/mlme_osdep.h
8496 delete mode 100644 drivers/staging/rtl8723au/include/odm.h
8497 delete mode 100644 drivers/staging/rtl8723au/include/odm_HWConfig.h
8498 delete mode 100644 drivers/staging/rtl8723au/include/odm_RegConfig8723A.h
8499 delete mode 100644 drivers/staging/rtl8723au/include/odm_RegDefine11N.h
8500 delete mode 100644 drivers/staging/rtl8723au/include/odm_debug.h
8501 delete mode 100644 drivers/staging/rtl8723au/include/odm_interface.h
8502 delete mode 100644 drivers/staging/rtl8723au/include/odm_precomp.h
8503 delete mode 100644 drivers/staging/rtl8723au/include/odm_reg.h
8504 delete mode 100644 drivers/staging/rtl8723au/include/osdep_intf.h
8505 delete mode 100644 drivers/staging/rtl8723au/include/osdep_service.h
8506 delete mode 100644 drivers/staging/rtl8723au/include/recv_osdep.h
8507 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
8508 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
8509 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_cmd.h
8510 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_dm.h
8511 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_hal.h
8512 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_pg.h
8513 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_recv.h
8514 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_rf.h
8515 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_spec.h
8516 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_sreset.h
8517 delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_xmit.h
8518 delete mode 100644 drivers/staging/rtl8723au/include/rtw_ap.h
8519 delete mode 100644 drivers/staging/rtl8723au/include/rtw_cmd.h
8520 delete mode 100644 drivers/staging/rtl8723au/include/rtw_debug.h
8521 delete mode 100644 drivers/staging/rtl8723au/include/rtw_eeprom.h
8522 delete mode 100644 drivers/staging/rtl8723au/include/rtw_efuse.h
8523 delete mode 100644 drivers/staging/rtl8723au/include/rtw_event.h
8524 delete mode 100644 drivers/staging/rtl8723au/include/rtw_ht.h
8525 delete mode 100644 drivers/staging/rtl8723au/include/rtw_io.h
8526 delete mode 100644 drivers/staging/rtl8723au/include/rtw_mlme.h
8527 delete mode 100644 drivers/staging/rtl8723au/include/rtw_mlme_ext.h
8528 delete mode 100644 drivers/staging/rtl8723au/include/rtw_pwrctrl.h
8529 delete mode 100644 drivers/staging/rtl8723au/include/rtw_recv.h
8530 delete mode 100644 drivers/staging/rtl8723au/include/rtw_rf.h
8531 delete mode 100644 drivers/staging/rtl8723au/include/rtw_security.h
8532 delete mode 100644 drivers/staging/rtl8723au/include/rtw_sreset.h
8533 delete mode 100644 drivers/staging/rtl8723au/include/rtw_version.h
8534 delete mode 100644 drivers/staging/rtl8723au/include/rtw_xmit.h
8535 delete mode 100644 drivers/staging/rtl8723au/include/sta_info.h
8536 delete mode 100644 drivers/staging/rtl8723au/include/usb_ops.h
8537 delete mode 100644 drivers/staging/rtl8723au/include/usb_ops_linux.h
8538 delete mode 100644 drivers/staging/rtl8723au/include/wifi.h
8539 delete mode 100644 drivers/staging/rtl8723au/include/wlan_bssdef.h
8540 delete mode 100644 drivers/staging/rtl8723au/include/xmit_osdep.h
8541 delete mode 100644 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
8542 delete mode 100644 drivers/staging/rtl8723au/os_dep/mlme_linux.c
8543 delete mode 100644 drivers/staging/rtl8723au/os_dep/os_intfs.c
8544 delete mode 100644 drivers/staging/rtl8723au/os_dep/recv_linux.c
8545 delete mode 100644 drivers/staging/rtl8723au/os_dep/usb_intf.c
8546 delete mode 100644 drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
8547 delete mode 100644 drivers/staging/rtl8723au/os_dep/xmit_linux.c
8548 delete mode 100644 drivers/staging/unisys/include/channel_guid.h
8549 delete mode 100644 drivers/staging/unisys/include/diagchannel.h
8550 delete mode 100644 drivers/staging/unisys/include/guestlinuxdebug.h
8551 delete mode 100644 drivers/staging/unisys/include/periodic_work.h
8552 delete mode 100644 drivers/staging/unisys/include/vbushelper.h
8553 delete mode 100644 drivers/staging/unisys/visorbus/controlvmcompletionstatus.h
8554 delete mode 100644 drivers/staging/unisys/visorbus/iovmcall_gnuc.h
8555 delete mode 100644 drivers/staging/unisys/visorbus/periodic_work.c
8556 delete mode 100644 drivers/staging/unisys/visorbus/vbusdeviceinfo.h
8557 Merging char-misc/char-misc-next (ac182e8abc6f mei: me: add kaby point device ids)
8558 $ git merge char-misc/char-misc-next
8559 Auto-merging include/linux/hyperv.h
8560 Auto-merging drivers/tty/serial/pch_uart.c
8561 Removing drivers/misc/bmp085.h
8562 Removing drivers/misc/bmp085.c
8563 Removing drivers/misc/bmp085-spi.c
8564 Removing drivers/misc/bmp085-i2c.c
8565 Auto-merging MAINTAINERS
8566 Removing Documentation/ABI/testing/sysfs-i2c-bmp085
8567 Auto-merging CREDITS
8568 Merge made by the 'recursive' strategy.
8570 Documentation/ABI/testing/sysfs-class-mic.txt | 2 +-
8571 Documentation/ABI/testing/sysfs-i2c-bmp085 | 31 -
8572 .../devicetree/bindings/nvmem/rockchip-efuse.txt | 13 +-
8573 Documentation/vme_api.txt | 13 +-
8575 arch/arm/common/bL_switcher_dummy_if.c | 14 +-
8576 arch/blackfin/mach-bf561/coreb.c | 13 +-
8577 arch/um/drivers/harddog_kern.c | 25 +-
8578 drivers/bluetooth/hci_vhci.c | 16 +-
8579 drivers/char/bfin-otp.c | 40 +-
8580 drivers/char/mem.c | 6 +
8581 drivers/char/mwave/3780i.c | 64 +-
8582 drivers/char/mwave/3780i.h | 8 +-
8583 drivers/char/mwave/mwavedd.c | 42 +-
8584 drivers/char/mwave/mwavedd.h | 14 +-
8585 drivers/char/mwave/smapi.c | 4 +-
8586 drivers/char/mwave/smapi.h | 6 +-
8587 drivers/char/mwave/tp3780i.c | 52 +-
8588 drivers/char/ppdev.c | 25 +-
8589 drivers/char/snsc.c | 7 +-
8590 drivers/char/xillybus/xillybus_core.c | 4 +-
8591 drivers/fpga/Kconfig | 1 +
8592 drivers/hid/uhid.c | 13 +-
8593 drivers/hv/channel.c | 148 +--
8594 drivers/hv/channel_mgmt.c | 128 +-
8595 drivers/hv/connection.c | 8 +-
8596 drivers/hv/hv.c | 8 +-
8597 drivers/hv/hv_balloon.c | 254 ++--
8598 drivers/hv/hv_fcopy.c | 14 +-
8599 drivers/hv/hv_kvp.c | 27 +-
8600 drivers/hv/hv_snapshot.c | 109 +-
8601 drivers/hv/hv_util.c | 155 ++-
8602 drivers/hv/hv_utils_transport.c | 15 +-
8603 drivers/hv/hv_utils_transport.h | 4 +-
8604 drivers/hv/hyperv_vmbus.h | 9 +-
8605 drivers/hv/ring_buffer.c | 76 +-
8606 drivers/hv/vmbus_drv.c | 12 +-
8607 drivers/hwtracing/coresight/coresight-etb10.c | 28 +-
8608 drivers/hwtracing/coresight/coresight-etm-perf.c | 157 ++-
8609 drivers/hwtracing/coresight/coresight-etm-perf.h | 34 +
8610 drivers/hwtracing/coresight/coresight-etm.h | 8 -
8611 .../hwtracing/coresight/coresight-etm3x-sysfs.c | 3 +-
8612 drivers/hwtracing/coresight/coresight-etm3x.c | 39 +-
8613 .../hwtracing/coresight/coresight-etm4x-sysfs.c | 63 +-
8614 drivers/hwtracing/coresight/coresight-etm4x.c | 419 +++++--
8615 drivers/hwtracing/coresight/coresight-etm4x.h | 11 +-
8616 drivers/hwtracing/coresight/coresight-funnel.c | 20 +-
8617 drivers/hwtracing/coresight/coresight-priv.h | 23 +-
8618 .../coresight/coresight-replicator-qcom.c | 18 +-
8619 drivers/hwtracing/coresight/coresight-replicator.c | 20 +-
8620 drivers/hwtracing/coresight/coresight-stm.c | 53 +-
8621 drivers/hwtracing/coresight/coresight-tmc-etf.c | 6 +-
8622 drivers/hwtracing/coresight/coresight-tmc-etr.c | 14 +-
8623 drivers/hwtracing/coresight/coresight-tmc.c | 80 +-
8624 drivers/hwtracing/coresight/coresight-tmc.h | 4 +-
8625 drivers/hwtracing/coresight/coresight-tpiu.c | 18 +-
8626 drivers/hwtracing/coresight/coresight.c | 31 +-
8627 drivers/hwtracing/coresight/of_coresight.c | 3 +-
8628 drivers/iio/pressure/Kconfig | 2 -
8629 drivers/input/misc/uinput.c | 15 +-
8630 drivers/lightnvm/core.c | 19 +-
8631 drivers/mcb/Kconfig | 9 +
8632 drivers/mcb/Makefile | 1 +
8633 drivers/mcb/mcb-core.c | 17 -
8634 drivers/mcb/mcb-internal.h | 9 +
8635 drivers/mcb/mcb-lpc.c | 158 +++
8636 drivers/mcb/mcb-parse.c | 126 +-
8637 drivers/memory/of_memory.c | 1 +
8638 drivers/misc/Kconfig | 28 -
8639 drivers/misc/Makefile | 3 -
8640 drivers/misc/bmp085-i2c.c | 83 --
8641 drivers/misc/bmp085-spi.c | 79 --
8642 drivers/misc/bmp085.c | 506 --------
8643 drivers/misc/bmp085.h | 33 -
8644 drivers/misc/genwqe/card_base.c | 15 +
8645 drivers/misc/mei/amthif.c | 344 ++----
8646 drivers/misc/mei/bus.c | 11 +-
8647 drivers/misc/mei/client.c | 188 ++-
8648 drivers/misc/mei/client.h | 7 +-
8649 drivers/misc/mei/hbm.c | 46 +-
8650 drivers/misc/mei/hw-me-regs.h | 3 +
8651 drivers/misc/mei/hw-me.c | 3 +
8652 drivers/misc/mei/hw-txe.c | 3 +
8653 drivers/misc/mei/interrupt.c | 52 +-
8654 drivers/misc/mei/main.c | 58 +-
8655 drivers/misc/mei/mei_dev.h | 30 +-
8656 drivers/misc/mei/pci-me.c | 9 +
8657 drivers/misc/mei/pci-txe.c | 7 +
8658 drivers/misc/mic/scif/scif_dma.c | 6 +-
8659 drivers/misc/mic/scif/scif_mmap.c | 4 +-
8660 drivers/misc/pch_phub.c | 20 +-
8661 drivers/misc/vmw_vmci/vmci_host.c | 14 +-
8662 drivers/nvmem/rockchip-efuse.c | 133 +-
8663 drivers/s390/char/sclp_ctl.c | 19 +-
8664 drivers/tty/serial/Kconfig | 2 +-
8665 drivers/tty/serial/pch_uart.c | 5 +
8666 drivers/uio/uio_dmem_genirq.c | 2 +-
8667 drivers/vhost/test.c | 13 +-
8668 drivers/vme/bridges/Kconfig | 8 +
8669 drivers/vme/bridges/Makefile | 1 +
8670 drivers/vme/bridges/vme_ca91cx42.c | 8 +-
8671 drivers/vme/bridges/vme_ca91cx42.h | 3 +-
8672 drivers/vme/bridges/vme_fake.c | 1299 ++++++++++++++++++++
8673 drivers/vme/bridges/vme_tsi148.c | 8 +-
8674 drivers/vme/bridges/vme_tsi148.h | 3 +-
8675 drivers/vme/vme.c | 31 +-
8676 drivers/vme/vme_bridge.h | 3 +-
8677 drivers/w1/slaves/w1_therm.c | 22 +-
8678 drivers/w1/w1.c | 4 +-
8679 include/linux/coresight.h | 5 +-
8680 include/linux/hyperv.h | 91 ++
8681 include/linux/mcb.h | 22 +-
8682 include/linux/miscdevice.h | 8 +
8683 include/linux/vme.h | 2 +-
8684 scripts/checkkconfigsymbols.py | 338 ++---
8685 scripts/ver_linux | 260 ++--
8686 tools/hv/hv_kvp_daemon.c | 2 +-
8687 tools/hv/hv_vss_daemon.c | 3 +
8688 119 files changed, 3928 insertions(+), 2717 deletions(-)
8689 delete mode 100644 Documentation/ABI/testing/sysfs-i2c-bmp085
8690 create mode 100644 drivers/mcb/mcb-lpc.c
8691 delete mode 100644 drivers/misc/bmp085-i2c.c
8692 delete mode 100644 drivers/misc/bmp085-spi.c
8693 delete mode 100644 drivers/misc/bmp085.c
8694 delete mode 100644 drivers/misc/bmp085.h
8695 create mode 100644 drivers/vme/bridges/vme_fake.c
8696 Merging extcon/extcon-next (38085c987f52 extcon: Add support for qcom SPMI PMIC USB id detection hardware)
8697 $ git merge extcon/extcon-next
8698 Merge made by the 'recursive' strategy.
8699 .../bindings/extcon/qcom,pm8941-misc.txt | 41 ++
8700 drivers/extcon/Kconfig | 6 +
8701 drivers/extcon/Makefile | 1 +
8702 drivers/extcon/extcon-adc-jack.c | 27 +-
8703 drivers/extcon/extcon-arizona.c | 27 +-
8704 drivers/extcon/extcon-axp288.c | 8 +-
8705 drivers/extcon/extcon-gpio.c | 2 +-
8706 drivers/extcon/extcon-max14577.c | 18 +-
8707 drivers/extcon/extcon-max3355.c | 8 +-
8708 drivers/extcon/extcon-max77693.c | 46 +-
8709 drivers/extcon/extcon-max77843.c | 22 +-
8710 drivers/extcon/extcon-max8997.c | 20 +-
8711 drivers/extcon/extcon-palmas.c | 16 +-
8712 drivers/extcon/extcon-qcom-spmi-misc.c | 170 +++++
8713 drivers/extcon/extcon-rt8973a.c | 4 +-
8714 drivers/extcon/extcon-sm5502.c | 4 +-
8715 drivers/extcon/extcon-usb-gpio.c | 8 +-
8716 drivers/extcon/extcon.c | 774 +++++++++++++++++----
8717 include/linux/extcon.h | 192 ++++-
8718 include/linux/extcon/extcon-adc-jack.h | 4 +-
8719 20 files changed, 1122 insertions(+), 276 deletions(-)
8720 create mode 100644 Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.txt
8721 create mode 100644 drivers/extcon/extcon-qcom-spmi-misc.c
8722 Merging cgroup/for-next (667430ec48e4 Merge branch 'for-4.8-fixes' into for-next)
8723 $ git merge cgroup/for-next
8724 Auto-merging kernel/sched/debug.c
8725 Auto-merging kernel/cgroup.c
8726 Auto-merging include/linux/cgroup.h
8727 Auto-merging fs/kernfs/dir.c
8728 Merge made by the 'recursive' strategy.
8729 fs/kernfs/dir.c | 84 +++++-----------------
8730 fs/sysfs/dir.c | 6 +-
8731 include/linux/blk-cgroup.h | 11 +--
8732 include/linux/cgroup.h | 9 ++-
8733 include/linux/kernfs.h | 28 +++++---
8734 include/trace/events/cgroup.h | 163 ++++++++++++++++++++++++++++++++++++++++++
8735 kernel/cgroup.c | 73 ++++++++++++-------
8736 kernel/cpuset.c | 12 ++--
8737 kernel/sched/debug.c | 3 +-
8738 9 files changed, 263 insertions(+), 126 deletions(-)
8739 create mode 100644 include/trace/events/cgroup.h
8740 Merging scsi/for-next (237870b3374e Merge branch 'fixes' into for-next)
8741 $ git merge scsi/for-next
8742 Auto-merging MAINTAINERS
8743 Merge made by the 'recursive' strategy.
8744 Documentation/powerpc/cxlflash.txt | 44 +-
8745 Documentation/scsi/smartpqi.txt | 80 +
8747 drivers/message/fusion/mptbase.c | 7 +-
8748 drivers/message/fusion/mptfc.c | 3 +-
8749 drivers/s390/scsi/zfcp_dbf.c | 162 +-
8750 drivers/s390/scsi/zfcp_dbf.h | 14 +-
8751 drivers/s390/scsi/zfcp_erp.c | 12 +-
8752 drivers/s390/scsi/zfcp_ext.h | 8 +-
8753 drivers/s390/scsi/zfcp_fsf.c | 22 +-
8754 drivers/s390/scsi/zfcp_fsf.h | 4 +-
8755 drivers/s390/scsi/zfcp_scsi.c | 8 +-
8756 drivers/scsi/Kconfig | 1 +
8757 drivers/scsi/Makefile | 1 +
8758 drivers/scsi/NCR5380.c | 7 -
8759 drivers/scsi/NCR5380.h | 8 +-
8760 drivers/scsi/aic94xx/aic94xx_hwi.c | 2 +-
8761 drivers/scsi/be2iscsi/be.h | 15 +-
8762 drivers/scsi/be2iscsi/be_cmds.c | 1096 +++--
8763 drivers/scsi/be2iscsi/be_cmds.h | 142 +-
8764 drivers/scsi/be2iscsi/be_iscsi.c | 408 +-
8765 drivers/scsi/be2iscsi/be_iscsi.h | 25 +-
8766 drivers/scsi/be2iscsi/be_main.c | 2480 +++++-----
8767 drivers/scsi/be2iscsi/be_main.h | 220 +-
8768 drivers/scsi/be2iscsi/be_mgmt.c | 1497 +++---
8769 drivers/scsi/be2iscsi/be_mgmt.h | 51 +-
8770 drivers/scsi/bfa/bfa_fcs_lport.c | 4 +-
8771 drivers/scsi/cxlflash/superpipe.c | 181 +-
8772 drivers/scsi/cxlflash/superpipe.h | 3 +-
8773 drivers/scsi/cxlflash/vlun.c | 13 +-
8774 drivers/scsi/esas2r/esas2r_init.c | 4 -
8775 drivers/scsi/esas2r/esas2r_main.c | 2 +-
8776 drivers/scsi/fcoe/fcoe_transport.c | 53 +-
8777 drivers/scsi/hisi_sas/hisi_sas.h | 10 +-
8778 drivers/scsi/hisi_sas/hisi_sas_main.c | 190 +-
8779 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 64 +
8780 drivers/scsi/hosts.c | 12 +-
8781 drivers/scsi/ibmvscsi/ibmvfc.c | 11 +
8782 drivers/scsi/ibmvscsi/ibmvfc.h | 1 +
8783 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 33 +-
8784 drivers/scsi/ipr.c | 125 +-
8785 drivers/scsi/ipr.h | 7 +-
8786 drivers/scsi/libfc/fc_exch.c | 1 -
8787 drivers/scsi/libfc/fc_rport.c | 26 +-
8788 drivers/scsi/megaraid/megaraid_sas_base.c | 13 +-
8789 drivers/scsi/mpt3sas/mpt3sas_base.c | 259 +-
8790 drivers/scsi/mpt3sas/mpt3sas_base.h | 24 +-
8791 drivers/scsi/mpt3sas/mpt3sas_config.c | 7 +-
8792 drivers/scsi/mpt3sas/mpt3sas_ctl.c | 49 +-
8793 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 169 +-
8794 drivers/scsi/mpt3sas/mpt3sas_transport.c | 28 +-
8795 drivers/scsi/pmcraid.c | 8 +-
8796 drivers/scsi/qla2xxx/qla_os.c | 18 +-
8797 drivers/scsi/qla4xxx/ql4_nx.c | 2 +-
8798 drivers/scsi/scsi_priv.h | 2 +
8799 drivers/scsi/scsi_scan.c | 2 -
8800 drivers/scsi/sg.c | 20 +-
8801 drivers/scsi/smartpqi/Kconfig | 54 +
8802 drivers/scsi/smartpqi/Makefile | 3 +
8803 drivers/scsi/smartpqi/smartpqi.h | 1136 +++++
8804 drivers/scsi/smartpqi/smartpqi_init.c | 6302 ++++++++++++++++++++++++
8805 drivers/scsi/smartpqi/smartpqi_sas_transport.c | 350 ++
8806 drivers/scsi/smartpqi/smartpqi_sis.c | 404 ++
8807 drivers/scsi/smartpqi/smartpqi_sis.h | 34 +
8808 drivers/scsi/sr.c | 2 +-
8809 drivers/scsi/ufs/tc-dwc-g210.c | 1 +
8810 include/uapi/scsi/cxlflash_ioctl.h | 19 +-
8811 67 files changed, 12485 insertions(+), 3500 deletions(-)
8812 create mode 100644 Documentation/scsi/smartpqi.txt
8813 create mode 100644 drivers/scsi/smartpqi/Kconfig
8814 create mode 100644 drivers/scsi/smartpqi/Makefile
8815 create mode 100644 drivers/scsi/smartpqi/smartpqi.h
8816 create mode 100644 drivers/scsi/smartpqi/smartpqi_init.c
8817 create mode 100644 drivers/scsi/smartpqi/smartpqi_sas_transport.c
8818 create mode 100644 drivers/scsi/smartpqi/smartpqi_sis.c
8819 create mode 100644 drivers/scsi/smartpqi/smartpqi_sis.h
8820 Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
8821 $ git merge target-updates/for-next
8823 Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
8824 $ git merge target-merge/for-next-merge
8826 Merging libata/for-next (4bf4f57f34b0 Merge branch 'for-4.9' into for-next)
8827 $ git merge libata/for-next
8828 Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
8829 Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
8830 Auto-merging arch/arm/boot/dts/stih407-family.dtsi
8831 Merge made by the 'recursive' strategy.
8832 arch/arm/boot/dts/stih407-family.dtsi | 4 +
8833 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +-
8834 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 2 +
8835 drivers/ata/ahci.c | 149 +++----------
8836 drivers/ata/ahci.h | 24 +--
8837 drivers/ata/ahci_qoriq.c | 12 +-
8838 drivers/ata/ahci_st.c | 4 +
8839 drivers/ata/libahci.c | 9 +-
8840 drivers/ata/libata-scsi.c | 288 ++++++++++++++++++++++---
8841 include/linux/ata.h | 69 +++---
8842 10 files changed, 358 insertions(+), 206 deletions(-)
8843 Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
8844 $ git merge binfmt_misc/for-next
8846 Merging pinctrl/for-next (d746eddbf9b5 Merge branch 'devel' into for-next)
8847 $ git merge pinctrl/for-next
8848 Auto-merging drivers/pinctrl/meson/pinctrl-meson-gxbb.c
8849 Merge made by the 'recursive' strategy.
8850 .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 +
8851 .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 65 ++
8852 .../devicetree/bindings/pinctrl/pinctrl-st.txt | 8 +-
8853 .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 5 +-
8854 .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 5 +-
8855 drivers/gpio/gpio-mxc.c | 7 +-
8856 drivers/pinctrl/Kconfig | 1 +
8857 drivers/pinctrl/Makefile | 1 +
8858 drivers/pinctrl/aspeed/Kconfig | 24 +
8859 drivers/pinctrl/aspeed/Makefile | 6 +
8860 drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 1231 ++++++++++++++++++++
8861 drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 808 +++++++++++++
8862 drivers/pinctrl/aspeed/pinctrl-aspeed.c | 498 ++++++++
8863 drivers/pinctrl/aspeed/pinctrl-aspeed.h | 569 +++++++++
8864 drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 4 +-
8865 drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 4 +-
8866 drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 4 +-
8867 drivers/pinctrl/freescale/pinctrl-imx.c | 6 +-
8868 drivers/pinctrl/intel/pinctrl-merrifield.c | 2 +-
8869 drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 5 -
8870 drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 43 +-
8871 drivers/pinctrl/meson/pinctrl-meson.c | 222 ++--
8872 drivers/pinctrl/meson/pinctrl-meson.h | 52 +-
8873 drivers/pinctrl/meson/pinctrl-meson8.c | 24 +-
8874 drivers/pinctrl/meson/pinctrl-meson8b.c | 24 +-
8875 drivers/pinctrl/nomadik/pinctrl-abx500.c | 8 +-
8876 drivers/pinctrl/nomadik/pinctrl-nomadik.c | 11 +-
8877 drivers/pinctrl/pinctrl-amd.c | 15 +
8878 drivers/pinctrl/pinctrl-at91.c | 2 +-
8879 drivers/pinctrl/pinctrl-palmas.c | 4 +-
8880 drivers/pinctrl/pinctrl-rockchip.c | 7 +-
8881 drivers/pinctrl/pinctrl-st.c | 17 -
8882 drivers/pinctrl/pinctrl-zynq.c | 2 +-
8883 drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 +
8884 drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 1 +
8885 drivers/pinctrl/samsung/pinctrl-exynos.c | 6 +-
8886 drivers/pinctrl/samsung/pinctrl-samsung.c | 10 +-
8887 drivers/pinctrl/sirf/pinctrl-atlas7.c | 5 +-
8888 drivers/pinctrl/sirf/pinctrl-sirf.c | 12 +-
8889 drivers/pinctrl/sunxi/Kconfig | 4 +
8890 drivers/pinctrl/sunxi/Makefile | 1 +
8891 drivers/pinctrl/sunxi/pinctrl-gr8.c | 541 +++++++++
8892 drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 12 +-
8893 drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c | 1 -
8894 44 files changed, 3960 insertions(+), 319 deletions(-)
8895 create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt
8896 create mode 100644 drivers/pinctrl/aspeed/Kconfig
8897 create mode 100644 drivers/pinctrl/aspeed/Makefile
8898 create mode 100644 drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
8899 create mode 100644 drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
8900 create mode 100644 drivers/pinctrl/aspeed/pinctrl-aspeed.c
8901 create mode 100644 drivers/pinctrl/aspeed/pinctrl-aspeed.h
8902 create mode 100644 drivers/pinctrl/sunxi/pinctrl-gr8.c
8903 Merging vhost/linux-next (5e59d9a1aed2 virtio_console: Stop doing DMA on the stack)
8904 $ git merge vhost/linux-next
8906 Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
8907 $ git merge remoteproc/for-next
8908 Merge made by the 'recursive' strategy.
8909 Merging rpmsg/for-next (a4a68bf90f34 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
8910 $ git merge rpmsg/for-next
8911 Merge made by the 'recursive' strategy.
8912 .../bindings/remoteproc/qcom,wcnss-pil.txt | 132 ++
8913 drivers/remoteproc/Kconfig | 20 +-
8914 drivers/remoteproc/Makefile | 2 +
8915 drivers/remoteproc/da8xx_remoteproc.c | 2 +-
8916 drivers/remoteproc/omap_remoteproc.c | 5 +-
8917 drivers/remoteproc/qcom_q6v5_pil.c | 4 +-
8918 drivers/remoteproc/qcom_wcnss.c | 624 +++++++++
8919 drivers/remoteproc/qcom_wcnss.h | 22 +
8920 drivers/remoteproc/qcom_wcnss_iris.c | 188 +++
8921 drivers/remoteproc/remoteproc_core.c | 191 ++-
8922 drivers/remoteproc/remoteproc_debugfs.c | 20 +-
8923 drivers/remoteproc/remoteproc_elf_loader.c | 6 +-
8924 drivers/remoteproc/remoteproc_internal.h | 15 +-
8925 drivers/remoteproc/remoteproc_virtio.c | 35 +-
8926 drivers/remoteproc/wkup_m3_rproc.c | 2 +
8927 drivers/rpmsg/Kconfig | 14 +
8928 drivers/rpmsg/Makefile | 4 +-
8929 drivers/rpmsg/qcom_smd.c | 1434 ++++++++++++++++++++
8930 drivers/rpmsg/rpmsg_core.c | 498 +++++++
8931 drivers/rpmsg/rpmsg_internal.h | 82 ++
8932 drivers/rpmsg/virtio_rpmsg_bus.c | 541 +++-----
8933 include/linux/platform_data/remoteproc-omap.h | 6 +-
8934 include/linux/remoteproc.h | 15 +-
8935 include/linux/rpmsg.h | 248 +---
8936 samples/rpmsg/rpmsg_client_sample.c | 32 +-
8937 25 files changed, 3429 insertions(+), 713 deletions(-)
8938 create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt
8939 create mode 100644 drivers/remoteproc/qcom_wcnss.c
8940 create mode 100644 drivers/remoteproc/qcom_wcnss.h
8941 create mode 100644 drivers/remoteproc/qcom_wcnss_iris.c
8942 create mode 100644 drivers/rpmsg/qcom_smd.c
8943 create mode 100644 drivers/rpmsg/rpmsg_core.c
8944 create mode 100644 drivers/rpmsg/rpmsg_internal.h
8945 Merging gpio/for-next (82e00e9a0d07 Merge branch 'devel' into for-next)
8946 $ git merge gpio/for-next
8947 Recorded preimage for 'drivers/gpio/gpio-mxc.c'
8948 Resolved 'arch/arm64/Kconfig.platforms' using previous resolution.
8949 Removing include/linux/platform_data/gpio-lpc32xx.h
8950 Auto-merging drivers/gpio/gpio-mxc.c
8951 CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxc.c
8952 Auto-merging drivers/gpio/Makefile
8953 Auto-merging drivers/gpio/Kconfig
8954 Auto-merging arch/arm64/Kconfig.platforms
8955 CONFLICT (content): Merge conflict in arch/arm64/Kconfig.platforms
8956 Auto-merging arch/arm64/Kconfig
8957 Auto-merging MAINTAINERS
8958 Removing Documentation/devicetree/bindings/gpio/gpio-tps65086.txt
8959 Automatic merge failed; fix conflicts and then commit the result.
8961 Recorded resolution for 'drivers/gpio/gpio-mxc.c'.
8962 [master f770d3b26a41] Merge remote-tracking branch 'gpio/for-next'
8963 $ git diff -M --stat --summary HEAD^..
8964 .../devicetree/bindings/gpio/brcm,bcm6345-gpio.txt | 46 ++
8965 .../devicetree/bindings/gpio/gpio-aspeed.txt | 36 ++
8966 .../devicetree/bindings/gpio/gpio-axp209.txt | 30 ++
8967 .../devicetree/bindings/gpio/gpio-tpic2810.txt | 16 +
8968 .../devicetree/bindings/gpio/gpio-tps65086.txt | 16 -
8969 .../devicetree/bindings/gpio/gpio-ts4900.txt | 30 ++
8970 .../devicetree/bindings/gpio/mrvl-gpio.txt | 23 -
8971 .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 1 +
8972 Documentation/gpio/board.txt | 6 +-
8973 Documentation/gpio/gpio-legacy.txt | 16 +-
8975 arch/arm64/Kconfig | 1 -
8976 arch/arm64/Kconfig.platforms | 12 +-
8977 arch/blackfin/Kconfig | 2 +-
8978 drivers/gpio/Kconfig | 70 ++-
8979 drivers/gpio/Makefile | 5 +
8980 drivers/gpio/gpio-aspeed.c | 457 ++++++++++++++++++++
8981 drivers/gpio/gpio-axp209.c | 162 +++++++
8982 drivers/gpio/gpio-gpio-mm.c | 267 ++++++++++++
8983 drivers/gpio/gpio-iop.c | 115 +----
8984 drivers/gpio/gpio-lpc32xx.c | 15 +-
8985 drivers/gpio/gpio-mmio.c | 4 +
8986 drivers/gpio/gpio-msic.c | 6 -
8987 drivers/gpio/gpio-mxc.c | 10 +-
8988 drivers/gpio/gpio-pca953x.c | 330 ++++++++-------
8989 drivers/gpio/gpio-rcar.c | 4 +
8990 drivers/gpio/gpio-spear-spics.c | 7 +-
8991 drivers/gpio/gpio-ts4900.c | 190 +++++++++
8992 drivers/gpio/gpio-vf610.c | 7 +-
8993 drivers/gpio/gpio-wcove.c | 469 +++++++++++++++++++++
8994 drivers/gpio/gpiolib-sysfs.c | 4 +-
8995 drivers/gpio/gpiolib.c | 21 +-
8996 include/linux/platform_data/gpio-lpc32xx.h | 50 ---
8997 33 files changed, 2019 insertions(+), 415 deletions(-)
8998 create mode 100644 Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.txt
8999 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-aspeed.txt
9000 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-axp209.txt
9001 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-tpic2810.txt
9002 delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-tps65086.txt
9003 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-ts4900.txt
9004 create mode 100644 drivers/gpio/gpio-aspeed.c
9005 create mode 100644 drivers/gpio/gpio-axp209.c
9006 create mode 100644 drivers/gpio/gpio-gpio-mm.c
9007 create mode 100644 drivers/gpio/gpio-ts4900.c
9008 create mode 100644 drivers/gpio/gpio-wcove.c
9009 delete mode 100644 include/linux/platform_data/gpio-lpc32xx.h
9010 Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
9011 $ git merge dma-mapping/dma-mapping-next
9013 Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next)
9014 $ git merge pwm/for-next
9015 Merge made by the 'recursive' strategy.
9016 .../devicetree/bindings/pwm/pwm-meson.txt | 23 +
9017 .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 3 +-
9018 Documentation/devicetree/bindings/pwm/pwm-st.txt | 8 +-
9019 .../devicetree/bindings/pwm/pwm-sun4i.txt | 1 +
9020 drivers/pwm/Kconfig | 9 +
9021 drivers/pwm/Makefile | 1 +
9022 drivers/pwm/core.c | 2 +
9023 drivers/pwm/pwm-berlin.c | 84 ++++
9024 drivers/pwm/pwm-cros-ec.c | 4 +-
9025 drivers/pwm/pwm-lpc18xx-sct.c | 12 +-
9026 drivers/pwm/pwm-meson.c | 529 +++++++++++++++++++++
9027 drivers/pwm/pwm-mtk-disp.c | 87 +++-
9028 drivers/pwm/pwm-samsung.c | 15 +-
9029 drivers/pwm/pwm-sti.c | 483 +++++++++++++++----
9030 drivers/pwm/pwm-sun4i.c | 9 +
9031 drivers/pwm/pwm-tipwmss.c | 19 -
9032 drivers/pwm/pwm-twl.c | 16 +
9033 drivers/pwm/sysfs.c | 18 +
9034 include/linux/pwm.h | 5 +
9035 19 files changed, 1183 insertions(+), 145 deletions(-)
9036 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
9037 create mode 100644 drivers/pwm/pwm-meson.c
9038 Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
9039 $ git merge dma-buf/for-next
9040 Resolved 'drivers/dma-buf/Kconfig' using previous resolution.
9041 Auto-merging drivers/dma-buf/Kconfig
9042 CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
9043 Automatic merge failed; fix conflicts and then commit the result.
9045 [master 7275df1d59d6] Merge remote-tracking branch 'dma-buf/for-next'
9046 $ git diff -M --stat --summary HEAD^..
9047 Merging userns/for-next (aeaa4a79ff6a fs: Call d_automount with the filesystems creds)
9048 $ git merge userns/for-next
9050 Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
9051 $ git merge ktest/for-next
9053 Merging clk/clk-next (7348b6ce9401 clk: rk808: Pass the right pointer as the get_hw context)
9054 $ git merge clk/clk-next
9055 Auto-merging drivers/clk/meson/meson8b.c
9056 Removing drivers/clk/clk-max77802.c
9057 Removing drivers/clk/clk-max-gen.h
9058 Removing drivers/clk/clk-max-gen.c
9059 Auto-merging MAINTAINERS
9060 Auto-merging Documentation/devicetree/bindings/clock/qcom,gcc.txt
9061 Removing Documentation/devicetree/bindings/clock/maxim,max77802.txt
9062 Merge made by the 'recursive' strategy.
9063 .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 3 +-
9064 .../bindings/arm/mediatek/mediatek,bdpsys.txt | 22 +
9065 .../bindings/arm/mediatek/mediatek,ethsys.txt | 22 +
9066 .../bindings/arm/mediatek/mediatek,hifsys.txt | 24 +
9067 .../bindings/arm/mediatek/mediatek,imgsys.txt | 3 +-
9068 .../bindings/arm/mediatek/mediatek,infracfg.txt | 3 +-
9069 .../bindings/arm/mediatek/mediatek,mmsys.txt | 3 +-
9070 .../bindings/arm/mediatek/mediatek,pericfg.txt | 3 +-
9071 .../bindings/arm/mediatek/mediatek,topckgen.txt | 3 +-
9072 .../bindings/arm/mediatek/mediatek,vdecsys.txt | 3 +-
9073 .../devicetree/bindings/clock/arm-syscon-icst.txt | 34 +-
9074 .../bindings/clock/armada3700-periph-clock.txt | 70 +
9075 .../bindings/clock/armada3700-tbg-clock.txt | 27 +
9076 .../bindings/clock/armada3700-xtal-clock.txt | 28 +
9077 .../devicetree/bindings/clock/maxim,max77686.txt | 118 +-
9078 .../devicetree/bindings/clock/maxim,max77802.txt | 44 -
9079 .../bindings/clock/mvebu-gated-clock.txt | 2 +
9080 .../devicetree/bindings/clock/qcom,gcc.txt | 1 +
9081 .../devicetree/bindings/clock/qcom,lcc.txt | 1 +
9083 drivers/clk/Kconfig | 19 +-
9084 drivers/clk/Makefile | 2 -
9085 drivers/clk/axis/clk-artpec6.c | 4 +-
9086 drivers/clk/bcm/clk-bcm2835.c | 63 +-
9087 drivers/clk/bcm/clk-kona-setup.c | 76 +-
9088 drivers/clk/bcm/clk-kona.c | 9 +-
9089 drivers/clk/bcm/clk-kona.h | 7 +-
9090 drivers/clk/berlin/berlin2-avpll.c | 12 +-
9091 drivers/clk/berlin/berlin2-avpll.h | 8 +-
9092 drivers/clk/berlin/berlin2-div.c | 4 +-
9093 drivers/clk/berlin/berlin2-div.h | 4 +-
9094 drivers/clk/berlin/berlin2-pll.c | 6 +-
9095 drivers/clk/berlin/berlin2-pll.h | 9 +-
9096 drivers/clk/berlin/bg2.c | 98 +-
9097 drivers/clk/berlin/bg2q.c | 39 +-
9098 drivers/clk/clk-asm9260.c | 31 +-
9099 drivers/clk/clk-axi-clkgen.c | 12 +-
9100 drivers/clk/clk-axm5516.c | 39 +-
9101 drivers/clk/clk-cdce706.c | 40 +-
9102 drivers/clk/clk-cdce925.c | 42 +-
9103 drivers/clk/clk-clps711x.c | 78 +-
9104 drivers/clk/clk-cs2000-cp.c | 16 +-
9105 drivers/clk/clk-divider.c | 2 +-
9106 drivers/clk/clk-efm32gg.c | 63 +-
9107 drivers/clk/clk-fixed-factor.c | 74 +-
9108 drivers/clk/clk-fixed-rate.c | 72 +-
9109 drivers/clk/clk-ls1x.c | 69 +-
9110 drivers/clk/clk-max-gen.c | 194 ---
9111 drivers/clk/clk-max-gen.h | 32 -
9112 drivers/clk/clk-max77686.c | 262 ++-
9113 drivers/clk/clk-max77802.c | 96 --
9114 drivers/clk/clk-mb86s7x.c | 16 +-
9115 drivers/clk/clk-moxart.c | 22 +-
9116 drivers/clk/clk-nspire.c | 19 +-
9117 drivers/clk/clk-palmas.c | 12 +-
9118 drivers/clk/clk-pwm.c | 9 +-
9119 drivers/clk/clk-qoriq.c | 6 +-
9120 drivers/clk/clk-rk808.c | 44 +-
9121 drivers/clk/clk-scpi.c | 33 +-
9122 drivers/clk/clk-si514.c | 11 +-
9123 drivers/clk/clk-si5351.c | 71 +-
9124 drivers/clk/clk-si570.c | 13 +-
9125 drivers/clk/clk-twl6040.c | 87 +-
9126 drivers/clk/clk-vt8500.c | 22 +-
9127 drivers/clk/clk-wm831x.c | 21 +-
9128 drivers/clk/clk.c | 49 +-
9129 drivers/clk/h8300/clk-div.c | 10 +-
9130 drivers/clk/h8300/clk-h8s2678.c | 12 +-
9131 drivers/clk/imx/clk-imx7d.c | 117 +-
9132 drivers/clk/imx/clk.h | 9 +
9133 drivers/clk/mediatek/Kconfig | 21 +
9134 drivers/clk/mediatek/Makefile | 6 +-
9135 drivers/clk/mediatek/clk-gate.c | 2 +-
9136 drivers/clk/mediatek/clk-mtk.c | 12 +-
9137 drivers/clk/mediatek/clk-pll.c | 2 +-
9138 drivers/clk/meson/Makefile | 2 +-
9139 drivers/clk/meson/clkc.h | 2 +-
9140 drivers/clk/meson/gxbb.c | 174 +-
9141 drivers/clk/meson/gxbb.h | 6 +-
9142 drivers/clk/meson/{meson8b-clkc.c => meson8b.c} | 293 +++-
9143 drivers/clk/meson/meson8b.h | 151 ++
9144 drivers/clk/microchip/clk-core.c | 6 +-
9145 drivers/clk/microchip/clk-pic32mzda.c | 1 +
9146 drivers/clk/mvebu/Kconfig | 3 +
9147 drivers/clk/mvebu/Makefile | 3 +
9148 drivers/clk/mvebu/armada-37xx-periph.c | 447 +++++
9149 drivers/clk/mvebu/armada-37xx-tbg.c | 158 ++
9150 drivers/clk/mvebu/armada-37xx-xtal.c | 91 ++
9151 drivers/clk/mvebu/armada-39x.c | 2 +
9152 drivers/clk/nxp/clk-lpc18xx-creg.c | 3 +-
9153 drivers/clk/qcom/Kconfig | 19 +
9154 drivers/clk/qcom/Makefile | 5 +-
9155 drivers/clk/qcom/clk-regmap.c | 5 +-
9156 drivers/clk/qcom/clk-regmap.h | 3 +-
9157 drivers/clk/qcom/common.c | 58 +-
9158 drivers/clk/qcom/gcc-ipq4019.c | 1 -
9159 drivers/clk/qcom/gcc-mdm9615.c | 1727 ++++++++++++++++++++
9160 drivers/clk/qcom/gcc-msm8996.c | 15 +-
9161 drivers/clk/qcom/lcc-mdm9615.c | 580 +++++++
9162 drivers/clk/qcom/mmcc-msm8996.c | 18 +-
9163 drivers/clk/renesas/r8a7796-cpg-mssr.c | 25 +
9164 drivers/clk/sunxi/clk-mod0.c | 3 +-
9165 drivers/clk/sunxi/clk-sun8i-apb0.c | 4 +-
9166 drivers/clk/versatile/clk-icst.c | 310 +++-
9167 include/dt-bindings/clock/gxbb-clkc.h | 3 +
9168 include/dt-bindings/clock/maxim,max77620.h | 21 +
9169 include/dt-bindings/clock/meson8b-clkc.h | 2 -
9170 include/dt-bindings/clock/mt2701-clk.h | 486 ++++++
9171 include/dt-bindings/clock/qcom,gcc-mdm9615.h | 327 ++++
9172 include/dt-bindings/clock/qcom,gcc-msm8996.h | 3 +
9173 include/dt-bindings/clock/qcom,lcc-mdm9615.h | 52 +
9174 include/dt-bindings/clock/qcom,mmcc-msm8996.h | 1 +
9175 include/dt-bindings/reset/mt2701-resets.h | 83 +
9176 include/dt-bindings/reset/qcom,gcc-mdm9615.h | 136 ++
9177 include/linux/clk-provider.h | 14 +-
9178 115 files changed, 6530 insertions(+), 1242 deletions(-)
9179 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,bdpsys.txt
9180 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt
9181 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,hifsys.txt
9182 create mode 100644 Documentation/devicetree/bindings/clock/armada3700-periph-clock.txt
9183 create mode 100644 Documentation/devicetree/bindings/clock/armada3700-tbg-clock.txt
9184 create mode 100644 Documentation/devicetree/bindings/clock/armada3700-xtal-clock.txt
9185 delete mode 100644 Documentation/devicetree/bindings/clock/maxim,max77802.txt
9186 delete mode 100644 drivers/clk/clk-max-gen.c
9187 delete mode 100644 drivers/clk/clk-max-gen.h
9188 delete mode 100644 drivers/clk/clk-max77802.c
9189 create mode 100644 drivers/clk/mediatek/Kconfig
9190 rename drivers/clk/meson/{meson8b-clkc.c => meson8b.c} (51%)
9191 create mode 100644 drivers/clk/meson/meson8b.h
9192 create mode 100644 drivers/clk/mvebu/armada-37xx-periph.c
9193 create mode 100644 drivers/clk/mvebu/armada-37xx-tbg.c
9194 create mode 100644 drivers/clk/mvebu/armada-37xx-xtal.c
9195 create mode 100644 drivers/clk/qcom/gcc-mdm9615.c
9196 create mode 100644 drivers/clk/qcom/lcc-mdm9615.c
9197 create mode 100644 include/dt-bindings/clock/maxim,max77620.h
9198 create mode 100644 include/dt-bindings/clock/mt2701-clk.h
9199 create mode 100644 include/dt-bindings/clock/qcom,gcc-mdm9615.h
9200 create mode 100644 include/dt-bindings/clock/qcom,lcc-mdm9615.h
9201 create mode 100644 include/dt-bindings/reset/mt2701-resets.h
9202 create mode 100644 include/dt-bindings/reset/qcom,gcc-mdm9615.h
9203 Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
9204 $ git merge random/dev
9206 Merging aio/master (b562e44f507e Linux 4.5)
9207 $ git merge aio/master
9209 Merging kselftest/next (29b4817d4018 Linux 4.8-rc1)
9210 $ git merge kselftest/next
9212 Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
9213 $ git merge y2038/y2038
9214 Resolved 'fs/afs/main.c' using previous resolution.
9215 Auto-merging fs/afs/main.c
9216 CONFLICT (content): Merge conflict in fs/afs/main.c
9217 Automatic merge failed; fix conflicts and then commit the result.
9219 [master c5b40edb5a16] Merge remote-tracking branch 'y2038/y2038'
9220 $ git diff -M --stat --summary HEAD^..
9221 fs/afs/main.c | 6 ++----
9222 1 file changed, 2 insertions(+), 4 deletions(-)
9223 Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
9224 $ git merge luto-misc/next
9226 Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
9227 $ git merge borntraeger/linux-next
9229 Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
9230 $ git merge livepatching/for-next
9231 Auto-merging arch/x86/kernel/Makefile
9232 Merge made by the 'recursive' strategy.
9233 Documentation/livepatch/module-elf-format.txt | 20 +++++++--
9234 arch/x86/kernel/Makefile | 1 +
9235 arch/x86/kernel/livepatch.c | 65 +++++++++++++++++++++++++++
9236 include/linux/livepatch.h | 3 ++
9237 kernel/livepatch/core.c | 19 +++++---
9238 kernel/module.c | 13 ++++--
9239 6 files changed, 107 insertions(+), 14 deletions(-)
9240 create mode 100644 arch/x86/kernel/livepatch.c
9241 Merging coresight/next (6015bb25e7b3 coresight: stm: return error code instead of zero in .packet())
9242 $ git merge coresight/next
9243 Auto-merging drivers/hwtracing/coresight/coresight-stm.c
9244 Merge made by the 'recursive' strategy.
9245 drivers/hwtracing/coresight/coresight-stm.c | 4 ++--
9246 1 file changed, 2 insertions(+), 2 deletions(-)
9247 Merging rtc/rtc-next (de75ccdd4118 rtc: asm9260: rework locking)
9248 $ git merge rtc/rtc-next
9249 Removing drivers/rtc/rtc-isl12057.c
9250 Auto-merging drivers/rtc/Kconfig
9251 Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt
9252 Merge made by the 'recursive' strategy.
9253 .../devicetree/bindings/i2c/trivial-devices.txt | 1 -
9254 .../devicetree/bindings/rtc/dallas,ds1390.txt | 2 +-
9255 drivers/rtc/Kconfig | 34 +-
9256 drivers/rtc/Makefile | 1 -
9257 drivers/rtc/rtc-ac100.c | 2 +
9258 drivers/rtc/rtc-asm9260.c | 20 +-
9259 drivers/rtc/rtc-at32ap700x.c | 2 +-
9260 drivers/rtc/rtc-bq32k.c | 16 +-
9261 drivers/rtc/rtc-coh901331.c | 2 +-
9262 drivers/rtc/rtc-davinci.c | 2 +-
9263 drivers/rtc/rtc-digicolor.c | 2 +-
9264 drivers/rtc/rtc-ds1302.c | 2 +-
9265 drivers/rtc/rtc-ds1307.c | 54 +-
9266 drivers/rtc/rtc-gemini.c | 2 +-
9267 drivers/rtc/rtc-isl12057.c | 643 ---------------------
9268 drivers/rtc/rtc-jz4740.c | 2 +-
9269 drivers/rtc/rtc-mcp795.c | 2 +-
9270 drivers/rtc/rtc-mt6397.c | 2 +-
9271 drivers/rtc/rtc-nuc900.c | 2 +-
9272 drivers/rtc/rtc-omap.c | 2 +-
9273 drivers/rtc/rtc-palmas.c | 2 +-
9274 drivers/rtc/rtc-pcf2123.c | 5 +-
9275 drivers/rtc/rtc-pcf50633.c | 2 +-
9276 drivers/rtc/rtc-pic32.c | 1 -
9277 drivers/rtc/rtc-rx6110.c | 3 +-
9278 drivers/rtc/rtc-rx8025.c | 2 +-
9279 drivers/rtc/rtc-spear.c | 2 +-
9280 drivers/rtc/rtc-stmp3xxx.c | 2 +-
9281 drivers/rtc/rtc-sysfs.c | 4 +-
9282 drivers/rtc/rtc-tegra.c | 2 +-
9283 drivers/rtc/rtc-twl.c | 2 +-
9284 31 files changed, 110 insertions(+), 712 deletions(-)
9285 delete mode 100644 drivers/rtc/rtc-isl12057.c
9286 Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
9287 $ git merge hwspinlock/for-next
9289 Merging nvdimm/libnvdimm-for-next (33b69bc53b00 Merge branch 'for-4.9/dax' into libnvdimm-for-next)
9290 $ git merge nvdimm/libnvdimm-for-next
9291 Merge made by the 'recursive' strategy.
9292 drivers/acpi/nfit/core.c | 127 ++++++-
9293 drivers/acpi/nfit/nfit.h | 11 +
9294 drivers/dax/Kconfig | 5 +
9295 drivers/dax/dax.c | 721 ++++++++++++++++++++++++++------------
9296 drivers/dax/dax.h | 5 +-
9297 drivers/dax/pmem.c | 7 +-
9298 drivers/nvdimm/dimm.c | 11 +
9299 drivers/nvdimm/dimm_devs.c | 34 +-
9300 drivers/nvdimm/namespace_devs.c | 2 +-
9301 drivers/nvdimm/nd.h | 1 +
9303 include/linux/libnvdimm.h | 1 +
9304 include/uapi/linux/magic.h | 1 +
9305 include/uapi/linux/ndctl.h | 30 +-
9306 tools/testing/nvdimm/Kbuild | 1 +
9307 tools/testing/nvdimm/test/iomap.c | 17 +
9308 tools/testing/nvdimm/test/nfit.c | 64 +++-
9309 17 files changed, 764 insertions(+), 275 deletions(-)
9310 Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
9311 $ git merge dax-misc/dax-misc
9313 Merging akpm-current/current (d481e88ed553 ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes)
9314 $ git merge --no-ff akpm-current/current
9315 Resolved 'include/linux/relay.h' using previous resolution.
9316 Auto-merging mm/slab.c
9317 Auto-merging mm/page_alloc.c
9318 Auto-merging mm/page-writeback.c
9319 Auto-merging mm/huge_memory.c
9320 Auto-merging kernel/relay.c
9321 Auto-merging kernel/fork.c
9322 Auto-merging init/main.c
9323 Auto-merging include/linux/sched.h
9324 Auto-merging include/linux/relay.h
9325 CONFLICT (content): Merge conflict in include/linux/relay.h
9326 Auto-merging include/linux/random.h
9327 Auto-merging include/linux/cpu.h
9328 Auto-merging include/asm-generic/vmlinux.lds.h
9329 Auto-merging fs/proc/task_mmu.c
9330 Auto-merging fs/proc/base.c
9331 Auto-merging fs/nfs/internal.h
9332 Auto-merging drivers/char/random.c
9333 Auto-merging arch/xtensa/kernel/vmlinux.lds.S
9334 Auto-merging arch/x86/kernel/process.c
9335 Auto-merging arch/x86/kernel/e820.c
9336 Auto-merging arch/x86/include/asm/smp.h
9337 Auto-merging arch/mips/cavium-octeon/setup.c
9338 Auto-merging arch/arm64/kernel/vmlinux.lds.S
9339 Auto-merging arch/arm64/kernel/process.c
9340 Auto-merging arch/arm/kernel/smp.c
9341 Auto-merging MAINTAINERS
9342 Automatic merge failed; fix conflicts and then commit the result.
9344 [master 53fdf99f676b] Merge branch 'akpm-current/current'
9345 $ git diff -M --stat --summary HEAD^..
9346 .gitattributes | 2 +
9347 Documentation/DMA-attributes.txt | 17 +
9348 .../filesystems/autofs4-mount-control.txt | 71 ++--
9349 Documentation/filesystems/autofs4.txt | 8 +-
9352 arch/alpha/kernel/vmlinux.lds.S | 1 +
9353 arch/arc/kernel/vmlinux.lds.S | 1 +
9354 arch/arm/include/asm/irq.h | 5 +-
9355 arch/arm/include/asm/page.h | 2 +
9356 arch/arm/kernel/process.c | 3 +-
9357 arch/arm/kernel/smp.c | 13 +-
9358 arch/arm/kernel/vmlinux-xip.lds.S | 1 +
9359 arch/arm/kernel/vmlinux.lds.S | 1 +
9360 arch/arm64/kernel/process.c | 8 +-
9361 arch/arm64/kernel/vmlinux.lds.S | 1 +
9362 arch/avr32/kernel/vmlinux.lds.S | 1 +
9363 arch/blackfin/kernel/vmlinux.lds.S | 1 +
9364 arch/c6x/kernel/vmlinux.lds.S | 1 +
9365 arch/cris/kernel/vmlinux.lds.S | 1 +
9366 arch/frv/kernel/vmlinux.lds.S | 1 +
9367 arch/h8300/kernel/vmlinux.lds.S | 1 +
9368 arch/hexagon/kernel/vmlinux.lds.S | 1 +
9369 arch/ia64/kernel/Makefile | 8 +-
9370 arch/ia64/kernel/vmlinux.lds.S | 1 +
9371 arch/m32r/kernel/vmlinux.lds.S | 1 +
9372 arch/m68k/kernel/vmlinux-nommu.lds | 1 +
9373 arch/m68k/kernel/vmlinux-std.lds | 1 +
9374 arch/m68k/kernel/vmlinux-sun3.lds | 1 +
9375 arch/metag/kernel/vmlinux.lds.S | 1 +
9376 arch/microblaze/kernel/vmlinux.lds.S | 1 +
9377 arch/mips/cavium-octeon/setup.c | 14 +
9378 arch/mips/include/asm/irq.h | 5 +-
9379 arch/mips/include/asm/kexec.h | 1 +
9380 arch/mips/include/asm/uprobes.h | 12 -
9381 arch/mips/kernel/crash.c | 18 +-
9382 arch/mips/kernel/machine_kexec.c | 1 +
9383 arch/mips/kernel/process.c | 11 +-
9384 arch/mips/kernel/vmlinux.lds.S | 1 +
9385 arch/mn10300/kernel/vmlinux.lds.S | 1 +
9386 arch/nios2/kernel/vmlinux.lds.S | 1 +
9387 arch/openrisc/kernel/vmlinux.lds.S | 1 +
9388 arch/parisc/kernel/vmlinux.lds.S | 1 +
9389 arch/powerpc/include/asm/mmzone.h | 3 +
9390 arch/powerpc/kernel/fadump.c | 5 +
9391 arch/powerpc/kernel/iommu.c | 6 +-
9392 arch/powerpc/kernel/vmlinux.lds.S | 1 +
9393 arch/s390/include/asm/uprobes.h | 10 -
9394 arch/s390/kernel/compat_linux.c | 4 +-
9395 arch/s390/kernel/vmlinux.lds.S | 1 +
9396 arch/score/kernel/vmlinux.lds.S | 1 +
9397 arch/sh/kernel/vmlinux.lds.S | 1 +
9398 arch/sparc/include/asm/irq_64.h | 5 +-
9399 arch/sparc/kernel/process_64.c | 10 +-
9400 arch/sparc/kernel/vmlinux.lds.S | 1 +
9401 arch/tile/include/asm/irq.h | 5 +-
9402 arch/tile/kernel/entry.S | 2 +-
9403 arch/tile/kernel/pmc.c | 3 -
9404 arch/tile/kernel/process.c | 73 +---
9405 arch/tile/kernel/traps.c | 9 +-
9406 arch/tile/kernel/vmlinux.lds.S | 1 +
9407 arch/tile/mm/mmap.c | 3 +-
9408 arch/um/Makefile | 2 +-
9409 arch/um/kernel/dyn.lds.S | 1 +
9410 arch/um/kernel/uml.lds.S | 1 +
9411 arch/unicore32/kernel/process.c | 3 +-
9412 arch/unicore32/kernel/vmlinux.lds.S | 1 +
9413 arch/x86/include/asm/irq.h | 5 +-
9414 arch/x86/include/asm/irqflags.h | 12 +-
9415 arch/x86/include/asm/kexec.h | 1 +
9416 arch/x86/include/asm/smp.h | 1 +
9417 arch/x86/kernel/acpi/cstate.c | 2 +-
9418 arch/x86/kernel/apic/hw_nmi.c | 18 +-
9419 arch/x86/kernel/crash.c | 22 +-
9420 arch/x86/kernel/e820.c | 2 +-
9421 arch/x86/kernel/machine_kexec_64.c | 1 +
9422 arch/x86/kernel/process.c | 7 +-
9423 arch/x86/kernel/smp.c | 5 +
9424 arch/x86/kernel/sys_x86_64.c | 5 +-
9425 arch/x86/kernel/vmlinux.lds.S | 1 +
9426 arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +-
9427 arch/x86/um/user-offsets.c | 4 +-
9428 arch/xtensa/kernel/vmlinux.lds.S | 3 +
9429 block/genhd.c | 2 +-
9430 drivers/acpi/processor_idle.c | 5 +-
9431 drivers/base/memory.c | 5 +-
9432 drivers/char/random.c | 36 +-
9433 drivers/cpuidle/driver.c | 5 +-
9434 drivers/idle/intel_idle.c | 4 +-
9435 drivers/nvme/host/pci.c | 3 +-
9436 drivers/of/base.c | 2 +
9437 drivers/rapidio/rio_cm.c | 15 +-
9438 drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +-
9439 fs/autofs4/autofs_i.h | 9 +-
9440 fs/autofs4/dev-ioctl.c | 77 ++---
9441 fs/autofs4/inode.c | 45 +--
9442 fs/autofs4/root.c | 4 +-
9445 fs/ext2/file.c | 1 +
9446 fs/ext4/file.c | 1 +
9447 fs/nfs/internal.h | 6 +-
9448 fs/nfs/pagelist.c | 2 +-
9449 fs/nfs/read.c | 2 +-
9450 fs/nfs/write.c | 4 +-
9451 fs/nfsd/auth.c | 6 +-
9452 fs/nfsd/nfs4state.c | 2 +-
9453 fs/ocfs2/cluster/tcp.c | 2 +-
9454 fs/ocfs2/dlm/dlmconvert.c | 12 +-
9455 fs/ocfs2/dlm/dlmdomain.c | 2 +-
9456 fs/ocfs2/dlmfs/dlmfs.c | 2 +-
9457 fs/ocfs2/super.c | 2 +-
9458 fs/pipe.c | 166 +++++----
9459 fs/proc/array.c | 189 +++++------
9460 fs/proc/base.c | 52 ++-
9463 fs/proc/internal.h | 2 +-
9464 fs/proc/meminfo.c | 211 ++++++------
9465 fs/proc/stat.c | 49 ++-
9466 fs/proc/task_mmu.c | 2 +-
9467 fs/seq_file.c | 57 +++-
9468 fs/xfs/xfs_file.c | 1 +
9469 include/asm-generic/vmlinux.lds.h | 6 +
9470 include/linux/auto_dev-ioctl.h | 211 +-----------
9471 include/linux/auto_fs.h | 1 -
9472 include/linux/bitops.h | 36 +-
9473 include/linux/bootmem.h | 9 +-
9474 include/linux/compaction.h | 40 ++-
9475 include/linux/compat.h | 1 -
9476 include/linux/console.h | 6 +
9477 include/linux/cpu.h | 5 +
9478 include/linux/crc64_ecma.h | 56 +++
9479 include/linux/cred.h | 11 +-
9480 include/linux/ctype.h | 5 +-
9481 include/linux/dma-mapping.h | 5 +
9482 include/linux/huge_mm.h | 15 +-
9483 include/linux/kbuild.h | 2 +-
9484 include/linux/kernel.h | 48 +--
9485 include/linux/kexec.h | 2 +
9486 include/linux/memblock.h | 1 +
9487 include/linux/memcontrol.h | 15 +
9488 include/linux/mm.h | 27 +-
9489 include/linux/mm_types.h | 2 -
9490 include/linux/nmi.h | 31 +-
9491 include/linux/oom.h | 46 +--
9492 include/linux/page_ext.h | 8 +-
9493 include/linux/page_owner.h | 2 +
9494 include/linux/pagemap.h | 16 +-
9495 include/linux/radix-tree.h | 8 +
9496 include/linux/random.h | 2 +-
9497 include/linux/relay.h | 3 +-
9498 include/linux/sched.h | 22 +-
9499 include/linux/sem.h | 1 +
9500 include/linux/seq_file.h | 4 +-
9501 include/linux/swap.h | 11 +-
9502 include/linux/writeback.h | 1 -
9503 include/trace/events/compaction.h | 2 +-
9504 include/trace/events/zsmalloc.h | 76 +++++
9505 include/uapi/linux/auto_dev-ioctl.h | 221 ++++++++++++
9506 include/uapi/linux/auto_fs.h | 1 +
9508 ipc/msg.c | 211 ++++++------
9509 ipc/sem.c | 138 +++++---
9510 kernel/configs/android-base.config | 7 +-
9511 kernel/configs/android-recommended.config | 4 +
9512 kernel/exit.c | 2 +-
9514 kernel/groups.c | 67 ++--
9515 kernel/panic.c | 47 ++-
9516 kernel/power/process.c | 17 +-
9517 kernel/printk/printk.c | 13 +-
9518 kernel/ptrace.c | 3 +-
9519 kernel/relay.c | 24 +-
9520 kernel/sched/idle.c | 13 +-
9521 kernel/sysctl.c | 10 -
9522 kernel/uid16.c | 4 +-
9523 kernel/watchdog.c | 1 -
9526 lib/crc64_ecma.c | 341 +++++++++++++++++++
9527 lib/kstrtox.c | 6 +-
9528 lib/nmi_backtrace.c | 42 ++-
9529 lib/stackdepot.c | 6 +
9530 lib/strncpy_from_user.c | 2 +
9531 mm/bootmem.c | 14 +-
9532 mm/compaction.c | 163 +++++----
9535 mm/huge_memory.c | 79 ++++-
9536 mm/internal.h | 3 +-
9537 mm/khugepaged.c | 25 +-
9539 mm/memcontrol.c | 131 +++-----
9541 mm/memory_hotplug.c | 4 +-
9542 mm/mempolicy.c | 2 +-
9545 mm/nobootmem.c | 10 +-
9546 mm/oom_kill.c | 374 ++++++++++-----------
9547 mm/page-writeback.c | 34 +-
9548 mm/page_alloc.c | 227 +++++++++----
9549 mm/page_ext.c | 45 ++-
9550 mm/page_owner.c | 158 +++++++--
9554 mm/swap_state.c | 14 +-
9555 mm/swapfile.c | 137 ++++----
9556 mm/vmacache.c | 8 +-
9558 mm/vmscan.c | 53 ++-
9559 mm/vmstat.c | 95 +-----
9560 mm/zsmalloc.c | 27 +-
9561 net/ipv4/ping.c | 15 +-
9562 net/sunrpc/auth_generic.c | 4 +-
9563 net/sunrpc/auth_gss/gss_rpc_xdr.c | 2 +-
9564 net/sunrpc/auth_gss/svcauth_gss.c | 2 +-
9565 net/sunrpc/auth_unix.c | 4 +-
9566 net/sunrpc/svcauth_unix.c | 6 +-
9567 scripts/checkpatch.pl | 221 +++++++-----
9568 scripts/const_structs.checkpatch | 64 ++++
9569 scripts/mod/Makefile | 11 +-
9570 scripts/mod/modpost.c | 2 +-
9571 scripts/recordmcount.c | 1 +
9572 scripts/recordmcount.pl | 1 +
9573 scripts/spelling.txt | 1 -
9574 tools/testing/radix-tree/Makefile | 3 +-
9575 tools/testing/radix-tree/iteration_check.c | 180 ++++++++++
9576 tools/testing/radix-tree/main.c | 1 +
9577 tools/testing/radix-tree/regression1.c | 2 +-
9578 tools/testing/radix-tree/test.h | 1 +
9579 tools/testing/selftests/vm/.gitignore | 1 +
9580 tools/testing/selftests/vm/Makefile | 4 +
9581 tools/testing/selftests/vm/mlock-random-test.c | 293 ++++++++++++++++
9582 tools/testing/selftests/vm/mlock2-tests.c | 63 +---
9583 tools/testing/selftests/vm/mlock2.h | 63 ++++
9584 238 files changed, 3848 insertions(+), 2281 deletions(-)
9585 create mode 100644 .gitattributes
9586 create mode 100644 include/linux/crc64_ecma.h
9587 create mode 100644 include/trace/events/zsmalloc.h
9588 create mode 100644 include/uapi/linux/auto_dev-ioctl.h
9589 create mode 100644 lib/crc64_ecma.c
9590 create mode 100644 scripts/const_structs.checkpatch
9591 create mode 100644 tools/testing/radix-tree/iteration_check.c
9592 create mode 100644 tools/testing/selftests/vm/mlock-random-test.c
9593 create mode 100644 tools/testing/selftests/vm/mlock2.h
9594 $ git clone -s -l -n -q . ../rebase-tmp
9596 $ git checkout -b akpm remotes/origin/akpm/master
9597 Switched to a new branch 'akpm'
9598 $ git rebase --onto master remotes/origin/akpm/master-base
9599 First, rewinding head to replay your work on top of it...
9600 Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
9601 Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s
9602 Applying: kdump, vmcoreinfo: report memory sections virtual addresses
9603 Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
9604 Applying: scripts/tags.sh: enable code completion in VIM
9605 Applying: kthread: rename probe_kthread_data() to kthread_probe_data()
9606 Applying: kthread: kthread worker API cleanup
9607 Applying: crypto: engine: fix linux-next merge conflict
9608 Applying: kthread/smpboot: do not park in kthread_create_on_cpu()
9609 Applying: kthread: allow to call __kthread_create_on_node() with va_list args
9610 Applying: kthread: add kthread_create_worker*()
9611 Applying: kthread: add kthread_destroy_worker()
9612 Applying: kthread: detect when a kthread work is used by more workers
9613 Applying: kthread: initial support for delayed kthread work
9614 Applying: kthread: allow to cancel kthread work
9615 Applying: kthread: allow to modify delayed kthread work
9616 Applying: kthread: better support freezable kthread workers
9617 Applying: kthread: add kerneldoc for kthread_create()
9618 Applying: hung_task: allow hung_task_panic when hung_task_warnings is 0
9619 Applying: hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix
9621 $ git fetch -f ../rebase-tmp akpm:akpm/master
9623 + 7b0bf9e07545...a02163494e4a akpm -> akpm/master (forced update)
9624 $ rm -rf ../rebase-tmp
9625 Merging akpm/master (a02163494e4a hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix)
9626 $ git merge --no-ff akpm/master
9627 Merge made by the 'recursive' strategy.
9628 Documentation/RCU/lockdep-splat.txt | 2 +-
9629 Documentation/dev-tools/kmemleak.rst | 9 +
9630 arch/x86/kernel/machine_kexec_64.c | 3 +
9631 arch/x86/kvm/i8254.c | 14 +-
9632 crypto/crypto_engine.c | 20 +-
9633 drivers/block/loop.c | 8 +-
9634 drivers/infiniband/sw/rdmavt/cq.c | 10 +-
9635 drivers/md/dm-rq.c | 6 +-
9636 drivers/md/dm.c | 4 +-
9637 drivers/media/pci/ivtv/ivtv-driver.c | 6 +-
9638 drivers/media/pci/ivtv/ivtv-irq.c | 2 +-
9639 drivers/net/ethernet/microchip/encx24j600.c | 10 +-
9640 drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-
9641 drivers/spi/spi.c | 18 +-
9642 drivers/tty/serial/sc16is7xx.c | 22 +-
9643 include/linux/kexec.h | 6 +
9644 include/linux/kmemleak.h | 18 +
9645 include/linux/kthread.h | 88 +++-
9646 include/linux/mlx5/device.h | 2 -
9647 kernel/hung_task.c | 28 +-
9648 kernel/kthread.c | 577 ++++++++++++++++++++++---
9649 kernel/smpboot.c | 5 +
9650 kernel/workqueue.c | 2 +-
9653 mm/kmemleak.c | 47 ++
9654 mm/memblock.c | 8 +-
9655 mm/nobootmem.c | 2 +-
9656 scripts/tags.sh | 3 +-
9657 sound/soc/intel/baytrail/sst-baytrail-ipc.c | 2 +-
9658 sound/soc/intel/common/sst-ipc.c | 6 +-
9659 sound/soc/intel/haswell/sst-haswell-ipc.c | 2 +-
9660 sound/soc/intel/skylake/skl-sst-ipc.c | 2 +-
9661 33 files changed, 767 insertions(+), 176 deletions(-)
projects / deliverable / linux.git / blob