2 Thursday 25 October 10:12:48 EST 2012
5 $ git reset --hard stable
6 HEAD is now at 2d1f4c8 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
7 Merging origin/master (0e9e3e3 Merge tag 'stable/for-linus-3.7-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen)
8 $ git merge origin/master
9 Updating 2d1f4c8..0e9e3e3
11 Documentation/00-INDEX | 4 +-
12 arch/alpha/include/asm/thread_info.h | 80 ++++--
13 arch/alpha/kernel/osf_sys.c | 25 +-
14 arch/alpha/kernel/process.c | 2 +-
15 arch/alpha/kernel/traps.c | 6 +-
16 arch/arm/include/asm/xen/interface.h | 12 +-
17 arch/arm/include/asm/xen/page.h | 13 +-
18 arch/arm/xen/grant-table.c | 2 +-
19 arch/ia64/include/asm/Kbuild | 1 +
20 arch/ia64/include/asm/kvm_para.h | 34 ---
21 arch/s390/Kconfig | 1 +
22 arch/s390/boot/compressed/vmlinux.lds.S | 2 +-
23 arch/s390/include/asm/perf_event.h | 2 +-
24 arch/s390/include/uapi/asm/Kbuild | 2 -
25 arch/s390/include/uapi/asm/chpid.h | 10 +-
26 arch/s390/include/uapi/asm/kvm_para.h | 11 +
27 arch/s390/kernel/cache.c | 9 +-
28 arch/s390/kernel/head_kdump.S | 10 +-
29 arch/s390/kernel/perf_cpum_cf.c | 6 +-
30 arch/s390/kernel/vmlinux.lds.S | 2 +-
31 arch/tile/Makefile | 4 +
32 arch/tile/kernel/module.c | 10 -
33 arch/x86/include/asm/xen/interface.h | 4 +-
34 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 3 +
35 arch/x86/kernel/entry_32.S | 8 +-
36 arch/x86/kernel/entry_64.S | 2 +-
37 arch/x86/kernel/kvm.c | 3 +
38 arch/x86/kernel/signal.c | 4 +-
39 arch/x86/kernel/uprobes.c | 16 +-
40 arch/x86/kvm/lapic.c | 2 +-
41 arch/x86/kvm/mmu.c | 3 +-
42 arch/x86/oprofile/nmi_int.c | 2 +-
43 arch/x86/xen/enlighten.c | 2 -
44 drivers/s390/cio/css.c | 7 +-
45 drivers/s390/cio/idset.c | 26 +-
46 drivers/s390/cio/idset.h | 3 +-
47 drivers/xen/balloon.c | 3 +-
48 drivers/xen/dbgp.c | 2 +
49 drivers/xen/events.c | 4 +
50 drivers/xen/grant-table.c | 8 +-
51 drivers/xen/sys-hypervisor.c | 4 +-
52 drivers/xen/xen-pciback/vpci.c | 14 +-
53 drivers/xen/xenbus/xenbus_xs.c | 2 +
54 fs/proc/stat.c | 14 +-
55 include/linux/uprobes.h | 11 -
56 include/xen/grant_table.h | 2 +-
57 include/xen/interface/grant_table.h | 2 +-
58 include/xen/interface/memory.h | 24 +-
59 kernel/events/uprobes.c | 345 ++++++++++++-------------
60 kernel/trace/ring_buffer.c | 4 +
61 virt/kvm/kvm_main.c | 4 +-
62 51 files changed, 377 insertions(+), 399 deletions(-)
63 delete mode 100644 arch/ia64/include/asm/kvm_para.h
64 create mode 100644 arch/s390/include/uapi/asm/kvm_para.h
65 Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
66 $ git merge fixes/master
68 Merging kbuild-current/rc-fixes (b1e0d8b kbuild: Fix gcc -x syntax)
69 $ git merge kbuild-current/rc-fixes
71 Merging arm-current/fixes (b43b1ff Merge tag 'fixes-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes)
72 $ git merge arm-current/fixes
73 Merge made by the 'recursive' strategy.
74 arch/arm/Kconfig | 9 +++++----
75 arch/arm/Makefile | 13 +++++++------
76 arch/arm/boot/Makefile | 10 +++++-----
77 arch/arm/include/asm/flat.h | 2 +-
78 arch/arm/include/asm/uaccess.h | 4 ++--
79 arch/arm/kernel/irq.c | 2 ++
80 arch/arm/kernel/kprobes-test-arm.c | 4 ++++
81 arch/arm/kernel/machine_kexec.c | 7 +++----
82 arch/arm/kernel/perf_event.c | 4 ++++
83 arch/arm/kernel/smp.c | 14 ++++++++++----
84 arch/arm/kernel/smp_twd.c | 4 ++--
85 arch/arm/lib/delay.c | 1 +
86 arch/arm/mm/alignment.c | 4 +++-
87 arch/arm/tools/Makefile | 2 +-
88 drivers/xen/Kconfig | 2 ++
89 15 files changed, 52 insertions(+), 30 deletions(-)
90 Merging m68k-current/for-linus (8a745ee m68k: Wire up kcmp)
91 $ git merge m68k-current/for-linus
93 Merging powerpc-merge/merge (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
94 $ git merge powerpc-merge/merge
96 Merging sparc/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
97 $ git merge sparc/master
99 Merging net/master (37561f6 tcp: Reject invalid ack_seq to Fast Open sockets)
100 $ git merge net/master
101 Auto-merging MAINTAINERS
102 Merge made by the 'recursive' strategy.
104 drivers/bcma/main.c | 5 +-
105 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 19 +++
106 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 29 +---
107 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 +
108 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 99 +++--------
109 drivers/net/ethernet/qlogic/qla3xxx.c | 9 +-
110 drivers/net/phy/Kconfig | 5 +
111 drivers/net/phy/Makefile | 1 +
112 drivers/net/phy/at803x.c | 176 ++++++++++++++++++++
113 drivers/net/usb/ipheth.c | 5 +
114 drivers/net/usb/qmi_wwan.c | 41 +++++
115 drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 +-
116 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 68 +++-----
117 drivers/net/wireless/ipw2x00/ipw2200.c | 2 +-
118 drivers/net/wireless/iwlwifi/dvm/devices.c | 39 +++--
119 include/linux/tcp.h | 3 +-
120 include/net/cfg80211.h | 1 +
121 include/uapi/linux/tcp.h | 1 +
122 net/8021q/vlan.c | 4 +-
123 net/batman-adv/bridge_loop_avoidance.c | 27 ++-
124 net/batman-adv/routing.c | 8 +-
125 net/batman-adv/types.h | 2 +
126 net/bluetooth/smp.c | 6 +-
127 net/core/skbuff.c | 6 +-
128 net/ipv4/route.c | 9 +-
129 net/ipv4/tcp.c | 10 +-
130 net/ipv4/tcp_input.c | 13 +-
131 net/ipv4/tcp_ipv4.c | 1 +
132 net/ipv4/tcp_minisocks.c | 1 +
133 net/ipv4/tcp_timer.c | 4 +-
134 net/mac80211/iface.c | 2 +-
135 net/mac80211/mlme.c | 35 ++--
136 net/mac80211/sta_info.c | 4 +-
137 net/mac80211/util.c | 4 +-
138 net/mac80211/wpa.c | 14 +-
139 net/netfilter/ipvs/ip_vs_ctl.c | 3 +-
140 net/netfilter/xt_CT.c | 10 +-
141 net/netfilter/xt_TEE.c | 1 +
142 net/netfilter/xt_nat.c | 8 +-
143 net/netlink/af_netlink.c | 19 ++-
144 net/wireless/mlme.c | 12 +-
145 42 files changed, 485 insertions(+), 234 deletions(-)
146 create mode 100644 drivers/net/phy/at803x.c
147 Merging sound-current/for-linus (21b3de8 ALSA: als3000: check for the kzalloc return value)
148 $ git merge sound-current/for-linus
149 Merge made by the 'recursive' strategy.
150 sound/isa/opti9xx/miro.c | 1 -
151 sound/pci/als300.c | 4 +
152 sound/pci/hda/patch_realtek.c | 20 +++-
153 sound/pci/rme9652/hdspm.c | 234 ++++++++++++++++++++++++-----------------
154 4 files changed, 162 insertions(+), 97 deletions(-)
155 Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
156 $ git merge pci-current/for-linus
158 Merging wireless/master (f89ff64 b43: Fix oops on unload when firmware not found)
159 $ git merge wireless/master
160 Merge made by the 'recursive' strategy.
161 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 164 ++++++++++----------
162 drivers/net/wireless/ath/ath9k/hif_usb.c | 1 +
163 drivers/net/wireless/b43/main.c | 4 +
164 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +-
165 drivers/net/wireless/mwifiex/cfg80211.c | 7 +-
166 drivers/net/wireless/mwifiex/scan.c | 13 +-
167 drivers/net/wireless/rt2x00/rt2500usb.c | 1 +
168 drivers/net/wireless/rt2x00/rt2800usb.c | 1 +
169 drivers/net/wireless/rt2x00/rt73usb.c | 1 +
170 drivers/net/wireless/rtlwifi/usb.c | 2 +-
171 10 files changed, 102 insertions(+), 94 deletions(-)
172 Merging driver-core.current/driver-core-linus (d28d388 firmware loader: sync firmware cache by async_synchronize_full_domain)
173 $ git merge driver-core.current/driver-core-linus
174 Merge made by the 'recursive' strategy.
175 drivers/base/firmware_class.c | 266 +++++++++++++++++++++++------------------
176 1 file changed, 151 insertions(+), 115 deletions(-)
177 Merging tty.current/tty-linus (a4f7438 Revert "serial: omap: fix software flow control")
178 $ git merge tty.current/tty-linus
179 Merge made by the 'recursive' strategy.
180 arch/arm/plat-omap/include/plat/omap-serial.h | 4 ++--
181 drivers/tty/serial/omap-serial.c | 12 ++++++------
182 2 files changed, 8 insertions(+), 8 deletions(-)
183 Merging usb.current/usb-linus (d7870af usb-storage: add unusual_devs entry for Casio EX-N1 digital camera)
184 $ git merge usb.current/usb-linus
185 Merge made by the 'recursive' strategy.
186 drivers/usb/core/hub.c | 7 +++++--
187 drivers/usb/gadget/net2272.c | 4 +++-
188 drivers/usb/host/xhci-hub.c | 9 ++++++---
189 drivers/usb/host/xhci.c | 4 ++--
190 drivers/usb/misc/ezusb.c | 1 +
191 drivers/usb/musb/musb_dsps.c | 8 ++++----
192 drivers/usb/renesas_usbhs/fifo.c | 1 +
193 drivers/usb/renesas_usbhs/mod_host.c | 5 +++++
194 drivers/usb/serial/sierra.c | 1 +
195 drivers/usb/storage/unusual_devs.h | 6 ++++++
196 10 files changed, 34 insertions(+), 12 deletions(-)
197 Merging staging.current/staging-linus (e297da6 staging: ipack: add missing include (implicit declaration of function 'kfree'))
198 $ git merge staging.current/staging-linus
199 Merge made by the 'recursive' strategy.
200 drivers/iio/Kconfig | 1 -
201 drivers/iio/Makefile | 1 -
202 drivers/staging/android/binder.c | 30 ++++++++++-
203 drivers/staging/comedi/drivers/8255_pci.c | 2 +
204 drivers/staging/comedi/drivers/amplc_dio200.c | 2 +
205 drivers/staging/comedi/drivers/amplc_pc236.c | 5 +-
206 drivers/staging/comedi/drivers/amplc_pc263.c | 2 +
207 drivers/staging/comedi/drivers/das08.c | 2 +
208 drivers/staging/comedi/drivers/ni_daq_700.c | 2 +-
209 drivers/staging/comedi/drivers/ni_labpc.c | 2 +
210 drivers/staging/iio/accel/adis16201_core.c | 24 +++++----
211 drivers/staging/iio/accel/adis16203_core.c | 20 +++----
212 drivers/staging/iio/accel/adis16204_core.c | 22 ++++----
213 drivers/staging/iio/accel/adis16209_core.c | 18 ++++---
214 drivers/staging/iio/accel/adis16220_core.c | 19 ++++---
215 drivers/staging/iio/accel/adis16240_core.c | 23 ++++----
216 drivers/staging/iio/gyro/adis16260_core.c | 29 +++++-----
217 drivers/staging/iio/imu/adis16400.h | 2 +
218 drivers/staging/iio/imu/adis16400_core.c | 70 ++++++++++++++++---------
219 drivers/staging/ipack/bridges/tpci200.c | 1 +
220 drivers/staging/omapdrm/omap_gem.c | 4 +-
221 drivers/staging/ramster/Kconfig | 1 +
222 drivers/staging/zram/zram_drv.c | 12 ++++-
223 include/linux/iio/iio.h | 16 ++++++
224 24 files changed, 204 insertions(+), 106 deletions(-)
225 Merging char-misc.current/char-misc-linus (1392550 Drivers: hv: Cleanup error handling in vmbus_open())
226 $ git merge char-misc.current/char-misc-linus
227 Merge made by the 'recursive' strategy.
228 drivers/extcon/extcon-adc-jack.c | 10 ++-
229 drivers/extcon/extcon-class.c | 142 ++++++++++++++++++++++----------------
230 drivers/extcon/extcon-gpio.c | 1 -
231 drivers/extcon/extcon-max77693.c | 46 ++++++++----
232 drivers/extcon/extcon-max8997.c | 6 +-
233 drivers/hv/channel.c | 24 ++++---
234 include/linux/extcon.h | 2 +-
235 include/linux/mfd/max77693.h | 13 ++++
236 8 files changed, 151 insertions(+), 93 deletions(-)
237 Merging input-current/for-linus (0cc8d6a Merge branch 'next' into for-linus)
238 $ git merge input-current/for-linus
240 Merging md-current/for-linus (72f36d5 md: refine reporting of resync/reshape delays.)
241 $ git merge md-current/for-linus
243 Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
244 $ git merge audit-current/for-linus
246 Merging crypto-current/master (9efade1 crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption)
247 $ git merge crypto-current/master
248 Merge made by the 'recursive' strategy.
249 crypto/cryptd.c | 11 ++++++++---
250 1 file changed, 8 insertions(+), 3 deletions(-)
251 Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
252 $ git merge ide/master
254 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
255 $ git merge dwmw2/master
257 Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
258 $ git merge sh-current/sh-fixes-for-linus
260 Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
261 $ git merge irqdomain-current/irqdomain/merge
263 Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
264 $ git merge devicetree-current/devicetree/merge
265 Auto-merging drivers/of/base.c
266 Merge made by the 'recursive' strategy.
267 drivers/of/base.c | 2 ++
268 1 file changed, 2 insertions(+)
269 Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
270 $ git merge spi-current/spi/merge
271 Auto-merging drivers/spi/spi.c
272 Auto-merging drivers/spi/spi-s3c64xx.c
273 Auto-merging drivers/spi/spi-bcm63xx.c
274 Merge made by the 'recursive' strategy.
275 drivers/spi/spi-bcm63xx.c | 16 ++++++----------
276 drivers/spi/spi-s3c64xx.c | 10 ++++------
277 drivers/spi/spi.c | 5 ++++-
278 3 files changed, 14 insertions(+), 17 deletions(-)
279 Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
280 $ git merge gpio-current/gpio/merge
282 Merging asm-generic/master (c37d615 Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic)
283 $ git merge asm-generic/master
285 Merging arm/for-next (4a83d2e Merge remote-tracking branch 'wildea/asids' into for-next)
286 $ git merge arm/for-next
287 Merge made by the 'recursive' strategy.
288 arch/arm/common/vic.c | 18 +-
289 arch/arm/include/asm/hardware/cache-l2x0.h | 5 +
290 arch/arm/include/asm/hardware/vic.h | 2 +-
291 arch/arm/include/asm/mmu.h | 11 +-
292 arch/arm/include/asm/mmu_context.h | 82 +-------
293 arch/arm/kernel/process.c | 1 +
294 arch/arm/mm/cache-aurora-l2.h | 55 ++++++
295 arch/arm/mm/cache-l2x0.c | 277 +++++++++++++++++++++++++---
296 arch/arm/mm/context.c | 207 +++++++++++----------
297 arch/arm/mm/proc-v7.S | 2 +-
298 drivers/mmc/host/mmci.c | 40 ++--
299 11 files changed, 456 insertions(+), 244 deletions(-)
300 create mode 100644 arch/arm/mm/cache-aurora-l2.h
301 Merging arm-perf/for-next/perf (eab8fc8 Merge branch 'hw-breakpoint' into for-next/perf)
302 $ git merge arm-perf/for-next/perf
303 Auto-merging arch/arm/kernel/perf_event.c
304 Merge made by the 'recursive' strategy.
305 arch/arm/include/asm/hw_breakpoint.h | 8 +-
306 arch/arm/include/asm/perf_event.h | 5 +
307 arch/arm/include/asm/pmu.h | 28 ++--
308 arch/arm/kernel/hw_breakpoint.c | 146 ++++++++++----------
309 arch/arm/kernel/perf_event.c | 84 ++++++++----
310 arch/arm/kernel/perf_event_cpu.c | 74 ++++++----
311 arch/arm/kernel/perf_event_v6.c | 126 ++++++++---------
312 arch/arm/kernel/perf_event_v7.c | 246 ++++++++++++++++------------------
313 arch/arm/kernel/perf_event_xscale.c | 157 +++++++++++-----------
314 9 files changed, 466 insertions(+), 408 deletions(-)
315 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
316 $ git merge davinci/davinci-next
318 Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
319 $ git merge xilinx/arm-next
321 Merging arm64/upstream (1e4097b arm64: Make the user fault reporting more specific)
322 $ git merge arm64/upstream
323 Merge made by the 'recursive' strategy.
324 Documentation/arm64/memory.txt | 12 ++++++------
325 arch/arm64/include/asm/io.h | 8 ++++----
326 arch/arm64/mm/fault.c | 13 +++++++++++--
327 3 files changed, 21 insertions(+), 12 deletions(-)
328 Merging blackfin/for-linus (cdc0584 Blackfin: twi: Add missing __iomem annotation)
329 $ git merge blackfin/for-linus
330 Removing arch/blackfin/include/asm/kvm_para.h
331 Merge made by the 'recursive' strategy.
332 arch/blackfin/include/asm/Kbuild | 6 +-
333 arch/blackfin/include/asm/bfin_sport.h | 128 +-----
334 arch/blackfin/include/asm/bfin_twi.h | 2 +-
335 arch/blackfin/include/asm/fixed_code.h | 30 +-
336 arch/blackfin/include/asm/kvm_para.h | 1 -
337 arch/blackfin/include/asm/ptrace.h | 161 +-------
338 arch/blackfin/include/asm/uaccess.h | 24 +-
339 arch/blackfin/include/asm/unistd.h | 430 +------------------
340 arch/blackfin/include/uapi/asm/Kbuild | 16 +
341 arch/blackfin/include/uapi/asm/bfin_sport.h | 136 ++++++
342 arch/blackfin/include/{ => uapi}/asm/byteorder.h | 0
343 arch/blackfin/include/{ => uapi}/asm/cachectl.h | 0
344 arch/blackfin/include/{ => uapi}/asm/fcntl.h | 0
345 arch/blackfin/include/uapi/asm/fixed_code.h | 38 ++
346 arch/blackfin/include/{ => uapi}/asm/ioctls.h | 0
347 arch/blackfin/include/{ => uapi}/asm/poll.h | 0
348 arch/blackfin/include/{ => uapi}/asm/posix_types.h | 0
349 arch/blackfin/include/uapi/asm/ptrace.h | 170 ++++++++
350 arch/blackfin/include/{ => uapi}/asm/sigcontext.h | 0
351 arch/blackfin/include/{ => uapi}/asm/siginfo.h | 0
352 arch/blackfin/include/{ => uapi}/asm/signal.h | 0
353 arch/blackfin/include/{ => uapi}/asm/stat.h | 0
354 arch/blackfin/include/{ => uapi}/asm/swab.h | 0
355 arch/blackfin/include/uapi/asm/unistd.h | 437 ++++++++++++++++++++
356 24 files changed, 816 insertions(+), 763 deletions(-)
357 delete mode 100644 arch/blackfin/include/asm/kvm_para.h
358 create mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h
359 rename arch/blackfin/include/{ => uapi}/asm/byteorder.h (100%)
360 rename arch/blackfin/include/{ => uapi}/asm/cachectl.h (100%)
361 rename arch/blackfin/include/{ => uapi}/asm/fcntl.h (100%)
362 create mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h
363 rename arch/blackfin/include/{ => uapi}/asm/ioctls.h (100%)
364 rename arch/blackfin/include/{ => uapi}/asm/poll.h (100%)
365 rename arch/blackfin/include/{ => uapi}/asm/posix_types.h (100%)
366 create mode 100644 arch/blackfin/include/uapi/asm/ptrace.h
367 rename arch/blackfin/include/{ => uapi}/asm/sigcontext.h (100%)
368 rename arch/blackfin/include/{ => uapi}/asm/siginfo.h (100%)
369 rename arch/blackfin/include/{ => uapi}/asm/signal.h (100%)
370 rename arch/blackfin/include/{ => uapi}/asm/stat.h (100%)
371 rename arch/blackfin/include/{ => uapi}/asm/swab.h (100%)
372 create mode 100644 arch/blackfin/include/uapi/asm/unistd.h
373 Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
374 $ git merge c6x/for-linux-next
376 Merging cris/for-next (eacb25c UAPI: Fix up empty files in arch/cris/)
377 $ git merge cris/for-next
378 Auto-merging arch/cris/include/asm/Kbuild
379 Merge made by the 'recursive' strategy.
380 arch/cris/include/arch-v10/arch/Kbuild | 5 +-
381 arch/cris/include/arch-v32/arch/Kbuild | 3 +-
382 arch/cris/include/arch-v32/arch/cryptocop.h | 116 +------
383 arch/cris/include/arch-v32/arch/spinlock.h | 2 +-
384 arch/cris/include/asm/Kbuild | 5 -
385 arch/cris/include/asm/ptrace.h | 5 +-
386 arch/cris/include/asm/signal.h | 122 +------
387 arch/cris/include/asm/swab.h | 3 +-
388 arch/cris/include/asm/termios.h | 43 +--
389 arch/cris/include/asm/types.h | 5 +-
390 arch/cris/include/asm/unistd.h | 342 +------------------
391 arch/cris/include/uapi/arch-v10/arch/Kbuild | 4 +
392 .../include/{ => uapi}/arch-v10/arch/sv_addr.agh | 0
393 .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h | 0
394 .../cris/include/{ => uapi}/arch-v10/arch/svinto.h | 0
395 arch/cris/include/{ => uapi}/arch-v10/arch/user.h | 0
396 arch/cris/include/uapi/arch-v32/arch/Kbuild | 2 +
397 arch/cris/include/uapi/arch-v32/arch/cryptocop.h | 122 +++++++
398 arch/cris/include/{ => uapi}/arch-v32/arch/user.h | 0
399 arch/cris/include/uapi/asm/Kbuild | 34 ++
400 arch/cris/include/{ => uapi}/asm/auxvec.h | 0
401 arch/cris/include/{ => uapi}/asm/bitsperlong.h | 0
402 arch/cris/include/{ => uapi}/asm/byteorder.h | 0
403 arch/cris/include/{ => uapi}/asm/errno.h | 0
404 arch/cris/include/{ => uapi}/asm/ethernet.h | 0
405 arch/cris/include/{ => uapi}/asm/etraxgpio.h | 0
406 arch/cris/include/{ => uapi}/asm/fcntl.h | 0
407 arch/cris/include/{ => uapi}/asm/ioctl.h | 0
408 arch/cris/include/{ => uapi}/asm/ioctls.h | 0
409 arch/cris/include/{ => uapi}/asm/ipcbuf.h | 0
410 arch/cris/include/{ => uapi}/asm/mman.h | 0
411 arch/cris/include/{ => uapi}/asm/msgbuf.h | 0
412 arch/cris/include/{ => uapi}/asm/param.h | 0
413 arch/cris/include/{ => uapi}/asm/poll.h | 0
414 arch/cris/include/{ => uapi}/asm/posix_types.h | 0
415 arch/cris/include/uapi/asm/ptrace.h | 1 +
416 arch/cris/include/{ => uapi}/asm/resource.h | 0
417 arch/cris/include/{ => uapi}/asm/rs485.h | 0
418 arch/cris/include/{ => uapi}/asm/sembuf.h | 0
419 arch/cris/include/{ => uapi}/asm/setup.h | 0
420 arch/cris/include/{ => uapi}/asm/shmbuf.h | 0
421 arch/cris/include/{ => uapi}/asm/sigcontext.h | 0
422 arch/cris/include/{ => uapi}/asm/siginfo.h | 0
423 arch/cris/include/uapi/asm/signal.h | 122 +++++++
424 arch/cris/include/{ => uapi}/asm/socket.h | 0
425 arch/cris/include/{ => uapi}/asm/sockios.h | 0
426 arch/cris/include/{ => uapi}/asm/stat.h | 0
427 arch/cris/include/{ => uapi}/asm/statfs.h | 0
428 arch/cris/include/uapi/asm/swab.h | 3 +
429 arch/cris/include/{ => uapi}/asm/sync_serial.h | 0
430 arch/cris/include/{ => uapi}/asm/termbits.h | 0
431 arch/cris/include/uapi/asm/termios.h | 45 +++
432 arch/cris/include/uapi/asm/types.h | 1 +
433 arch/cris/include/uapi/asm/unistd.h | 344 ++++++++++++++++++++
434 arch/cris/kernel/asm-offsets.c | 6 +-
435 55 files changed, 689 insertions(+), 646 deletions(-)
436 rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr.agh (100%)
437 rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr_ag.h (100%)
438 rename arch/cris/include/{ => uapi}/arch-v10/arch/svinto.h (100%)
439 rename arch/cris/include/{ => uapi}/arch-v10/arch/user.h (100%)
440 create mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h
441 rename arch/cris/include/{ => uapi}/arch-v32/arch/user.h (100%)
442 rename arch/cris/include/{ => uapi}/asm/auxvec.h (100%)
443 rename arch/cris/include/{ => uapi}/asm/bitsperlong.h (100%)
444 rename arch/cris/include/{ => uapi}/asm/byteorder.h (100%)
445 rename arch/cris/include/{ => uapi}/asm/errno.h (100%)
446 rename arch/cris/include/{ => uapi}/asm/ethernet.h (100%)
447 rename arch/cris/include/{ => uapi}/asm/etraxgpio.h (100%)
448 rename arch/cris/include/{ => uapi}/asm/fcntl.h (100%)
449 rename arch/cris/include/{ => uapi}/asm/ioctl.h (100%)
450 rename arch/cris/include/{ => uapi}/asm/ioctls.h (100%)
451 rename arch/cris/include/{ => uapi}/asm/ipcbuf.h (100%)
452 rename arch/cris/include/{ => uapi}/asm/mman.h (100%)
453 rename arch/cris/include/{ => uapi}/asm/msgbuf.h (100%)
454 rename arch/cris/include/{ => uapi}/asm/param.h (100%)
455 rename arch/cris/include/{ => uapi}/asm/poll.h (100%)
456 rename arch/cris/include/{ => uapi}/asm/posix_types.h (100%)
457 create mode 100644 arch/cris/include/uapi/asm/ptrace.h
458 rename arch/cris/include/{ => uapi}/asm/resource.h (100%)
459 rename arch/cris/include/{ => uapi}/asm/rs485.h (100%)
460 rename arch/cris/include/{ => uapi}/asm/sembuf.h (100%)
461 rename arch/cris/include/{ => uapi}/asm/setup.h (100%)
462 rename arch/cris/include/{ => uapi}/asm/shmbuf.h (100%)
463 rename arch/cris/include/{ => uapi}/asm/sigcontext.h (100%)
464 rename arch/cris/include/{ => uapi}/asm/siginfo.h (100%)
465 create mode 100644 arch/cris/include/uapi/asm/signal.h
466 rename arch/cris/include/{ => uapi}/asm/socket.h (100%)
467 rename arch/cris/include/{ => uapi}/asm/sockios.h (100%)
468 rename arch/cris/include/{ => uapi}/asm/stat.h (100%)
469 rename arch/cris/include/{ => uapi}/asm/statfs.h (100%)
470 create mode 100644 arch/cris/include/uapi/asm/swab.h
471 rename arch/cris/include/{ => uapi}/asm/sync_serial.h (100%)
472 rename arch/cris/include/{ => uapi}/asm/termbits.h (100%)
473 create mode 100644 arch/cris/include/uapi/asm/termios.h
474 create mode 100644 arch/cris/include/uapi/asm/types.h
475 create mode 100644 arch/cris/include/uapi/asm/unistd.h
476 Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
477 $ git merge hexagon/linux-next
479 Merging ia64/next (d536e0d Merge tag 'disintegrate-ia64-20121009' of git://git.infradead.org/users/dhowells/linux-headers into next)
480 $ git merge ia64/next
482 Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
483 $ git merge m68k/for-next
485 Merging m68knommu/for-next (be69d3d m68knommu: platform code merge for 68000 core cpus)
486 $ git merge m68knommu/for-next
487 Removing arch/m68k/platform/68VZ328/Makefile
488 Removing arch/m68k/platform/68EZ328/Makefile
489 Removing arch/m68k/platform/68328/head-rom.S
490 Removing arch/m68k/platform/68328/head-ram.S
491 Removing arch/m68k/platform/68328/head-pilot.S
492 Removing arch/m68k/platform/68328/head-de2.S
493 Removing arch/m68k/platform/68328/Makefile
494 Auto-merging arch/m68k/platform/68000/timers.c
495 Auto-merging arch/m68k/platform/68000/romvec.S
496 Auto-merging arch/m68k/platform/68000/m68VZ328.c
497 Auto-merging arch/m68k/platform/68000/m68EZ328.c
498 Auto-merging arch/m68k/platform/68000/m68328.c
499 Auto-merging arch/m68k/platform/68000/ints.c
500 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/termbits.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/termbits.h left in tree.
501 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/sockios.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/sockios.h left in tree.
502 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/socket.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/socket.h left in tree.
503 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/shmbuf.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/shmbuf.h left in tree.
504 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/sembuf.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/sembuf.h left in tree.
505 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/msgbuf.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/msgbuf.h left in tree.
506 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/auxvec.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/auxvec.h left in tree.
507 CONFLICT (modify/delete): arch/m68k/include/asm/termios.h deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68k/include/asm/termios.h left in tree.
508 Removing arch/m68k/include/asm/spinlock.h
509 Removing arch/m68k/include/asm/shmparam.h
510 Removing arch/m68k/include/asm/hw_irq.h
511 Auto-merging arch/m68k/include/asm/Kbuild
512 Automatic merge failed; fix conflicts and then commit the result.
513 $ git rm -f arch/m68k/include/asm/termios.h arch/m68k/include/uapi/asm/auxvec.h arch/m68k/include/uapi/asm/msgbuf.h arch/m68k/include/uapi/asm/sembuf.h arch/m68k/include/uapi/asm/shmbuf.h arch/m68k/include/uapi/asm/socket.h arch/m68k/include/uapi/asm/sockios.h arch/m68k/include/uapi/asm/termbits.h
514 arch/m68k/include/asm/termios.h: needs merge
515 arch/m68k/include/uapi/asm/auxvec.h: needs merge
516 arch/m68k/include/uapi/asm/msgbuf.h: needs merge
517 arch/m68k/include/uapi/asm/sembuf.h: needs merge
518 arch/m68k/include/uapi/asm/shmbuf.h: needs merge
519 arch/m68k/include/uapi/asm/socket.h: needs merge
520 arch/m68k/include/uapi/asm/sockios.h: needs merge
521 arch/m68k/include/uapi/asm/termbits.h: needs merge
522 rm 'arch/m68k/include/asm/termios.h'
523 rm 'arch/m68k/include/uapi/asm/auxvec.h'
524 rm 'arch/m68k/include/uapi/asm/msgbuf.h'
525 rm 'arch/m68k/include/uapi/asm/sembuf.h'
526 rm 'arch/m68k/include/uapi/asm/shmbuf.h'
527 rm 'arch/m68k/include/uapi/asm/socket.h'
528 rm 'arch/m68k/include/uapi/asm/sockios.h'
529 rm 'arch/m68k/include/uapi/asm/termbits.h'
531 [master 16d6d50] Merge remote-tracking branch 'm68knommu/for-next'
532 $ git diff -M --stat --summary HEAD^..
533 arch/m68k/Kconfig.cpu | 2 +-
534 arch/m68k/Makefile | 6 +-
535 arch/m68k/include/asm/Kbuild | 11 +
536 arch/m68k/include/asm/hw_irq.h | 6 -
537 arch/m68k/include/asm/shmparam.h | 6 -
538 arch/m68k/include/asm/spinlock.h | 6 -
539 arch/m68k/include/asm/termios.h | 50 ----
540 arch/m68k/include/uapi/asm/auxvec.h | 4 -
541 arch/m68k/include/uapi/asm/msgbuf.h | 31 ---
542 arch/m68k/include/uapi/asm/sembuf.h | 25 --
543 arch/m68k/include/uapi/asm/shmbuf.h | 42 ----
544 arch/m68k/include/uapi/asm/socket.h | 72 ------
545 arch/m68k/include/uapi/asm/sockios.h | 13 --
546 arch/m68k/include/uapi/asm/termbits.h | 201 ----------------
547 arch/m68k/platform/68000/Makefile | 18 ++
548 .../{68VZ328/bootlogo.h => 68000/bootlogo-vz.h} | 0
549 arch/m68k/platform/{68328 => 68000}/bootlogo.h | 0
550 arch/m68k/platform/{68328 => 68000}/entry.S | 0
551 arch/m68k/platform/68000/head.S | 240 ++++++++++++++++++++
552 arch/m68k/platform/{68328 => 68000}/ints.c | 2 +-
553 .../platform/{68328/config.c => 68000/m68328.c} | 2 +-
554 .../{68EZ328/config.c => 68000/m68EZ328.c} | 2 +-
555 .../{68VZ328/config.c => 68000/m68VZ328.c} | 4 +-
556 arch/m68k/platform/{68328 => 68000}/romvec.S | 2 +-
557 arch/m68k/platform/{68328 => 68000}/timers.c | 2 +-
558 arch/m68k/platform/68328/Makefile | 21 --
559 arch/m68k/platform/68328/head-de2.S | 128 -----------
560 arch/m68k/platform/68328/head-pilot.S | 207 -----------------
561 arch/m68k/platform/68328/head-ram.S | 141 ------------
562 arch/m68k/platform/68328/head-rom.S | 105 ---------
563 arch/m68k/platform/68EZ328/Makefile | 5 -
564 arch/m68k/platform/68VZ328/Makefile | 5 -
565 32 files changed, 279 insertions(+), 1080 deletions(-)
566 delete mode 100644 arch/m68k/include/asm/hw_irq.h
567 delete mode 100644 arch/m68k/include/asm/shmparam.h
568 delete mode 100644 arch/m68k/include/asm/spinlock.h
569 delete mode 100644 arch/m68k/include/asm/termios.h
570 delete mode 100644 arch/m68k/include/uapi/asm/auxvec.h
571 delete mode 100644 arch/m68k/include/uapi/asm/msgbuf.h
572 delete mode 100644 arch/m68k/include/uapi/asm/sembuf.h
573 delete mode 100644 arch/m68k/include/uapi/asm/shmbuf.h
574 delete mode 100644 arch/m68k/include/uapi/asm/socket.h
575 delete mode 100644 arch/m68k/include/uapi/asm/sockios.h
576 delete mode 100644 arch/m68k/include/uapi/asm/termbits.h
577 create mode 100644 arch/m68k/platform/68000/Makefile
578 rename arch/m68k/platform/{68VZ328/bootlogo.h => 68000/bootlogo-vz.h} (100%)
579 rename arch/m68k/platform/{68328 => 68000}/bootlogo.h (100%)
580 rename arch/m68k/platform/{68328 => 68000}/entry.S (100%)
581 create mode 100644 arch/m68k/platform/68000/head.S
582 rename arch/m68k/platform/{68328 => 68000}/ints.c (98%)
583 rename arch/m68k/platform/{68328/config.c => 68000/m68328.c} (97%)
584 rename arch/m68k/platform/{68EZ328/config.c => 68000/m68EZ328.c} (97%)
585 rename arch/m68k/platform/{68VZ328/config.c => 68000/m68VZ328.c} (98%)
586 rename arch/m68k/platform/{68328 => 68000}/romvec.S (94%)
587 rename arch/m68k/platform/{68328 => 68000}/timers.c (98%)
588 delete mode 100644 arch/m68k/platform/68328/Makefile
589 delete mode 100644 arch/m68k/platform/68328/head-de2.S
590 delete mode 100644 arch/m68k/platform/68328/head-pilot.S
591 delete mode 100644 arch/m68k/platform/68328/head-ram.S
592 delete mode 100644 arch/m68k/platform/68328/head-rom.S
593 delete mode 100644 arch/m68k/platform/68EZ328/Makefile
594 delete mode 100644 arch/m68k/platform/68VZ328/Makefile
595 $ git am -3 ../patches/0001-m68k-fix-up-for-UAPI-changes.patch
596 Applying: m68k: fix up for UAPI changes
598 Unstaged changes after reset:
599 M arch/m68k/include/uapi/asm/Kbuild
601 $ git commit -v -a --amend
602 [master 3569670] Merge remote-tracking branch 'm68knommu/for-next'
603 Merging microblaze/next (1883baa UAPI: (Scripted) Disintegrate arch/microblaze/include/asm)
604 $ git merge microblaze/next
605 Auto-merging arch/microblaze/include/asm/Kbuild
606 Merge made by the 'recursive' strategy.
607 arch/microblaze/include/asm/Kbuild | 2 -
608 arch/microblaze/include/asm/elf.h | 97 +----
609 arch/microblaze/include/asm/ptrace.h | 62 +--
610 arch/microblaze/include/asm/setup.h | 6 +-
611 arch/microblaze/include/asm/unistd.h | 390 +------------------
612 arch/microblaze/include/uapi/asm/Kbuild | 32 ++
613 arch/microblaze/include/{ => uapi}/asm/auxvec.h | 0
614 .../include/{ => uapi}/asm/bitsperlong.h | 0
615 arch/microblaze/include/{ => uapi}/asm/byteorder.h | 0
616 arch/microblaze/include/uapi/asm/elf.h | 121 ++++++
617 arch/microblaze/include/{ => uapi}/asm/errno.h | 0
618 arch/microblaze/include/{ => uapi}/asm/fcntl.h | 0
619 arch/microblaze/include/{ => uapi}/asm/ioctl.h | 0
620 arch/microblaze/include/{ => uapi}/asm/ioctls.h | 0
621 arch/microblaze/include/{ => uapi}/asm/ipcbuf.h | 0
622 arch/microblaze/include/{ => uapi}/asm/kvm_para.h | 0
623 arch/microblaze/include/{ => uapi}/asm/mman.h | 0
624 arch/microblaze/include/{ => uapi}/asm/msgbuf.h | 0
625 arch/microblaze/include/{ => uapi}/asm/param.h | 0
626 arch/microblaze/include/{ => uapi}/asm/poll.h | 0
627 .../include/{ => uapi}/asm/posix_types.h | 0
628 arch/microblaze/include/uapi/asm/ptrace.h | 72 ++++
629 arch/microblaze/include/{ => uapi}/asm/resource.h | 0
630 arch/microblaze/include/{ => uapi}/asm/sembuf.h | 0
631 arch/microblaze/include/uapi/asm/setup.h | 19 +
632 arch/microblaze/include/{ => uapi}/asm/shmbuf.h | 0
633 .../microblaze/include/{ => uapi}/asm/sigcontext.h | 0
634 arch/microblaze/include/{ => uapi}/asm/siginfo.h | 0
635 arch/microblaze/include/{ => uapi}/asm/signal.h | 0
636 arch/microblaze/include/{ => uapi}/asm/socket.h | 0
637 arch/microblaze/include/{ => uapi}/asm/sockios.h | 0
638 arch/microblaze/include/{ => uapi}/asm/stat.h | 0
639 arch/microblaze/include/{ => uapi}/asm/statfs.h | 0
640 arch/microblaze/include/{ => uapi}/asm/swab.h | 0
641 arch/microblaze/include/{ => uapi}/asm/termbits.h | 0
642 arch/microblaze/include/{ => uapi}/asm/termios.h | 0
643 arch/microblaze/include/{ => uapi}/asm/types.h | 0
644 arch/microblaze/include/uapi/asm/unistd.h | 400 ++++++++++++++++++++
645 38 files changed, 649 insertions(+), 552 deletions(-)
646 rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%)
647 rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%)
648 rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%)
649 create mode 100644 arch/microblaze/include/uapi/asm/elf.h
650 rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%)
651 rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%)
652 rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%)
653 rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%)
654 rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%)
655 rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%)
656 rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%)
657 rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%)
658 rename arch/microblaze/include/{ => uapi}/asm/param.h (100%)
659 rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%)
660 rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%)
661 create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h
662 rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%)
663 rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%)
664 create mode 100644 arch/microblaze/include/uapi/asm/setup.h
665 rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%)
666 rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%)
667 rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%)
668 rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%)
669 rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%)
670 rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%)
671 rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%)
672 rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%)
673 rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%)
674 rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%)
675 rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%)
676 rename arch/microblaze/include/{ => uapi}/asm/types.h (100%)
677 create mode 100644 arch/microblaze/include/uapi/asm/unistd.h
678 Merging mips/mips-for-linux-next (c0aa62e MIPS: Cavium: Update defconfig)
679 $ git merge mips/mips-for-linux-next
680 Auto-merging MAINTAINERS
681 Merge made by the 'recursive' strategy.
683 arch/mips/Kconfig | 17 ++-
684 arch/mips/cavium-octeon/setup.c | 30 +++++-
685 arch/mips/configs/cavium_octeon_defconfig | 98 ++++++++++++++---
686 arch/mips/include/asm/cpu.h | 6 +-
687 arch/mips/include/asm/mipsregs.h | 2 +-
688 arch/mips/include/asm/page.h | 8 +-
689 arch/mips/include/asm/pgtable-64.h | 2 +-
690 arch/mips/include/asm/pgtable-bits.h | 13 ++-
691 arch/mips/include/asm/pgtable.h | 168 ++++++++++++++++++++++++++++-
692 arch/mips/include/asm/sparsemem.h | 2 +-
693 arch/mips/include/asm/tlbdebug.h | 1 +
694 arch/mips/kernel/mips_ksyms.c | 2 +-
695 arch/mips/kernel/scall64-n32.S | 6 --
696 arch/mips/lib/dump_tlb.c | 47 ++++++++
697 arch/mips/mm/c-octeon.c | 46 ++++----
698 arch/mips/mm/pgtable-64.c | 31 ++++++
699 arch/mips/mm/tlb-r4k.c | 22 +++-
700 arch/mips/mm/tlbex.c | 91 +++++++++++-----
701 arch/mips/pci/pci-octeon.c | 4 +
702 drivers/edac/Kconfig | 33 +++++-
703 drivers/edac/Makefile | 5 +
704 drivers/edac/octeon_edac-l2c.c | 118 ++++++++++++++++++++
705 drivers/edac/octeon_edac-lmc.c | 150 ++++++++++++++++++++++++++
706 drivers/edac/octeon_edac-lmc.h | 78 ++++++++++++++
707 drivers/edac/octeon_edac-pc.c | 140 ++++++++++++++++++++++++
708 drivers/edac/octeon_edac-pci.c | 135 +++++++++++++++++++++++
709 27 files changed, 1172 insertions(+), 92 deletions(-)
710 create mode 100644 drivers/edac/octeon_edac-l2c.c
711 create mode 100644 drivers/edac/octeon_edac-lmc.c
712 create mode 100644 drivers/edac/octeon_edac-lmc.h
713 create mode 100644 drivers/edac/octeon_edac-pc.c
714 create mode 100644 drivers/edac/octeon_edac-pci.c
715 Merging openrisc/for-upstream (6257c57 Merge tag 'disintegrate-openrisc-20121009' of git://git.infradead.org/users/dhowells/linux-headers)
716 $ git merge openrisc/for-upstream
718 Merging parisc/for-next (559fd14 Merge tag 'disintegrate-parisc-20121016' into for-next)
719 $ git merge parisc/for-next
721 Merge made by the 'recursive' strategy.
722 Merging powerpc/next (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
723 $ git merge powerpc/next
725 Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
728 Merging mpc5xxx/next (fa9b24a powerpc/mpc5200: move lpbfifo node and fix its interrupt property)
729 $ git merge mpc5xxx/next
730 Merge made by the 'recursive' strategy.
731 arch/powerpc/boot/dts/mpc5200b.dtsi | 6 ++++++
732 arch/powerpc/boot/dts/o2d.dtsi | 6 ------
733 arch/powerpc/boot/dts/pcm030.dts | 7 ++++++-
734 arch/powerpc/platforms/52xx/mpc52xx_pic.c | 9 +++++----
735 4 files changed, 17 insertions(+), 11 deletions(-)
736 Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
737 $ git merge galak/next
739 Merging s390/features (0adeba2 s390/traps: preinitialize program check table)
740 $ git merge s390/features
741 Merge made by the 'recursive' strategy.
742 arch/s390/include/asm/pgtable.h | 10 +++
743 arch/s390/kernel/Makefile | 2 +-
744 arch/s390/kernel/entry.h | 21 +++++-
745 arch/s390/kernel/entry64.S | 4 +-
746 arch/s390/kernel/pgm_check.S | 152 +++++++++++++++++++++++++++++++++++++++
747 arch/s390/kernel/traps.c | 52 ++------------
748 arch/s390/mm/dump_pagetables.c | 7 +-
749 arch/s390/mm/pageattr.c | 2 +-
750 arch/s390/mm/vmem.c | 46 ++++++++++--
751 9 files changed, 240 insertions(+), 56 deletions(-)
752 create mode 100644 arch/s390/kernel/pgm_check.S
753 Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.)
754 $ git merge sh/sh-latest
756 Merging sparc-next/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
757 $ git merge sparc-next/master
759 Merging tile/master (ddffeb8 Linux 3.7-rc1)
760 $ git merge tile/master
762 Merging unicore32/unicore32 (5d05622 unicore32: switch to generic sys_execve())
763 $ git merge unicore32/unicore32
764 Auto-merging arch/unicore32/include/uapi/asm/unistd.h
765 Removing arch/unicore32/include/asm/kvm_para.h
766 Merge made by the 'recursive' strategy.
767 arch/unicore32/Kconfig | 5 ++
768 arch/unicore32/include/asm/Kbuild | 1 -
769 arch/unicore32/include/asm/bug.h | 5 --
770 arch/unicore32/include/asm/cmpxchg.h | 2 +-
771 arch/unicore32/include/asm/kvm_para.h | 1 -
772 arch/unicore32/include/asm/processor.h | 5 --
773 arch/unicore32/include/asm/ptrace.h | 76 +----------------
774 arch/unicore32/include/uapi/asm/Kbuild | 7 ++
775 arch/unicore32/include/{ => uapi}/asm/byteorder.h | 0
776 arch/unicore32/include/uapi/asm/ptrace.h | 90 ++++++++++++++++++++
777 arch/unicore32/include/{ => uapi}/asm/sigcontext.h | 0
778 arch/unicore32/include/{ => uapi}/asm/unistd.h | 1 +
779 arch/unicore32/kernel/entry.S | 20 ++---
780 arch/unicore32/kernel/process.c | 58 +++----------
781 arch/unicore32/kernel/setup.h | 6 ++
782 arch/unicore32/kernel/sys.c | 63 --------------
783 arch/unicore32/mm/fault.c | 37 +++++---
784 17 files changed, 159 insertions(+), 218 deletions(-)
785 delete mode 100644 arch/unicore32/include/asm/kvm_para.h
786 rename arch/unicore32/include/{ => uapi}/asm/byteorder.h (100%)
787 create mode 100644 arch/unicore32/include/uapi/asm/ptrace.h
788 rename arch/unicore32/include/{ => uapi}/asm/sigcontext.h (100%)
789 rename arch/unicore32/include/{ => uapi}/asm/unistd.h (92%)
790 Merging xtensa/for_next (7216cab xtensa: add missing system calls to the syscall table)
791 $ git merge xtensa/for_next
793 Merging btrfs/next (f46dbe3 btrfs: init ref_index to zero in add_inode_ref)
794 $ git merge btrfs/next
796 Merging ceph/master (3515297 rbd: activate v2 image support)
797 $ git merge ceph/master
798 Merge made by the 'recursive' strategy.
799 drivers/block/rbd.c | 100 +++++++++++++++++++++++++++++++++++++++-----------
800 net/ceph/messenger.c | 61 ++++++++++++++----------------
801 2 files changed, 106 insertions(+), 55 deletions(-)
802 Merging cifs/for-next (f51de01 cifs: extra sanity checking for cifs.idmap keys)
803 $ git merge cifs/for-next
804 Merge made by the 'recursive' strategy.
805 fs/cifs/cifsacl.c | 749 +++++++++++++++------------------------------------
806 fs/cifs/cifsacl.h | 53 ++--
807 fs/cifs/cifsfs.c | 12 +-
808 fs/cifs/cifsproto.h | 1 -
809 fs/cifs/inode.c | 7 +-
810 fs/cifs/readdir.c | 10 +
811 6 files changed, 258 insertions(+), 574 deletions(-)
812 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
813 $ git merge configfs/linux-next
815 Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
816 $ git merge ecryptfs/next
818 Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
819 $ git merge ext3/for_next
821 Merging ext4/dev (5de35e8 ext4: Avoid underflow in ext4_trim_fs())
824 Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
825 $ git merge fuse/for-next
826 Auto-merging include/uapi/linux/fuse.h
827 Auto-merging fs/fuse/inode.c
828 Auto-merging fs/fuse/dev.c
829 Merge made by the 'recursive' strategy.
831 fs/fuse/Kconfig | 16 ++++-
832 fs/fuse/dev.c | 19 ++++++
833 fs/fuse/dir.c | 160 +++++++++++++++++++++++++++++++++++++++++++--
834 fs/fuse/fuse_i.h | 6 ++
835 fs/fuse/inode.c | 5 +-
836 include/uapi/linux/fuse.h | 12 ++++
837 7 files changed, 211 insertions(+), 17 deletions(-)
838 Merging gfs2/master (3bba80e GFS2: Speed up gfs2_rbm_from_block)
839 $ git merge gfs2/master
840 Merge made by the 'recursive' strategy.
841 fs/gfs2/file.c | 2 --
842 fs/gfs2/glock.c | 10 ++++------
843 fs/gfs2/glock.h | 54 +++++++++++++++++++++++++-------------------------
844 fs/gfs2/glops.c | 10 +++++-----
845 fs/gfs2/incore.h | 1 +
846 fs/gfs2/lops.c | 2 --
847 fs/gfs2/ops_fstype.c | 3 +++
848 fs/gfs2/quota.c | 7 +++++--
849 fs/gfs2/rgrp.c | 54 ++++++++++++++++++++++++++++++--------------------
850 9 files changed, 78 insertions(+), 65 deletions(-)
851 Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling)
852 $ git merge jfs/jfs-next
854 Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
855 $ git merge logfs/master
856 Merge made by the 'recursive' strategy.
857 fs/logfs/dev_mtd.c | 2 +-
858 1 file changed, 1 insertion(+), 1 deletion(-)
859 Merging nfs/linux-next (481e438 NFSv4.1: Simplify the sequence setup)
860 $ git merge nfs/linux-next
861 Merge made by the 'recursive' strategy.
862 fs/lockd/clnt4xdr.c | 8 ---
863 fs/lockd/clntproc.c | 3 +-
864 fs/lockd/clntxdr.c | 8 ---
865 fs/lockd/host.c | 15 ++---
866 fs/lockd/mon.c | 60 +++++++++--------
867 fs/nfs/cache_lib.c | 1 -
868 fs/nfs/callback_proc.c | 1 -
869 fs/nfs/client.c | 6 +-
870 fs/nfs/inode.c | 4 +-
871 fs/nfs/mount_clnt.c | 7 +-
872 fs/nfs/nfs2xdr.c | 4 +-
873 fs/nfs/nfs3xdr.c | 7 +-
874 fs/nfs/nfs4_fs.h | 1 +
875 fs/nfs/nfs4client.c | 4 --
876 fs/nfs/nfs4file.c | 1 -
877 fs/nfs/nfs4filelayout.c | 37 +++--------
878 fs/nfs/nfs4filelayoutdev.c | 2 -
879 fs/nfs/nfs4proc.c | 150 ++++++++++++++----------------------------
880 fs/nfs/nfs4state.c | 1 -
881 fs/nfs/nfs4xdr.c | 6 +-
882 fs/nfs/objlayout/objlayout.c | 11 ----
883 fs/nfs/pnfs.c | 17 +----
884 fs/nfs/write.c | 26 +++-----
885 net/sunrpc/xprtsock.c | 41 +++---------
886 24 files changed, 136 insertions(+), 285 deletions(-)
887 Merging nfsd/nfsd-next (ddffeb8 Linux 3.7-rc1)
888 $ git merge nfsd/nfsd-next
890 Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
891 $ git merge ocfs2/linux-next
892 Auto-merging fs/ocfs2/cluster/heartbeat.c
893 Merge made by the 'recursive' strategy.
894 fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
895 fs/ocfs2/cluster/masklog.h | 3 ++-
896 fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
897 fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
898 fs/ocfs2/symlink.c | 2 +-
899 5 files changed, 27 insertions(+), 35 deletions(-)
900 Merging omfs/for-next (976d167 Linux 3.1-rc9)
901 $ git merge omfs/for-next
903 Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
904 $ git merge squashfs/master
906 Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
907 $ git merge v9fs/for-next
908 Merge made by the 'recursive' strategy.
909 Merging ubifs/linux-next (a74b6e4 UBIFS: fix mounting problems after power cuts)
910 $ git merge ubifs/linux-next
911 Merge made by the 'recursive' strategy.
912 fs/ubifs/find.c | 5 +++--
913 fs/ubifs/lprops.c | 6 ++++++
914 fs/ubifs/ubifs.h | 3 +++
915 3 files changed, 12 insertions(+), 2 deletions(-)
916 Merging xfs/for-next (e04426b xfs: move allocation stack switch up to xfs_bmapi_allocate)
917 $ git merge xfs/for-next
918 Removing fs/xfs/xfs_iget.c
919 Auto-merging fs/xfs/xfs_icache.h
920 Auto-merging fs/xfs/xfs_icache.c
921 Merge made by the 'recursive' strategy.
922 fs/xfs/Makefile | 3 +-
923 fs/xfs/xfs_alloc.c | 43 +--
924 fs/xfs/xfs_alloc.h | 3 -
925 fs/xfs/xfs_bmap.c | 63 +++-
926 fs/xfs/xfs_bmap.h | 9 +-
927 fs/xfs/xfs_export.c | 1 +
928 fs/xfs/xfs_file.c | 13 +-
929 fs/xfs/xfs_ialloc.c | 1 +
930 fs/xfs/{xfs_sync.c => xfs_icache.c} | 701 ++++++++++++++++++++--------------
931 fs/xfs/{xfs_sync.h => xfs_icache.h} | 14 +-
932 fs/xfs/xfs_iget.c | 705 -----------------------------------
933 fs/xfs/xfs_inode.c | 251 +++++++++++++
934 fs/xfs/xfs_inode.h | 10 +-
935 fs/xfs/xfs_iomap.c | 27 +-
936 fs/xfs/xfs_itable.c | 1 +
937 fs/xfs/xfs_log.c | 122 +++++-
938 fs/xfs/xfs_log.h | 4 +
939 fs/xfs/xfs_log_priv.h | 1 +
940 fs/xfs/xfs_log_recover.c | 1 +
941 fs/xfs/xfs_mount.c | 31 +-
942 fs/xfs/xfs_mount.h | 6 +-
943 fs/xfs/xfs_qm.c | 1 +
944 fs/xfs/xfs_qm_syscalls.c | 1 +
945 fs/xfs/xfs_rtalloc.c | 1 +
946 fs/xfs/xfs_super.c | 139 ++++---
947 fs/xfs/xfs_super.h | 1 +
948 fs/xfs/xfs_vnodeops.c | 3 +-
949 27 files changed, 987 insertions(+), 1169 deletions(-)
950 rename fs/xfs/{xfs_sync.c => xfs_icache.c} (64%)
951 rename fs/xfs/{xfs_sync.h => xfs_icache.h} (73%)
952 delete mode 100644 fs/xfs/xfs_iget.c
953 Merging vfs/for-next (a736427 missing const in alpha callers of do_mount())
954 $ git merge vfs/for-next
955 Auto-merging arch/alpha/kernel/osf_sys.c
956 Merge made by the 'recursive' strategy.
957 arch/alpha/kernel/osf_sys.c | 6 +++---
958 1 file changed, 3 insertions(+), 3 deletions(-)
959 Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next)
962 Merging hid/for-next (5277e97 HID: roccat: allow readout of koneplus sensor register data)
963 $ git merge hid/for-next
964 Merge made by the 'recursive' strategy.
965 .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 6 +-
966 .../ABI/testing/sysfs-driver-hid-roccat-lua | 7 +
967 drivers/hid/Makefile | 4 +-
968 drivers/hid/hid-core.c | 1 +
969 drivers/hid/hid-ids.h | 1 +
970 drivers/hid/hid-roccat-koneplus.c | 11 +-
971 drivers/hid/hid-roccat-lua.c | 227 ++++++++++++++++++++
972 drivers/hid/hid-roccat-lua.h | 29 +++
973 8 files changed, 280 insertions(+), 6 deletions(-)
974 create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-lua
975 create mode 100644 drivers/hid/hid-roccat-lua.c
976 create mode 100644 drivers/hid/hid-roccat-lua.h
977 Merging quilt/i2c (13a2e9c i2c-i801: Fix comment)
978 $ git merge quilt/i2c
979 Auto-merging drivers/i2c/i2c-stub.c
980 Merge made by the 'recursive' strategy.
981 drivers/i2c/Makefile | 1 +
982 drivers/i2c/busses/Kconfig | 1 -
983 drivers/i2c/busses/Makefile | 1 -
984 drivers/i2c/busses/i2c-i801.c | 13 ++++---
985 drivers/i2c/{busses => }/i2c-stub.c | 65 +++++++++++++++++------------------
986 5 files changed, 42 insertions(+), 39 deletions(-)
987 rename drivers/i2c/{busses => }/i2c-stub.c (75%)
988 Merging i2c-embedded/i2c-embedded/for-next (62885f5 MXS: Implement DMA support into mxs-i2c)
989 $ git merge i2c-embedded/i2c-embedded/for-next
991 Merging quilt/jdelvare-hwmon (0110e1d hwmon: (w83627ehf) Add support for suspend)
992 $ git merge quilt/jdelvare-hwmon
993 Merge made by the 'recursive' strategy.
994 drivers/hwmon/asb100.c | 2 +-
995 drivers/hwmon/w83627ehf.c | 93 ++++++++++++++++++++++++++++++++++++++++++++-
996 drivers/hwmon/w83627hf.c | 77 ++++++++++++++++++++++++++++++++++++-
997 drivers/hwmon/w83781d.c | 2 +-
998 drivers/hwmon/w83791d.c | 2 +-
999 drivers/hwmon/w83792d.c | 2 +-
1000 drivers/hwmon/w83l786ng.c | 2 +-
1001 7 files changed, 172 insertions(+), 8 deletions(-)
1002 Merging hwmon-staging/hwmon-next (502d539 hwmon: DA9055 HWMON driver)
1003 $ git merge hwmon-staging/hwmon-next
1004 Merge made by the 'recursive' strategy.
1005 Documentation/hwmon/ads7828 | 46 +++--
1006 Documentation/hwmon/coretemp | 2 +
1007 Documentation/hwmon/da9055 | 47 +++++
1008 drivers/hwmon/Kconfig | 19 +-
1009 drivers/hwmon/Makefile | 1 +
1010 drivers/hwmon/ads7828.c | 247 ++++++++++--------------
1011 drivers/hwmon/coretemp.c | 60 +++---
1012 drivers/hwmon/da9052-hwmon.c | 27 +--
1013 drivers/hwmon/da9055-hwmon.c | 336 +++++++++++++++++++++++++++++++++
1014 drivers/hwmon/ina2xx.c | 13 +-
1015 include/linux/platform_data/ads7828.h | 29 +++
1016 11 files changed, 603 insertions(+), 224 deletions(-)
1017 create mode 100644 Documentation/hwmon/da9055
1018 create mode 100644 drivers/hwmon/da9055-hwmon.c
1019 create mode 100644 include/linux/platform_data/ads7828.h
1020 Merging v4l-dvb/master (c3a6417 Merge /home/v4l/v4l/for_upstream)
1021 $ git merge v4l-dvb/master
1023 Merge made by the 'recursive' strategy.
1024 Merging kbuild/for-next (b974d36 Merge branch 'kbuild/kbuild' into kbuild/for-next)
1025 $ git merge kbuild/for-next
1027 Merge made by the 'recursive' strategy.
1028 Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
1029 $ git merge kconfig/for-next
1031 Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
1032 $ git merge libata/NEXT
1034 Merging infiniband/for-next (1e3474d Merge branches 'cxgb4' and 'mlx4' into for-next)
1035 $ git merge infiniband/for-next
1036 Merge made by the 'recursive' strategy.
1037 drivers/infiniband/hw/cxgb4/mem.c | 2 +-
1038 drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
1039 drivers/infiniband/hw/mlx4/mad.c | 85 +++++++++-----------
1040 drivers/infiniband/hw/mlx4/mcg.c | 18 +++--
1041 drivers/net/ethernet/mellanox/mlx4/eq.c | 6 --
1042 drivers/net/ethernet/mellanox/mlx4/main.c | 5 +-
1043 .../net/ethernet/mellanox/mlx4/resource_tracker.c | 6 --
1044 7 files changed, 56 insertions(+), 68 deletions(-)
1045 Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
1046 $ git merge pstore/master
1048 Merging acpi/next (d1d4a81 Merge branches 'fixes-for-37', 'ec' and 'thermal' into release)
1049 $ git merge acpi/next
1051 Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
1052 $ git merge cpuidle/cpuidle-next
1053 Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
1054 Resolved 'include/linux/cpuidle.h' using previous resolution.
1055 Auto-merging include/linux/cpuidle.h
1056 CONFLICT (content): Merge conflict in include/linux/cpuidle.h
1057 Auto-merging drivers/cpuidle/coupled.c
1058 CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
1059 Automatic merge failed; fix conflicts and then commit the result.
1061 [master d1ee166] Merge remote-tracking branch 'cpuidle/cpuidle-next'
1062 $ git diff -M --stat --summary HEAD^..
1063 Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
1064 $ git merge cpupowerutils/master
1066 Merging thermal/next (a180acf ACPI video: Ignore errors after _DOD evaluation.)
1067 $ git merge thermal/next
1068 Merge made by the 'recursive' strategy.
1069 Documentation/thermal/sysfs-api.txt | 64 ++
1070 drivers/acpi/thermal.c | 6 +-
1071 drivers/acpi/video.c | 11 +-
1072 drivers/platform/x86/acerhdf.c | 2 +-
1073 drivers/platform/x86/intel_mid_thermal.c | 2 +-
1074 drivers/power/power_supply_core.c | 2 +-
1075 drivers/staging/omap-thermal/omap-thermal-common.c | 2 +-
1076 drivers/thermal/Kconfig | 49 ++
1077 drivers/thermal/Makefile | 3 +
1078 drivers/thermal/exynos_thermal.c | 4 +-
1079 drivers/thermal/fair_share.c | 133 ++++
1080 drivers/thermal/rcar_thermal.c | 2 +-
1081 drivers/thermal/spear_thermal.c | 2 +-
1082 drivers/thermal/step_wise.c | 194 ++++++
1083 drivers/thermal/thermal_core.h | 53 ++
1084 drivers/thermal/thermal_sys.c | 700 +++++++++++++-------
1085 drivers/thermal/user_space.c | 68 ++
1086 include/linux/thermal.h | 128 +++-
1087 18 files changed, 1132 insertions(+), 293 deletions(-)
1088 create mode 100644 drivers/thermal/fair_share.c
1089 create mode 100644 drivers/thermal/step_wise.c
1090 create mode 100644 drivers/thermal/thermal_core.h
1091 create mode 100644 drivers/thermal/user_space.c
1092 Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
1093 $ git merge ieee1394/for-next
1095 Merging ubi/linux-next (ddffeb8 Linux 3.7-rc1)
1096 $ git merge ubi/linux-next
1098 Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
1099 $ git merge dlm/next
1101 Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
1102 $ git merge scsi/for-next
1104 Merging target-updates/for-next (cf0eb28 iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values)
1105 $ git merge target-updates/for-next
1107 Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2)
1108 $ git merge target-merge/for-next-merge
1110 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
1111 $ git merge ibft/linux-next
1113 Merging isci/all (6734092 isci: add a couple __iomem annotations)
1114 $ git merge isci/all
1116 Merging slave-dma/next (1377fde drivers/dma: remove CONFIG_EXPERIMENTAL)
1117 $ git merge slave-dma/next
1118 Merge made by the 'recursive' strategy.
1119 drivers/dma/Kconfig | 2 +-
1120 1 file changed, 1 insertion(+), 1 deletion(-)
1121 Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
1122 $ git merge dmaengine/next
1124 Merging net-next/master (e4e541a sock-diag: Report shutdown for inet and unix sockets (v2))
1125 $ git merge net-next/master
1126 Auto-merging net/ipv4/tcp_ipv4.c
1127 Auto-merging net/ipv4/tcp_input.c
1128 Auto-merging net/ipv4/tcp.c
1129 Auto-merging include/uapi/linux/usb/cdc.h
1130 Removing drivers/net/ethernet/cadence/at91_ether.h
1131 Removing arch/arm/mach-at91/include/mach/at91rm9200_emac.h
1132 Auto-merging MAINTAINERS
1133 Merge made by the 'recursive' strategy.
1135 arch/arm/mach-at91/Kconfig | 4 -
1136 arch/arm/mach-at91/board-csb337.c | 2 +
1137 arch/arm/mach-at91/include/mach/at91rm9200_emac.h | 138 ---
1138 arch/avr32/Kconfig | 1 -
1139 drivers/net/ethernet/cadence/Kconfig | 8 +-
1140 drivers/net/ethernet/cadence/at91_ether.c | 1029 +++--------------
1141 drivers/net/ethernet/cadence/at91_ether.h | 112 --
1142 drivers/net/ethernet/cadence/macb.c | 20 +-
1143 drivers/net/ethernet/cadence/macb.h | 22 +
1144 drivers/net/ethernet/emulex/benet/be.h | 20 +-
1145 drivers/net/ethernet/emulex/benet/be_cmds.c | 392 ++++++-
1146 drivers/net/ethernet/emulex/benet/be_cmds.h | 150 ++-
1147 drivers/net/ethernet/emulex/benet/be_ethtool.c | 80 +-
1148 drivers/net/ethernet/emulex/benet/be_hw.h | 3 +
1149 drivers/net/ethernet/emulex/benet/be_main.c | 535 ++++++---
1150 drivers/net/ethernet/intel/e1000e/netdev.c | 11 +
1151 drivers/net/ethernet/intel/igb/e1000_82575.h | 3 +
1152 drivers/net/ethernet/intel/igb/e1000_phy.c | 20 +
1153 drivers/net/ethernet/intel/igb/igb.h | 70 +-
1154 drivers/net/ethernet/intel/igb/igb_ethtool.c | 53 +-
1155 drivers/net/ethernet/intel/igb/igb_main.c | 1244 +++++++++++++--------
1156 drivers/net/ethernet/intel/igb/igb_ptp.c | 55 +-
1157 drivers/net/ethernet/intel/ixgbe/ixgbe.h | 7 +-
1158 drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 44 +
1159 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 3 +-
1160 drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 1 +
1161 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 102 +-
1162 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 4 +
1163 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 7 +-
1164 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 79 +-
1165 drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 31 +-
1166 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 109 +-
1167 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 465 +++++---
1168 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
1169 drivers/net/ethernet/intel/ixgbevf/defines.h | 7 +-
1170 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 4 +-
1171 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 210 +++-
1172 drivers/net/ethernet/intel/ixgbevf/mbx.h | 10 +
1173 drivers/net/ethernet/intel/ixgbevf/vf.c | 58 +
1174 drivers/net/ethernet/intel/ixgbevf/vf.h | 2 +
1175 drivers/net/hyperv/rndis_filter.c | 5 -
1176 drivers/net/usb/Kconfig | 18 +
1177 drivers/net/usb/Makefile | 1 +
1178 drivers/net/usb/cdc_mbim.c | 412 +++++++
1179 drivers/net/usb/cdc_ncm.c | 584 +++++-----
1180 include/linux/platform_data/macb.h | 1 +
1181 include/linux/usb/cdc_ncm.h | 134 +++
1182 include/net/af_unix.h | 1 -
1183 include/net/ip6_fib.h | 10 +
1184 include/uapi/linux/inet_diag.h | 3 +-
1185 include/uapi/linux/unix_diag.h | 1 +
1186 include/uapi/linux/usb/cdc.h | 23 +
1187 net/core/dev.c | 1 -
1188 net/core/pktgen.c | 6 +-
1189 net/core/rtnetlink.c | 6 +-
1190 net/core/sock.c | 3 +
1191 net/ipv4/fib_semantics.c | 2 +-
1192 net/ipv4/inet_diag.c | 3 +
1193 net/ipv4/tcp.c | 5 +-
1194 net/ipv4/tcp_input.c | 43 +-
1195 net/ipv4/tcp_ipv4.c | 7 +-
1196 net/ipv6/ip6_fib.c | 57 +
1197 net/ipv6/route.c | 136 ++-
1198 net/ipv6/tcp_ipv6.c | 4 +-
1199 net/sched/sch_api.c | 9 +-
1200 net/sched/sch_cbq.c | 3 +-
1201 net/unix/diag.c | 3 +
1202 68 files changed, 4102 insertions(+), 2497 deletions(-)
1203 delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200_emac.h
1204 delete mode 100644 drivers/net/ethernet/cadence/at91_ether.h
1205 create mode 100644 drivers/net/usb/cdc_mbim.c
1206 create mode 100644 include/linux/usb/cdc_ncm.h
1207 Merging wireless-next/master (9b34f40 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless)
1208 $ git merge wireless-next/master
1209 Auto-merging drivers/net/wireless/mwifiex/scan.c
1210 Auto-merging drivers/net/wireless/mwifiex/cfg80211.c
1211 Auto-merging drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
1212 Auto-merging drivers/net/wireless/b43/main.c
1213 Merge made by the 'recursive' strategy.
1214 arch/mips/bcm47xx/nvram.c | 4 +-
1215 arch/mips/bcm47xx/wgt634u.c | 8 +-
1216 drivers/bcma/driver_chipcommon.c | 23 +-
1217 drivers/bcma/driver_chipcommon_nflash.c | 3 +
1218 drivers/bcma/driver_chipcommon_pmu.c | 5 +-
1219 drivers/bcma/driver_chipcommon_sflash.c | 35 +-
1220 drivers/bcma/driver_mips.c | 48 +-
1221 drivers/bcma/driver_pci_host.c | 14 +-
1222 drivers/bcma/main.c | 54 +-
1223 drivers/bcma/sprom.c | 5 +-
1224 drivers/bluetooth/btmrvl_sdio.c | 28 +-
1225 drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 4 +-
1226 drivers/net/wireless/airo.c | 2 +-
1227 drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +-
1228 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +-
1229 drivers/net/wireless/ath/ath9k/ath9k.h | 2 +
1230 drivers/net/wireless/ath/ath9k/gpio.c | 60 +-
1231 drivers/net/wireless/ath/ath9k/hw.h | 1 +
1232 drivers/net/wireless/ath/ath9k/link.c | 12 +-
1233 drivers/net/wireless/ath/ath9k/main.c | 3 +-
1234 drivers/net/wireless/ath/carl9170/rx.c | 6 +-
1235 drivers/net/wireless/ath/carl9170/usb.c | 7 +
1236 drivers/net/wireless/ath/hw.c | 20 +-
1237 drivers/net/wireless/b43/main.c | 2 +-
1238 drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 4 -
1239 .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 2 +-
1240 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 36 -
1241 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 11 +-
1242 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 4 +-
1243 drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +-
1244 drivers/net/wireless/hostap/hostap_80211_rx.c | 2 +-
1245 drivers/net/wireless/ipw2x00/libipw_rx.c | 6 +-
1246 drivers/net/wireless/iwlwifi/dvm/main.c | 9 +-
1247 drivers/net/wireless/iwlwifi/iwl-devtrace.h | 95 +-
1248 drivers/net/wireless/iwlwifi/iwl-io.c | 4 +-
1249 drivers/net/wireless/iwlwifi/iwl-io.h | 2 +-
1250 drivers/net/wireless/iwlwifi/iwl-prph.h | 3 +
1251 drivers/net/wireless/iwlwifi/iwl-trans.h | 8 +
1252 drivers/net/wireless/iwlwifi/pcie/rx.c | 3 +-
1253 drivers/net/wireless/iwlwifi/pcie/trans.c | 9 +-
1254 drivers/net/wireless/iwlwifi/pcie/tx.c | 18 +-
1255 drivers/net/wireless/libertas/mesh.c | 2 +-
1256 drivers/net/wireless/mwifiex/cfg80211.c | 4 +-
1257 drivers/net/wireless/mwifiex/cmdevt.c | 21 +-
1258 drivers/net/wireless/mwifiex/main.h | 2 -
1259 drivers/net/wireless/mwifiex/scan.c | 13 +-
1260 drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +-
1261 drivers/net/wireless/orinoco/main.h | 2 +-
1262 drivers/net/wireless/orinoco/orinoco_usb.c | 9 +-
1263 drivers/net/wireless/rt2x00/rt2800lib.c | 100 +-
1264 drivers/net/wireless/rtlwifi/cam.c | 7 +-
1265 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 6 +-
1266 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 6 +-
1267 drivers/ssb/driver_mipscore.c | 16 +-
1268 include/linux/bcma/bcma.h | 2 +-
1269 include/linux/bcma/bcma_driver_chipcommon.h | 5 +
1270 include/linux/bcma/bcma_driver_mips.h | 3 +
1271 include/linux/bcma/bcma_regs.h | 5 +-
1272 include/linux/ieee80211.h | 47 +-
1273 include/linux/ssb/ssb_driver_mips.h | 10 +-
1274 include/net/bluetooth/a2mp.h | 24 +-
1275 include/net/bluetooth/amp.h | 50 +
1276 include/net/bluetooth/bluetooth.h | 1 -
1277 include/net/bluetooth/hci.h | 40 +-
1278 include/net/bluetooth/hci_core.h | 48 +-
1279 include/net/bluetooth/l2cap.h | 14 +-
1280 include/net/cfg80211.h | 14 +
1281 include/net/mac80211.h | 101 +-
1282 include/uapi/linux/nl80211.h | 48 +
1283 net/bluetooth/Kconfig | 1 +
1284 net/bluetooth/Makefile | 2 +-
1285 net/bluetooth/a2mp.c | 459 +++-
1286 net/bluetooth/af_bluetooth.c | 10 +-
1287 net/bluetooth/amp.c | 374 ++++
1288 net/bluetooth/bnep/core.c | 3 +-
1289 net/bluetooth/cmtp/core.c | 2 +-
1290 net/bluetooth/hci_conn.c | 70 +-
1291 net/bluetooth/hci_core.c | 65 +-
1292 net/bluetooth/hci_event.c | 167 +-
1293 net/bluetooth/hci_sysfs.c | 10 +-
1294 net/bluetooth/hidp/core.c | 8 +-
1295 net/bluetooth/l2cap_core.c | 503 +++--
1296 net/bluetooth/l2cap_sock.c | 89 +-
1297 net/bluetooth/lib.c | 14 -
1298 net/bluetooth/mgmt.c | 5 +-
1299 net/bluetooth/rfcomm/core.c | 19 +-
1300 net/bluetooth/rfcomm/sock.c | 9 +-
1301 net/bluetooth/rfcomm/tty.c | 6 +-
1302 net/bluetooth/sco.c | 12 +-
1303 net/bluetooth/smp.c | 2 +-
1304 net/mac80211/Kconfig | 2 +-
1305 net/mac80211/Makefile | 1 +
1306 net/mac80211/cfg.c | 284 +--
1307 net/mac80211/chan.c | 455 +++-
1308 net/mac80211/debugfs.h | 6 +-
1309 net/mac80211/debugfs_netdev.c | 10 +-
1310 net/mac80211/driver-ops.h | 65 +
1311 net/mac80211/ibss.c | 88 +-
1312 net/mac80211/ieee80211_i.h | 171 +-
1313 net/mac80211/iface.c | 44 +-
1314 net/mac80211/main.c | 105 +-
1315 net/mac80211/mesh.c | 43 +-
1316 net/mac80211/mesh.h | 4 +-
1317 net/mac80211/mesh_plink.c | 14 +-
1318 net/mac80211/mesh_sync.c | 55 +-
1319 net/mac80211/mlme.c | 219 +-
1320 net/mac80211/offchannel.c | 9 +-
1321 net/mac80211/pm.c | 2 +
1322 net/mac80211/rate.h | 12 +-
1323 net/mac80211/rx.c | 32 +-
1324 net/mac80211/scan.c | 29 +-
1325 net/mac80211/sta_info.c | 59 +-
1326 net/mac80211/status.c | 15 +-
1327 net/mac80211/trace.h | 112 +
1328 net/mac80211/tx.c | 281 ++-
1329 net/mac80211/util.c | 143 +-
1330 net/mac80211/vht.c | 35 +
1331 net/wireless/Makefile | 4 +-
1332 net/wireless/ap.c | 3 +-
1333 net/wireless/chan.c | 16 +-
1334 net/wireless/core.c | 12 +-
1335 net/wireless/core.h | 6 +-
1336 net/wireless/ethtool.c | 15 +-
1337 net/wireless/ibss.c | 9 +-
1338 net/wireless/mesh.c | 11 +-
1339 net/wireless/mlme.c | 92 +-
1340 net/wireless/nl80211.c | 255 ++-
1341 net/wireless/rdev-ops.h | 861 ++++++++
1342 net/wireless/scan.c | 138 +-
1343 net/wireless/sme.c | 12 +-
1344 net/wireless/sysfs.c | 5 +-
1345 net/wireless/trace.c | 7 +
1346 net/wireless/trace.h | 2286 ++++++++++++++++++++
1347 net/wireless/util.c | 14 +-
1348 net/wireless/wext-compat.c | 48 +-
1349 135 files changed, 7480 insertions(+), 1613 deletions(-)
1350 create mode 100644 include/net/bluetooth/amp.h
1351 create mode 100644 net/bluetooth/amp.c
1352 create mode 100644 net/mac80211/vht.c
1353 create mode 100644 net/wireless/rdev-ops.h
1354 create mode 100644 net/wireless/trace.c
1355 create mode 100644 net/wireless/trace.h
1356 Merging bluetooth/master (77220c6 Bluetooth: Disallow LE scanning and connecting in peripheral role)
1357 $ git merge bluetooth/master
1358 Merge made by the 'recursive' strategy.
1359 include/net/bluetooth/hci.h | 7 +
1360 include/net/bluetooth/hci_core.h | 41 +-
1361 include/net/bluetooth/l2cap.h | 32 ++
1362 net/bluetooth/Kconfig | 1 -
1363 net/bluetooth/cmtp/capi.c | 2 +-
1364 net/bluetooth/cmtp/sock.c | 2 +-
1365 net/bluetooth/hci_conn.c | 4 +
1366 net/bluetooth/hci_core.c | 65 +--
1367 net/bluetooth/hci_event.c | 129 +++++-
1368 net/bluetooth/l2cap_core.c | 947 +++++++++++++++++++++++++++++++++++---
1369 net/bluetooth/l2cap_sock.c | 5 +
1370 net/bluetooth/mgmt.c | 66 ++-
1371 12 files changed, 1136 insertions(+), 165 deletions(-)
1372 Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions())
1373 $ git merge mtd/master
1374 Merge made by the 'recursive' strategy.
1375 drivers/mtd/nand/nand_base.c | 9 +++++----
1376 drivers/mtd/ofpart.c | 2 +-
1377 2 files changed, 6 insertions(+), 5 deletions(-)
1378 Merging l2-mtd/master (9dfb519 jffs2: Fix lock acquisition order bug in jffs2_write_begin)
1379 $ git merge l2-mtd/master
1380 Removing include/linux/platform_data/mtd-nomadik-nand.h
1381 Removing drivers/mtd/nand/nomadik_nand.c
1382 Removing arch/arm/mach-nomadik/include/mach/fsmc.h
1383 Merge made by the 'recursive' strategy.
1384 .../devicetree/bindings/mtd/denali-nand.txt | 23 ++
1385 .../devicetree/bindings/mtd/fsmc-nand.txt | 12 +-
1386 Documentation/devicetree/bindings/mtd/m25p80.txt | 29 +++
1387 arch/arm/boot/dts/spear13xx.dtsi | 10 +-
1388 arch/arm/boot/dts/spear300.dtsi | 8 +-
1389 arch/arm/boot/dts/spear310.dtsi | 8 +-
1390 arch/arm/boot/dts/spear320.dtsi | 8 +-
1391 arch/arm/boot/dts/spear600.dtsi | 8 +-
1392 arch/arm/configs/nhk8815_defconfig | 2 +-
1393 arch/arm/mach-nomadik/board-nhk8815.c | 73 +++---
1394 arch/arm/mach-nomadik/include/mach/fsmc.h | 29 ---
1395 arch/arm/mach-u300/core.c | 14 +-
1396 drivers/clk/clk-nomadik.c | 1 +
1397 drivers/mtd/cmdlinepart.c | 80 +++----
1398 drivers/mtd/devices/m25p80.c | 36 +--
1399 drivers/mtd/devices/slram.c | 2 +-
1400 drivers/mtd/devices/spear_smi.c | 13 +-
1401 drivers/mtd/nand/Kconfig | 26 ++-
1402 drivers/mtd/nand/Makefile | 3 +-
1403 drivers/mtd/nand/denali.c | 162 +++-----------
1404 drivers/mtd/nand/denali.h | 5 +
1405 drivers/mtd/nand/denali_dt.c | 167 ++++++++++++++
1406 drivers/mtd/nand/denali_pci.c | 144 ++++++++++++
1407 drivers/mtd/nand/fsl_elbc_nand.c | 15 --
1408 drivers/mtd/nand/fsmc_nand.c | 102 ++++-----
1409 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 +-
1410 drivers/mtd/nand/nomadik_nand.c | 235 --------------------
1411 drivers/mtd/onenand/onenand_base.c | 2 +-
1412 drivers/mtd/tests/mtd_nandbiterrs.c | 73 +++---
1413 drivers/mtd/tests/mtd_nandecctest.c | 6 +-
1414 drivers/mtd/tests/mtd_oobtest.c | 171 +++++++-------
1415 drivers/mtd/tests/mtd_pagetest.c | 152 ++++++-------
1416 drivers/mtd/tests/mtd_readtest.c | 42 ++--
1417 drivers/mtd/tests/mtd_speedtest.c | 88 ++++----
1418 drivers/mtd/tests/mtd_stresstest.c | 44 ++--
1419 drivers/mtd/tests/mtd_subpagetest.c | 124 +++++------
1420 drivers/mtd/tests/mtd_torturetest.c | 73 +++---
1421 fs/jffs2/file.c | 39 ++--
1422 include/linux/mtd/fsmc.h | 3 -
1423 include/linux/mtd/mtd.h | 2 +-
1424 include/linux/platform_data/mtd-nomadik-nand.h | 16 --
1425 41 files changed, 1023 insertions(+), 1041 deletions(-)
1426 create mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
1427 create mode 100644 Documentation/devicetree/bindings/mtd/m25p80.txt
1428 delete mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
1429 create mode 100644 drivers/mtd/nand/denali_dt.c
1430 create mode 100644 drivers/mtd/nand/denali_pci.c
1431 delete mode 100644 drivers/mtd/nand/nomadik_nand.c
1432 delete mode 100644 include/linux/platform_data/mtd-nomadik-nand.h
1433 Merging crypto/master (3200da8 crypto: tegra - fix missing unlock on error case)
1434 $ git merge crypto/master
1435 Auto-merging arch/x86/crypto/crc32c-intel_glue.c
1436 Merge made by the 'recursive' strategy.
1437 arch/x86/crypto/Makefile | 2 +
1438 arch/x86/crypto/camellia_glue.c | 16 +-
1439 arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 332 +-
1440 arch/x86/crypto/cast5_avx_glue.c | 79 +-
1441 arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 190 +-
1442 arch/x86/crypto/cast6_avx_glue.c | 77 +-
1443 .../crypto/{crc32c-intel.c => crc32c-intel_glue.c} | 81 +
1444 arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 460 ++
1445 arch/x86/crypto/glue_helper-asm-avx.S | 91 +
1446 arch/x86/crypto/glue_helper.c | 12 +-
1447 arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 166 +-
1448 arch/x86/crypto/serpent_avx_glue.c | 49 +-
1449 arch/x86/crypto/serpent_sse2_glue.c | 12 +-
1450 arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 208 +-
1451 arch/x86/crypto/twofish_avx_glue.c | 73 +-
1452 arch/x86/crypto/twofish_glue_3way.c | 20 +-
1453 arch/x86/include/asm/crypto/glue_helper.h | 28 +-
1454 arch/x86/include/asm/crypto/serpent-avx.h | 27 +-
1455 arch/x86/include/asm/crypto/twofish.h | 4 +-
1456 crypto/Kconfig | 10 +
1457 crypto/tcrypt.c | 6 +
1458 crypto/testmgr.c | 30 +
1459 crypto/testmgr.h | 5641 +++++++++++++++++++-
1460 crypto/vmac.c | 47 +-
1461 drivers/crypto/talitos.c | 3 +-
1462 drivers/crypto/tegra-aes.c | 8 +-
1463 include/crypto/vmac.h | 2 +
1464 27 files changed, 6956 insertions(+), 718 deletions(-)
1465 rename arch/x86/crypto/{crc32c-intel.c => crc32c-intel_glue.c} (69%)
1466 create mode 100644 arch/x86/crypto/crc32c-pcl-intel-asm_64.S
1467 create mode 100644 arch/x86/crypto/glue_helper-asm-avx.S
1468 Merging drm/drm-next (1f31c69 Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next)
1469 $ git merge drm/drm-next
1471 Merging sound/for-next (f598158 ALSA: sound/usb: remove CONFIG_EXPERIMENTAL)
1472 $ git merge sound/for-next
1473 Auto-merging sound/pci/hda/patch_realtek.c
1474 Auto-merging sound/pci/hda/hda_intel.c
1475 Merge made by the 'recursive' strategy.
1476 include/sound/Kbuild | 10 -
1477 include/sound/asequencer.h | 594 +----------------
1478 include/sound/asound.h | 935 +-------------------------
1479 include/sound/emu10k1.h | 355 +---------
1480 include/sound/pcm.h | 3 +
1481 include/sound/sb16_csp.h | 104 +--
1482 include/uapi/sound/Kbuild | 10 +
1483 include/uapi/sound/asequencer.h | 614 +++++++++++++++++
1484 include/uapi/sound/asound.h | 960 +++++++++++++++++++++++++++
1485 include/{ => uapi}/sound/asound_fm.h | 0
1486 include/{ => uapi}/sound/compress_offload.h | 0
1487 include/{ => uapi}/sound/compress_params.h | 0
1488 include/uapi/sound/emu10k1.h | 373 +++++++++++
1489 include/{ => uapi}/sound/hdsp.h | 0
1490 include/{ => uapi}/sound/hdspm.h | 0
1491 include/uapi/sound/sb16_csp.h | 122 ++++
1492 include/{ => uapi}/sound/sfnt_info.h | 0
1493 sound/core/pcm_compat.c | 19 +-
1494 sound/core/pcm_lib.c | 57 +-
1495 sound/core/pcm_native.c | 2 +
1496 sound/drivers/Kconfig | 1 -
1497 sound/drivers/aloop.c | 36 +-
1498 sound/drivers/dummy.c | 73 +-
1499 sound/isa/Kconfig | 4 +-
1500 sound/pci/Kconfig | 2 +-
1501 sound/pci/hda/Kconfig | 5 +-
1502 sound/pci/hda/hda_codec.c | 92 ++-
1503 sound/pci/hda/hda_codec.h | 3 +
1504 sound/pci/hda/hda_intel.c | 119 +++-
1505 sound/pci/hda/hda_jack.c | 24 +
1506 sound/pci/hda/hda_jack.h | 2 +
1507 sound/pci/hda/hda_local.h | 8 +-
1508 sound/pci/hda/patch_cirrus.c | 5 +-
1509 sound/pci/hda/patch_conexant.c | 44 ++
1510 sound/pci/hda/patch_hdmi.c | 7 +-
1511 sound/pci/hda/patch_realtek.c | 7 +-
1512 sound/pci/hda/patch_sigmatel.c | 7 +-
1513 sound/pci/ice1712/Makefile | 2 +-
1514 sound/pci/ice1712/amp.c | 1 -
1515 sound/pci/ice1712/aureon.c | 4 +-
1516 sound/pci/ice1712/delta.c | 1 -
1517 sound/pci/ice1712/ews.c | 5 +-
1518 sound/pci/ice1712/hoontech.c | 1 -
1519 sound/pci/ice1712/ice1712.c | 9 +-
1520 sound/pci/ice1712/ice1712.h | 12 +-
1521 sound/pci/ice1712/ice1724.c | 19 +-
1522 sound/pci/ice1712/juli.c | 4 +-
1523 sound/pci/ice1712/maya44.c | 5 +-
1524 sound/pci/ice1712/phase.c | 3 +-
1525 sound/pci/ice1712/pontis.c | 1 -
1526 sound/pci/ice1712/prodigy192.c | 5 +-
1527 sound/pci/ice1712/prodigy_hifi.c | 1 -
1528 sound/pci/ice1712/psc724.c | 464 +++++++++++++
1529 sound/pci/ice1712/psc724.h | 13 +
1530 sound/pci/ice1712/quartet.c | 10 +-
1531 sound/pci/ice1712/revo.c | 1 -
1532 sound/pci/ice1712/se.c | 11 +-
1533 sound/pci/ice1712/vt1720_mobo.c | 1 -
1534 sound/pci/ice1712/wm8766.c | 361 ++++++++++
1535 sound/pci/ice1712/wm8766.h | 163 +++++
1536 sound/pci/ice1712/wm8776.c | 633 ++++++++++++++++++
1537 sound/pci/ice1712/wm8776.h | 226 +++++++
1538 sound/pci/ice1712/wtm.c | 1 -
1539 sound/usb/Kconfig | 2 +-
1540 sound/usb/pcm.c | 3 -
1541 sound/usb/quirks-table.h | 75 +++
1542 66 files changed, 4513 insertions(+), 2121 deletions(-)
1543 create mode 100644 include/uapi/sound/asequencer.h
1544 create mode 100644 include/uapi/sound/asound.h
1545 rename include/{ => uapi}/sound/asound_fm.h (100%)
1546 rename include/{ => uapi}/sound/compress_offload.h (100%)
1547 rename include/{ => uapi}/sound/compress_params.h (100%)
1548 create mode 100644 include/uapi/sound/emu10k1.h
1549 rename include/{ => uapi}/sound/hdsp.h (100%)
1550 rename include/{ => uapi}/sound/hdspm.h (100%)
1551 create mode 100644 include/uapi/sound/sb16_csp.h
1552 rename include/{ => uapi}/sound/sfnt_info.h (100%)
1553 create mode 100644 sound/pci/ice1712/psc724.c
1554 create mode 100644 sound/pci/ice1712/psc724.h
1555 create mode 100644 sound/pci/ice1712/wm8766.c
1556 create mode 100644 sound/pci/ice1712/wm8766.h
1557 create mode 100644 sound/pci/ice1712/wm8776.c
1558 create mode 100644 sound/pci/ice1712/wm8776.h
1559 Merging sound-asoc/for-next (e7be26b Merge remote-tracking branches 'asoc/fix/ux500', 'asoc/fix/wm8994', 'asoc/topic/ak4104', 'asoc/topic/atmel', 'asoc/topic/cs4271', 'asoc/topic/da9055', 'asoc/topic/davinci', 'asoc/topic/fsi', 'asoc/topic/fsl', 'asoc/topic/jack', 'asoc/topic/samsung', 'asoc/topic/si476x', 'asoc/topic/wm2200', 'asoc/topic/wm8750', 'asoc/topic/wm8770', 'asoc/topic/wm8971' and 'asoc/topic/wm8994' into asoc-next)
1560 $ git merge sound-asoc/for-next
1561 Merge made by the 'recursive' strategy.
1562 Documentation/devicetree/bindings/sound/ak4104.txt | 17 +
1563 Documentation/devicetree/bindings/sound/cs4271.txt | 2 +
1564 arch/arm/mach-at91/at91sam9260_devices.c | 9 +
1565 arch/arm/mach-at91/board-sam9g20ek.c | 17 +
1566 arch/arm/mach-davinci/board-da850-evm.c | 24 +-
1567 drivers/base/regmap/internal.h | 2 +
1568 drivers/base/regmap/regmap-debugfs.c | 50 +-
1569 drivers/base/regmap/regmap.c | 154 +++--
1570 drivers/misc/atmel-ssc.c | 65 +-
1571 include/linux/mfd/wm8994/pdata.h | 5 +
1572 include/linux/platform_data/davinci_asp.h | 3 +
1573 include/linux/regmap.h | 6 +-
1574 include/sound/cs4271.h | 1 +
1575 sound/soc/atmel/sam9g20_wm8731.c | 51 +-
1576 sound/soc/codecs/Kconfig | 4 +
1577 sound/soc/codecs/Makefile | 2 +
1578 sound/soc/codecs/ak4104.c | 29 +-
1579 sound/soc/codecs/cs4271.c | 21 +-
1580 sound/soc/codecs/da9055.c | 43 +-
1581 sound/soc/codecs/si476x.c | 255 ++++++++
1582 sound/soc/codecs/wm2200.c | 628 +++++++++++++++++++-
1583 sound/soc/codecs/wm8750.c | 86 ++-
1584 sound/soc/codecs/wm8770.c | 217 ++++---
1585 sound/soc/codecs/wm8958-dsp2.c | 31 +-
1586 sound/soc/codecs/wm8971.c | 80 ++-
1587 sound/soc/codecs/wm8994.c | 118 ++--
1588 sound/soc/codecs/wm8994.h | 1 +
1589 sound/soc/codecs/wmfw.h | 99 +++
1590 sound/soc/davinci/davinci-evm.c | 5 +
1591 sound/soc/davinci/davinci-mcasp.c | 93 ++-
1592 sound/soc/davinci/davinci-mcasp.h | 2 +-
1593 sound/soc/davinci/davinci-pcm.c | 53 +-
1594 sound/soc/davinci/davinci-pcm.h | 2 +
1595 sound/soc/fsl/Kconfig | 16 +-
1596 sound/soc/fsl/Makefile | 4 +
1597 sound/soc/fsl/p1022_rdk.c | 392 ++++++++++++
1598 sound/soc/fsl/pcm030-audio-fabric.c | 4 +-
1599 sound/soc/samsung/ac97.c | 6 +-
1600 sound/soc/samsung/bells.c | 222 +++++--
1601 sound/soc/samsung/i2s.c | 8 +-
1602 sound/soc/samsung/pcm.c | 12 +-
1603 sound/soc/samsung/spdif.c | 12 +-
1604 sound/soc/sh/fsi.c | 25 +-
1605 sound/soc/soc-jack.c | 3 -
1606 sound/soc/ux500/mop500.c | 17 +
1607 sound/soc/ux500/ux500_msp_i2s.c | 8 +-
1608 46 files changed, 2375 insertions(+), 529 deletions(-)
1609 create mode 100644 Documentation/devicetree/bindings/sound/ak4104.txt
1610 create mode 100644 sound/soc/codecs/si476x.c
1611 create mode 100644 sound/soc/codecs/wmfw.h
1612 create mode 100644 sound/soc/fsl/p1022_rdk.c
1613 Merging modules/modules-next (29183bf Merge branch 'module-signing-fixes' into modules-next)
1614 $ git merge modules/modules-next
1615 Merge made by the 'recursive' strategy.
1616 Documentation/ABI/testing/ima_policy | 3 +-
1617 arch/arm/include/uapi/asm/unistd.h | 1 +
1618 arch/arm/kernel/calls.S | 1 +
1619 arch/powerpc/include/asm/systbl.h | 1 +
1620 arch/powerpc/include/asm/unistd.h | 2 +-
1621 arch/powerpc/include/uapi/asm/unistd.h | 1 +
1622 arch/x86/syscalls/syscall_32.tbl | 1 +
1623 arch/x86/syscalls/syscall_64.tbl | 1 +
1624 include/linux/asn1.h | 2 +
1625 include/linux/ima.h | 6 +
1626 include/linux/security.h | 13 ++
1627 include/linux/syscalls.h | 1 +
1628 include/uapi/asm-generic/unistd.h | 4 +-
1629 kernel/module.c | 375 +++++++++++++++++++-------------
1630 kernel/module_signing.c | 14 +-
1631 kernel/sys_ni.c | 1 +
1632 lib/asn1_decoder.c | 10 +-
1633 security/capability.c | 6 +
1634 security/integrity/ima/ima.h | 2 +-
1635 security/integrity/ima/ima_api.c | 4 +-
1636 security/integrity/ima/ima_main.c | 21 ++
1637 security/integrity/ima/ima_policy.c | 3 +
1638 security/security.c | 10 +
1639 23 files changed, 319 insertions(+), 164 deletions(-)
1640 Merging virtio/virtio-next (3905d29 virtio: tools: make it clear that virtqueue_add_buf() no longer returns > 0)
1641 $ git merge virtio/virtio-next
1642 Merge made by the 'recursive' strategy.
1643 drivers/char/virtio_console.c | 10 ++---
1644 drivers/lguest/core.c | 2 +-
1645 drivers/net/virtio_net.c | 46 +++++++++------------
1646 drivers/rpmsg/virtio_rpmsg_bus.c | 6 +--
1647 drivers/scsi/virtio_scsi.c | 24 ++++++-----
1648 drivers/virtio/virtio_mmio.c | 4 +-
1649 drivers/virtio/virtio_pci.c | 20 ++-------
1650 drivers/virtio/virtio_ring.c | 46 +++++++++------------
1651 include/linux/virtio.h | 10 ++++-
1652 include/linux/virtio_scsi.h | 28 ++++++++++++-
1654 net/9p/trans_virtio.c | 3 +-
1655 tools/lguest/lguest.c | 84 ++++++++++++++++----------------------
1656 tools/virtio/virtio_test.c | 4 +-
1657 14 files changed, 138 insertions(+), 150 deletions(-)
1658 Merging input/next (e4b2900 Input: serio - add ARC PS/2 driver)
1659 $ git merge input/next
1660 Auto-merging drivers/input/touchscreen/wm831x-ts.c
1661 Auto-merging drivers/input/touchscreen/edt-ft5x06.c
1662 Merge made by the 'recursive' strategy.
1663 .../bindings/input/touchscreen/mms114.txt | 34 +++
1664 drivers/input/joystick/as5011.c | 19 +-
1665 drivers/input/misc/wm831x-on.c | 5 +-
1666 drivers/input/serio/Kconfig | 9 +
1667 drivers/input/serio/Makefile | 1 +
1668 drivers/input/serio/arc_ps2.c | 279 ++++++++++++++++++++
1669 drivers/input/serio/i8042-io.h | 2 +-
1670 drivers/input/touchscreen/cy8ctmg110_ts.c | 13 +-
1671 drivers/input/touchscreen/edt-ft5x06.c | 10 +-
1672 drivers/input/touchscreen/mms114.c | 62 ++++-
1673 drivers/input/touchscreen/wm831x-ts.c | 6 +-
1674 11 files changed, 416 insertions(+), 24 deletions(-)
1675 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt
1676 create mode 100644 drivers/input/serio/arc_ps2.c
1677 Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
1678 $ git merge input-mt/for-next
1680 Merging cgroup/for-next (5a9423c Merge branch 'for-3.8' into for-next)
1681 $ git merge cgroup/for-next
1682 Merge made by the 'recursive' strategy.
1683 include/linux/cgroup.h | 1 -
1684 include/linux/freezer.h | 50 +++++++++--
1685 kernel/cgroup.c | 101 +++++++++--------------
1686 kernel/cgroup_freezer.c | 210 +++++++++++++++++------------------------------
1687 kernel/fork.c | 9 +-
1688 5 files changed, 156 insertions(+), 215 deletions(-)
1689 Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
1690 $ git merge block/for-next
1691 Resolved 'init/Kconfig' using previous resolution.
1692 Auto-merging init/Kconfig
1693 CONFLICT (content): Merge conflict in init/Kconfig
1694 Auto-merging drivers/block/mtip32xx/mtip32xx.h
1695 Auto-merging drivers/block/mtip32xx/mtip32xx.c
1696 Auto-merging drivers/block/loop.c
1697 Auto-merging drivers/block/floppy.c
1698 Auto-merging drivers/block/Kconfig
1699 Auto-merging block/genhd.c
1700 Auto-merging MAINTAINERS
1701 Automatic merge failed; fix conflicts and then commit the result.
1703 [master dfb6e35] Merge remote-tracking branch 'block/for-next'
1704 $ git diff -M --stat --summary HEAD^..
1706 block/genhd.c | 6 +-
1707 drivers/block/Kconfig | 1 +
1708 drivers/block/cciss.c | 1 -
1709 drivers/block/floppy.c | 97 +-
1710 drivers/block/loop.c | 17 +-
1711 drivers/block/mtip32xx/mtip32xx.c | 19 +-
1712 drivers/block/mtip32xx/mtip32xx.h | 3 +
1713 drivers/block/xen-blkback/common.h | 4 +-
1714 drivers/block/xen-blkback/xenbus.c | 9 +-
1715 drivers/memstick/core/Kconfig | 12 +
1716 drivers/memstick/core/Makefile | 2 +-
1717 drivers/memstick/core/ms_block.c | 2395 ++++++++++++++++++++++++++++++++++++
1718 drivers/memstick/core/ms_block.h | 293 +++++
1719 14 files changed, 2797 insertions(+), 69 deletions(-)
1720 create mode 100644 drivers/memstick/core/ms_block.c
1721 create mode 100644 drivers/memstick/core/ms_block.h
1722 Merging quilt/device-mapper (cee3685 track_chunk is always called with interrupts enabled. Consequently, we do not need to save and restore interrupt state in "flags" variable. This patch changes spin_lock_irqsave to spin_lock_irq and spin_unlock_irqrestore to spin_unlock_irq.)
1723 $ git merge quilt/device-mapper
1724 Merge made by the 'recursive' strategy.
1725 drivers/md/dm-raid1.c | 10 ++---
1726 drivers/md/dm-snap.c | 5 +--
1727 drivers/md/persistent-data/dm-btree-internal.h | 16 ++++----
1728 drivers/md/persistent-data/dm-btree-remove.c | 50 ++++++++++++------------
1729 drivers/md/persistent-data/dm-btree-spine.c | 6 +--
1730 drivers/md/persistent-data/dm-btree.c | 22 +++++------
1731 6 files changed, 53 insertions(+), 56 deletions(-)
1732 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
1733 $ git merge embedded/master
1735 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
1736 $ git merge firmware/master
1738 Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
1739 $ git merge pcmcia/master
1741 Merging mmc/mmc-next (ec8e1ca mmc: dw_mmc: use helper macro module_platform_driver())
1742 $ git merge mmc/mmc-next
1743 Merge made by the 'recursive' strategy.
1744 drivers/mmc/card/queue.c | 17 +-
1745 drivers/mmc/host/Kconfig | 7 +
1746 drivers/mmc/host/Makefile | 1 +
1747 drivers/mmc/host/dw_mmc-pci.c | 2 +-
1748 drivers/mmc/host/dw_mmc-pltfm.c | 16 +-
1749 drivers/mmc/host/dw_mmc.c | 2 +-
1750 drivers/mmc/host/rtsx_pci_sdmmc.c | 1332 +++++++++++++++++++++++++++++++++++++
1751 drivers/mmc/host/sdhci-s3c.c | 28 +-
1752 include/linux/mmc/dw_mmc.h | 2 +-
1753 9 files changed, 1370 insertions(+), 37 deletions(-)
1754 create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
1755 Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
1756 $ git merge kgdb/kgdb-next
1757 Merge made by the 'recursive' strategy.
1758 Merging slab/for-next (d75f461 Merge branch 'slab/next' into for-next)
1759 $ git merge slab/for-next
1760 Merge made by the 'recursive' strategy.
1761 include/linux/mm_types.h | 7 +--
1762 mm/slab.c | 118 +++++++++-------------------------------
1763 mm/slab.h | 20 +++++++
1764 mm/slab_common.c | 109 +++++++++++++++++++++++++++++++++++++
1765 mm/slub.c | 135 +++++++++++++---------------------------------
1766 5 files changed, 194 insertions(+), 195 deletions(-)
1767 Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1)
1768 $ git merge uclinux/for-next
1770 Merging md/for-next (8814c65 md/raid5: add blktrace calls)
1771 $ git merge md/for-next
1772 Merge made by the 'recursive' strategy.
1773 block/blk-core.c | 1 +
1774 drivers/md/faulty.c | 5 +-
1775 drivers/md/md.c | 8 +-
1776 drivers/md/md.h | 8 +
1777 drivers/md/raid5.c | 446 ++++++++++++++++++++++++++++++++--
1778 drivers/md/raid5.h | 19 ++
1779 include/linux/raid/Kbuild | 2 -
1780 include/linux/raid/md_u.h | 141 +----------
1781 include/uapi/linux/raid/Kbuild | 2 +
1782 include/{ => uapi}/linux/raid/md_p.h | 0
1783 include/uapi/linux/raid/md_u.h | 155 ++++++++++++
1784 11 files changed, 617 insertions(+), 170 deletions(-)
1785 rename include/{ => uapi}/linux/raid/md_p.h (100%)
1786 create mode 100644 include/uapi/linux/raid/md_u.h
1787 Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic)
1788 $ git merge mfd/for-next
1790 Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
1791 $ git merge battery/master
1793 Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
1794 $ git merge fbdev/fbdev-next
1796 Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
1797 $ git merge viafb/viafb-next
1799 Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
1800 $ git merge omap_dss2/for-next
1802 Merging regulator/for-next (229d1a2 Merge remote-tracking branches 'regulator/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexpress' into regulator-next)
1803 $ git merge regulator/for-next
1804 Removing include/linux/regulator/tps65090-regulator.h
1805 Merge made by the 'recursive' strategy.
1806 .../bindings/regulator/gpio-regulator.txt | 36 +++
1807 .../devicetree/bindings/regulator/vexpress.txt | 32 ++
1808 drivers/regulator/Kconfig | 18 ++
1809 drivers/regulator/Makefile | 2 +
1810 drivers/regulator/core.c | 5 +
1811 drivers/regulator/gpio-regulator.c | 94 ++++++
1812 drivers/regulator/lp8788-ldo.c | 2 +-
1813 drivers/regulator/max77686.c | 164 +++++++++-
1814 drivers/regulator/tps51632-regulator.c | 332 ++++++++++++++++++++
1815 drivers/regulator/tps65090-regulator.c | 247 +++++++++++----
1816 drivers/regulator/vexpress.c | 147 +++++++++
1817 include/linux/mfd/tps65090.h | 35 +++
1818 include/linux/regulator/driver.h | 3 +
1819 include/linux/regulator/tps51632-regulator.h | 47 +++
1820 include/linux/regulator/tps65090-regulator.h | 50 ---
1821 15 files changed, 1091 insertions(+), 123 deletions(-)
1822 create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt
1823 create mode 100644 Documentation/devicetree/bindings/regulator/vexpress.txt
1824 create mode 100644 drivers/regulator/tps51632-regulator.c
1825 create mode 100644 drivers/regulator/vexpress.c
1826 create mode 100644 include/linux/regulator/tps51632-regulator.h
1827 delete mode 100644 include/linux/regulator/tps65090-regulator.h
1828 Merging security/next (61d335d Merge branch 'security-next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/security-keys into next-queue)
1829 $ git merge security/next
1830 Resolved 'fs/cifs/cifsacl.c' using previous resolution.
1831 Resolved 'net/dns_resolver/dns_key.c' using previous resolution.
1832 Resolved 'security/keys/keyctl.c' using previous resolution.
1833 Resolved 'security/keys/keyring.c' using previous resolution.
1834 Resolved 'security/keys/process_keys.c' using previous resolution.
1835 Auto-merging security/keys/request_key.c
1836 Auto-merging security/keys/process_keys.c
1837 CONFLICT (content): Merge conflict in security/keys/process_keys.c
1838 Auto-merging security/keys/keyring.c
1839 CONFLICT (content): Merge conflict in security/keys/keyring.c
1840 Auto-merging security/keys/keyctl.c
1841 CONFLICT (content): Merge conflict in security/keys/keyctl.c
1842 Auto-merging security/keys/key.c
1843 Auto-merging net/dns_resolver/dns_key.c
1844 CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c
1845 Auto-merging kernel/cred.c
1846 Auto-merging include/linux/key.h
1847 Auto-merging fs/nfs/idmap.c
1848 Auto-merging fs/cifs/cifsacl.c
1849 CONFLICT (content): Merge conflict in fs/cifs/cifsacl.c
1850 Auto-merging arch/x86/kernel/vsyscall_64.c
1851 Auto-merging Documentation/security/keys.txt
1852 Automatic merge failed; fix conflicts and then commit the result.
1854 [master a7d35ed] Merge remote-tracking branch 'security/next'
1855 $ git diff -M --stat --summary HEAD^..
1856 Documentation/prctl/seccomp_filter.txt | 74 +++++++++++++++++--
1857 Documentation/security/keys.txt | 17 +++++
1858 arch/x86/kernel/vsyscall_64.c | 110 ++++++++++++++-------------
1859 fs/cifs/cifsacl.c | 12 +--
1860 fs/nfs/idmap.c | 12 +--
1861 include/linux/cred.h | 17 +----
1862 include/linux/key.h | 1 +
1863 kernel/cred.c | 127 ++++----------------------------
1864 kernel/seccomp.c | 13 +++-
1865 net/dns_resolver/dns_key.c | 9 +--
1866 security/keys/key.c | 6 +-
1867 security/keys/keyctl.c | 15 ++--
1868 security/keys/keyring.c | 10 +--
1869 security/keys/process_keys.c | 94 ++++++++++-------------
1870 security/keys/request_key.c | 21 ++++--
1871 15 files changed, 252 insertions(+), 286 deletions(-)
1872 Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
1873 $ git merge selinux/master
1875 Merge made by the 'recursive' strategy.
1876 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
1877 $ git merge lblnet/master
1879 Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
1880 $ git merge watchdog/master
1881 Merge made by the 'recursive' strategy.
1882 drivers/watchdog/davinci_wdt.c | 4 ++--
1883 1 file changed, 2 insertions(+), 2 deletions(-)
1884 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
1885 $ git merge dwmw2-iommu/master
1887 Merging iommu/next (f74b527 Merge branches 'iommu/fixes', 'dma-debug' and 'x86/amd' into next)
1888 $ git merge iommu/next
1889 Merge made by the 'recursive' strategy.
1890 Documentation/DMA-API-HOWTO.txt | 126 ++++++++++++++++++++++++
1891 Documentation/DMA-API.txt | 12 +++
1892 arch/x86/include/asm/dma-mapping.h | 1 +
1893 drivers/iommu/amd_iommu.c | 184 +++++++++++++++++++++++++++---------
1894 drivers/iommu/amd_iommu_init.c | 39 ++++++--
1895 drivers/iommu/amd_iommu_types.h | 1 +
1896 drivers/iommu/tegra-smmu.c | 2 +-
1897 include/linux/dma-debug.h | 7 ++
1898 lib/dma-debug.c | 71 +++++++++++++-
1899 9 files changed, 388 insertions(+), 55 deletions(-)
1900 Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
1901 $ git merge vfio/next
1903 Merging osd/linux-next (b6755ff osduld: Add osdname & systemid sysfs at scsi_osd class)
1904 $ git merge osd/linux-next
1905 Merge made by the 'recursive' strategy.
1906 drivers/scsi/osd/osd_uld.c | 28 ++++++++++++++++++++++++++++
1907 1 file changed, 28 insertions(+)
1908 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
1909 $ git merge jc_docs/docs-next
1911 Merging trivial/for-next (db83101 iscsi: fix check keys)
1912 $ git merge trivial/for-next
1913 Auto-merging mm/util.c
1914 Auto-merging drivers/target/iscsi/iscsi_target_parameters.c
1915 Auto-merging drivers/char/ppdev.c
1916 Merge made by the 'recursive' strategy.
1917 drivers/char/ppdev.c | 6 +-----
1918 drivers/target/iscsi/iscsi_target_parameters.c | 1 +
1920 3 files changed, 3 insertions(+), 6 deletions(-)
1921 Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
1922 $ git merge audit/for-next
1924 Merging pm/linux-next (b960e9a Merge branch 'pm-sleep-next' into linux-next)
1925 $ git merge pm/linux-next
1926 Merge made by the 'recursive' strategy.
1927 Documentation/ABI/testing/sysfs-class-devfreq | 15 +-
1928 Documentation/ABI/testing/sysfs-devices-power | 31 ++
1929 Documentation/power/pm_qos_interface.txt | 2 +-
1930 arch/x86/kernel/acpi/sleep.c | 2 +
1931 arch/x86/pci/acpi.c | 10 +
1932 drivers/acpi/acpi_pad.c | 8 +-
1933 drivers/acpi/container.c | 17 +-
1934 drivers/acpi/dock.c | 26 +-
1935 drivers/acpi/ec.c | 97 ++---
1936 drivers/acpi/glue.c | 1 +
1937 drivers/acpi/internal.h | 4 +-
1938 drivers/acpi/osl.c | 7 +-
1939 drivers/acpi/processor_driver.c | 14 +
1940 drivers/acpi/scan.c | 11 +-
1941 drivers/acpi/sleep.c | 91 +++--
1942 drivers/base/core.c | 2 +-
1943 drivers/base/power/clock_ops.c | 6 +-
1944 drivers/base/power/domain.c | 16 +-
1945 drivers/base/power/opp.c | 55 ++-
1946 drivers/base/power/power.h | 6 +-
1947 drivers/base/power/qos.c | 292 +++++++++++---
1948 drivers/base/power/sysfs.c | 94 ++++-
1949 drivers/cpufreq/Makefile | 4 +-
1950 drivers/cpufreq/cpufreq.c | 16 +-
1951 drivers/cpufreq/cpufreq_conservative.c | 34 --
1952 drivers/cpufreq/cpufreq_governor.c | 52 +++
1953 drivers/cpufreq/cpufreq_ondemand.c | 34 --
1954 drivers/cpufreq/cpufreq_performance.c | 2 +
1955 drivers/cpufreq/cpufreq_powersave.c | 2 +
1956 drivers/cpufreq/cpufreq_stats.c | 1 +
1957 drivers/cpufreq/cpufreq_userspace.c | 2 +
1958 drivers/cpufreq/freq_table.c | 2 +
1959 drivers/cpufreq/powernow-k8.c | 9 +-
1960 drivers/cpuidle/cpuidle.c | 16 +-
1961 drivers/cpuidle/cpuidle.h | 6 +-
1962 drivers/cpuidle/governors/menu.c | 166 ++++++--
1963 drivers/cpuidle/sysfs.c | 19 +-
1964 drivers/devfreq/devfreq.c | 518 ++++++++++++-------------
1965 drivers/devfreq/governor.h | 13 +
1966 drivers/devfreq/governor_performance.c | 16 +-
1967 drivers/devfreq/governor_powersave.c | 16 +-
1968 drivers/devfreq/governor_simpleondemand.c | 33 ++
1969 drivers/devfreq/governor_userspace.c | 23 +-
1970 drivers/mtd/nand/sh_flctl.c | 4 +-
1971 drivers/pci/pci-acpi.c | 8 +-
1972 include/acpi/acpi_bus.h | 11 +-
1973 include/linux/acpi.h | 6 +-
1974 include/linux/cpufreq.h | 7 +
1975 include/linux/devfreq.h | 49 +--
1976 include/linux/pm.h | 3 +-
1977 include/linux/pm_qos.h | 77 +++-
1978 include/linux/tick.h | 6 +
1980 kernel/power/main.c | 2 +-
1981 kernel/power/qos.c | 65 +++-
1982 kernel/power/swap.c | 2 +-
1983 kernel/time/tick-sched.c | 4 +
1984 57 files changed, 1370 insertions(+), 673 deletions(-)
1985 create mode 100644 drivers/cpufreq/cpufreq_governor.c
1986 Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
1987 $ git merge apm/for-next
1989 Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
1990 $ git merge fsnotify/for-next
1991 Resolved 'kernel/audit_tree.c' using previous resolution.
1992 Auto-merging kernel/audit_watch.c
1993 Auto-merging kernel/audit_tree.c
1994 CONFLICT (content): Merge conflict in kernel/audit_tree.c
1995 Auto-merging include/linux/fsnotify_backend.h
1996 Auto-merging fs/notify/notification.c
1997 Auto-merging fs/notify/inotify/inotify_user.c
1998 Auto-merging fs/notify/fanotify/fanotify_user.c
1999 Automatic merge failed; fix conflicts and then commit the result.
2001 [master b1f29d4] Merge remote-tracking branch 'fsnotify/for-next'
2002 $ git diff -M --stat --summary HEAD^..
2003 fs/notify/dnotify/dnotify.c | 4 +-
2004 fs/notify/fanotify/fanotify.c | 6 +++
2005 fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
2006 fs/notify/group.c | 47 ++++++++++--------
2007 fs/notify/inode_mark.c | 14 ++++--
2008 fs/notify/inotify/inotify_fsnotify.c | 4 +-
2009 fs/notify/inotify/inotify_user.c | 34 ++++++-------
2010 fs/notify/mark.c | 91 +++++++++++++++++++---------------
2011 fs/notify/notification.c | 1 +
2012 fs/notify/vfsmount_mark.c | 14 ++++--
2013 include/linux/fsnotify_backend.h | 31 ++++++++----
2014 kernel/audit_tree.c | 10 ++--
2015 kernel/audit_watch.c | 4 +-
2016 13 files changed, 178 insertions(+), 119 deletions(-)
2017 Merging edac/linux_next (cfe5031 edac: edac_mc no longer deals with kobjects directly)
2018 $ git merge edac/linux_next
2019 Auto-merging drivers/edac/edac_mc.c
2020 Merge made by the 'recursive' strategy.
2021 drivers/edac/edac_mc.c | 7 -------
2022 include/linux/edac.h | 1 -
2023 2 files changed, 8 deletions(-)
2024 Merging edac-amd/for-next (003626a MCE, AMD: Dump error status)
2025 $ git merge edac-amd/for-next
2026 Auto-merging include/linux/edac.h
2027 Auto-merging drivers/edac/edac_mc.c
2028 Auto-merging drivers/edac/Kconfig
2029 Merge made by the 'recursive' strategy.
2030 drivers/edac/Kconfig | 8 +-
2031 drivers/edac/amd64_edac.c | 308 +++++++++++++++------------------------
2032 drivers/edac/amd64_edac.h | 59 ++++++--
2033 drivers/edac/amd64_edac_inj.c | 128 ++++++++--------
2034 drivers/edac/edac_mc.c | 57 +++++---
2035 drivers/edac/edac_mc_sysfs.c | 22 +--
2036 drivers/edac/edac_module.c | 27 +++-
2037 drivers/edac/edac_pci.c | 3 +-
2038 drivers/edac/highbank_mc_edac.c | 8 +-
2039 drivers/edac/mce_amd.c | 254 +++++++++++++++++---------------
2040 drivers/edac/mce_amd.h | 11 +-
2041 include/linux/edac.h | 3 +
2042 12 files changed, 445 insertions(+), 443 deletions(-)
2043 Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
2044 $ git merge devicetree/devicetree/next
2046 Merging dt-rh/for-next (205a8eb dtc: fix for_each_*() to skip first object if deleted)
2047 $ git merge dt-rh/for-next
2049 Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
2050 $ git merge spi/spi/next
2052 Merging spi-mb/spi-next (32111ab Merge tag 'spi-linus' into spi-next)
2053 $ git merge spi-mb/spi-next
2054 Auto-merging drivers/spi/spi-s3c64xx.c
2055 Merge made by the 'recursive' strategy.
2056 Documentation/devicetree/bindings/spi/omap-spi.txt | 4 +-
2057 drivers/spi/spi-mxs.c | 3 +-
2058 drivers/spi/spi-omap2-mcspi.c | 25 ++++++---
2059 drivers/spi/spi-pl022.c | 55 ++++++++++++-------
2060 drivers/spi/spi-rspi.c | 56 ++++++++++++--------
2061 drivers/spi/spi-s3c64xx.c | 32 +++++------
2062 include/linux/platform_data/spi-omap2-mcspi.h | 4 ++
2063 include/linux/spi/tsc2005.h | 2 -
2064 8 files changed, 113 insertions(+), 68 deletions(-)
2065 Merging tip/auto-latest (dc09199 Merge branch 'x86/urgent')
2066 $ git merge tip/auto-latest
2067 Auto-merging kernel/time/tick-sched.c
2068 Auto-merging include/linux/mm_types.h
2069 Auto-merging include/linux/acpi.h
2070 Auto-merging drivers/acpi/osl.c
2071 Auto-merging arch/s390/include/asm/pgtable.h
2072 Auto-merging arch/mips/include/asm/pgtable.h
2073 Auto-merging MAINTAINERS
2074 Merge made by the 'recursive' strategy.
2076 Documentation/acpi/initrd_table_override.txt | 94 ++
2077 Documentation/scheduler/numa-problem.txt | 230 +++
2079 arch/mips/include/asm/pgtable.h | 2 +
2080 arch/s390/include/asm/pgtable.h | 13 +
2081 arch/sh/mm/Kconfig | 1 +
2082 arch/x86/Kconfig | 31 +
2083 arch/x86/include/asm/efi.h | 5 +-
2084 arch/x86/include/asm/pgtable.h | 7 +
2085 arch/x86/kernel/Makefile | 1 -
2086 arch/x86/kernel/acpi/boot.c | 6 +
2087 arch/x86/kernel/apic/io_apic.c | 3 +
2088 arch/x86/kernel/cpu/perf_event.c | 131 +-
2089 arch/x86/kernel/cpu/perf_event.h | 5 +
2090 arch/x86/kernel/cpu/perf_event_amd.c | 9 +
2091 arch/x86/kernel/cpu/perf_event_intel.c | 9 +
2092 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 45 +-
2093 arch/x86/kernel/cpu/perf_event_knc.c | 93 +-
2094 arch/x86/kernel/cpu/perf_event_p6.c | 129 +-
2095 arch/x86/kernel/rtc.c | 6 -
2096 arch/x86/kernel/setup.c | 4 +
2097 arch/x86/kernel/tsc.c | 6 +
2098 arch/x86/lib/copy_page_64.S | 120 +-
2099 arch/x86/mm/gup.c | 23 +-
2100 arch/x86/mm/init.c | 22 +-
2101 arch/x86/mm/init_64.c | 7 +-
2102 arch/x86/mm/pgtable.c | 17 +-
2103 arch/x86/platform/efi/efi.c | 29 +-
2104 arch/x86/platform/efi/efi_64.c | 7 +-
2105 drivers/acpi/Kconfig | 9 +
2106 drivers/acpi/osl.c | 202 ++-
2107 drivers/base/node.c | 2 +-
2108 include/asm-generic/pgtable.h | 4 +
2109 include/linux/acpi.h | 16 +
2110 include/linux/earlycpio.h | 17 +
2111 include/linux/huge_mm.h | 19 +
2112 include/linux/init_task.h | 8 +
2113 include/linux/mempolicy.h | 11 +-
2114 include/linux/migrate.h | 7 +
2115 include/linux/migrate_mode.h | 3 +
2116 include/linux/mm.h | 122 +-
2117 include/linux/mm_types.h | 10 +
2118 include/linux/mmzone.h | 15 +-
2119 include/linux/page-flags-layout.h | 83 ++
2120 include/linux/perf_event.h | 10 +-
2121 include/linux/sched.h | 66 +-
2122 include/uapi/linux/mempolicy.h | 17 +-
2124 kernel/lockdep_proc.c | 2 +-
2125 kernel/sched/core.c | 88 +-
2126 kernel/sched/debug.c | 39 +-
2127 kernel/sched/fair.c | 1475 ++++++++++++++++---
2128 kernel/sched/features.h | 19 +
2129 kernel/sched/sched.h | 96 +-
2130 kernel/sysctl.c | 45 +-
2131 kernel/time/tick-sched.c | 113 +-
2133 lib/earlycpio.c | 145 ++
2134 mm/huge_memory.c | 254 +++-
2135 mm/memory.c | 132 +-
2136 mm/mempolicy.c | 273 +++-
2137 mm/migrate.c | 87 +-
2138 mm/mprotect.c | 31 +-
2139 mm/pgtable-generic.c | 3 +-
2141 scripts/kconfig/Makefile | 7 +-
2142 tools/kvm/.gitignore | 12 +
2143 tools/kvm/CREDITS-Git | 30 +
2144 tools/kvm/Documentation/kernel-debugging.txt | 15 +
2145 tools/kvm/Documentation/kvm-balloon.txt | 24 +
2146 tools/kvm/Documentation/kvm-debug.txt | 16 +
2147 tools/kvm/Documentation/kvm-list.txt | 16 +
2148 tools/kvm/Documentation/kvm-pause.txt | 16 +
2149 tools/kvm/Documentation/kvm-resume.txt | 16 +
2150 tools/kvm/Documentation/kvm-run.txt | 62 +
2151 tools/kvm/Documentation/kvm-sandbox.txt | 16 +
2152 tools/kvm/Documentation/kvm-setup.txt | 15 +
2153 tools/kvm/Documentation/kvm-stat.txt | 19 +
2154 tools/kvm/Documentation/kvm-stop.txt | 16 +
2155 tools/kvm/Documentation/kvm-version.txt | 21 +
2156 tools/kvm/Documentation/virtio-console.txt | 41 +
2157 tools/kvm/Makefile | 457 ++++++
2158 tools/kvm/README | 112 ++
2159 tools/kvm/builtin-balloon.c | 80 +
2160 tools/kvm/builtin-debug.c | 110 ++
2161 tools/kvm/builtin-help.c | 63 +
2162 tools/kvm/builtin-list.c | 149 ++
2163 tools/kvm/builtin-pause.c | 88 ++
2164 tools/kvm/builtin-resume.c | 88 ++
2165 tools/kvm/builtin-run.c | 697 +++++++++
2166 tools/kvm/builtin-sandbox.c | 9 +
2167 tools/kvm/builtin-setup.c | 262 ++++
2168 tools/kvm/builtin-stat.c | 127 ++
2169 tools/kvm/builtin-stop.c | 70 +
2170 tools/kvm/builtin-version.c | 15 +
2171 tools/kvm/code16gcc.h | 15 +
2172 tools/kvm/command-list.txt | 15 +
2173 tools/kvm/config/feature-tests.mak | 177 +++
2174 tools/kvm/config/utilities.mak | 196 +++
2175 tools/kvm/disk/blk.c | 76 +
2176 tools/kvm/disk/core.c | 354 +++++
2177 tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++
2178 tools/kvm/disk/raw.c | 141 ++
2179 tools/kvm/framebuffer.c | 80 +
2180 tools/kvm/guest/init.c | 72 +
2181 tools/kvm/guest_compat.c | 99 ++
2182 tools/kvm/hw/i8042.c | 355 +++++
2183 tools/kvm/hw/pci-shmem.c | 405 ++++++
2184 tools/kvm/hw/rtc.c | 149 ++
2185 tools/kvm/hw/serial.c | 452 ++++++
2186 tools/kvm/hw/vesa.c | 89 ++
2187 tools/kvm/include/asm/hweight.h | 8 +
2188 tools/kvm/include/bios/memcpy.h | 9 +
2189 tools/kvm/include/kvm/8250-serial.h | 11 +
2190 tools/kvm/include/kvm/apic.h | 17 +
2191 tools/kvm/include/kvm/brlock.h | 41 +
2192 tools/kvm/include/kvm/builtin-balloon.h | 9 +
2193 tools/kvm/include/kvm/builtin-debug.h | 20 +
2194 tools/kvm/include/kvm/builtin-help.h | 6 +
2195 tools/kvm/include/kvm/builtin-list.h | 10 +
2196 tools/kvm/include/kvm/builtin-pause.h | 9 +
2197 tools/kvm/include/kvm/builtin-resume.h | 9 +
2198 tools/kvm/include/kvm/builtin-run.h | 11 +
2199 tools/kvm/include/kvm/builtin-sandbox.h | 6 +
2200 tools/kvm/include/kvm/builtin-setup.h | 11 +
2201 tools/kvm/include/kvm/builtin-stat.h | 9 +
2202 tools/kvm/include/kvm/builtin-stop.h | 9 +
2203 tools/kvm/include/kvm/builtin-version.h | 6 +
2204 tools/kvm/include/kvm/compiler.h | 10 +
2205 tools/kvm/include/kvm/disk-image.h | 96 ++
2206 tools/kvm/include/kvm/e820.h | 13 +
2207 tools/kvm/include/kvm/framebuffer.h | 36 +
2208 tools/kvm/include/kvm/guest_compat.h | 9 +
2209 tools/kvm/include/kvm/i8042.h | 12 +
2210 tools/kvm/include/kvm/ioeventfd.h | 28 +
2211 tools/kvm/include/kvm/ioport.h | 70 +
2212 tools/kvm/include/kvm/irq.h | 33 +
2213 tools/kvm/include/kvm/kvm-cmd.h | 17 +
2214 tools/kvm/include/kvm/kvm-config.h | 60 +
2215 tools/kvm/include/kvm/kvm-cpu.h | 26 +
2216 tools/kvm/include/kvm/kvm-ipc.h | 26 +
2217 tools/kvm/include/kvm/kvm.h | 121 ++
2218 tools/kvm/include/kvm/msi.h | 10 +
2219 tools/kvm/include/kvm/mutex.h | 33 +
2220 tools/kvm/include/kvm/parse-options.h | 218 +++
2221 tools/kvm/include/kvm/pci-shmem.h | 32 +
2222 tools/kvm/include/kvm/pci.h | 95 ++
2223 tools/kvm/include/kvm/qcow.h | 133 ++
2224 tools/kvm/include/kvm/rbtree-interval.h | 28 +
2225 tools/kvm/include/kvm/read-write.h | 43 +
2226 tools/kvm/include/kvm/rtc.h | 9 +
2227 tools/kvm/include/kvm/rwsem.h | 39 +
2228 tools/kvm/include/kvm/sdl.h | 28 +
2229 tools/kvm/include/kvm/segment.h | 21 +
2230 tools/kvm/include/kvm/strbuf.h | 20 +
2231 tools/kvm/include/kvm/symbol.h | 30 +
2232 tools/kvm/include/kvm/term.h | 24 +
2233 tools/kvm/include/kvm/threadpool.h | 38 +
2234 tools/kvm/include/kvm/types.h | 7 +
2235 tools/kvm/include/kvm/uip.h | 360 +++++
2236 tools/kvm/include/kvm/util-init.h | 51 +
2237 tools/kvm/include/kvm/util.h | 97 ++
2238 tools/kvm/include/kvm/vesa.h | 18 +
2239 tools/kvm/include/kvm/virtio-9p.h | 76 +
2240 tools/kvm/include/kvm/virtio-balloon.h | 9 +
2241 tools/kvm/include/kvm/virtio-blk.h | 12 +
2242 tools/kvm/include/kvm/virtio-console.h | 10 +
2243 tools/kvm/include/kvm/virtio-mmio.h | 58 +
2244 tools/kvm/include/kvm/virtio-net.h | 30 +
2245 tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
2246 tools/kvm/include/kvm/virtio-pci.h | 49 +
2247 tools/kvm/include/kvm/virtio-rng.h | 9 +
2248 tools/kvm/include/kvm/virtio-scsi.h | 26 +
2249 tools/kvm/include/kvm/virtio.h | 102 ++
2250 tools/kvm/include/kvm/vnc.h | 22 +
2251 tools/kvm/include/linux/bitops.h | 33 +
2252 tools/kvm/include/linux/byteorder.h | 7 +
2253 tools/kvm/include/linux/compiler.h | 20 +
2254 tools/kvm/include/linux/kernel.h | 41 +
2255 tools/kvm/include/linux/module.h | 6 +
2256 tools/kvm/include/linux/prefetch.h | 6 +
2257 tools/kvm/include/linux/stddef.h | 16 +
2258 tools/kvm/include/linux/types.h | 51 +
2259 tools/kvm/ioeventfd.c | 216 +++
2260 tools/kvm/ioport.c | 198 +++
2261 tools/kvm/kvm-cmd.c | 91 ++
2262 tools/kvm/kvm-cpu.c | 242 ++++
2263 tools/kvm/kvm-ipc.c | 498 +++++++
2264 tools/kvm/kvm.c | 458 ++++++
2265 tools/kvm/main.c | 19 +
2266 tools/kvm/mmio.c | 139 ++
2267 tools/kvm/net/uip/arp.c | 30 +
2268 tools/kvm/net/uip/buf.c | 114 ++
2269 tools/kvm/net/uip/core.c | 190 +++
2270 tools/kvm/net/uip/csum.c | 92 ++
2271 tools/kvm/net/uip/dhcp.c | 202 +++
2272 tools/kvm/net/uip/icmp.c | 29 +
2273 tools/kvm/net/uip/ipv4.c | 29 +
2274 tools/kvm/net/uip/tcp.c | 345 +++++
2275 tools/kvm/net/uip/udp.c | 236 +++
2276 tools/kvm/pci.c | 215 +++
2277 tools/kvm/powerpc/boot.c | 8 +
2278 tools/kvm/powerpc/cpu_info.c | 195 +++
2279 tools/kvm/powerpc/cpu_info.h | 42 +
2280 tools/kvm/powerpc/include/kvm/barrier.h | 6 +
2281 tools/kvm/powerpc/include/kvm/kvm-arch.h | 68 +
2282 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 +
2283 tools/kvm/powerpc/ioport.c | 18 +
2284 tools/kvm/powerpc/irq.c | 56 +
2285 tools/kvm/powerpc/kvm-cpu.c | 290 ++++
2286 tools/kvm/powerpc/kvm.c | 529 +++++++
2287 tools/kvm/powerpc/spapr.h | 93 ++
2288 tools/kvm/powerpc/spapr_hcall.c | 134 ++
2289 tools/kvm/powerpc/spapr_hvcons.c | 108 ++
2290 tools/kvm/powerpc/spapr_hvcons.h | 19 +
2291 tools/kvm/powerpc/spapr_pci.c | 423 ++++++
2292 tools/kvm/powerpc/spapr_pci.h | 57 +
2293 tools/kvm/powerpc/spapr_rtas.c | 233 +++
2294 tools/kvm/powerpc/xics.c | 522 +++++++
2295 tools/kvm/powerpc/xics.h | 18 +
2296 tools/kvm/symbol.c | 133 ++
2297 tools/kvm/term.c | 171 +++
2298 tools/kvm/tests/Makefile | 19 +
2299 tools/kvm/tests/boot/Makefile | 13 +
2300 tools/kvm/tests/boot/init.c | 11 +
2301 tools/kvm/tests/kernel/.gitignore | 2 +
2302 tools/kvm/tests/kernel/Makefile | 20 +
2303 tools/kvm/tests/kernel/README | 16 +
2304 tools/kvm/tests/kernel/kernel.S | 8 +
2305 tools/kvm/tests/pit/.gitignore | 2 +
2306 tools/kvm/tests/pit/Makefile | 20 +
2307 tools/kvm/tests/pit/README | 16 +
2308 tools/kvm/tests/pit/tick.S | 101 ++
2309 tools/kvm/ui/sdl.c | 321 ++++
2310 tools/kvm/ui/vnc.c | 248 ++++
2311 tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
2312 tools/kvm/util/generate-cmdlist.sh | 23 +
2313 tools/kvm/util/init.c | 69 +
2314 tools/kvm/util/kvm-ifup-vbr0 | 6 +
2315 tools/kvm/util/parse-options.c | 577 ++++++++
2316 tools/kvm/util/rbtree-interval.c | 118 ++
2317 tools/kvm/util/read-write.c | 354 +++++
2318 tools/kvm/util/set_private_br.sh | 51 +
2319 tools/kvm/util/strbuf.c | 62 +
2320 tools/kvm/util/threadpool.c | 173 +++
2321 tools/kvm/util/util.c | 133 ++
2322 tools/kvm/virtio/9p-pdu.c | 287 ++++
2323 tools/kvm/virtio/9p.c | 1432 ++++++++++++++++++
2324 tools/kvm/virtio/balloon.c | 270 ++++
2325 tools/kvm/virtio/blk.c | 315 ++++
2326 tools/kvm/virtio/console.c | 203 +++
2327 tools/kvm/virtio/core.c | 233 +++
2328 tools/kvm/virtio/mmio.c | 264 ++++
2329 tools/kvm/virtio/net.c | 670 +++++++++
2330 tools/kvm/virtio/pci.c | 398 +++++
2331 tools/kvm/virtio/rng.c | 193 +++
2332 tools/kvm/virtio/scsi.c | 309 ++++
2333 tools/kvm/x86/bios.c | 174 +++
2334 tools/kvm/x86/bios/.gitignore | 3 +
2335 tools/kvm/x86/bios/bios-rom.S | 12 +
2336 tools/kvm/x86/bios/e820.c | 72 +
2337 tools/kvm/x86/bios/entry.S | 92 ++
2338 tools/kvm/x86/bios/gen-offsets.sh | 14 +
2339 tools/kvm/x86/bios/int10.c | 110 ++
2340 tools/kvm/x86/bios/int15.c | 18 +
2341 tools/kvm/x86/bios/local.S | 7 +
2342 tools/kvm/x86/bios/macro.S | 25 +
2343 tools/kvm/x86/bios/memcpy.c | 23 +
2344 tools/kvm/x86/bios/rom.ld.S | 16 +
2345 tools/kvm/x86/boot.c | 41 +
2346 tools/kvm/x86/cpuid.c | 60 +
2347 tools/kvm/x86/include/kvm/assembly.h | 24 +
2348 tools/kvm/x86/include/kvm/barrier.h | 20 +
2349 tools/kvm/x86/include/kvm/bios-export.h | 13 +
2350 tools/kvm/x86/include/kvm/bios.h | 93 ++
2351 tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
2352 tools/kvm/x86/include/kvm/cpufeature.h | 41 +
2353 tools/kvm/x86/include/kvm/interrupt.h | 26 +
2354 tools/kvm/x86/include/kvm/kvm-arch.h | 43 +
2355 tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
2356 tools/kvm/x86/include/kvm/mptable.h | 9 +
2357 tools/kvm/x86/interrupt.c | 28 +
2358 tools/kvm/x86/ioport.c | 77 +
2359 tools/kvm/x86/irq.c | 224 +++
2360 tools/kvm/x86/kvm-cpu.c | 425 ++++++
2361 tools/kvm/x86/kvm.c | 362 +++++
2362 tools/kvm/x86/mptable.c | 289 ++++
2363 tools/perf/Documentation/android.txt | 75 +
2364 tools/perf/Documentation/perf-diff.txt | 60 +
2365 tools/perf/Makefile | 33 +-
2366 tools/perf/builtin-annotate.c | 3 +-
2367 tools/perf/builtin-diff.c | 405 +++++-
2368 tools/perf/builtin-help.c | 2 +-
2369 tools/perf/builtin-inject.c | 6 +-
2370 tools/perf/builtin-kvm.c | 35 +-
2371 tools/perf/builtin-record.c | 32 +
2372 tools/perf/builtin-report.c | 4 +-
2373 tools/perf/builtin-sched.c | 3 +-
2374 tools/perf/builtin-script.c | 4 +-
2375 tools/perf/builtin-test.c | 2 -
2376 tools/perf/builtin-top.c | 3 +-
2377 tools/perf/builtin-trace.c | 71 +-
2378 tools/perf/config/feature-tests.mak | 20 +-
2379 tools/perf/perf.c | 2 +
2380 tools/perf/ui/hist.c | 134 +-
2381 tools/perf/ui/stdio/hist.c | 2 +-
2382 tools/perf/util/build-id.c | 2 +-
2383 tools/perf/util/event.c | 215 +--
2384 tools/perf/util/event.h | 6 +-
2385 tools/perf/util/evlist.c | 3 -
2386 tools/perf/util/hist.h | 8 +
2387 tools/perf/util/machine.c | 277 ++++
2388 tools/perf/util/machine.h | 19 +
2389 tools/perf/util/parse-events-test.c | 80 +-
2390 tools/perf/util/parse-events.c | 18 +
2391 tools/perf/util/parse-events.h | 2 +
2392 tools/perf/util/parse-events.y | 18 +
2393 tools/perf/util/pmu.c | 7 +-
2394 .../util/scripting-engines/trace-event-python.c | 1 -
2395 tools/perf/util/session.c | 4 +-
2396 tools/perf/util/sort.h | 18 +
2397 tools/perf/util/thread.c | 42 +-
2398 tools/perf/util/thread.h | 2 +
2399 tools/perf/util/trace-event-read.c | 2 -
2400 tools/perf/util/util.c | 2 +
2401 tools/perf/util/util.h | 2 +
2402 327 files changed, 30633 insertions(+), 1006 deletions(-)
2403 create mode 100644 Documentation/acpi/initrd_table_override.txt
2404 create mode 100644 Documentation/scheduler/numa-problem.txt
2405 create mode 100644 include/linux/earlycpio.h
2406 create mode 100644 include/linux/page-flags-layout.h
2407 create mode 100644 lib/earlycpio.c
2408 create mode 100644 tools/kvm/.gitignore
2409 create mode 100644 tools/kvm/CREDITS-Git
2410 create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
2411 create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
2412 create mode 100644 tools/kvm/Documentation/kvm-debug.txt
2413 create mode 100644 tools/kvm/Documentation/kvm-list.txt
2414 create mode 100644 tools/kvm/Documentation/kvm-pause.txt
2415 create mode 100644 tools/kvm/Documentation/kvm-resume.txt
2416 create mode 100644 tools/kvm/Documentation/kvm-run.txt
2417 create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
2418 create mode 100644 tools/kvm/Documentation/kvm-setup.txt
2419 create mode 100644 tools/kvm/Documentation/kvm-stat.txt
2420 create mode 100644 tools/kvm/Documentation/kvm-stop.txt
2421 create mode 100644 tools/kvm/Documentation/kvm-version.txt
2422 create mode 100644 tools/kvm/Documentation/virtio-console.txt
2423 create mode 100644 tools/kvm/Makefile
2424 create mode 100644 tools/kvm/README
2425 create mode 100644 tools/kvm/builtin-balloon.c
2426 create mode 100644 tools/kvm/builtin-debug.c
2427 create mode 100644 tools/kvm/builtin-help.c
2428 create mode 100644 tools/kvm/builtin-list.c
2429 create mode 100644 tools/kvm/builtin-pause.c
2430 create mode 100644 tools/kvm/builtin-resume.c
2431 create mode 100644 tools/kvm/builtin-run.c
2432 create mode 100644 tools/kvm/builtin-sandbox.c
2433 create mode 100644 tools/kvm/builtin-setup.c
2434 create mode 100644 tools/kvm/builtin-stat.c
2435 create mode 100644 tools/kvm/builtin-stop.c
2436 create mode 100644 tools/kvm/builtin-version.c
2437 create mode 100644 tools/kvm/code16gcc.h
2438 create mode 100644 tools/kvm/command-list.txt
2439 create mode 100644 tools/kvm/config/feature-tests.mak
2440 create mode 100644 tools/kvm/config/utilities.mak
2441 create mode 100644 tools/kvm/disk/blk.c
2442 create mode 100644 tools/kvm/disk/core.c
2443 create mode 100644 tools/kvm/disk/qcow.c
2444 create mode 100644 tools/kvm/disk/raw.c
2445 create mode 100644 tools/kvm/framebuffer.c
2446 create mode 100644 tools/kvm/guest/init.c
2447 create mode 100644 tools/kvm/guest_compat.c
2448 create mode 100644 tools/kvm/hw/i8042.c
2449 create mode 100644 tools/kvm/hw/pci-shmem.c
2450 create mode 100644 tools/kvm/hw/rtc.c
2451 create mode 100644 tools/kvm/hw/serial.c
2452 create mode 100644 tools/kvm/hw/vesa.c
2453 create mode 100644 tools/kvm/include/asm/hweight.h
2454 create mode 100644 tools/kvm/include/bios/memcpy.h
2455 create mode 100644 tools/kvm/include/kvm/8250-serial.h
2456 create mode 100644 tools/kvm/include/kvm/apic.h
2457 create mode 100644 tools/kvm/include/kvm/brlock.h
2458 create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
2459 create mode 100644 tools/kvm/include/kvm/builtin-debug.h
2460 create mode 100644 tools/kvm/include/kvm/builtin-help.h
2461 create mode 100644 tools/kvm/include/kvm/builtin-list.h
2462 create mode 100644 tools/kvm/include/kvm/builtin-pause.h
2463 create mode 100644 tools/kvm/include/kvm/builtin-resume.h
2464 create mode 100644 tools/kvm/include/kvm/builtin-run.h
2465 create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
2466 create mode 100644 tools/kvm/include/kvm/builtin-setup.h
2467 create mode 100644 tools/kvm/include/kvm/builtin-stat.h
2468 create mode 100644 tools/kvm/include/kvm/builtin-stop.h
2469 create mode 100644 tools/kvm/include/kvm/builtin-version.h
2470 create mode 100644 tools/kvm/include/kvm/compiler.h
2471 create mode 100644 tools/kvm/include/kvm/disk-image.h
2472 create mode 100644 tools/kvm/include/kvm/e820.h
2473 create mode 100644 tools/kvm/include/kvm/framebuffer.h
2474 create mode 100644 tools/kvm/include/kvm/guest_compat.h
2475 create mode 100644 tools/kvm/include/kvm/i8042.h
2476 create mode 100644 tools/kvm/include/kvm/ioeventfd.h
2477 create mode 100644 tools/kvm/include/kvm/ioport.h
2478 create mode 100644 tools/kvm/include/kvm/irq.h
2479 create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
2480 create mode 100644 tools/kvm/include/kvm/kvm-config.h
2481 create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
2482 create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
2483 create mode 100644 tools/kvm/include/kvm/kvm.h
2484 create mode 100644 tools/kvm/include/kvm/msi.h
2485 create mode 100644 tools/kvm/include/kvm/mutex.h
2486 create mode 100644 tools/kvm/include/kvm/parse-options.h
2487 create mode 100644 tools/kvm/include/kvm/pci-shmem.h
2488 create mode 100644 tools/kvm/include/kvm/pci.h
2489 create mode 100644 tools/kvm/include/kvm/qcow.h
2490 create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
2491 create mode 100644 tools/kvm/include/kvm/read-write.h
2492 create mode 100644 tools/kvm/include/kvm/rtc.h
2493 create mode 100644 tools/kvm/include/kvm/rwsem.h
2494 create mode 100644 tools/kvm/include/kvm/sdl.h
2495 create mode 100644 tools/kvm/include/kvm/segment.h
2496 create mode 100644 tools/kvm/include/kvm/strbuf.h
2497 create mode 100644 tools/kvm/include/kvm/symbol.h
2498 create mode 100644 tools/kvm/include/kvm/term.h
2499 create mode 100644 tools/kvm/include/kvm/threadpool.h
2500 create mode 100644 tools/kvm/include/kvm/types.h
2501 create mode 100644 tools/kvm/include/kvm/uip.h
2502 create mode 100644 tools/kvm/include/kvm/util-init.h
2503 create mode 100644 tools/kvm/include/kvm/util.h
2504 create mode 100644 tools/kvm/include/kvm/vesa.h
2505 create mode 100644 tools/kvm/include/kvm/virtio-9p.h
2506 create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
2507 create mode 100644 tools/kvm/include/kvm/virtio-blk.h
2508 create mode 100644 tools/kvm/include/kvm/virtio-console.h
2509 create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
2510 create mode 100644 tools/kvm/include/kvm/virtio-net.h
2511 create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
2512 create mode 100644 tools/kvm/include/kvm/virtio-pci.h
2513 create mode 100644 tools/kvm/include/kvm/virtio-rng.h
2514 create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
2515 create mode 100644 tools/kvm/include/kvm/virtio.h
2516 create mode 100644 tools/kvm/include/kvm/vnc.h
2517 create mode 100644 tools/kvm/include/linux/bitops.h
2518 create mode 100644 tools/kvm/include/linux/byteorder.h
2519 create mode 100644 tools/kvm/include/linux/compiler.h
2520 create mode 100644 tools/kvm/include/linux/kernel.h
2521 create mode 100644 tools/kvm/include/linux/module.h
2522 create mode 100644 tools/kvm/include/linux/prefetch.h
2523 create mode 100644 tools/kvm/include/linux/stddef.h
2524 create mode 100644 tools/kvm/include/linux/types.h
2525 create mode 100644 tools/kvm/ioeventfd.c
2526 create mode 100644 tools/kvm/ioport.c
2527 create mode 100644 tools/kvm/kvm-cmd.c
2528 create mode 100644 tools/kvm/kvm-cpu.c
2529 create mode 100644 tools/kvm/kvm-ipc.c
2530 create mode 100644 tools/kvm/kvm.c
2531 create mode 100644 tools/kvm/main.c
2532 create mode 100644 tools/kvm/mmio.c
2533 create mode 100644 tools/kvm/net/uip/arp.c
2534 create mode 100644 tools/kvm/net/uip/buf.c
2535 create mode 100644 tools/kvm/net/uip/core.c
2536 create mode 100644 tools/kvm/net/uip/csum.c
2537 create mode 100644 tools/kvm/net/uip/dhcp.c
2538 create mode 100644 tools/kvm/net/uip/icmp.c
2539 create mode 100644 tools/kvm/net/uip/ipv4.c
2540 create mode 100644 tools/kvm/net/uip/tcp.c
2541 create mode 100644 tools/kvm/net/uip/udp.c
2542 create mode 100644 tools/kvm/pci.c
2543 create mode 100644 tools/kvm/powerpc/boot.c
2544 create mode 100644 tools/kvm/powerpc/cpu_info.c
2545 create mode 100644 tools/kvm/powerpc/cpu_info.h
2546 create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
2547 create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
2548 create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
2549 create mode 100644 tools/kvm/powerpc/ioport.c
2550 create mode 100644 tools/kvm/powerpc/irq.c
2551 create mode 100644 tools/kvm/powerpc/kvm-cpu.c
2552 create mode 100644 tools/kvm/powerpc/kvm.c
2553 create mode 100644 tools/kvm/powerpc/spapr.h
2554 create mode 100644 tools/kvm/powerpc/spapr_hcall.c
2555 create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
2556 create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
2557 create mode 100644 tools/kvm/powerpc/spapr_pci.c
2558 create mode 100644 tools/kvm/powerpc/spapr_pci.h
2559 create mode 100644 tools/kvm/powerpc/spapr_rtas.c
2560 create mode 100644 tools/kvm/powerpc/xics.c
2561 create mode 100644 tools/kvm/powerpc/xics.h
2562 create mode 100644 tools/kvm/symbol.c
2563 create mode 100644 tools/kvm/term.c
2564 create mode 100644 tools/kvm/tests/Makefile
2565 create mode 100644 tools/kvm/tests/boot/Makefile
2566 create mode 100644 tools/kvm/tests/boot/init.c
2567 create mode 100644 tools/kvm/tests/kernel/.gitignore
2568 create mode 100644 tools/kvm/tests/kernel/Makefile
2569 create mode 100644 tools/kvm/tests/kernel/README
2570 create mode 100644 tools/kvm/tests/kernel/kernel.S
2571 create mode 100644 tools/kvm/tests/pit/.gitignore
2572 create mode 100644 tools/kvm/tests/pit/Makefile
2573 create mode 100644 tools/kvm/tests/pit/README
2574 create mode 100644 tools/kvm/tests/pit/tick.S
2575 create mode 100644 tools/kvm/ui/sdl.c
2576 create mode 100644 tools/kvm/ui/vnc.c
2577 create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
2578 create mode 100755 tools/kvm/util/generate-cmdlist.sh
2579 create mode 100644 tools/kvm/util/init.c
2580 create mode 100755 tools/kvm/util/kvm-ifup-vbr0
2581 create mode 100644 tools/kvm/util/parse-options.c
2582 create mode 100644 tools/kvm/util/rbtree-interval.c
2583 create mode 100644 tools/kvm/util/read-write.c
2584 create mode 100755 tools/kvm/util/set_private_br.sh
2585 create mode 100644 tools/kvm/util/strbuf.c
2586 create mode 100644 tools/kvm/util/threadpool.c
2587 create mode 100644 tools/kvm/util/util.c
2588 create mode 100644 tools/kvm/virtio/9p-pdu.c
2589 create mode 100644 tools/kvm/virtio/9p.c
2590 create mode 100644 tools/kvm/virtio/balloon.c
2591 create mode 100644 tools/kvm/virtio/blk.c
2592 create mode 100644 tools/kvm/virtio/console.c
2593 create mode 100644 tools/kvm/virtio/core.c
2594 create mode 100644 tools/kvm/virtio/mmio.c
2595 create mode 100644 tools/kvm/virtio/net.c
2596 create mode 100644 tools/kvm/virtio/pci.c
2597 create mode 100644 tools/kvm/virtio/rng.c
2598 create mode 100644 tools/kvm/virtio/scsi.c
2599 create mode 100644 tools/kvm/x86/bios.c
2600 create mode 100644 tools/kvm/x86/bios/.gitignore
2601 create mode 100644 tools/kvm/x86/bios/bios-rom.S
2602 create mode 100644 tools/kvm/x86/bios/e820.c
2603 create mode 100644 tools/kvm/x86/bios/entry.S
2604 create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
2605 create mode 100644 tools/kvm/x86/bios/int10.c
2606 create mode 100644 tools/kvm/x86/bios/int15.c
2607 create mode 100644 tools/kvm/x86/bios/local.S
2608 create mode 100644 tools/kvm/x86/bios/macro.S
2609 create mode 100644 tools/kvm/x86/bios/memcpy.c
2610 create mode 100644 tools/kvm/x86/bios/rom.ld.S
2611 create mode 100644 tools/kvm/x86/boot.c
2612 create mode 100644 tools/kvm/x86/cpuid.c
2613 create mode 100644 tools/kvm/x86/include/kvm/assembly.h
2614 create mode 100644 tools/kvm/x86/include/kvm/barrier.h
2615 create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
2616 create mode 100644 tools/kvm/x86/include/kvm/bios.h
2617 create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
2618 create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
2619 create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
2620 create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
2621 create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
2622 create mode 100644 tools/kvm/x86/include/kvm/mptable.h
2623 create mode 100644 tools/kvm/x86/interrupt.c
2624 create mode 100644 tools/kvm/x86/ioport.c
2625 create mode 100644 tools/kvm/x86/irq.c
2626 create mode 100644 tools/kvm/x86/kvm-cpu.c
2627 create mode 100644 tools/kvm/x86/kvm.c
2628 create mode 100644 tools/kvm/x86/mptable.c
2629 create mode 100644 tools/perf/Documentation/android.txt
2630 create mode 100644 tools/perf/util/machine.c
2631 create mode 100644 tools/perf/util/machine.h
2632 Merging rcu/rcu/next (1a0ec9c Merge branch 'tracing.2012.10.23c' into dev.3.8.2012.10.23d)
2633 $ git merge rcu/rcu/next
2634 Auto-merging kernel/sched/core.c
2635 Auto-merging kernel/cpu.c
2636 Auto-merging init/Kconfig
2637 Auto-merging include/linux/sched.h
2638 Merge made by the 'recursive' strategy.
2639 Documentation/RCU/RTFP.txt | 2 +-
2640 Documentation/RCU/checklist.txt | 17 +-
2641 Documentation/RCU/listRCU.txt | 2 +-
2642 Documentation/RCU/whatisRCU.txt | 17 +-
2643 Documentation/memory-barriers.txt | 9 +-
2644 arch/um/drivers/mconsole_kern.c | 2 +-
2645 include/linux/rculist.h | 17 --
2646 include/linux/rcupdate.h | 22 +++
2647 include/linux/sched.h | 10 +-
2648 include/linux/srcu.h | 34 ++++
2649 init/Kconfig | 15 +-
2651 kernel/ksysfs.c | 18 +++
2653 kernel/rcupdate.c | 54 +++++++
2654 kernel/rcutiny.c | 6 +-
2655 kernel/rcutiny_plugin.h | 61 ++++++-
2656 kernel/rcutorture.c | 54 +++----
2657 kernel/rcutree.c | 253 ++++++++++++++++++-----------
2658 kernel/rcutree.h | 24 +--
2659 kernel/rcutree_plugin.h | 18 ++-
2660 kernel/rcutree_trace.c | 322 ++++++++++++++++++-------------------
2661 kernel/sched/core.c | 8 +-
2662 kernel/srcu.c | 16 +-
2663 lib/Kconfig.debug | 2 +-
2664 25 files changed, 632 insertions(+), 369 deletions(-)
2665 Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
2666 $ git merge cputime/cputime
2668 Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
2669 $ git merge uprobes/for-next
2671 Merging kvm/linux-next (03604b3 Merge branch 'for-upstream' of http://github.com/agraf/linux-2.6 into queue)
2672 $ git merge kvm/linux-next
2673 Resolved 'arch/powerpc/include/asm/Kbuild' using previous resolution.
2674 Resolved 'arch/powerpc/include/asm/kvm_para.h' using previous resolution.
2675 Auto-merging include/uapi/linux/kvm.h
2676 Auto-merging arch/powerpc/kvm/trace.h
2677 Auto-merging arch/powerpc/kvm/book3s_hv.c
2678 Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c
2679 Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c
2680 Auto-merging arch/powerpc/kernel/ppc_ksyms.c
2681 Auto-merging arch/powerpc/include/uapi/asm/kvm.h
2682 Auto-merging arch/powerpc/include/asm/kvm_para.h
2683 CONFLICT (content): Merge conflict in arch/powerpc/include/asm/kvm_para.h
2684 Auto-merging arch/powerpc/include/asm/kvm_book3s.h
2685 Auto-merging arch/powerpc/include/asm/Kbuild
2686 CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
2687 Automatic merge failed; fix conflicts and then commit the result.
2689 [master 190bcbc] Merge remote-tracking branch 'kvm/linux-next'
2690 $ git diff -M --stat --summary HEAD^..
2691 Documentation/virtual/kvm/api.txt | 82 ++++++-
2692 arch/powerpc/include/asm/epapr_hcalls.h | 36 +--
2693 arch/powerpc/include/asm/fsl_hcalls.h | 36 +--
2694 arch/powerpc/include/asm/kvm_book3s.h | 2 +-
2695 arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 +-
2696 arch/powerpc/include/asm/kvm_host.h | 38 ++-
2697 arch/powerpc/include/asm/kvm_para.h | 15 +-
2698 arch/powerpc/include/asm/kvm_ppc.h | 64 ++++-
2699 arch/powerpc/include/asm/reg_booke.h | 7 +
2700 arch/powerpc/include/uapi/asm/kvm.h | 59 +++++
2701 arch/powerpc/kernel/epapr_hcalls.S | 28 +++
2702 arch/powerpc/kernel/epapr_paravirt.c | 11 +-
2703 arch/powerpc/kernel/kvm.c | 2 +-
2704 arch/powerpc/kernel/ppc_ksyms.c | 5 +
2705 arch/powerpc/kvm/44x.c | 1 +
2706 arch/powerpc/kvm/44x_emulate.c | 110 +++++----
2707 arch/powerpc/kvm/Kconfig | 3 +
2708 arch/powerpc/kvm/book3s.c | 125 ++++++++++
2709 arch/powerpc/kvm/book3s_32_mmu_host.c | 1 +
2710 arch/powerpc/kvm/book3s_64_mmu_host.c | 1 +
2711 arch/powerpc/kvm/book3s_64_mmu_hv.c | 65 ++++--
2712 arch/powerpc/kvm/book3s_hv.c | 337 +++++++++++++++++++++------
2713 arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-
2714 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 +-
2715 arch/powerpc/kvm/book3s_mmu_hpte.c | 5 -
2716 arch/powerpc/kvm/book3s_pr.c | 180 ++++++++++----
2717 arch/powerpc/kvm/book3s_rmhandlers.S | 15 +-
2718 arch/powerpc/kvm/booke.c | 310 ++++++++++++++++++++----
2719 arch/powerpc/kvm/booke_emulate.c | 22 +-
2720 arch/powerpc/kvm/e500.h | 3 +-
2721 arch/powerpc/kvm/e500_tlb.c | 92 ++++++--
2722 arch/powerpc/kvm/powerpc.c | 150 ++++++++++--
2723 arch/powerpc/kvm/trace.h | 200 +++++++++++++---
2724 arch/powerpc/platforms/Kconfig | 1 +
2725 arch/powerpc/sysdev/fsl_msi.c | 9 +-
2726 arch/powerpc/sysdev/fsl_soc.c | 2 +
2727 arch/s390/kvm/interrupt.c | 19 +-
2728 arch/s390/kvm/kvm-s390.c | 2 +-
2729 arch/x86/kvm/x86.c | 12 +-
2730 drivers/tty/Kconfig | 1 +
2731 drivers/virt/Kconfig | 1 +
2732 include/linux/kvm_host.h | 2 +-
2733 include/uapi/linux/kvm.h | 10 +-
2734 virt/kvm/iommu.c | 6 +-
2735 44 files changed, 1690 insertions(+), 392 deletions(-)
2736 $ git am -3 ../patches/0001-KVM-PPC-fix-fallout-from-UAPI-changes.patch
2737 Applying: KVM: PPC: fix fallout from UAPI changes
2739 Unstaged changes after reset:
2740 D arch/powerpc/include/asm/epapr_hcalls.h
2741 M arch/powerpc/include/uapi/asm/Kbuild
2742 M arch/powerpc/include/uapi/asm/kvm_para.h
2744 $ git commit -v -a --amend
2745 [master 84756a5] Merge remote-tracking branch 'kvm/linux-next'
2746 Merging kvm-ppc/kvm-ppc-next (f37f444 KVM: PPC: Move mtspr/mfspr emulation into own functions)
2747 $ git merge kvm-ppc/kvm-ppc-next
2748 Merge made by the 'recursive' strategy.
2749 Documentation/virtual/kvm/api.txt | 3 +-
2750 arch/powerpc/kvm/44x_emulate.c | 2 +
2751 arch/powerpc/kvm/emulate.c | 221 ++++++++++++++++++++-----------------
2752 3 files changed, 125 insertions(+), 101 deletions(-)
2753 Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
2754 $ git merge oprofile/for-next
2756 Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
2757 $ git merge xen/upstream/xen
2759 Merging xen-two/linux-next (ad50261 Merge branch 'stable/for-linus-3.7' into linux-next)
2760 $ git merge xen-two/linux-next
2761 Merge made by the 'recursive' strategy.
2762 drivers/net/xen-netback/netback.c | 11 ++++++--
2763 drivers/xen/grant-table.c | 53 ------------------------------------
2764 drivers/xen/xenbus/xenbus_client.c | 6 ++--
2765 include/xen/grant_table.h | 12 --------
2766 4 files changed, 12 insertions(+), 70 deletions(-)
2767 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
2768 $ git merge xen-pvhvm/linux-next
2770 Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
2771 $ git merge percpu/for-next
2773 Merging workqueues/for-next (8b57f8d Merge branch 'for-3.7-fixes' into for-next)
2774 $ git merge workqueues/for-next
2775 Merge made by the 'recursive' strategy.
2776 kernel/workqueue.c | 10 +++++++---
2777 1 file changed, 7 insertions(+), 3 deletions(-)
2778 Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
2779 $ git merge drivers-x86/linux-next
2780 Auto-merging drivers/platform/x86/asus-wmi.c
2781 Merge made by the 'recursive' strategy.
2782 drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
2783 1 file changed, 76 insertions(+)
2784 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
2785 $ git merge hwpoison/hwpoison
2787 Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
2788 $ git merge sysctl/master
2790 Merging regmap/for-next (97f99c4 Merge tag 'regmap-fix-mmio' into regmap-next)
2791 $ git merge regmap/for-next
2792 Merge made by the 'recursive' strategy.
2793 drivers/base/regmap/internal.h | 4 +--
2794 drivers/base/regmap/regmap-irq.c | 19 +++++++++++
2795 drivers/base/regmap/regmap.c | 67 ++++++++++++++++++++++----------------
2796 include/linux/regmap.h | 18 +++++++++-
2797 4 files changed, 76 insertions(+), 32 deletions(-)
2798 Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
2799 $ git merge hsi/for-next
2801 Merging leds/for-next (2f73c39 leds: add output driver configuration for pca9633 led driver)
2802 $ git merge leds/for-next
2804 Merging driver-core/driver-core-next (6f0c058 Linux 3.7-rc2)
2805 $ git merge driver-core/driver-core-next
2807 Merging tty/tty-next (a1c25f2 serial: clps711x: Cleanup driver)
2808 $ git merge tty/tty-next
2809 Merge made by the 'recursive' strategy.
2810 arch/arm/plat-omap/include/plat/serial.h | 9 -
2811 arch/x86/platform/ce4100/ce4100.c | 3 +
2812 drivers/bluetooth/hci_ldisc.c | 7 +-
2813 drivers/tty/hvc/hvcs.c | 4 +-
2814 drivers/tty/n_tty.c | 752 ++++++++++++++++--------------
2815 drivers/tty/pty.c | 30 +-
2816 drivers/tty/serial/8250/8250.c | 9 +-
2817 drivers/tty/serial/8250/8250.h | 36 ++
2818 drivers/tty/serial/8250/8250_dw.c | 25 +
2819 drivers/tty/serial/8250/8250_early.c | 2 +-
2820 drivers/tty/serial/8250/8250_pci.c | 6 +-
2821 drivers/tty/serial/clps711x.c | 595 +++++++++++------------
2822 drivers/tty/serial/pxa.c | 55 +++
2823 drivers/tty/serial/samsung.c | 16 +-
2824 drivers/tty/serial/vt8500_serial.c | 8 +-
2825 drivers/tty/tty_audit.c | 15 +-
2826 drivers/tty/tty_buffer.c | 228 +++++----
2827 drivers/tty/tty_io.c | 15 +-
2828 drivers/tty/tty_ldisc.c | 47 +-
2829 drivers/tty/tty_mutex.c | 4 +-
2830 drivers/tty/tty_port.c | 2 +
2831 drivers/tty/vt/selection.c | 9 +-
2832 fs/devpts/inode.c | 61 ++-
2833 include/linux/devpts_fs.h | 20 +-
2834 include/linux/tty.h | 44 +-
2835 include/linux/tty_flip.h | 2 +-
2836 kernel/auditsc.c | 2 +-
2837 kernel/printk.c | 12 +-
2838 28 files changed, 1085 insertions(+), 933 deletions(-)
2839 $ git am -3 ../patches/0001-staging-disable-dgrp-driver-since-it-is-broken-by-tt.patch
2840 Applying: staging: disable dgrp driver since it is broken by tty changes
2842 Unstaged changes after reset:
2843 M drivers/staging/dgrp/Kconfig
2845 $ git commit -v -a --amend
2846 [master 81a9b50] Merge remote-tracking branch 'tty/tty-next'
2847 Merging usb/usb-next (bd066ee usb: "ehci-w90x900" Fix a typo and add some whitespace.)
2848 $ git merge usb/usb-next
2849 Recorded preimage for 'drivers/usb/misc/ezusb.c'
2850 Auto-merging drivers/usb/misc/ezusb.c
2851 CONFLICT (content): Merge conflict in drivers/usb/misc/ezusb.c
2852 Removing drivers/usb/host/ohci-xls.c
2853 Removing drivers/usb/host/ohci-sh.c
2854 Removing drivers/usb/host/ohci-ppc-soc.c
2855 Removing drivers/usb/host/ohci-pnx8550.c
2856 Removing drivers/usb/host/ohci-cns3xxx.c
2857 Removing drivers/usb/host/ohci-au1xxx.c
2858 Removing drivers/usb/host/ehci-xls.c
2859 Removing drivers/usb/host/ehci-ls1x.c
2860 Removing drivers/usb/host/ehci-ixp4xx.c
2861 Removing drivers/usb/host/ehci-cns3xxx.c
2862 Removing drivers/usb/host/ehci-au1xxx.c
2863 Auto-merging drivers/usb/core/hub.c
2864 Automatic merge failed; fix conflicts and then commit the result.
2866 Recorded resolution for 'drivers/usb/misc/ezusb.c'.
2867 [master d464bf1] Merge remote-tracking branch 'usb/usb-next'
2868 $ git diff -M --stat --summary HEAD^..
2869 Documentation/usb/error-codes.txt | 5 +-
2870 arch/arm/mach-cns3xxx/cns3420vb.c | 54 ++++-
2871 arch/mips/alchemy/common/Makefile | 2 +-
2872 arch/mips/alchemy/common/platform.c | 58 ++++-
2873 .../mips/alchemy/common/usb.c | 0
2874 arch/mips/configs/db1000_defconfig | 1 +
2875 arch/mips/configs/db1235_defconfig | 2 +
2876 arch/mips/configs/gpr_defconfig | 1 +
2877 arch/mips/configs/ls1b_defconfig | 1 +
2878 arch/mips/configs/mtx1_defconfig | 1 +
2879 arch/mips/loongson1/common/platform.c | 8 +-
2880 arch/mips/netlogic/xlr/platform.c | 17 +-
2881 arch/mips/pnx8550/common/platform.c | 31 ++-
2882 arch/sh/kernel/cpu/sh3/setup-sh7720.c | 6 +-
2883 arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 6 +-
2884 arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 6 +-
2885 arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 6 +-
2886 drivers/usb/core/devices.c | 18 +-
2887 drivers/usb/core/hcd.c | 19 +-
2888 drivers/usb/core/hub.c | 2 +
2889 drivers/usb/core/urb.c | 22 +-
2890 drivers/usb/core/usb.c | 4 +-
2891 drivers/usb/host/Kconfig | 28 +--
2892 drivers/usb/host/Makefile | 1 -
2893 drivers/usb/host/ehci-au1xxx.c | 184 ---------------
2894 drivers/usb/host/ehci-cns3xxx.c | 155 -------------
2895 drivers/usb/host/ehci-dbg.c | 15 --
2896 drivers/usb/host/ehci-hcd.c | 54 ++---
2897 drivers/usb/host/ehci-hub.c | 23 +-
2898 drivers/usb/host/ehci-ixp4xx.c | 139 -----------
2899 drivers/usb/host/ehci-lpm.c | 23 +-
2900 drivers/usb/host/ehci-ls1x.c | 147 ------------
2901 drivers/usb/host/ehci-pci.c | 17 --
2902 drivers/usb/host/ehci-platform.c | 24 +-
2903 drivers/usb/host/ehci-s5p.c | 10 +-
2904 drivers/usb/host/ehci-sched.c | 132 +++++------
2905 drivers/usb/host/ehci-tegra.c | 5 +-
2906 drivers/usb/host/ehci-vt8500.c | 16 --
2907 drivers/usb/host/ehci-w90x900.c | 2 +-
2908 drivers/usb/host/ehci-xls.c | 142 ------------
2909 drivers/usb/host/ehci.h | 28 ++-
2910 drivers/usb/host/ohci-at91.c | 2 +-
2911 drivers/usb/host/ohci-au1xxx.c | 234 -------------------
2912 drivers/usb/host/ohci-cns3xxx.c | 166 -------------
2913 drivers/usb/host/ohci-ep93xx.c | 2 +-
2914 drivers/usb/host/ohci-exynos.c | 22 +-
2915 drivers/usb/host/ohci-hcd.c | 139 ++++++++---
2916 drivers/usb/host/ohci-hub.c | 42 ----
2917 drivers/usb/host/ohci-omap.c | 2 +-
2918 drivers/usb/host/ohci-pci.c | 47 +---
2919 drivers/usb/host/ohci-platform.c | 28 +--
2920 drivers/usb/host/ohci-pnx8550.c | 243 --------------------
2921 drivers/usb/host/ohci-ppc-soc.c | 216 -----------------
2922 drivers/usb/host/ohci-pxa27x.c | 2 +-
2923 drivers/usb/host/ohci-q.c | 4 +-
2924 drivers/usb/host/ohci-s3c2410.c | 35 +--
2925 drivers/usb/host/ohci-sh.c | 141 ------------
2926 drivers/usb/host/ohci-sm501.c | 2 +-
2927 drivers/usb/host/ohci-spear.c | 2 +-
2928 drivers/usb/host/ohci-tmio.c | 2 +-
2929 drivers/usb/host/ohci-xls.c | 152 ------------
2930 drivers/usb/host/r8a66597-hcd.c | 6 +-
2931 drivers/usb/host/uhci-q.c | 73 +++---
2932 drivers/usb/misc/ezusb.c | 38 +--
2933 drivers/usb/phy/tegra_usb_phy.c | 4 +-
2934 drivers/usb/usb-skeleton.c | 13 +-
2935 drivers/usb/wusbcore/devconnect.c | 13 --
2936 include/linux/usb.h | 34 +--
2937 include/linux/usb/ehci_pdriver.h | 3 +
2938 include/linux/usb/ezusb.h | 8 -
2939 include/linux/usb/ohci_pdriver.h | 2 +
2940 71 files changed, 640 insertions(+), 2452 deletions(-)
2941 rename drivers/usb/host/alchemy-common.c => arch/mips/alchemy/common/usb.c (100%)
2942 delete mode 100644 drivers/usb/host/ehci-au1xxx.c
2943 delete mode 100644 drivers/usb/host/ehci-cns3xxx.c
2944 delete mode 100644 drivers/usb/host/ehci-ixp4xx.c
2945 delete mode 100644 drivers/usb/host/ehci-ls1x.c
2946 delete mode 100644 drivers/usb/host/ehci-xls.c
2947 delete mode 100644 drivers/usb/host/ohci-au1xxx.c
2948 delete mode 100644 drivers/usb/host/ohci-cns3xxx.c
2949 delete mode 100644 drivers/usb/host/ohci-pnx8550.c
2950 delete mode 100644 drivers/usb/host/ohci-ppc-soc.c
2951 delete mode 100644 drivers/usb/host/ohci-sh.c
2952 delete mode 100644 drivers/usb/host/ohci-xls.c
2953 Merging staging/staging-next (23249ea staging: comedi: Kconfig: update COMEDI_AMPLC_DIO200_PCI option)
2954 $ git merge staging/staging-next
2955 Recorded preimage for 'drivers/staging/comedi/drivers/amplc_dio200.c'
2956 Auto-merging drivers/staging/omapdrm/omap_gem.c
2957 Auto-merging drivers/staging/ipack/carriers/tpci200.h
2958 Auto-merging drivers/staging/ipack/carriers/tpci200.c
2959 Removing drivers/staging/ipack/bridges/Kconfig
2960 Auto-merging drivers/staging/iio/imu/adis16400_core.c
2961 Auto-merging drivers/staging/iio/gyro/adis16260_core.c
2962 Auto-merging drivers/staging/iio/accel/adis16240_core.c
2963 Auto-merging drivers/staging/iio/accel/adis16220_core.c
2964 Auto-merging drivers/staging/iio/accel/adis16209_core.c
2965 Auto-merging drivers/staging/iio/accel/adis16204_core.c
2966 Auto-merging drivers/staging/iio/accel/adis16203_core.c
2967 Auto-merging drivers/staging/iio/accel/adis16201_core.c
2968 Auto-merging drivers/staging/comedi/drivers/ni_labpc.c
2969 Removing drivers/staging/comedi/drivers/mpc8260cpm.c
2970 Auto-merging drivers/staging/comedi/drivers/das08.c
2971 Auto-merging drivers/staging/comedi/drivers/amplc_pc236.c
2972 Auto-merging drivers/staging/comedi/drivers/amplc_dio200.c
2973 CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/amplc_dio200.c
2974 Auto-merging drivers/staging/comedi/drivers/8255_pci.c
2975 Auto-merging drivers/staging/android/binder.c
2976 Automatic merge failed; fix conflicts and then commit the result.
2978 Recorded resolution for 'drivers/staging/comedi/drivers/amplc_dio200.c'.
2979 [master aaad869] Merge remote-tracking branch 'staging/staging-next'
2980 $ git diff -M --stat --summary HEAD^..
2981 drivers/iio/accel/Kconfig | 2 +-
2982 drivers/iio/adc/at91_adc.c | 21 +-
2983 drivers/iio/dac/Kconfig | 10 +
2984 drivers/iio/dac/Makefile | 1 +
2985 drivers/iio/dac/ad5449.c | 375 ++++++
2986 drivers/iio/dac/ad5686.c | 2 +-
2987 drivers/iio/industrialio-buffer.c | 6 +-
2988 drivers/iio/industrialio-core.c | 5 +
2989 drivers/iio/industrialio-event.c | 4 +-
2990 drivers/iio/inkern.c | 5 +-
2991 drivers/staging/android/Makefile | 2 +
2992 drivers/staging/android/binder.c | 95 +-
2993 drivers/staging/android/binder_trace.h | 327 +++++
2994 drivers/staging/bcm/CmHost.c | 30 +-
2995 drivers/staging/bcm/InterfaceIdleMode.h | 5 +-
2996 drivers/staging/bcm/InterfaceMisc.c | 114 +-
2997 drivers/staging/bcm/LeakyBucket.c | 6 +-
2998 drivers/staging/bcm/Misc.c | 222 +--
2999 drivers/staging/bcm/Prototypes.h | 8 +-
3000 drivers/staging/ccg/ccg.c | 8 +-
3001 drivers/staging/ced1401/ced_ioc.c | 30 +-
3002 drivers/staging/ced1401/usb1401.c | 29 +-
3003 drivers/staging/comedi/Kconfig | 6 +-
3004 drivers/staging/comedi/comedi.h | 27 +-
3005 drivers/staging/comedi/comedidev.h | 11 +-
3006 drivers/staging/comedi/drivers.c | 1 +
3007 drivers/staging/comedi/drivers/8255_pci.c | 10 +-
3008 .../comedi/drivers/addi-data/APCI1710_82x54.c | 8 +-
3009 .../comedi/drivers/addi-data/APCI1710_Chrono.c | 7 +
3010 .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 4 +
3011 .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 42 +
3012 .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 5 +-
3013 .../comedi/drivers/addi-data/APCI1710_Pwm.c | 9 +-
3014 .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 +
3015 .../comedi/drivers/addi-data/APCI1710_Tor.c | 5 +-
3016 .../comedi/drivers/addi-data/APCI1710_Ttl.c | 4 +
3017 .../staging/comedi/drivers/addi-data/addi_common.c | 12 +-
3018 .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1 +
3019 .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +
3020 .../comedi/drivers/addi-data/hwdrv_apci035.c | 14 +
3021 .../comedi/drivers/addi-data/hwdrv_apci1032.c | 11 +-
3022 .../comedi/drivers/addi-data/hwdrv_apci1500.c | 19 +-
3023 .../comedi/drivers/addi-data/hwdrv_apci1516.c | 17 +-
3024 .../comedi/drivers/addi-data/hwdrv_apci1564.c | 16 +
3025 .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 4 +
3026 .../comedi/drivers/addi-data/hwdrv_apci2016.c | 12 +
3027 .../comedi/drivers/addi-data/hwdrv_apci2032.c | 14 +
3028 .../comedi/drivers/addi-data/hwdrv_apci2200.c | 19 +-
3029 .../comedi/drivers/addi-data/hwdrv_apci3120.c | 37 +-
3030 .../comedi/drivers/addi-data/hwdrv_apci3200.c | 28 +-
3031 .../comedi/drivers/addi-data/hwdrv_apci3501.c | 18 +
3032 .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 16 +
3033 drivers/staging/comedi/drivers/adl_pci6208.c | 10 +-
3034 drivers/staging/comedi/drivers/adl_pci7x3x.c | 2 -
3035 drivers/staging/comedi/drivers/adl_pci8164.c | 14 +-
3036 drivers/staging/comedi/drivers/adl_pci9111.c | 9 +-
3037 drivers/staging/comedi/drivers/adl_pci9118.c | 8 +-
3038 drivers/staging/comedi/drivers/adq12b.c | 46 +-
3039 drivers/staging/comedi/drivers/adv_pci1710.c | 10 +-
3040 drivers/staging/comedi/drivers/adv_pci1723.c | 9 +-
3041 drivers/staging/comedi/drivers/adv_pci_dio.c | 10 +-
3042 drivers/staging/comedi/drivers/aio_aio12_8.c | 8 +-
3043 drivers/staging/comedi/drivers/aio_iiro_16.c | 19 +-
3044 drivers/staging/comedi/drivers/amplc_dio200.c | 1414 ++++++++++++++------
3045 drivers/staging/comedi/drivers/amplc_pc236.c | 25 +-
3046 drivers/staging/comedi/drivers/amplc_pci224.c | 22 +-
3047 drivers/staging/comedi/drivers/amplc_pci230.c | 21 +-
3048 drivers/staging/comedi/drivers/cb_das16_cs.c | 5 +-
3049 drivers/staging/comedi/drivers/cb_pcidas.c | 10 +-
3050 drivers/staging/comedi/drivers/cb_pcidas64.c | 875 ++++++------
3051 drivers/staging/comedi/drivers/cb_pcidda.c | 10 +-
3052 drivers/staging/comedi/drivers/cb_pcimdas.c | 104 +-
3053 drivers/staging/comedi/drivers/cb_pcimdda.c | 9 +-
3054 drivers/staging/comedi/drivers/comedi_bond.c | 8 +-
3055 drivers/staging/comedi/drivers/comedi_parport.c | 8 +-
3056 drivers/staging/comedi/drivers/comedi_test.c | 8 +-
3057 drivers/staging/comedi/drivers/contec_pci_dio.c | 2 -
3058 drivers/staging/comedi/drivers/daqboard2000.c | 8 +-
3059 drivers/staging/comedi/drivers/das08.c | 22 +-
3060 drivers/staging/comedi/drivers/das08_cs.c | 9 +-
3061 drivers/staging/comedi/drivers/das16.c | 23 +-
3062 drivers/staging/comedi/drivers/das16m1.c | 49 +-
3063 drivers/staging/comedi/drivers/das1800.c | 28 +-
3064 drivers/staging/comedi/drivers/das6402.c | 16 +-
3065 drivers/staging/comedi/drivers/das800.c | 18 +-
3066 drivers/staging/comedi/drivers/dmm32at.c | 27 +-
3067 drivers/staging/comedi/drivers/dt2801.c | 14 +-
3068 drivers/staging/comedi/drivers/dt2811.c | 13 +-
3069 drivers/staging/comedi/drivers/dt2814.c | 12 +-
3070 drivers/staging/comedi/drivers/dt2815.c | 9 +-
3071 drivers/staging/comedi/drivers/dt282x.c | 33 +-
3072 drivers/staging/comedi/drivers/dt3000.c | 25 +-
3073 drivers/staging/comedi/drivers/dt9812.c | 27 +-
3074 drivers/staging/comedi/drivers/dyna_pci10xx.c | 10 +-
3075 drivers/staging/comedi/drivers/fl512.c | 10 +-
3076 drivers/staging/comedi/drivers/gsc_hpdi.c | 343 ++---
3077 drivers/staging/comedi/drivers/icp_multi.c | 9 +-
3078 drivers/staging/comedi/drivers/ii_pci20kc.c | 51 +-
3079 drivers/staging/comedi/drivers/jr3_pci.c | 37 +-
3080 drivers/staging/comedi/drivers/jr3_pci.h | 12 +-
3081 drivers/staging/comedi/drivers/ke_counter.c | 46 +-
3082 drivers/staging/comedi/drivers/me4000.c | 10 +-
3083 drivers/staging/comedi/drivers/me_daq.c | 41 +-
3084 drivers/staging/comedi/drivers/mpc624.c | 10 +-
3085 drivers/staging/comedi/drivers/mpc8260cpm.c | 164 ---
3086 drivers/staging/comedi/drivers/multiq3.c | 11 +-
3087 drivers/staging/comedi/drivers/ni_6527.c | 23 +-
3088 drivers/staging/comedi/drivers/ni_65xx.c | 122 +-
3089 drivers/staging/comedi/drivers/ni_660x.c | 585 ++++----
3090 drivers/staging/comedi/drivers/ni_670x.c | 9 +-
3091 drivers/staging/comedi/drivers/ni_at_a2150.c | 20 +-
3092 drivers/staging/comedi/drivers/ni_at_ao.c | 13 +-
3093 drivers/staging/comedi/drivers/ni_atmio.c | 11 +-
3094 drivers/staging/comedi/drivers/ni_atmio16d.c | 15 +-
3095 drivers/staging/comedi/drivers/ni_daq_dio24.c | 14 +-
3096 drivers/staging/comedi/drivers/ni_labpc.c | 47 +-
3097 drivers/staging/comedi/drivers/ni_labpc_cs.c | 6 +-
3098 drivers/staging/comedi/drivers/ni_mio_common.c | 150 ++-
3099 drivers/staging/comedi/drivers/ni_mio_cs.c | 9 +-
3100 drivers/staging/comedi/drivers/ni_pcidio.c | 36 +-
3101 drivers/staging/comedi/drivers/ni_pcimio.c | 49 +-
3102 drivers/staging/comedi/drivers/pcl711.c | 15 +-
3103 drivers/staging/comedi/drivers/pcl726.c | 10 +-
3104 drivers/staging/comedi/drivers/pcl812.c | 27 +-
3105 drivers/staging/comedi/drivers/pcl816.c | 21 +-
3106 drivers/staging/comedi/drivers/pcl818.c | 32 +-
3107 drivers/staging/comedi/drivers/pcm3724.c | 44 +-
3108 drivers/staging/comedi/drivers/pcmad.c | 10 +-
3109 drivers/staging/comedi/drivers/pcmda12.c | 34 +-
3110 drivers/staging/comedi/drivers/pcmmio.c | 124 +-
3111 drivers/staging/comedi/drivers/pcmuio.c | 25 +-
3112 drivers/staging/comedi/drivers/poc.c | 15 +-
3113 drivers/staging/comedi/drivers/quatech_daqp_cs.c | 34 +-
3114 drivers/staging/comedi/drivers/rtd520.c | 34 +-
3115 drivers/staging/comedi/drivers/rti800.c | 13 +-
3116 drivers/staging/comedi/drivers/rti802.c | 9 +-
3117 drivers/staging/comedi/drivers/s526.c | 8 +-
3118 drivers/staging/comedi/drivers/s626.c | 39 +-
3119 drivers/staging/comedi/drivers/serial2002.c | 38 +-
3120 drivers/staging/comedi/drivers/skel.c | 18 +-
3121 drivers/staging/comedi/drivers/ssv_dnp.c | 26 +-
3122 drivers/staging/comedi/drivers/unioxx5.c | 44 +-
3123 drivers/staging/comedi/drivers/usbdux.c | 10 +-
3124 drivers/staging/comedi/drivers/usbduxfast.c | 152 +--
3125 drivers/staging/comedi/drivers/vmk80xx.c | 13 +-
3126 .../staging/comedi/kcomedilib/kcomedilib_main.c | 5 +-
3127 drivers/staging/crystalhd/crystalhd_cmds.c | 4 +-
3128 drivers/staging/csr/csr_framework_ext.c | 1 -
3129 drivers/staging/csr/csr_framework_ext.h | 49 -
3130 drivers/staging/csr/csr_framework_ext_types.h | 34 +-
3131 drivers/staging/csr/csr_log.h | 2 +-
3132 drivers/staging/csr/csr_log_configure.h | 100 +-
3133 drivers/staging/csr/csr_sched.h | 97 +-
3134 drivers/staging/csr/csr_time.c | 9 +-
3135 drivers/staging/csr/csr_time.h | 74 +-
3136 drivers/staging/csr/csr_wifi_hip_dump.c | 4 +-
3137 drivers/staging/csr/csr_wifi_hip_signals.h | 8 +-
3138 drivers/staging/csr/csr_wifi_hip_unifi.h | 2 +-
3139 drivers/staging/csr/csr_wifi_router_ctrl_sef.c | 67 +-
3140 .../csr/csr_wifi_router_free_upstream_contents.c | 46 +-
3141 drivers/staging/csr/csr_wifi_sme_sef.h | 204 +--
3142 drivers/staging/csr/csr_wifi_sme_serialize.h | 328 ++---
3143 drivers/staging/csr/csr_wifi_sme_task.h | 8 +-
3144 drivers/staging/csr/data_tx.c | 45 +-
3145 drivers/staging/csr/io.c | 1 -
3146 drivers/staging/csr/monitor.c | 1 -
3147 drivers/staging/csr/netdev.c | 9 +-
3148 drivers/staging/csr/sdio_mmc.c | 1 -
3149 drivers/staging/csr/sme_native.c | 1 -
3150 drivers/staging/csr/sme_sys.c | 11 +-
3151 drivers/staging/csr/sme_userspace.h | 2 +-
3152 drivers/staging/csr/ul_int.c | 1 -
3153 drivers/staging/csr/unifi_pdu_processing.c | 17 +-
3154 drivers/staging/csr/unifi_priv.h | 7 +-
3155 drivers/staging/csr/unifi_wext.h | 1 -
3156 drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +-
3157 drivers/staging/dgrp/dgrp_net_ops.c | 3 +
3158 drivers/staging/dgrp/dgrp_sysfs.c | 3 +-
3159 drivers/staging/et131x/et131x.c | 269 ++--
3160 drivers/staging/gdm72xx/gdm_wimax.c | 5 +-
3161 drivers/staging/gdm72xx/sdio_boot.c | 81 +-
3162 drivers/staging/iio/accel/adis16201_core.c | 4 +-
3163 drivers/staging/iio/accel/adis16203_core.c | 2 -
3164 drivers/staging/iio/accel/adis16204_core.c | 4 +-
3165 drivers/staging/iio/accel/adis16209_core.c | 6 +-
3166 drivers/staging/iio/accel/adis16209_trigger.c | 11 +-
3167 drivers/staging/iio/accel/adis16220_core.c | 2 -
3168 drivers/staging/iio/accel/adis16240_core.c | 2 -
3169 drivers/staging/iio/accel/adis16240_trigger.c | 11 +-
3170 drivers/staging/iio/accel/kxsd9.c | 2 +-
3171 drivers/staging/iio/accel/lis3l02dq.h | 1 +
3172 drivers/staging/iio/accel/lis3l02dq_core.c | 10 +-
3173 drivers/staging/iio/accel/lis3l02dq_ring.c | 4 +-
3174 drivers/staging/iio/adc/lpc32xx_adc.c | 2 +-
3175 drivers/staging/iio/adc/mxs-lradc.c | 2 +-
3176 drivers/staging/iio/cdc/ad7150.c | 12 +-
3177 drivers/staging/iio/cdc/ad7152.c | 2 +-
3178 drivers/staging/iio/cdc/ad7746.c | 2 +-
3179 drivers/staging/iio/gyro/adis16260_core.c | 6 +-
3180 drivers/staging/iio/iio_dummy_evgen.c | 2 +-
3181 drivers/staging/iio/imu/adis16400_core.c | 10 +-
3182 drivers/staging/iio/magnetometer/hmc5843.c | 2 +-
3183 drivers/staging/iio/meter/ade7753.h | 2 -
3184 drivers/staging/iio/meter/ade7754.h | 2 -
3185 drivers/staging/iio/meter/ade7758.h | 3 -
3186 drivers/staging/iio/meter/ade7759.h | 2 -
3187 drivers/staging/iio/meter/ade7854.h | 2 -
3188 drivers/staging/ipack/Kconfig | 15 +-
3189 drivers/staging/ipack/Makefile | 2 +-
3190 drivers/staging/ipack/bridges/Kconfig | 8 -
3191 drivers/staging/ipack/carriers/Kconfig | 7 +
3192 .../staging/ipack/{bridges => carriers}/Makefile | 0
3193 .../staging/ipack/{bridges => carriers}/tpci200.c | 309 ++---
3194 .../staging/ipack/{bridges => carriers}/tpci200.h | 23 +-
3195 drivers/staging/ipack/devices/Kconfig | 1 -
3196 drivers/staging/ipack/devices/ipoctal.c | 118 +-
3197 drivers/staging/ipack/ipack.c | 45 +-
3198 drivers/staging/ipack/ipack.h | 58 +-
3199 drivers/staging/line6/audio.c | 8 +-
3200 drivers/staging/line6/driver.c | 20 +-
3201 drivers/staging/line6/driver.h | 2 -
3202 drivers/staging/olpc_dcon/olpc_dcon.c | 83 +-
3203 drivers/staging/olpc_dcon/olpc_dcon.h | 2 +-
3204 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 30 -
3205 drivers/staging/omapdrm/omap_crtc.c | 2 +-
3206 drivers/staging/omapdrm/omap_dmm_priv.h | 9 +-
3207 drivers/staging/omapdrm/omap_dmm_tiler.c | 106 +-
3208 drivers/staging/omapdrm/omap_dmm_tiler.h | 7 +-
3209 drivers/staging/omapdrm/omap_fb.c | 14 +-
3210 drivers/staging/omapdrm/omap_gem.c | 2 +-
3211 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 5 +-
3212 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +-
3213 drivers/staging/rts5139/Makefile | 22 +-
3214 drivers/staging/rts5139/ms.c | 96 +-
3215 drivers/staging/rts5139/ms.h | 18 +-
3216 drivers/staging/rts5139/ms_mg.c | 104 +-
3217 drivers/staging/rts5139/ms_mg.h | 14 +-
3218 drivers/staging/rts5139/rts51x.c | 10 +-
3219 drivers/staging/rts5139/rts51x_card.c | 80 +-
3220 drivers/staging/rts5139/rts51x_card.h | 30 +-
3221 drivers/staging/rts5139/rts51x_chip.c | 24 +-
3222 drivers/staging/rts5139/rts51x_chip.h | 16 +-
3223 drivers/staging/rts5139/rts51x_fop.c | 6 +-
3224 drivers/staging/rts5139/rts51x_scsi.c | 238 ++--
3225 drivers/staging/rts5139/rts51x_scsi.h | 6 +-
3226 drivers/staging/rts5139/sd.c | 36 +-
3227 drivers/staging/rts5139/sd.h | 12 +-
3228 drivers/staging/rts5139/sd_cprm.c | 124 +-
3229 drivers/staging/rts5139/sd_cprm.h | 18 +-
3230 drivers/staging/rts5139/xd.c | 58 +-
3231 drivers/staging/rts5139/xd.h | 10 +-
3232 drivers/staging/sbe-2t3e3/cpld.c | 2 +-
3233 drivers/staging/sbe-2t3e3/main.c | 7 +-
3234 drivers/staging/sbe-2t3e3/module.c | 11 +-
3235 drivers/staging/sbe-2t3e3/netdev.c | 5 +-
3236 drivers/staging/silicom/bp_mod.c | 11 +-
3237 drivers/staging/silicom/bp_proc.c | 85 +-
3238 drivers/staging/silicom/bypasslib/bplibk.h | 1 +
3239 drivers/staging/silicom/bypasslib/bypass.c | 1 -
3240 drivers/staging/slicoss/slicoss.c | 157 +--
3241 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 24 +-
3242 drivers/staging/usbip/stub_dev.c | 13 +-
3243 drivers/staging/usbip/stub_rx.c | 5 +-
3244 drivers/staging/usbip/stub_tx.c | 3 +-
3245 drivers/staging/usbip/usbip_common.c | 40 +-
3246 drivers/staging/usbip/usbip_common.h | 4 +-
3247 drivers/staging/usbip/vhci.h | 1 -
3248 drivers/staging/usbip/vhci_hcd.c | 49 +-
3249 drivers/staging/usbip/vhci_rx.c | 2 +-
3250 drivers/staging/usbip/vhci_sysfs.c | 6 +-
3251 drivers/staging/usbip/vhci_tx.c | 2 +-
3252 drivers/staging/vt6655/hostap.c | 6 +-
3253 drivers/staging/vt6655/rxtx.c | 2 +-
3254 drivers/staging/vt6655/wcmd.c | 1 +
3255 drivers/staging/vt6656/device.h | 1 -
3256 drivers/staging/vt6656/firmware.c | 22 +-
3257 drivers/staging/vt6656/hostap.c | 6 +-
3258 drivers/staging/vt6656/main_usb.c | 1 -
3259 drivers/staging/vt6656/rf.c | 3 +
3260 drivers/staging/vt6656/rxtx.c | 2 +-
3261 drivers/staging/vt6656/usbpipe.c | 1 +
3262 drivers/staging/winbond/mds.c | 2 +-
3263 drivers/staging/winbond/wbhal.h | 4 +-
3264 drivers/staging/wlags49_h2/man/wlags49.4 | 2 +-
3265 drivers/staging/xgifb/TODO | 2 +-
3266 drivers/staging/xgifb/vb_setmode.c | 4 +-
3267 drivers/staging/zram/zram_drv.h | 4 +-
3268 include/linux/iio/types.h | 1 +
3269 include/linux/platform_data/ad5449.h | 40 +
3270 289 files changed, 6078 insertions(+), 5216 deletions(-)
3271 create mode 100644 drivers/iio/dac/ad5449.c
3272 create mode 100644 drivers/staging/android/binder_trace.h
3273 delete mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c
3274 delete mode 100644 drivers/staging/ipack/bridges/Kconfig
3275 create mode 100644 drivers/staging/ipack/carriers/Kconfig
3276 rename drivers/staging/ipack/{bridges => carriers}/Makefile (100%)
3277 rename drivers/staging/ipack/{bridges => carriers}/tpci200.c (68%)
3278 rename drivers/staging/ipack/{bridges => carriers}/tpci200.h (89%)
3279 create mode 100644 include/linux/platform_data/ad5449.h
3280 Merging char-misc/char-misc-next (b456355 Drivers: hv: remove unused variable from channel_mgmt.c)
3281 $ git merge char-misc/char-misc-next
3282 Auto-merging drivers/hv/channel.c
3283 Merge made by the 'recursive' strategy.
3284 Documentation/DocBook/uio-howto.tmpl | 56 ++++
3285 arch/arm/include/asm/io.h | 2 +-
3286 arch/arm/mm/mmap.c | 2 +-
3287 arch/ia64/include/asm/io.h | 2 +-
3288 arch/ia64/kernel/efi.c | 2 +-
3289 arch/sh/include/asm/io.h | 2 +-
3290 arch/sh/mm/mmap.c | 2 +-
3291 drivers/char/mem.c | 10 +-
3292 drivers/hv/channel.c | 8 -
3293 drivers/hv/channel_mgmt.c | 8 -
3294 drivers/misc/mei/init.c | 37 +--
3295 drivers/misc/mei/interrupt.c | 189 ++++++-------
3296 drivers/misc/mei/iorw.c | 197 +++++++++-----
3297 drivers/misc/mei/main.c | 186 +++++--------
3298 drivers/misc/mei/mei_dev.h | 43 +--
3299 drivers/uio/Kconfig | 16 ++
3300 drivers/uio/Makefile | 1 +
3301 drivers/uio/uio_dmem_genirq.c | 354 +++++++++++++++++++++++++
3302 include/linux/platform_data/uio_dmem_genirq.h | 26 ++
3303 19 files changed, 782 insertions(+), 361 deletions(-)
3304 create mode 100644 drivers/uio/uio_dmem_genirq.c
3305 create mode 100644 include/linux/platform_data/uio_dmem_genirq.h
3306 Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
3307 $ git merge tmem/linux-next
3308 Auto-merging include/xen/xen.h
3309 Auto-merging include/xen/interface/xen.h
3310 Auto-merging arch/x86/xen/smp.c
3311 Auto-merging arch/x86/xen/setup.c
3312 Auto-merging arch/x86/include/asm/xen/page.h
3313 Auto-merging arch/x86/include/asm/xen/interface.h
3314 Merge made by the 'recursive' strategy.
3315 arch/x86/include/asm/xen/interface.h | 3 ++-
3316 arch/x86/include/asm/xen/page.h | 3 +++
3317 arch/x86/xen/setup.c | 13 +++++++++---
3318 arch/x86/xen/smp.c | 39 ++++++++++++++++++----------------
3319 drivers/xen/cpu_hotplug.c | 3 ++-
3320 include/xen/interface/xen.h | 1 +
3321 include/xen/xen.h | 4 ++++
3322 7 files changed, 43 insertions(+), 23 deletions(-)
3323 Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
3324 $ git merge writeback/writeback-for-next
3326 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
3327 $ git merge arm-dt/devicetree/arm-next
3329 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
3330 $ git merge hwspinlock/linux-next
3332 Merging pinctrl/for-next (7512cde Merge branch 'u300' into for-next)
3333 $ git merge pinctrl/for-next
3334 Auto-merging include/linux/platform_data/pinctrl-nomadik.h
3335 Removing arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
3336 Auto-merging arch/arm/mach-u300/core.c
3337 Auto-merging arch/arm/mach-nomadik/board-nhk8815.c
3338 Auto-merging arch/arm/boot/dts/Makefile
3339 Auto-merging arch/arm/Kconfig
3340 Merge made by the 'recursive' strategy.
3341 .../devicetree/bindings/gpio/gpio_atmel.txt | 5 +
3342 .../bindings/pinctrl/atmel,at91-pinctrl.txt | 136 ++
3343 .../bindings/pinctrl/nvidia,tegra20-pinmux.txt | 2 +-
3344 .../bindings/pinctrl/nvidia,tegra30-pinmux.txt | 2 +-
3345 .../bindings/pinctrl/samsung-pinctrl.txt | 118 +-
3346 Documentation/pinctrl.txt | 4 +-
3347 arch/arm/Kconfig | 2 +
3348 arch/arm/boot/dts/Makefile | 44 +-
3349 arch/arm/boot/dts/at91sam9260.dtsi | 187 ++-
3350 arch/arm/boot/dts/at91sam9263.dtsi | 173 ++-
3351 arch/arm/boot/dts/at91sam9263ek.dts | 1 +
3352 arch/arm/boot/dts/at91sam9g15.dtsi | 28 +
3353 arch/arm/boot/dts/at91sam9g15ek.dts | 16 +
3354 arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 +
3355 arch/arm/boot/dts/at91sam9g25.dtsi | 28 +
3356 arch/arm/boot/dts/at91sam9g25ek.dts | 49 +-
3357 arch/arm/boot/dts/at91sam9g35.dtsi | 28 +
3358 arch/arm/boot/dts/at91sam9g35ek.dts | 16 +
3359 arch/arm/boot/dts/at91sam9g45.dtsi | 189 ++-
3360 arch/arm/boot/dts/at91sam9m10g45ek.dts | 1 +
3361 arch/arm/boot/dts/at91sam9n12.dtsi | 180 ++-
3362 arch/arm/boot/dts/at91sam9x25.dtsi | 28 +
3363 arch/arm/boot/dts/at91sam9x25ek.dts | 16 +
3364 arch/arm/boot/dts/at91sam9x35.dtsi | 28 +
3365 arch/arm/boot/dts/at91sam9x35ek.dts | 16 +
3366 arch/arm/boot/dts/at91sam9x5.dtsi | 178 ++-
3367 arch/arm/boot/dts/at91sam9x5ek.dtsi | 59 +
3368 arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 278 ++++
3369 arch/arm/boot/dts/exynos4210.dtsi | 241 +---
3370 arch/arm/configs/at91_dt_defconfig | 1 +
3371 arch/arm/mach-at91/at91rm9200.c | 4 +-
3372 arch/arm/mach-at91/at91sam9260.c | 7 +-
3373 arch/arm/mach-at91/at91sam9261.c | 4 +-
3374 arch/arm/mach-at91/at91sam9263.c | 9 +-
3375 arch/arm/mach-at91/at91sam9g45.c | 10 +-
3376 arch/arm/mach-at91/at91sam9n12.c | 15 +-
3377 arch/arm/mach-at91/at91sam9rl.c | 4 +-
3378 arch/arm/mach-at91/at91sam9x5.c | 19 +-
3379 arch/arm/mach-at91/board-dt.c | 2 -
3380 arch/arm/mach-at91/gpio.c | 190 +--
3381 arch/arm/mach-at91/setup.c | 6 +-
3382 arch/arm/mach-at91/soc.h | 12 +-
3383 arch/arm/mach-nomadik/board-nhk8815.c | 3 +-
3384 arch/arm/mach-nomadik/cpu-8815.c | 2 +-
3385 arch/arm/mach-nomadik/i2c-8815nhk.c | 3 +-
3386 arch/arm/mach-u300/core.c | 3 +-
3387 arch/arm/mach-u300/include/mach/irqs.h | 126 +-
3388 arch/arm/mach-ux500/board-mop500-audio.c | 3 +-
3389 arch/arm/mach-ux500/board-mop500-pins.c | 3 +-
3390 arch/arm/mach-ux500/board-mop500.c | 2 +-
3391 arch/arm/mach-ux500/cpu-db8500.c | 4 +-
3392 arch/arm/mach-ux500/devices-common.c | 3 +-
3393 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 102 --
3394 drivers/mtd/nand/atmel_nand.c | 9 +
3395 drivers/pinctrl/Kconfig | 9 +
3396 drivers/pinctrl/Makefile | 1 +
3397 drivers/pinctrl/core.c | 6 +-
3398 drivers/pinctrl/core.h | 2 +
3399 drivers/pinctrl/pinconf.c | 4 -
3400 drivers/pinctrl/pinctrl-at91.c | 1490 ++++++++++++++++++++
3401 drivers/pinctrl/pinctrl-coh901.c | 122 +-
3402 drivers/pinctrl/pinctrl-exynos.c | 367 +++--
3403 drivers/pinctrl/pinctrl-exynos.h | 170 +--
3404 drivers/pinctrl/pinctrl-nomadik-db8500.c | 101 +-
3405 drivers/pinctrl/pinctrl-nomadik.c | 63 +-
3406 drivers/pinctrl/pinctrl-nomadik.h | 2 +-
3407 drivers/pinctrl/pinctrl-samsung.c | 203 ++-
3408 drivers/pinctrl/pinctrl-samsung.h | 29 +-
3409 drivers/pinctrl/pinctrl-tegra.c | 2 +-
3410 drivers/pinctrl/pinctrl-tegra30.c | 24 +-
3411 drivers/pinctrl/pinctrl-u300.c | 32 +-
3412 drivers/pinctrl/pinmux.c | 67 +-
3413 drivers/tty/serial/atmel_serial.c | 8 +
3414 include/linux/platform_data/pinctrl-coh901.h | 2 -
3415 .../linux/platform_data/pinctrl-nomadik.h | 111 +-
3416 75 files changed, 3940 insertions(+), 1480 deletions(-)
3417 create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
3418 create mode 100644 arch/arm/boot/dts/at91sam9g15.dtsi
3419 create mode 100644 arch/arm/boot/dts/at91sam9g15ek.dts
3420 create mode 100644 arch/arm/boot/dts/at91sam9g25.dtsi
3421 create mode 100644 arch/arm/boot/dts/at91sam9g35.dtsi
3422 create mode 100644 arch/arm/boot/dts/at91sam9g35ek.dts
3423 create mode 100644 arch/arm/boot/dts/at91sam9x25.dtsi
3424 create mode 100644 arch/arm/boot/dts/at91sam9x25ek.dts
3425 create mode 100644 arch/arm/boot/dts/at91sam9x35.dtsi
3426 create mode 100644 arch/arm/boot/dts/at91sam9x35ek.dts
3427 create mode 100644 arch/arm/boot/dts/at91sam9x5ek.dtsi
3428 delete mode 100644 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
3429 create mode 100644 drivers/pinctrl/pinctrl-at91.c
3430 rename arch/arm/plat-nomadik/include/plat/pincfg.h => include/linux/platform_data/pinctrl-nomadik.h (66%)
3431 Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
3432 $ git merge vhost/linux-next
3433 Resolved 'drivers/net/tun.c' using previous resolution.
3434 Auto-merging drivers/net/tun.c
3435 CONFLICT (content): Merge conflict in drivers/net/tun.c
3436 Automatic merge failed; fix conflicts and then commit the result.
3438 [master c0707e3] Merge remote-tracking branch 'vhost/linux-next'
3439 $ git diff -M --stat --summary HEAD^..
3440 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
3441 $ git merge memblock/memblock-kill-early_node_map
3443 Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
3444 $ git merge remoteproc/for-next
3446 Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
3447 $ git merge irqdomain/irqdomain/next
3449 Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
3450 $ git merge gpio/gpio/next
3452 Merging gpio-lw/for-next (cc46f74 Merge branch 'devel' into for-next)
3453 $ git merge gpio-lw/for-next
3454 Auto-merging drivers/gpio/gpio-mvebu.c
3455 Auto-merging arch/arm/Kconfig
3456 Merge made by the 'recursive' strategy.
3457 arch/arm/Kconfig | 1 +
3458 drivers/gpio/Kconfig | 15 +++
3459 drivers/gpio/Makefile | 2 +
3460 drivers/gpio/gpio-74x164.c | 2 +-
3461 drivers/gpio/gpio-clps711x.c | 163 ++++++++++++++++++++++++++++++++
3462 drivers/gpio/gpio-da9055.c | 204 ++++++++++++++++++++++++++++++++++++++++
3463 drivers/gpio/gpio-mvebu.c | 2 +
3464 drivers/gpio/gpio-omap.c | 3 +-
3465 drivers/gpio/gpio-pl061.c | 59 +++++-------
3466 drivers/gpio/gpio-timberdale.c | 4 +-
3467 drivers/gpio/gpio-vt8500.c | 2 +
3468 drivers/gpio/gpiolib.c | 85 +++++++++--------
3469 12 files changed, 462 insertions(+), 80 deletions(-)
3470 create mode 100644 drivers/gpio/gpio-clps711x.c
3471 create mode 100644 drivers/gpio/gpio-da9055.c
3472 Merging arm-soc/for-next (357dde5 Merge branch 'fixes' into for-next)
3473 $ git merge arm-soc/for-next
3474 Auto-merging include/linux/dma/ipu-dma.h
3475 Removing arch/arm/plat-mxc/include/mach/uncompress.h
3476 Removing arch/arm/plat-mxc/include/mach/timex.h
3477 Removing arch/arm/plat-mxc/include/mach/irqs.h
3478 Removing arch/arm/plat-mxc/Makefile
3479 Removing arch/arm/plat-mxc/Kconfig
3480 Removing arch/arm/mach-vt8500/include/mach/restart.h
3481 Removing arch/arm/mach-vt8500/include/mach/i8042.h
3482 Removing arch/arm/mach-vt8500/include/mach/hardware.h
3483 Auto-merging arch/arm/mach-imx/ulpi.c
3484 Auto-merging arch/arm/mach-imx/tzic.c
3485 Auto-merging arch/arm/mach-imx/time.c
3486 Auto-merging arch/arm/mach-imx/system.c
3487 Auto-merging arch/arm/mach-imx/irq-common.h
3488 Auto-merging arch/arm/mach-imx/iram_alloc.c
3489 Auto-merging arch/arm/mach-imx/iomux-v3.c
3490 Auto-merging arch/arm/mach-imx/iomux-v1.c
3491 Auto-merging arch/arm/mach-imx/iomux-mx51.h
3492 Auto-merging arch/arm/mach-imx/iomux-mx50.h
3493 Auto-merging arch/arm/mach-imx/iomux-mx35.h
3494 Auto-merging arch/arm/mach-imx/iomux-mx27.h
3495 Auto-merging arch/arm/mach-imx/iomux-mx25.h
3496 Auto-merging arch/arm/mach-imx/iomux-mx21.h
3497 Auto-merging arch/arm/mach-imx/iomux-mx1.h
3498 Removing arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
3499 Auto-merging arch/arm/mach-imx/hardware.h
3500 Auto-merging arch/arm/mach-imx/epit.c
3501 Auto-merging arch/arm/mach-imx/devices/platform-spi_imx.c
3502 Auto-merging arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
3503 Auto-merging arch/arm/mach-imx/devices/platform-pata_imx.c
3504 Auto-merging arch/arm/mach-imx/devices/platform-mxc_w1.c
3505 Auto-merging arch/arm/mach-imx/devices/platform-mxc_rtc.c
3506 Auto-merging arch/arm/mach-imx/devices/platform-mxc_rnga.c
3507 Auto-merging arch/arm/mach-imx/devices/platform-mxc_pwm.c
3508 Auto-merging arch/arm/mach-imx/devices/platform-mxc_nand.c
3509 Auto-merging arch/arm/mach-imx/devices/platform-mxc-mmc.c
3510 Auto-merging arch/arm/mach-imx/devices/platform-mxc-ehci.c
3511 Auto-merging arch/arm/mach-imx/devices/platform-mx2-camera.c
3512 Auto-merging arch/arm/mach-imx/devices/platform-mx1-camera.c
3513 Auto-merging arch/arm/mach-imx/devices/platform-ipu-core.c
3514 Auto-merging arch/arm/mach-imx/devices/platform-imxdi_rtc.c
3515 Auto-merging arch/arm/mach-imx/devices/platform-imx_udc.c
3516 Auto-merging arch/arm/mach-imx/devices/platform-imx27-coda.c
3517 Auto-merging arch/arm/mach-imx/devices/platform-imx21-hcd.c
3518 Auto-merging arch/arm/mach-imx/devices/platform-imx2-wdt.c
3519 Auto-merging arch/arm/mach-imx/devices/platform-imx-uart.c
3520 Auto-merging arch/arm/mach-imx/devices/platform-imx-ssi.c
3521 Auto-merging arch/arm/mach-imx/devices/platform-imx-keypad.c
3522 Auto-merging arch/arm/mach-imx/devices/platform-imx-i2c.c
3523 Auto-merging arch/arm/mach-imx/devices/platform-imx-fb.c
3524 Auto-merging arch/arm/mach-imx/devices/platform-imx-dma.c
3525 Auto-merging arch/arm/mach-imx/devices/platform-gpio_keys.c
3526 Auto-merging arch/arm/mach-imx/devices/platform-gpio-mxc.c
3527 Auto-merging arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
3528 Auto-merging arch/arm/mach-imx/devices/platform-flexcan.c
3529 Auto-merging arch/arm/mach-imx/devices/platform-fec.c
3530 Auto-merging arch/arm/mach-imx/devices/platform-ahci-imx.c
3531 Auto-merging arch/arm/mach-imx/devices/devices.c
3532 Auto-merging arch/arm/mach-imx/devices/devices-common.h
3533 Auto-merging arch/arm/mach-imx/devices/Makefile
3534 Auto-merging arch/arm/mach-imx/cpufreq.c
3535 Auto-merging arch/arm/mach-imx/cpu.c
3536 Auto-merging arch/arm/mach-imx/common.h
3537 Auto-merging arch/arm/mach-imx/avic.c
3538 Auto-merging arch/arm/mach-imx/3ds_debugboard.c
3539 Auto-merging arch/arm/include/debug/imx.S
3540 Removing arch/arm/boot/compressed/head-vt8500.S
3541 Auto-merging arch/arm/Makefile
3542 Auto-merging arch/arm/Kconfig
3543 Auto-merging MAINTAINERS
3544 Merge made by the 'recursive' strategy.
3545 .../devicetree/bindings/i2c/fsl-imx-i2c.txt | 4 +-
3547 arch/arm/Kconfig | 15 +--
3548 arch/arm/Kconfig.debug | 8 ++
3549 arch/arm/Makefile | 1 -
3550 arch/arm/arm-soc-for-next-contents.txt | 7 +
3551 arch/arm/boot/compressed/Makefile | 4 -
3552 arch/arm/boot/compressed/head-vt8500.S | 46 -------
3553 arch/arm/boot/dts/imx27.dtsi | 4 +-
3554 arch/arm/boot/dts/imx51.dtsi | 4 +-
3555 arch/arm/boot/dts/imx53.dtsi | 6 +-
3556 arch/arm/boot/dts/imx6q.dtsi | 6 +-
3557 arch/arm/configs/imx_v4_v5_defconfig | 5 +-
3558 arch/arm/configs/imx_v6_v7_defconfig | 3 +-
3559 .../mach/debug-macro.S => include/debug/imx.S} | 33 +++--
3560 arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c | 2 +-
3561 .../include/mach => mach-imx}/3ds_debugboard.h | 0
3562 arch/arm/mach-imx/Kconfig | 89 ++++++++++++-
3563 arch/arm/mach-imx/Makefile | 22 ++++
3564 arch/arm/{plat-mxc => mach-imx}/avic.c | 5 +-
3565 .../include/mach => mach-imx}/board-mx31lilly.h | 0
3566 .../include/mach => mach-imx}/board-mx31lite.h | 0
3567 .../include/mach => mach-imx}/board-mx31moboard.h | 0
3568 .../include/mach => mach-imx}/board-pcm038.h | 0
3569 arch/arm/mach-imx/clk-imx1.c | 17 +--
3570 arch/arm/mach-imx/clk-imx21.c | 18 +--
3571 arch/arm/mach-imx/clk-imx25.c | 26 ++--
3572 arch/arm/mach-imx/clk-imx27.c | 40 +++---
3573 arch/arm/mach-imx/clk-imx31.c | 21 ++-
3574 arch/arm/mach-imx/clk-imx35.c | 13 +-
3575 arch/arm/mach-imx/clk-imx51-imx53.c | 15 +--
3576 arch/arm/mach-imx/clk-imx6q.c | 3 +-
3577 arch/arm/mach-imx/clk-pllv1.c | 4 +-
3578 .../{plat-mxc/include/mach => mach-imx}/common.h | 1 +
3579 arch/arm/mach-imx/cpu-imx25.c | 5 +-
3580 arch/arm/mach-imx/cpu-imx27.c | 2 +-
3581 arch/arm/mach-imx/cpu-imx31.c | 7 +-
3582 arch/arm/mach-imx/cpu-imx35.c | 5 +-
3583 arch/arm/mach-imx/cpu-imx5.c | 3 +-
3584 arch/arm/{plat-mxc => mach-imx}/cpu.c | 3 +-
3585 arch/arm/mach-imx/cpu_op-mx51.c | 3 +-
3586 arch/arm/{plat-mxc => mach-imx}/cpufreq.c | 3 +-
3587 arch/arm/{plat-mxc => mach-imx}/cpuidle.c | 0
3588 .../{plat-mxc/include/mach => mach-imx}/cpuidle.h | 0
3589 arch/arm/mach-imx/devices-imx1.h | 3 +-
3590 arch/arm/mach-imx/devices-imx21.h | 3 +-
3591 arch/arm/mach-imx/devices-imx25.h | 3 +-
3592 arch/arm/mach-imx/devices-imx27.h | 3 +-
3593 arch/arm/mach-imx/devices-imx31.h | 3 +-
3594 arch/arm/mach-imx/devices-imx35.h | 3 +-
3595 arch/arm/mach-imx/devices-imx50.h | 3 +-
3596 arch/arm/mach-imx/devices-imx51.h | 3 +-
3597 arch/arm/{plat-mxc => mach-imx}/devices/Kconfig | 0
3598 arch/arm/{plat-mxc => mach-imx}/devices/Makefile | 2 +
3599 .../mach => mach-imx/devices}/devices-common.h | 9 +-
3600 arch/arm/{plat-mxc => mach-imx/devices}/devices.c | 4 +-
3601 .../devices/platform-ahci-imx.c | 5 +-
3602 .../{plat-mxc => mach-imx}/devices/platform-fec.c | 5 +-
3603 .../devices/platform-flexcan.c | 4 +-
3604 .../devices/platform-fsl-usb2-udc.c | 5 +-
3605 .../devices/platform-gpio-mxc.c | 2 +-
3606 .../devices/platform-gpio_keys.c | 5 +-
3607 .../devices/platform-imx-dma.c | 23 +++-
3608 .../devices/platform-imx-fb.c | 16 ++-
3609 .../devices/platform-imx-i2c.c | 32 ++---
3610 .../devices/platform-imx-keypad.c | 4 +-
3611 .../devices/platform-imx-ssi.c | 4 +-
3612 .../devices/platform-imx-uart.c | 4 +-
3613 .../devices/platform-imx2-wdt.c | 5 +-
3614 .../devices/platform-imx21-hcd.c | 4 +-
3615 .../devices/platform-imx27-coda.c | 4 +-
3616 .../devices/platform-imx_udc.c | 4 +-
3617 .../devices/platform-imxdi_rtc.c | 5 +-
3618 .../devices/platform-ipu-core.c | 5 +-
3619 .../devices/platform-mx1-camera.c | 4 +-
3620 .../devices/platform-mx2-camera.c | 16 ++-
3621 .../devices/platform-mxc-ehci.c | 5 +-
3622 .../devices/platform-mxc-mmc.c | 20 +--
3623 .../devices/platform-mxc_nand.c | 25 ++--
3624 .../devices/platform-mxc_pwm.c | 4 +-
3625 .../devices/platform-mxc_rnga.c | 4 +-
3626 .../devices/platform-mxc_rtc.c | 13 +-
3627 .../devices/platform-mxc_w1.c | 4 +-
3628 .../devices/platform-pata_imx.c | 4 +-
3629 .../devices/platform-sdhci-esdhc-imx.c | 5 +-
3630 .../devices/platform-spi_imx.c | 4 +-
3631 arch/arm/mach-imx/ehci-imx25.c | 4 +-
3632 arch/arm/mach-imx/ehci-imx27.c | 4 +-
3633 arch/arm/mach-imx/ehci-imx31.c | 4 +-
3634 arch/arm/mach-imx/ehci-imx35.c | 4 +-
3635 arch/arm/mach-imx/ehci-imx5.c | 4 +-
3636 arch/arm/{plat-mxc => mach-imx}/epit.c | 6 +-
3637 .../include/mach => mach-imx}/eukrea-baseboards.h | 0
3638 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 7 +-
3639 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +-
3640 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 7 +-
3641 arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 7 +-
3642 .../{plat-mxc/include/mach => mach-imx}/hardware.h | 26 ++--
3643 arch/arm/mach-imx/hotplug.c | 3 +-
3644 arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h | 0
3645 arch/arm/mach-imx/imx27-dt.c | 11 +-
3646 arch/arm/mach-imx/imx31-dt.c | 5 +-
3647 arch/arm/mach-imx/imx51-dt.c | 9 +-
3648 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h | 10 --
3649 arch/arm/mach-imx/iomux-imx31.c | 5 +-
3650 .../include/mach => mach-imx}/iomux-mx1.h | 2 +-
3651 .../include/mach => mach-imx}/iomux-mx21.h | 4 +-
3652 .../include/mach => mach-imx}/iomux-mx25.h | 2 +-
3653 .../include/mach => mach-imx}/iomux-mx27.h | 4 +-
3654 .../include/mach => mach-imx}/iomux-mx2x.h | 0
3655 .../include/mach => mach-imx}/iomux-mx3.h | 0
3656 .../include/mach => mach-imx}/iomux-mx35.h | 2 +-
3657 .../include/mach => mach-imx}/iomux-mx50.h | 2 +-
3658 .../include/mach => mach-imx}/iomux-mx51.h | 2 +-
3659 arch/arm/{plat-mxc => mach-imx}/iomux-v1.c | 5 +-
3660 .../{plat-mxc/include/mach => mach-imx}/iomux-v1.h | 0
3661 arch/arm/{plat-mxc => mach-imx}/iomux-v3.c | 5 +-
3662 .../{plat-mxc/include/mach => mach-imx}/iomux-v3.h | 0
3663 .../arm/{plat-mxc/include/mach => mach-imx}/iram.h | 0
3664 arch/arm/{plat-mxc => mach-imx}/iram_alloc.c | 3 +-
3665 arch/arm/{plat-mxc => mach-imx}/irq-common.c | 0
3666 arch/arm/{plat-mxc => mach-imx}/irq-common.h | 3 +
3667 arch/arm/mach-imx/lluart.c | 3 +-
3668 arch/arm/mach-imx/mach-apf9328.c | 7 +-
3669 arch/arm/mach-imx/mach-armadillo5x0.c | 9 +-
3670 arch/arm/mach-imx/mach-bug.c | 7 +-
3671 arch/arm/mach-imx/mach-cpuimx27.c | 11 +-
3672 arch/arm/mach-imx/mach-cpuimx35.c | 9 +-
3673 arch/arm/mach-imx/mach-cpuimx51sd.c | 9 +-
3674 arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 10 +-
3675 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 +-
3676 arch/arm/mach-imx/mach-imx27ipcam.c | 6 +-
3677 arch/arm/mach-imx/mach-imx27lite.c | 6 +-
3678 arch/arm/mach-imx/mach-imx53.c | 11 +-
3679 arch/arm/mach-imx/mach-imx6q.c | 6 +-
3680 arch/arm/mach-imx/mach-kzm_arm11_01.c | 7 +-
3681 arch/arm/mach-imx/mach-mx1ads.c | 7 +-
3682 arch/arm/mach-imx/mach-mx21ads.c | 6 +-
3683 arch/arm/mach-imx/mach-mx25_3ds.c | 8 +-
3684 arch/arm/mach-imx/mach-mx27_3ds.c | 10 +-
3685 arch/arm/mach-imx/mach-mx27ads.c | 6 +-
3686 arch/arm/mach-imx/mach-mx31_3ds.c | 12 +-
3687 arch/arm/mach-imx/mach-mx31ads.c | 5 +-
3688 arch/arm/mach-imx/mach-mx31lilly.c | 11 +-
3689 arch/arm/mach-imx/mach-mx31lite.c | 11 +-
3690 arch/arm/mach-imx/mach-mx31moboard.c | 14 +-
3691 arch/arm/mach-imx/mach-mx35_3ds.c | 8 +-
3692 arch/arm/mach-imx/mach-mx50_rdp.c | 7 +-
3693 arch/arm/mach-imx/mach-mx51_3ds.c | 9 +-
3694 arch/arm/mach-imx/mach-mx51_babbage.c | 7 +-
3695 arch/arm/mach-imx/mach-mxt_td60.c | 6 +-
3696 arch/arm/mach-imx/mach-pca100.c | 8 +-
3697 arch/arm/mach-imx/mach-pcm037.c | 8 +-
3698 arch/arm/mach-imx/mach-pcm037_eet.c | 5 +-
3699 arch/arm/mach-imx/mach-pcm038.c | 13 +-
3700 arch/arm/mach-imx/mach-pcm043.c | 9 +-
3701 arch/arm/mach-imx/mach-qong.c | 6 +-
3702 arch/arm/mach-imx/mach-scb9328.c | 7 +-
3703 arch/arm/mach-imx/mach-vpr200.c | 7 +-
3704 arch/arm/mach-imx/mm-imx1.c | 9 +-
3705 arch/arm/mach-imx/mm-imx21.c | 14 +-
3706 arch/arm/mach-imx/mm-imx25.c | 12 +-
3707 arch/arm/mach-imx/mm-imx27.c | 14 +-
3708 arch/arm/mach-imx/mm-imx3.c | 13 +-
3709 arch/arm/mach-imx/mm-imx5.c | 12 +-
3710 arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h | 0
3711 .../arm/{plat-mxc/include/mach => mach-imx}/mx21.h | 0
3712 .../arm/{plat-mxc/include/mach => mach-imx}/mx25.h | 0
3713 .../arm/{plat-mxc/include/mach => mach-imx}/mx27.h | 0
3714 .../arm/{plat-mxc/include/mach => mach-imx}/mx2x.h | 0
3715 .../arm/{plat-mxc/include/mach => mach-imx}/mx31.h | 0
3716 arch/arm/mach-imx/mx31lilly-db.c | 9 +-
3717 arch/arm/mach-imx/mx31lite-db.c | 9 +-
3718 arch/arm/mach-imx/mx31moboard-devboard.c | 9 +-
3719 arch/arm/mach-imx/mx31moboard-marxbot.c | 9 +-
3720 arch/arm/mach-imx/mx31moboard-smartbot.c | 11 +-
3721 .../arm/{plat-mxc/include/mach => mach-imx}/mx35.h | 0
3722 .../arm/{plat-mxc/include/mach => mach-imx}/mx3x.h | 0
3723 .../arm/{plat-mxc/include/mach => mach-imx}/mx50.h | 0
3724 .../arm/{plat-mxc/include/mach => mach-imx}/mx51.h | 0
3725 .../arm/{plat-mxc/include/mach => mach-imx}/mx53.h | 0
3726 .../arm/{plat-mxc/include/mach => mach-imx}/mx6q.h | 0
3727 arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h | 0
3728 arch/arm/mach-imx/pcm970-baseboard.c | 7 +-
3729 arch/arm/mach-imx/platsmp.c | 5 +-
3730 arch/arm/mach-imx/pm-imx27.c | 3 +-
3731 arch/arm/mach-imx/pm-imx3.c | 7 +-
3732 arch/arm/mach-imx/pm-imx5.c | 7 +-
3733 arch/arm/mach-imx/pm-imx6q.c | 5 +-
3734 arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c | 0
3735 arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S | 0
3736 arch/arm/{plat-mxc => mach-imx}/system.c | 5 +-
3737 arch/arm/{plat-mxc => mach-imx}/time.c | 5 +-
3738 arch/arm/{plat-mxc => mach-imx}/tzic.c | 6 +-
3739 arch/arm/{plat-mxc => mach-imx}/ulpi.c | 2 +-
3740 .../arm/{plat-mxc/include/mach => mach-imx}/ulpi.h | 0
3741 arch/arm/mach-vt8500/include/mach/hardware.h | 12 --
3742 arch/arm/mach-vt8500/include/mach/i8042.h | 18 ---
3743 arch/arm/mach-vt8500/include/mach/restart.h | 17 ---
3744 arch/arm/mach-vt8500/timer.c | 2 +-
3745 arch/arm/mach-vt8500/vt8500.c | 2 -
3746 arch/arm/plat-mxc/Kconfig | 89 -------------
3747 arch/arm/plat-mxc/Makefile | 24 ----
3748 arch/arm/plat-mxc/include/mach/irqs.h | 21 ---
3749 arch/arm/plat-mxc/include/mach/timex.h | 22 ----
3750 arch/arm/plat-mxc/include/mach/uncompress.h | 132 -------------------
3751 drivers/dma/imx-dma.c | 137 ++++++++++++--------
3752 drivers/dma/imx-sdma.c | 1 -
3753 drivers/dma/ipu/ipu_idmac.c | 3 +-
3754 drivers/dma/ipu/ipu_irq.c | 3 +-
3755 drivers/i2c/busses/i2c-imx.c | 40 +++++-
3756 drivers/media/platform/soc_camera/mx2_camera.c | 95 ++++++++++----
3757 drivers/media/platform/soc_camera/mx3_camera.c | 2 +-
3758 drivers/mmc/host/mxcmmc.c | 31 ++++-
3759 drivers/mtd/nand/mxc_nand.c | 96 +++++++++-----
3760 drivers/rtc/rtc-mxc.c | 34 ++++-
3761 drivers/usb/host/ehci-mxc.c | 1 -
3762 drivers/video/imxfb.c | 38 +++++-
3763 drivers/video/mx3fb.c | 3 +-
3764 drivers/watchdog/imx2_wdt.c | 1 -
3765 .../mach/ipu.h => include/linux/dma/ipu-dma.h | 6 +-
3766 include/linux/platform_data/asoc-imx-ssi.h | 2 +
3767 include/linux/platform_data/dma-imx.h | 4 +-
3768 sound/soc/fsl/imx-pcm-fiq.c | 1 -
3769 sound/soc/fsl/imx-ssi.c | 1 -
3770 225 files changed, 1091 insertions(+), 1112 deletions(-)
3771 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
3772 delete mode 100644 arch/arm/boot/compressed/head-vt8500.S
3773 rename arch/arm/{plat-mxc/include/mach/debug-macro.S => include/debug/imx.S} (59%)
3774 rename arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c (99%)
3775 rename arch/arm/{plat-mxc/include/mach => mach-imx}/3ds_debugboard.h (100%)
3776 rename arch/arm/{plat-mxc => mach-imx}/avic.c (98%)
3777 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lilly.h (100%)
3778 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lite.h (100%)
3779 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31moboard.h (100%)
3780 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-pcm038.h (100%)
3781 rename arch/arm/{plat-mxc/include/mach => mach-imx}/common.h (99%)
3782 rename arch/arm/{plat-mxc => mach-imx}/cpu.c (97%)
3783 rename arch/arm/{plat-mxc => mach-imx}/cpufreq.c (99%)
3784 rename arch/arm/{plat-mxc => mach-imx}/cpuidle.c (100%)
3785 rename arch/arm/{plat-mxc/include/mach => mach-imx}/cpuidle.h (100%)
3786 rename arch/arm/{plat-mxc => mach-imx}/devices/Kconfig (100%)
3787 rename arch/arm/{plat-mxc => mach-imx}/devices/Makefile (98%)
3788 rename arch/arm/{plat-mxc/include/mach => mach-imx/devices}/devices-common.h (97%)
3789 rename arch/arm/{plat-mxc => mach-imx/devices}/devices.c (92%)
3790 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ahci-imx.c (98%)
3791 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fec.c (97%)
3792 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-flexcan.c (96%)
3793 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fsl-usb2-udc.c (96%)
3794 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio-mxc.c (96%)
3795 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio_keys.c (94%)
3796 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-dma.c (63%)
3797 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-fb.c (79%)
3798 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-i2c.c (76%)
3799 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-keypad.c (97%)
3800 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-ssi.c (98%)
3801 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-uart.c (98%)
3802 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx2-wdt.c (97%)
3803 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx21-hcd.c (94%)
3804 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx27-coda.c (93%)
3805 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx_udc.c (96%)
3806 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imxdi_rtc.c (94%)
3807 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ipu-core.c (98%)
3808 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx1-camera.c (94%)
3809 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-camera.c (83%)
3810 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-ehci.c (97%)
3811 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-mmc.c (76%)
3812 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_nand.c (74%)
3813 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_pwm.c (97%)
3814 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rnga.c (95%)
3815 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rtc.c (77%)
3816 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_w1.c (95%)
3817 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-pata_imx.c (96%)
3818 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-sdhci-esdhc-imx.c (98%)
3819 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-spi_imx.c (98%)
3820 rename arch/arm/{plat-mxc => mach-imx}/epit.c (99%)
3821 rename arch/arm/{plat-mxc/include/mach => mach-imx}/eukrea-baseboards.h (100%)
3822 rename arch/arm/{plat-mxc/include/mach => mach-imx}/hardware.h (94%)
3823 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h (100%)
3824 delete mode 100644 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
3825 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx1.h (99%)
3826 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx21.h (99%)
3827 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx25.h (99%)
3828 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx27.h (99%)
3829 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx2x.h (100%)
3830 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx3.h (100%)
3831 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx35.h (99%)
3832 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx50.h (99%)
3833 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx51.h (99%)
3834 rename arch/arm/{plat-mxc => mach-imx}/iomux-v1.c (98%)
3835 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v1.h (100%)
3836 rename arch/arm/{plat-mxc => mach-imx}/iomux-v3.c (97%)
3837 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v3.h (100%)
3838 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iram.h (100%)
3839 rename arch/arm/{plat-mxc => mach-imx}/iram_alloc.c (98%)
3840 rename arch/arm/{plat-mxc => mach-imx}/irq-common.c (100%)
3841 rename arch/arm/{plat-mxc => mach-imx}/irq-common.h (94%)
3842 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h (100%)
3843 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx21.h (100%)
3844 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx25.h (100%)
3845 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx27.h (100%)
3846 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx2x.h (100%)
3847 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx31.h (100%)
3848 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx35.h (100%)
3849 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx3x.h (100%)
3850 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx50.h (100%)
3851 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx51.h (100%)
3852 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx53.h (100%)
3853 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx6q.h (100%)
3854 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h (100%)
3855 rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c (100%)
3856 rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S (100%)
3857 rename arch/arm/{plat-mxc => mach-imx}/system.c (97%)
3858 rename arch/arm/{plat-mxc => mach-imx}/time.c (99%)
3859 rename arch/arm/{plat-mxc => mach-imx}/tzic.c (98%)
3860 rename arch/arm/{plat-mxc => mach-imx}/ulpi.c (99%)
3861 rename arch/arm/{plat-mxc/include/mach => mach-imx}/ulpi.h (100%)
3862 delete mode 100644 arch/arm/mach-vt8500/include/mach/hardware.h
3863 delete mode 100644 arch/arm/mach-vt8500/include/mach/i8042.h
3864 delete mode 100644 arch/arm/mach-vt8500/include/mach/restart.h
3865 delete mode 100644 arch/arm/plat-mxc/Kconfig
3866 delete mode 100644 arch/arm/plat-mxc/Makefile
3867 delete mode 100644 arch/arm/plat-mxc/include/mach/irqs.h
3868 delete mode 100644 arch/arm/plat-mxc/include/mach/timex.h
3869 delete mode 100644 arch/arm/plat-mxc/include/mach/uncompress.h
3870 rename arch/arm/plat-mxc/include/mach/ipu.h => include/linux/dma/ipu-dma.h (97%)
3871 Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling)
3872 $ git merge cortex/for-next
3873 Auto-merging arch/arm/mm/alignment.c
3874 Auto-merging arch/arm/kernel/process.c
3875 Merge made by the 'recursive' strategy.
3876 arch/arm/include/asm/assembler.h | 13 ++-
3877 arch/arm/include/asm/cp15.h | 11 ++-
3878 arch/arm/include/asm/cputype.h | 3 +
3879 arch/arm/include/asm/glue-cache.h | 25 ++++++
3880 arch/arm/include/asm/glue-df.h | 8 ++
3881 arch/arm/include/asm/glue-proc.h | 9 ++
3882 arch/arm/include/asm/irqflags.h | 22 +++--
3883 arch/arm/include/asm/processor.h | 7 ++
3884 arch/arm/include/asm/ptrace.h | 8 ++
3885 arch/arm/include/asm/system_info.h | 1 +
3886 arch/arm/include/uapi/asm/ptrace.h | 36 ++++++--
3887 arch/arm/kernel/asm-offsets.c | 3 +
3888 arch/arm/kernel/entry-common.S | 4 +
3889 arch/arm/kernel/entry-header.S | 148 +++++++++++++++++++++++++++++++++
3890 arch/arm/kernel/entry-v7m.S | 134 ++++++++++++++++++++++++++++++
3891 arch/arm/kernel/head-common.S | 9 +-
3892 arch/arm/kernel/head-nommu.S | 9 +-
3893 arch/arm/kernel/process.c | 4 +
3894 arch/arm/kernel/ptrace.c | 3 +
3895 arch/arm/kernel/setup.c | 13 ++-
3896 arch/arm/kernel/traps.c | 2 +
3897 arch/arm/mm/alignment.c | 2 +
3898 arch/arm/mm/mmu.c | 17 ++++
3899 arch/arm/mm/nommu.c | 2 +
3900 arch/arm/mm/proc-v7m.S | 161 ++++++++++++++++++++++++++++++++++++
3901 25 files changed, 632 insertions(+), 22 deletions(-)
3902 create mode 100644 arch/arm/kernel/entry-v7m.S
3903 create mode 100644 arch/arm/mm/proc-v7m.S
3904 Merging ep93xx/ep93xx-for-next (fab1f74 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
3905 $ git merge ep93xx/ep93xx-for-next
3907 Merge made by the 'recursive' strategy.
3908 Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
3909 $ git merge ixp4xx/next
3910 Merge made by the 'recursive' strategy.
3911 arch/arm/mach-ixp4xx/common-pci.c | 1 +
3912 arch/arm/mach-ixp4xx/common.c | 13 +++----
3913 arch/arm/mach-ixp4xx/goramo_mlr.c | 3 +-
3914 arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 +-
3915 arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 ++++++++++-------------
3916 arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 +++---
3917 arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++-
3918 arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 12 +-----
3919 drivers/char/hw_random/Kconfig | 6 +--
3920 drivers/char/hw_random/ixp4xx-rng.c | 5 ++-
3921 drivers/crypto/Kconfig | 2 +-
3922 drivers/crypto/ixp4xx_crypto.c | 12 +++---
3923 drivers/net/wan/ixp4xx_hss.c | 2 +-
3924 13 files changed, 59 insertions(+), 68 deletions(-)
3925 Merging msm/for-next (a0d271c Linux 3.6)
3926 $ git merge msm/for-next
3928 Merging renesas/next (33e6bc3 Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/boards' into next)
3929 $ git merge renesas/next
3930 Auto-merging arch/arm/boot/dts/Makefile
3931 Merge made by the 'recursive' strategy.
3932 arch/arm/boot/dts/Makefile | 3 +-
3933 arch/arm/boot/dts/sh7372-mackerel.dts | 22 +++++++
3934 arch/arm/configs/armadillo800eva_defconfig | 3 +-
3935 arch/arm/configs/kzm9g_defconfig | 4 ++
3936 arch/arm/configs/mackerel_defconfig | 18 +++++-
3937 arch/arm/configs/marzen_defconfig | 4 ++
3938 arch/arm/mach-shmobile/Kconfig | 1 +
3939 arch/arm/mach-shmobile/board-armadillo800eva.c | 8 +++
3940 arch/arm/mach-shmobile/board-kzm9g.c | 14 ++++-
3941 arch/arm/mach-shmobile/board-mackerel.c | 8 ++-
3942 arch/arm/mach-shmobile/board-marzen.c | 25 ++++++++
3943 arch/arm/mach-shmobile/clock-r8a7779.c | 16 ++++-
3944 arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++
3945 arch/arm/mach-shmobile/setup-r8a7740.c | 18 +++++-
3946 arch/arm/mach-shmobile/setup-r8a7779.c | 79 +++++++++++++++++++++++-
3947 arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++
3948 16 files changed, 238 insertions(+), 9 deletions(-)
3949 create mode 100644 arch/arm/boot/dts/sh7372-mackerel.dts
3950 Merging samsung/for-next (f1d782f Merge branch 'next/board-samsung' into for-next)
3951 $ git merge samsung/for-next
3952 Merge made by the 'recursive' strategy.
3953 .../devicetree/bindings/media/s5p-mfc.txt | 23 ++++
3954 arch/arm/boot/dts/exynos4210-origen.dts | 16 +++
3955 arch/arm/boot/dts/exynos4210-smdkv310.dts | 16 +++
3956 arch/arm/boot/dts/exynos4210-trats.dts | 6 +-
3957 arch/arm/boot/dts/exynos5250-smdk5250.dts | 5 +
3958 arch/arm/boot/dts/exynos5250.dtsi | 6 +
3959 arch/arm/mach-exynos/Kconfig | 1 +
3960 arch/arm/mach-exynos/clock-exynos4.c | 5 -
3961 arch/arm/mach-exynos/clock-exynos5.c | 7 +-
3962 arch/arm/mach-exynos/common.c | 5 +
3963 arch/arm/mach-exynos/mach-exynos4-dt.c | 1 +
3964 arch/arm/mach-exynos/mach-exynos5-dt.c | 16 +++
3965 arch/arm/mach-exynos/mach-nuri.c | 1 -
3966 arch/arm/mach-exynos/mach-universal_c210.c | 1 -
3967 arch/arm/mach-s3c24xx/s3c2416.c | 2 +
3968 arch/arm/mach-s3c24xx/s3c2443.c | 4 +
3969 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 141 ++++++++++++++++----
3970 arch/arm/mach-s3c64xx/mach-crag6410.c | 29 +++-
3971 arch/arm/mach-s5p64x0/common.c | 3 +
3972 arch/arm/mach-s5pc100/common.c | 3 +
3973 arch/arm/mach-s5pv210/common.c | 3 +
3974 arch/arm/mach-s5pv210/mach-goni.c | 1 -
3975 arch/arm/plat-samsung/clock.c | 75 ++++++++++-
3976 arch/arm/plat-samsung/devs.c | 1 +
3977 arch/arm/plat-samsung/include/plat/gpio-core.h | 2 +
3978 arch/arm/plat-samsung/include/plat/mfc.h | 11 ++
3979 arch/arm/plat-samsung/include/plat/spi-core.h | 30 +++++
3980 arch/arm/plat-samsung/s5p-dev-mfc.c | 34 +++++
3981 arch/arm/plat-samsung/s5p-irq-gpioint.c | 8 +-
3982 drivers/gpio/gpio-samsung.c | 25 ++--
3983 30 files changed, 427 insertions(+), 54 deletions(-)
3984 create mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt
3985 create mode 100644 arch/arm/plat-samsung/include/plat/spi-core.h
3986 Merging tegra/for-next (cc8c1c9 Merge branch 'for-3.8/defconfig' into for-next)
3987 $ git merge tegra/for-next
3988 Auto-merging include/linux/tegra-ahb.h
3989 Auto-merging drivers/iommu/tegra-smmu.c
3990 Auto-merging drivers/crypto/tegra-aes.c
3991 Removing arch/arm/mach-tegra/include/mach/irqs.h
3992 Removing arch/arm/mach-tegra/include/mach/dma.h
3993 Auto-merging arch/arm/Kconfig
3994 Merge made by the 'recursive' strategy.
3995 .../devicetree/bindings/rtc/nvidia,tegra20-rtc.txt | 19 ++
3996 .../bindings/timer/nvidia,tegra20-timer.txt | 21 +++
3997 .../bindings/timer/nvidia,tegra30-timer.txt | 23 +++
3998 arch/arm/Kconfig | 1 +
3999 arch/arm/boot/dts/tegra20-harmony.dts | 63 ++-----
4000 arch/arm/boot/dts/tegra20-paz00.dts | 59 ++-----
4001 arch/arm/boot/dts/tegra20-seaboard.dts | 65 +++----
4002 arch/arm/boot/dts/tegra20-tamonten.dtsi | 63 ++-----
4003 arch/arm/boot/dts/tegra20-ventana.dts | 75 ++++----
4004 arch/arm/boot/dts/tegra20-whistler.dts | 119 ++++---------
4005 arch/arm/boot/dts/tegra20.dtsi | 21 +++
4006 arch/arm/boot/dts/tegra30-cardhu-a02.dts | 6 +
4007 arch/arm/boot/dts/tegra30-cardhu-a04.dts | 6 +
4008 arch/arm/boot/dts/tegra30-cardhu.dtsi | 74 ++++----
4009 arch/arm/boot/dts/tegra30.dtsi | 23 +++
4010 arch/arm/configs/tegra_defconfig | 1 +
4011 arch/arm/mach-tegra/apbio.c | 3 -
4012 arch/arm/mach-tegra/board-dt-tegra20.c | 5 +-
4013 arch/arm/mach-tegra/board-dt-tegra30.c | 4 +
4014 arch/arm/mach-tegra/clock.c | 2 -
4015 arch/arm/mach-tegra/cpu-tegra.c | 3 -
4016 arch/arm/mach-tegra/cpuidle.c | 44 +----
4017 arch/arm/mach-tegra/include/mach/dma.h | 54 ------
4018 arch/arm/mach-tegra/include/mach/irqs.h | 182 --------------------
4019 arch/arm/mach-tegra/include/mach/powergate.h | 2 +
4020 arch/arm/mach-tegra/pcie.c | 3 +
4021 arch/arm/mach-tegra/platsmp.c | 1 -
4022 arch/arm/mach-tegra/sleep-t20.S | 2 -
4023 arch/arm/mach-tegra/sleep-t30.S | 2 -
4024 arch/arm/mach-tegra/tegra20_clocks_data.c | 2 -
4025 arch/arm/mach-tegra/tegra2_emc.c | 2 -
4026 arch/arm/mach-tegra/timer.c | 40 +++--
4027 drivers/amba/tegra-ahb.c | 1 +
4028 drivers/crypto/tegra-aes.c | 2 -
4029 drivers/iommu/tegra-smmu.c | 4 +-
4030 drivers/staging/nvec/nvec.c | 1 -
4031 .../include/mach => include/linux}/tegra-ahb.h | 6 +-
4032 sound/soc/tegra/tegra30_ahub.c | 1 -
4033 sound/soc/tegra/tegra_pcm.h | 2 -
4034 39 files changed, 326 insertions(+), 681 deletions(-)
4035 create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
4036 create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt
4037 create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt
4038 delete mode 100644 arch/arm/mach-tegra/include/mach/dma.h
4039 delete mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
4040 rename {arch/arm/mach-tegra/include/mach => include/linux}/tegra-ahb.h (86%)
4041 Merging kvmtool/master (1cdfa19 tools/kvm: Fix formatting in parse-options.h)
4042 $ git merge kvmtool/master
4043 Merge made by the 'recursive' strategy.
4044 tools/kvm/Makefile | 3 +++
4045 tools/kvm/builtin-run.c | 10 +++++++++-
4046 tools/kvm/include/kvm/parse-options.h | 22 +++++++++++-----------
4047 3 files changed, 23 insertions(+), 12 deletions(-)
4048 Merging dma-mapping/dma-mapping-next (4e85fb8 ARM: mm: Remove unused arm_vmregion priv field)
4049 $ git merge dma-mapping/dma-mapping-next
4050 Merge made by the 'recursive' strategy.
4051 arch/arm/include/asm/dma-mapping.h | 1 +
4052 arch/arm/mm/dma-mapping.c | 2 +-
4053 arch/arm/mm/vmregion.h | 1 -
4054 drivers/base/Kconfig | 2 +-
4055 drivers/base/dma-coherent.c | 5 ++---
4056 drivers/base/dma-contiguous.c | 5 +----
4057 mm/page_alloc.c | 2 +-
4058 7 files changed, 7 insertions(+), 11 deletions(-)
4059 Merging pwm/for-next (85f8879 pwm: dt: Fix description of second PWM cell)
4060 $ git merge pwm/for-next
4062 Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
4063 $ git merge dma-buf/for-next
4064 Auto-merging drivers/base/dma-buf.c
4065 Merge made by the 'recursive' strategy.
4066 drivers/base/dma-buf.c | 2 ++
4067 1 file changed, 2 insertions(+)
4068 Merging userns/for-next (e9069f4 btrfs: Fix compilation with user namespace support enabled)
4069 $ git merge userns/for-next
4071 Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
4072 $ git merge ktest/for-next
4074 Merging signal/for-next (8213538 Merge branches 'arch-frv', 'arch-powerpc', 'arch-s390' and 'no-rebases' into for-next)
4075 $ git merge signal/for-next
4076 Recorded preimage for 'arch/alpha/kernel/osf_sys.c'
4077 Auto-merging include/linux/sched.h
4078 Auto-merging arch/s390/kernel/entry64.S
4079 Auto-merging arch/s390/Kconfig
4080 Auto-merging arch/powerpc/include/asm/unistd.h
4081 Auto-merging arch/parisc/include/asm/unistd.h
4082 Auto-merging arch/mips/kernel/scall64-n32.S
4083 Auto-merging arch/mips/kernel/mips_ksyms.c
4084 Auto-merging arch/mips/Kconfig
4085 Auto-merging arch/m68k/include/asm/unistd.h
4086 Auto-merging arch/arm64/include/asm/processor.h
4087 Auto-merging arch/arm64/Kconfig
4088 Auto-merging arch/alpha/kernel/process.c
4089 Auto-merging arch/alpha/kernel/osf_sys.c
4090 CONFLICT (content): Merge conflict in arch/alpha/kernel/osf_sys.c
4091 Automatic merge failed; fix conflicts and then commit the result.
4093 Recorded resolution for 'arch/alpha/kernel/osf_sys.c'.
4094 [master 9ad55dd] Merge remote-tracking branch 'signal/for-next'
4095 $ git diff -M --stat --summary HEAD^..
4096 arch/alpha/kernel/entry.S | 21 +--
4097 arch/alpha/kernel/process.c | 16 +--
4098 arch/alpha/kernel/signal.c | 16 +--
4099 arch/arm64/Kconfig | 2 +
4100 arch/arm64/include/asm/processor.h | 5 -
4101 arch/arm64/include/asm/syscalls.h | 14 +-
4102 arch/arm64/include/asm/unistd.h | 1 +
4103 arch/arm64/include/asm/unistd32.h | 8 +-
4104 arch/arm64/kernel/entry.S | 17 +--
4105 arch/arm64/kernel/process.c | 83 +++++-------
4106 arch/arm64/kernel/sys.c | 76 +----------
4107 arch/arm64/kernel/sys32.S | 19 ---
4108 arch/arm64/kernel/sys_compat.c | 38 +-----
4109 arch/c6x/Kconfig | 1 +
4110 arch/c6x/include/uapi/asm/unistd.h | 1 -
4111 arch/c6x/kernel/entry.S | 12 +-
4112 arch/frv/Kconfig | 1 +
4113 arch/frv/include/asm/unistd.h | 1 -
4114 arch/frv/kernel/entry.S | 28 +---
4115 arch/ia64/Kconfig | 2 +
4116 arch/ia64/include/asm/processor.h | 16 ---
4117 arch/ia64/include/asm/unistd.h | 1 +
4118 arch/ia64/kernel/entry.S | 39 +++---
4119 arch/ia64/kernel/head.S | 13 --
4120 arch/ia64/kernel/process.c | 158 +++++++++-------------
4121 arch/m68k/Kconfig | 1 +
4122 arch/m68k/include/asm/unistd.h | 1 -
4123 arch/m68k/kernel/entry.S | 7 -
4124 arch/mips/Kconfig | 2 +
4125 arch/mips/include/asm/processor.h | 2 -
4126 arch/mips/include/asm/ptrace.h | 6 +
4127 arch/mips/include/asm/unistd.h | 1 +
4128 arch/mips/kernel/entry.S | 6 +
4129 arch/mips/kernel/linux32.c | 21 ---
4130 arch/mips/kernel/mips_ksyms.c | 2 -
4131 arch/mips/kernel/process.c | 62 ++++-----
4132 arch/mips/kernel/scall64-n32.S | 2 +-
4133 arch/mips/kernel/scall64-o32.S | 2 +-
4134 arch/mips/kernel/syscall.c | 53 --------
4135 arch/openrisc/Kconfig | 2 +
4136 arch/openrisc/include/uapi/asm/unistd.h | 2 +
4137 arch/openrisc/kernel/entry.S | 43 +++---
4138 arch/openrisc/kernel/process.c | 163 ++++++++---------------
4139 arch/parisc/Kconfig | 2 +
4140 arch/parisc/include/asm/unistd.h | 1 +
4141 arch/parisc/kernel/entry.S | 217 +++----------------------------
4142 arch/parisc/kernel/process.c | 96 +++-----------
4143 arch/parisc/kernel/sys_parisc32.c | 22 ----
4144 arch/parisc/kernel/syscall_table.S | 2 +-
4145 arch/powerpc/Kconfig | 1 +
4146 arch/powerpc/include/asm/unistd.h | 1 -
4147 arch/powerpc/kernel/entry_32.S | 5 -
4148 arch/powerpc/kernel/entry_64.S | 8 +-
4149 arch/powerpc/kernel/process.c | 41 ++----
4150 arch/s390/Kconfig | 1 +
4151 arch/s390/include/asm/unistd.h | 1 -
4152 arch/s390/kernel/entry.S | 32 +----
4153 arch/s390/kernel/entry64.S | 26 +---
4154 arch/sparc/Kconfig | 2 +
4155 arch/sparc/include/asm/processor_32.h | 1 -
4156 arch/sparc/include/asm/processor_64.h | 11 +-
4157 arch/sparc/include/asm/ptrace.h | 10 +-
4158 arch/sparc/include/asm/switch_to_64.h | 2 +-
4159 arch/sparc/include/asm/syscalls.h | 2 -
4160 arch/sparc/include/asm/thread_info_64.h | 25 ++--
4161 arch/sparc/include/asm/uaccess_64.h | 4 +-
4162 arch/sparc/include/asm/unistd.h | 1 +
4163 arch/sparc/kernel/entry.S | 51 ++++----
4164 arch/sparc/kernel/etrap_64.S | 8 +-
4165 arch/sparc/kernel/process_32.c | 152 +++++++---------------
4166 arch/sparc/kernel/process_64.c | 143 +++++---------------
4167 arch/sparc/kernel/sys_sparc32.c | 36 -----
4168 arch/sparc/kernel/sys_sparc_32.c | 24 ----
4169 arch/sparc/kernel/sys_sparc_64.c | 22 ----
4170 arch/sparc/kernel/syscalls.S | 30 ++---
4171 arch/sparc/kernel/systbls_64.S | 2 +-
4172 arch/sparc/kernel/traps_64.c | 4 +-
4173 arch/sparc/mm/init_64.c | 2 +-
4174 arch/tile/Kconfig | 2 +
4175 arch/tile/include/asm/compat.h | 6 -
4176 arch/tile/include/asm/elf.h | 1 +
4177 arch/tile/include/asm/processor.h | 4 +
4178 arch/tile/include/asm/switch_to.h | 5 +-
4179 arch/tile/include/asm/syscalls.h | 3 +-
4180 arch/tile/include/asm/unistd.h | 1 +
4181 arch/tile/kernel/compat.c | 1 -
4182 arch/tile/kernel/entry.S | 11 --
4183 arch/tile/kernel/intvec_32.S | 16 ++-
4184 arch/tile/kernel/intvec_64.S | 17 ++-
4185 arch/tile/kernel/process.c | 148 ++++++---------------
4186 arch/tile/kernel/sys.c | 1 -
4187 arch/um/kernel/process.c | 2 -
4188 arch/um/kernel/syscall.c | 8 +-
4189 drivers/staging/gdm72xx/gdm_usb.c | 4 +-
4191 fs/fs_struct.c | 24 ----
4192 include/linux/compat.h | 2 -
4193 include/linux/fdtable.h | 1 -
4194 include/linux/fs_struct.h | 1 -
4195 include/linux/sched.h | 1 -
4196 kernel/exit.c | 92 -------------
4197 101 files changed, 588 insertions(+), 1724 deletions(-)
4198 Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
4199 $ git merge clk/clk-next
4201 Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
4202 $ git merge random/dev
4204 Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
4205 $ git merge lzo-update/lzo-update
4206 Removing lib/lzo/lzo1x_decompress.c
4207 Auto-merging crypto/testmgr.h
4208 Merge made by the 'recursive' strategy.
4209 crypto/testmgr.h | 38 ++---
4210 include/linux/lzo.h | 15 +-
4211 lib/decompress_unlzo.c | 2 +-
4212 lib/lzo/Makefile | 2 +-
4213 lib/lzo/lzo1x_compress.c | 335 +++++++++++++++++++++++----------------
4214 lib/lzo/lzo1x_decompress.c | 255 -----------------------------
4215 lib/lzo/lzo1x_decompress_safe.c | 237 +++++++++++++++++++++++++++
4216 lib/lzo/lzodefs.h | 34 +++-
4217 8 files changed, 488 insertions(+), 430 deletions(-)
4218 delete mode 100644 lib/lzo/lzo1x_decompress.c
4219 create mode 100644 lib/lzo/lzo1x_decompress_safe.c
4220 Merging drop-experimental/linux-next (ac6ad7e net/xfrm: remove CONFIG_EXPERIMENTAL)
4221 $ git merge drop-experimental/linux-next
4222 Auto-merging net/mac80211/Kconfig
4223 Auto-merging init/Kconfig
4224 Auto-merging drivers/net/usb/Kconfig
4225 Auto-merging drivers/mmc/host/Kconfig
4226 Merge made by the 'recursive' strategy.
4227 drivers/media/Kconfig | 7 +++----
4228 drivers/media/pci/cx25821/Kconfig | 2 +-
4229 drivers/media/platform/s5p-fimc/Kconfig | 1 -
4230 drivers/media/platform/s5p-tv/Kconfig | 3 +--
4231 drivers/media/usb/pvrusb2/Kconfig | 8 +++----
4232 drivers/mmc/core/Kconfig | 3 +--
4233 drivers/mmc/host/Kconfig | 20 +++++++-----------
4234 drivers/net/Kconfig | 9 ++++----
4235 drivers/net/ethernet/8390/Kconfig | 21 ++++++++-----------
4236 drivers/net/ethernet/atheros/Kconfig | 8 +++----
4237 drivers/net/ethernet/dec/tulip/Kconfig | 4 ++--
4238 drivers/net/ethernet/i825xx/Kconfig | 12 +++++------
4239 drivers/net/ethernet/intel/Kconfig | 9 ++------
4240 drivers/net/ethernet/natsemi/Kconfig | 3 ---
4241 drivers/net/ethernet/packetengines/Kconfig | 4 ++--
4242 drivers/net/ethernet/realtek/Kconfig | 4 ++--
4243 drivers/net/ethernet/silan/Kconfig | 6 +++---
4244 drivers/net/ethernet/ti/Kconfig | 4 ++--
4245 drivers/net/team/Kconfig | 3 +--
4246 drivers/net/usb/Kconfig | 16 +++++++-------
4247 drivers/net/wan/Kconfig | 8 +++----
4248 fs/ecryptfs/Kconfig | 4 ++--
4249 init/Kconfig | 31 ++--------------------------
4250 net/9p/Kconfig | 2 +-
4251 net/Kconfig | 5 ++---
4252 net/ceph/Kconfig | 4 ++--
4253 net/dccp/Kconfig | 4 ++--
4254 net/dccp/ccids/Kconfig | 5 ++---
4255 net/decnet/Kconfig | 4 ++--
4256 net/decnet/netfilter/Kconfig | 2 +-
4257 net/dsa/Kconfig | 2 +-
4258 net/ieee802154/Kconfig | 3 +--
4259 net/ipv4/Kconfig | 11 +---------
4260 net/ipv4/netfilter/Kconfig | 4 ++--
4261 net/ipv6/Kconfig | 24 +++++++++------------
4262 net/l2tp/Kconfig | 4 ++--
4263 net/lapb/Kconfig | 3 +--
4264 net/mac80211/Kconfig | 2 +-
4265 net/mac802154/Kconfig | 2 +-
4266 net/netfilter/Kconfig | 24 +++++++--------------
4267 net/nfc/Kconfig | 4 ++--
4268 net/nfc/llcp/Kconfig | 4 ++--
4269 net/nfc/nci/Kconfig | 4 ++--
4270 net/rds/Kconfig | 4 ++--
4271 net/rxrpc/Kconfig | 2 +-
4272 net/sctp/Kconfig | 4 ++--
4273 net/sunrpc/Kconfig | 2 +-
4274 net/tipc/Kconfig | 4 ++--
4275 net/wanrouter/Kconfig | 1 -
4276 net/x25/Kconfig | 3 +--
4277 net/xfrm/Kconfig | 16 +++++++-------
4278 51 files changed, 132 insertions(+), 211 deletions(-)
4279 Merging scsi-post-merge/merge-base:master ()
4280 Merging akpm-current/current (417b23b revert "epoll: support for disabling items, and a self-test app")
4281 $ git merge akpm-current/current
4282 Removing tools/testing/selftests/epoll/test_epoll.c
4283 Removing tools/testing/selftests/epoll/Makefile
4284 Auto-merging mm/page_alloc.c
4285 Auto-merging drivers/dma/Kconfig
4286 Merge made by the 'recursive' strategy.
4287 drivers/dma/Kconfig | 11 +
4288 drivers/dma/dw_dmac_regs.h | 18 +-
4289 drivers/rtc/rtc-imxdi.c | 2 +
4290 drivers/video/backlight/Kconfig | 3 +-
4291 fs/compat_ioctl.c | 2 +
4292 fs/eventpoll.c | 38 +--
4293 include/linux/rbtree_augmented.h | 1 +
4294 include/uapi/linux/eventpoll.h | 1 -
4295 kernel/pid_namespace.c | 12 +-
4296 lib/genalloc.c | 2 +-
4297 mm/mmu_notifier.c | 26 +--
4298 mm/page_alloc.c | 4 +-
4300 security/device_cgroup.c | 87 ++++---
4301 tools/testing/selftests/Makefile | 2 +-
4302 tools/testing/selftests/epoll/Makefile | 11 -
4303 tools/testing/selftests/epoll/test_epoll.c | 344 ----------------------------
4304 tools/vm/page-types.c | 2 +-
4305 usr/gen_init_cpio.c | 43 ++--
4306 19 files changed, 162 insertions(+), 467 deletions(-)
4307 delete mode 100644 tools/testing/selftests/epoll/Makefile
4308 delete mode 100644 tools/testing/selftests/epoll/test_epoll.c
4309 $ git clone -s -l -n -q . ../rebase-tmp
4311 $ git fetch --no-tags ../next refs/heads/akpm/master:akpm
4313 * [new branch] akpm/master -> akpm
4314 $ git fetch --no-tags ../next refs/heads/akpm/base:akpm-base
4316 * [new branch] akpm/base -> akpm-base
4318 Switched to branch 'akpm'
4319 $ git rebase --onto master akpm-base
4320 First, rewinding head to replay your work on top of it...
4321 Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction only in direct reclaim
4322 Applying: proc: check vma->vm_file before dereferencing
4323 Applying: memstick: remove unused field from state struct
4324 Applying: memstick: ms_block: fix compile issue
4325 Applying: memstick: use after free in msb_disk_release()
4326 Applying: memstick: memory leak on error in msb_ftl_scan()
4327 Applying: CRIS: Fix I/O macros
4328 Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
4329 Applying: vfs: d_obtain_alias() needs to use "/" as default name.
4330 Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
4331 Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
4332 Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
4333 Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
4334 Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
4335 Applying: acpi_memhotplug.c: remove memory info from list before freeing it
4336 Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
4337 Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
4338 Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
4339 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
4340 Applying: x86 numa: don't check if node is NUMA_NO_NODE
4341 Applying: arch/x86/tools/insn_sanity.c: identify source of messages
4342 Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
4343 Applying: olpc: fix olpc-xo1-sci.c build errors
4344 Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
4345 Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
4346 Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
4347 Applying: timeconst.pl: remove deprecated defined(@array)
4348 Applying: time: don't inline EXPORT_SYMBOL functions
4349 Applying: fs/pstore/ram.c: fix up section annotations
4350 Applying: h8300: select generic atomic64_t support
4351 Applying: drivers/message/fusion/mptscsih.c: missing break
4352 Applying: cciss: cleanup bitops usage
4353 Applying: cciss: use check_signature()
4354 Applying: block: store partition_meta_info.uuid as a string
4355 Applying: init: reduce PARTUUID min length to 1 from 36
4356 Applying: block: partition: msdos: provide UUIDs for partitions
4357 Applying: drbd: use copy_highpage
4358 Applying: vfs: increment iversion when a file is truncated
4359 Applying: fs: change return values from -EACCES to -EPERM
4360 Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
4361 Applying: mm/page_alloc.c: remove duplicate check
4362 Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
4363 Applying: mm: show migration types in show_mem
4364 Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning
4365 Applying: memory hotplug: suppress "Device nodeX does not have a release() function" warning
4366 Applying: mm, memcg: make mem_cgroup_out_of_memory() static
4367 Applying: mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD
4368 Applying: mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD
4369 Applying: thp: clean up __collapse_huge_page_isolate
4370 Applying: thp-clean-up-__collapse_huge_page_isolate v2
4371 Applying: mm: introduce mm_find_pmd()
4372 Applying: thp: introduce hugepage_vma_check()
4373 Applying: thp: cleanup: introduce mk_huge_pmd()
4374 Applying: memory-hotplug: skip HWPoisoned page when offlining pages
4375 Applying: memory-hotplug: update mce_bad_pages when removing the memory
4376 Applying: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix
4377 Applying: memory-hotplug: auto offline page_cgroup when onlining memory block failed
4378 Applying: memory-hotplug: fix NR_FREE_PAGES mismatch
4379 Applying: memory-hotplug: allocate zone's pcp before onlining pages
4380 Applying: mm: make zone_pcp_reset independent of MEMORY_HOTREMOVE
4381 Applying: memory-hotplug: build zonelist if a zone is populated after onlining pages
4382 Applying: memory_hotplug: fix possible incorrect node_states[N_NORMAL_MEMORY]
4383 Applying: slub, hotplug: ignore unrelated node's hot-adding and hot-removing
4384 Applying: slab: ignore internal flags in cache creation
4385 Using index info to reconstruct a base tree...
4390 Falling back to patching base and 3-way merge...
4391 Auto-merging mm/slub.c
4392 Auto-merging mm/slab_common.c
4393 Auto-merging mm/slab.h
4394 Auto-merging mm/slab.c
4395 Applying: drop_caches: add some documentation and info messsge
4396 Applying: drop_caches-add-some-documentation-and-info-messsge-checkpatch-fixes
4397 Applying: swap: add a simple detector for inappropriate swapin readahead
4398 Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
4399 Applying: mm/memblock: reduce overhead in binary search
4400 Applying: scripts/pnmtologo: fix for plain PBM
4401 Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
4402 Applying: include/linux/init.h: use the stringify operator for the __define_initcall macro
4403 Applying: scripts/tags.sh: add magic for declarations of popular kernel type
4404 Applying: backlight: da903x_bl: use dev_get_drvdata() instead of platform_get_drvdata()
4405 Applying: backlight: 88pm860x_bl: fix checkpatch warning
4406 Applying: backlight: atmel-pwm-bl: fix checkpatch warning
4407 Applying: backlight: corgi_lcd: fix checkpatch error and warning
4408 Applying: backlight: da903x_bl: fix checkpatch warning
4409 Applying: backlight: generic_bl: fix checkpatch warning
4410 Applying: backlight: hp680_bl: fix checkpatch error and warning
4411 Applying: backlight: ili9320: fix checkpatch error and warning
4412 Applying: backlight: jornada720: fix checkpatch error and warning
4413 Applying: backlight: l4f00242t03: fix checkpatch warning
4414 Applying: backlight: lm3630: fix checkpatch warning
4415 Applying: backlight: locomolcd: fix checkpatch error and warning
4416 Applying: backlight: omap1: fix checkpatch warning
4417 Applying: backlight: pcf50633: fix checkpatch warning
4418 Applying: backlight: platform_lcd: fix checkpatch error
4419 Applying: backlight: tdo24m: fix checkpatch warning
4420 Applying: backlight: tosa: fix checkpatch error and warning
4421 Applying: backlight: vgg2432a4: fix checkpatch warning
4422 Applying: backlight: lms283gf05: use devm_gpio_request_one
4423 Applying: backlight: tosa: use devm_gpio_request_one
4424 Applying: drivers/video/backlight/lp855x_bl.c: use generic PWM functions
4425 Applying: drivers-video-backlight-lp855x_blc-use-generic-pwm-functions-fix
4426 Applying: drivers/video/backlight/lp855x_bl.c: remove unnecessary mutex code
4427 Applying: drivers/video/backlight/da9052_bl.c: add missing const
4428 Applying: drivers/video/backlight/lms283gf05.c: add missing const
4429 Applying: drivers/video/backlight/tdo24m.c: add missing const
4430 Applying: drivers/video/backlight/vgg2432a4.c: add missing const
4431 Applying: drivers/video/backlight/s6e63m0.c: remove unnecessary cast of void pointer
4432 Applying: string: introduce helper to get base file name from given path
4433 Applying: lib: dynamic_debug: use kbasename()
4434 Applying: staging: rts_pstor: use kbasename()
4435 Applying: mm: use kbasename()
4436 Applying: procfs: use kbasename()
4437 Applying: trace: use kbasename()
4438 Applying: compat: generic compat_sys_sched_rr_get_interval() implementation
4439 Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
4440 Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
4441 Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
4442 Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
4443 Applying: checkpatch: improve network block comment style checking
4444 Applying: binfmt_elf: fix corner case kfree of uninitialized data
4445 Applying: binfmt_elf-fix-corner-case-kfree-of-uninitialized-data-checkpatch-fixes
4446 Applying: rtc: omap: kicker mechanism support
4447 Applying: ARM: davinci: remove rtc kicker release
4448 Applying: rtc: omap: dt support
4449 Applying: rtc: omap: depend on am33xx
4450 Applying: rtc: omap: add runtime pm support
4451 Applying: drivers/rtc/rtc-imxdi: support for i.MX53
4452 Applying: drivers/rtc/rtc-imxdi.c: add devicetree support
4453 Applying: ARM: mach-imx: support for DryIce RTC in i.MX53
4454 Applying: hfsplus: add on-disk layout declarations related to attributes tree
4455 Applying: hfsplus: add functionality of manipulating by records in attributes tree
4456 Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
4457 Applying: hfsplus: add support of manipulation by attributes file
4458 Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
4459 Applying: hfsplus: code style fixes - reworked support of extended attributes
4460 Applying: fat: modify nfs mount option
4461 Applying: fat (exportfs): rebuild inode if ilookup() fails
4462 Applying: fat-exportfs-rebuild-inode-if-ilookup-fails-fix
4463 Applying: fat (exportfs): rebuild directory-inode if fat_dget() fails
4464 Applying: Documentation: update nfs option in filesystem/vfat.txt
4465 Applying: kstrto*: add documentation
4466 Applying: simple_strto*: annotate function as obsolete
4467 Applying: proc: don't show nonexistent capabilities
4468 Applying: procfs: add VmFlags field in smaps output
4469 Applying: procfs-add-vmflags-field-in-smaps-output-v4-fix
4470 Applying: ipc: remove forced assignment of selected message
4471 Applying: ipc: add sysctl to specify desired next object id
4472 Applying: ipc-add-sysctl-to-specify-desired-next-object-id-checkpatch-fixes
4473 Applying: ipc: message queue receive cleanup
4474 Applying: ipc-message-queue-receive-cleanup-checkpatch-fixes
4475 Applying: ipc: message queue copy feature introduced
4476 Applying: selftests: IPC message queue copy feature test
4477 Applying: selftests-ipc-message-queue-copy-feature-test-checkpatch-fixes
4478 Applying: ipc/sem.c: alternatives to preempt_disable()
4479 Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held
4480 Applying: Documentation/sparse.txt: document context annotations for lock checking
4481 Applying: aoe: describe the behavior of the "err" character device
4482 Applying: aoe: print warning regarding a common reason for dropped transmits
4483 Applying: aoe-print-warning-regarding-a-common-reason-for-dropped-transmits-v2
4484 Applying: aoe: avoid using skb member after dev_queue_xmit
4485 Applying: aoe: update cap on outstanding commands based on config query response
4486 Applying: aoe: support the forgetting (flushing) of a user-specified AoE target
4487 Applying: aoe: support larger I/O requests via aoe_maxsectors module param
4488 Applying: aoe: "payload" sysfs file exports per-AoE-command data transfer size
4489 Applying: aoe: cleanup: remove unused ata_scnt function
4490 Applying: aoe: whitespace cleanup
4491 Applying: aoe: update driver-internal version number to 60
4492 Applying: random: make it possible to enable debugging without rebuild
4493 Applying: random-make-it-possible-to-enable-debugging-without-rebuild-fix
4494 Applying: documentation-dma-api-howtotxt-add-dma-mapping-error-check-usage-examples-fix
4495 Applying: include/linux/kfifo.h: replace open-coded type check code with typecheck()
4496 Applying: tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
4498 $ git fetch -f ../rebase-tmp akpm:akpm/master
4500 + 284ba17...2e275f8 akpm -> akpm/master (forced update)
4501 $ rm -rf ../rebase-tmp
4502 Merging akpm/master (2e275f8 tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test)
4503 $ git merge --no-ff akpm/master
4504 Merge made by the 'recursive' strategy.
4505 Documentation/DMA-API-HOWTO.txt | 2 +-
4506 Documentation/DocBook/kernel-api.tmpl | 3 +
4507 Documentation/backlight/lp855x-driver.txt | 10 +-
4508 .../devicetree/bindings/rtc/imxdi-rtc.txt | 17 +
4509 Documentation/devicetree/bindings/rtc/rtc-omap.txt | 17 +
4510 Documentation/filesystems/proc.txt | 40 +-
4511 Documentation/filesystems/vfat.txt | 23 +-
4512 Documentation/memory-hotplug.txt | 5 +-
4513 Documentation/sparse.txt | 18 +
4514 Documentation/sysctl/vm.txt | 33 +-
4515 arch/arm/mach-davinci/devices-da8xx.c | 13 +-
4516 arch/arm/mach-imx/clk-imx51-imx53.c | 1 +
4517 arch/arm64/include/asm/unistd.h | 1 +
4518 arch/arm64/kernel/sys_compat.c | 15 -
4519 arch/cris/include/asm/io.h | 39 +-
4520 arch/h8300/Kconfig | 1 +
4521 arch/powerpc/include/asm/machdep.h | 36 +-
4522 arch/powerpc/include/asm/systbl.h | 2 +-
4523 arch/powerpc/include/asm/unistd.h | 1 +
4524 arch/powerpc/kernel/sys_ppc32.c | 17 +-
4525 arch/sparc/include/asm/unistd.h | 1 +
4526 arch/sparc/kernel/sys_sparc32.c | 14 -
4527 arch/tile/include/asm/compat.h | 2 -
4528 arch/tile/include/asm/unistd.h | 1 +
4529 arch/tile/kernel/compat.c | 18 -
4530 arch/x86/Kconfig | 1 +
4531 arch/x86/include/asm/uv/uv.h | 2 +-
4532 arch/x86/kernel/acpi/boot.c | 7 +-
4533 arch/x86/mm/numa.c | 3 +-
4534 arch/x86/platform/iris/iris.c | 67 ++-
4535 arch/x86/platform/uv/tlb_uv.c | 10 +-
4536 arch/x86/tools/insn_sanity.c | 10 +-
4537 block/genhd.c | 8 +-
4538 block/partitions/efi.c | 7 +-
4539 block/partitions/msdos.c | 21 +-
4540 drivers/acpi/acpi_memhotplug.c | 123 +++--
4541 drivers/base/memory.c | 9 +-
4542 drivers/base/node.c | 11 +
4543 drivers/block/aoe/aoe.h | 10 +-
4544 drivers/block/aoe/aoeblk.c | 19 +
4545 drivers/block/aoe/aoechr.c | 7 +-
4546 drivers/block/aoe/aoecmd.c | 22 +-
4547 drivers/block/aoe/aoedev.c | 44 +-
4548 drivers/block/aoe/aoemain.c | 2 +-
4549 drivers/block/aoe/aoenet.c | 13 +-
4550 drivers/block/cciss.c | 21 +-
4551 drivers/block/drbd/drbd_bitmap.c | 7 +-
4552 drivers/char/random.c | 14 +-
4553 drivers/firmware/dmi_scan.c | 78 ++-
4554 drivers/gpu/drm/i915/intel_pm.c | 3 +-
4555 drivers/memstick/core/ms_block.c | 8 +-
4556 drivers/memstick/core/ms_block.h | 5 +-
4557 drivers/message/fusion/mptscsih.c | 1 +
4558 drivers/pcmcia/cs.c | 37 +-
4559 drivers/rtc/Kconfig | 12 +-
4560 drivers/rtc/rtc-imxdi.c | 11 +
4561 drivers/rtc/rtc-omap.c | 80 ++-
4562 drivers/staging/rts_pstor/trace.h | 24 +-
4563 drivers/video/backlight/88pm860x_bl.c | 4 +-
4564 drivers/video/backlight/atmel-pwm-bl.c | 7 +-
4565 drivers/video/backlight/corgi_lcd.c | 16 +-
4566 drivers/video/backlight/da903x_bl.c | 15 +-
4567 drivers/video/backlight/da9052_bl.c | 2 +-
4568 drivers/video/backlight/generic_bl.c | 4 +-
4569 drivers/video/backlight/hp680_bl.c | 4 +-
4570 drivers/video/backlight/ili9320.c | 14 +-
4571 drivers/video/backlight/ili9320.h | 2 +-
4572 drivers/video/backlight/jornada720_bl.c | 34 +-
4573 drivers/video/backlight/jornada720_lcd.c | 3 +-
4574 drivers/video/backlight/l4f00242t03.c | 3 +-
4575 drivers/video/backlight/lm3630_bl.c | 2 +-
4576 drivers/video/backlight/lms283gf05.c | 16 +-
4577 drivers/video/backlight/locomolcd.c | 65 ++-
4578 drivers/video/backlight/lp855x_bl.c | 51 +-
4579 drivers/video/backlight/omap1_bl.c | 4 +-
4580 drivers/video/backlight/pcf50633-backlight.c | 8 +-
4581 drivers/video/backlight/platform_lcd.c | 2 +-
4582 drivers/video/backlight/s6e63m0.c | 2 +-
4583 drivers/video/backlight/tdo24m.c | 33 +-
4584 drivers/video/backlight/tosa_bl.c | 10 +-
4585 drivers/video/backlight/tosa_lcd.c | 24 +-
4586 drivers/video/backlight/vgg2432a4.c | 10 +-
4588 fs/autofs4/root.c | 2 +-
4589 fs/binfmt_elf.c | 4 +-
4590 fs/block_dev.c | 9 +-
4591 fs/btrfs/disk-io.c | 8 +-
4592 fs/btrfs/file.c | 3 +-
4593 fs/btrfs/ioctl.c | 2 +-
4595 fs/debugfs/inode.c | 1 -
4596 fs/dlm/config.c | 2 +-
4597 fs/drop_caches.c | 2 +
4598 fs/fat/fat.h | 17 +-
4600 fs/fat/inode.c | 36 +-
4601 fs/fat/nfs.c | 233 ++++++++-
4602 fs/gfs2/sys.c | 18 +-
4603 fs/hfsplus/Makefile | 3 +-
4604 fs/hfsplus/attributes.c | 399 ++++++++++++++
4605 fs/hfsplus/bfind.c | 79 ++-
4606 fs/hfsplus/bnode.c | 6 +-
4607 fs/hfsplus/brec.c | 23 +-
4608 fs/hfsplus/btree.c | 8 +
4609 fs/hfsplus/catalog.c | 36 +-
4610 fs/hfsplus/dir.c | 6 +-
4611 fs/hfsplus/extents.c | 4 +-
4612 fs/hfsplus/hfsplus_fs.h | 41 +-
4613 fs/hfsplus/hfsplus_raw.h | 68 ++-
4614 fs/hfsplus/inode.c | 13 +
4615 fs/hfsplus/ioctl.c | 542 +++++++++++++++++---
4616 fs/hfsplus/super.c | 33 +-
4617 fs/hfsplus/unicode.c | 7 +-
4618 fs/ncpfs/ioctl.c | 2 +-
4619 fs/ocfs2/file.c | 5 +-
4620 fs/proc/array.c | 9 +
4621 fs/proc/base.c | 11 +-
4622 fs/proc/proc_devtree.c | 7 +-
4623 fs/proc/task_mmu.c | 53 ++
4624 fs/pstore/ram.c | 12 +-
4626 fs/udf/file.c | 2 +-
4627 include/linux/compat.h | 3 +
4628 include/linux/compiler.h | 2 +
4629 include/linux/genhd.h | 8 +-
4630 include/linux/gfp.h | 2 +-
4631 include/linux/init.h | 40 +-
4632 include/linux/ipc_namespace.h | 1 +
4633 include/linux/kernel.h | 47 +-
4634 include/linux/kfifo.h | 22 +-
4635 include/linux/memory.h | 1 +
4636 include/linux/msg.h | 5 +-
4637 include/linux/oom.h | 2 -
4638 include/linux/page-isolation.h | 10 +-
4639 include/linux/platform_data/lp855x.h | 9 +-
4640 include/linux/rmap.h | 3 +
4641 include/linux/string.h | 11 +
4642 include/linux/writeback.h | 9 +-
4643 include/uapi/linux/msg.h | 1 +
4644 init/do_mounts.c | 61 ++-
4645 ipc/compat.c | 45 +-
4646 ipc/ipc_sysctl.c | 28 +
4648 ipc/msgutil.c | 38 ++
4649 ipc/sem.c | 250 ++++++---
4652 kernel/compat.c | 17 +
4653 kernel/time.c | 4 +-
4654 kernel/timeconst.pl | 2 +-
4655 kernel/trace/trace_uprobe.c | 8 +-
4656 lib/dynamic_debug.c | 9 +-
4657 lib/kstrtox.c | 64 +++
4658 lib/vsprintf.c | 8 +
4659 mm/huge_memory.c | 152 ++----
4660 mm/internal.h | 53 ++
4663 mm/memcontrol.c | 4 +-
4664 mm/memory-failure.c | 2 +-
4666 mm/memory_hotplug.c | 149 +++++-
4667 mm/migrate.c | 14 +-
4668 mm/page-writeback.c | 11 +-
4669 mm/page_alloc.c | 102 +++-
4670 mm/page_cgroup.c | 3 +
4671 mm/page_isolation.c | 27 +-
4676 mm/slab_common.c | 7 +
4679 mm/swap_state.c | 6 +
4682 scripts/checkpatch.pl | 6 +-
4683 scripts/pnmtologo.c | 9 +
4684 scripts/tags.sh | 41 +-
4685 security/selinux/netnode.c | 3 +-
4686 tools/testing/selftests/ipc/Makefile | 25 +
4687 tools/testing/selftests/ipc/msgque.c | 231 +++++++++
4688 tools/testing/selftests/kcmp/kcmp_test.c | 6 +-
4689 184 files changed, 3770 insertions(+), 1170 deletions(-)
4690 create mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.txt
4691 create mode 100644 Documentation/devicetree/bindings/rtc/rtc-omap.txt
4692 create mode 100644 fs/hfsplus/attributes.c
4693 create mode 100644 tools/testing/selftests/ipc/Makefile
4694 create mode 100644 tools/testing/selftests/ipc/msgque.c
projects / karo-tx-linux.git / blob