2 Wednesday 17 July 09:43:22 EST 2013
5 $ git reset --hard stable
6 HEAD is now at 47188d3 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
7 Merging origin/master (16fc5bc smp: blackfin: fix check error, using atomic_ops to handle atomic_t type)
8 $ git merge --no-ff origin/master
9 Merge made by the 'recursive' strategy.
10 arch/blackfin/mach-common/smp.c | 6 +++---
11 drivers/base/regmap/regmap.c | 2 +-
12 drivers/spi/spi-altera.c | 12 ++++++++++++
13 drivers/spi/spi-nuc900.c | 13 +++++++++++++
14 drivers/spi/spi-s3c64xx.c | 3 +++
15 drivers/spi/spi-xilinx.c | 16 ++++++++++++++++
16 6 files changed, 48 insertions(+), 4 deletions(-)
17 Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n)
18 $ git merge --no-ff fixes/master
20 Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes)
21 $ git merge --no-ff kbuild-current/rc-fixes
23 Merging arc-current/for-curr (ad81f05 Linux 3.11-rc1)
24 $ git merge --no-ff arc-current/for-curr
26 Merging arm-current/fixes (cbbe6f8 ARM: 7778/1: smp_twd: twd_update_frequency need be run on all online CPUs)
27 $ git merge --no-ff arm-current/fixes
29 Merging m68k-current/for-linus (ad81f05 Linux 3.11-rc1)
30 $ git merge --no-ff m68k-current/for-linus
32 Merging metag-fixes/fixes (d903bca metag: checksum.h: fix carry in csum_tcpudp_nofold)
33 $ git merge --no-ff metag-fixes/fixes
35 Merging powerpc-merge/merge (ea461ab powerpc/eeh: Fix fetching bus for single-dev-PE)
36 $ git merge --no-ff powerpc-merge/merge
38 Merging sparc/master (6d128e1 Revert "Makefile: Fix install error with make -j option")
39 $ git merge --no-ff sparc/master
41 Merging net/master (52fe29e be2net: Fix to avoid hardware workaround when not needed)
42 $ git merge --no-ff net/master
43 Merge made by the 'recursive' strategy.
44 drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 24 +++++++++++++++++-
45 drivers/net/ethernet/broadcom/Kconfig | 1 +
46 drivers/net/ethernet/emulex/benet/be_main.c | 14 +++++++---
47 drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 2 +-
48 drivers/net/macvtap.c | 3 ++-
49 net/core/ethtool.c | 30 ++++++++++++++--------
50 net/ipv4/ip_input.c | 7 +++--
51 net/ipv6/ndisc.c | 6 ++---
52 net/irda/irlan/irlan_eth.c | 31 ++++++++++-------------
53 9 files changed, 77 insertions(+), 41 deletions(-)
54 Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling)
55 $ git merge --no-ff ipsec/master
57 Merging sound-current/for-linus (d52392b ALSA: hda - Add new GPU codec ID to snd-hda)
58 $ git merge --no-ff sound-current/for-linus
59 Merge made by the 'recursive' strategy.
60 drivers/media/pci/saa7134/saa7134-alsa.c | 2 ++
61 drivers/staging/line6/pcm.c | 5 +++-
62 sound/arm/pxa2xx-pcm-lib.c | 2 ++
63 sound/oss/vwsnd.c | 4 +++-
64 sound/pci/asihpi/asihpi.c | 3 +++
65 sound/pci/atiixp.c | 2 ++
66 sound/pci/atiixp_modem.c | 2 ++
67 sound/pci/hda/patch_hdmi.c | 2 ++
68 sound/soc/atmel/atmel-pcm-dma.c | 2 ++
69 sound/soc/codecs/sgtl5000.c | 2 +-
70 sound/soc/codecs/sgtl5000.h | 2 +-
71 sound/soc/codecs/wm8978.c | 1 +
72 sound/soc/codecs/wm8994.c | 4 ----
73 sound/soc/omap/mcbsp.c | 39 ++++++++++++++++++--------------
74 sound/soc/omap/omap-dmic.c | 11 +--------
75 sound/soc/omap/omap-mcpdm.c | 16 ++-----------
76 sound/soc/omap/omap-pcm.c | 17 +++++++++++---
77 sound/soc/s6000/s6000-pcm.c | 2 ++
78 sound/soc/samsung/i2s.c | 8 +++----
79 sound/usb/6fire/pcm.c | 12 ++++++++--
80 sound/usb/misc/ua101.c | 14 ++++++++++--
81 sound/usb/usx2y/usbusx2yaudio.c | 4 ++++
82 22 files changed, 96 insertions(+), 60 deletions(-)
83 Merging pci-current/for-linus (65694c5 x86/PCI: Map PCI setup data with ioremap() so it can be in highmem)
84 $ git merge --no-ff pci-current/for-linus
86 Merging wireless/master (53e5946 ath9k_htc: fix data race between request_firmware_nowait() callback and suspend())
87 $ git merge --no-ff wireless/master
88 Merge made by the 'recursive' strategy.
89 drivers/net/wireless/ath/ath9k/hif_usb.c | 9 ++++---
90 drivers/net/wireless/ath/ath9k/xmit.c | 44 ++++++++++++++++++++------------
91 drivers/net/wireless/rtlwifi/pci.c | 13 ----------
92 drivers/net/wireless/rtlwifi/ps.c | 12 +++++++++
93 drivers/net/wireless/rtlwifi/ps.h | 1 +
94 drivers/net/wireless/rtlwifi/usb.c | 2 ++
95 6 files changed, 49 insertions(+), 32 deletions(-)
96 Merging driver-core.current/driver-core-linus (aa01aa3 sysfs: use file mode defines from stat.h)
97 $ git merge --no-ff driver-core.current/driver-core-linus
98 Merge made by the 'recursive' strategy.
99 drivers/base/core.c | 120 +++++++++++++++++++++++++++++++++++++------------
100 fs/sysfs/group.c | 70 ++++++++++++++++++++---------
101 include/linux/device.h | 37 +++++++++++----
102 include/linux/sysfs.h | 64 ++++++++++++++++++++++----
103 kernel/events/core.c | 2 -
104 mm/backing-dev.c | 2 -
105 6 files changed, 223 insertions(+), 72 deletions(-)
106 Merging tty.current/tty-linus (ad81f05 Linux 3.11-rc1)
107 $ git merge --no-ff tty.current/tty-linus
109 Merging usb.current/usb-linus (e583d9d USB: global suspend and remote wakeup don't mix)
110 $ git merge --no-ff usb.current/usb-linus
111 Merge made by the 'recursive' strategy.
112 drivers/usb/core/hub.c | 39 +++++++++++++++++++++++++++-------
113 drivers/usb/core/hub.h | 3 +++
114 drivers/usb/dwc3/Kconfig | 2 +-
115 drivers/usb/dwc3/core.c | 2 +-
116 drivers/usb/dwc3/core.h | 4 ++--
117 drivers/usb/dwc3/gadget.c | 1 +
118 drivers/usb/gadget/Kconfig | 5 ++++-
119 drivers/usb/gadget/at91_udc.c | 16 ++++++++------
120 drivers/usb/gadget/fotg210-udc.c | 4 ++--
121 drivers/usb/gadget/mv_u3d_core.c | 4 ++--
122 drivers/usb/gadget/udc-core.c | 6 ++++++
123 drivers/usb/phy/phy-omap-usb3.c | 2 +-
124 drivers/usb/phy/phy-samsung-usb2.c | 2 +-
125 drivers/usb/renesas_usbhs/mod_gadget.c | 4 ----
126 include/linux/usb.h | 11 ----------
127 include/uapi/linux/usb/ch11.h | 11 ++++++++++
128 16 files changed, 75 insertions(+), 41 deletions(-)
129 Merging staging.current/staging-linus (ad81f05 Linux 3.11-rc1)
130 $ git merge --no-ff staging.current/staging-linus
132 Merging char-misc.current/char-misc-linus (ad81f05 Linux 3.11-rc1)
133 $ git merge --no-ff char-misc.current/char-misc-linus
135 Merging input-current/for-linus (88ce3c3 Merge branch 'next' into for-linus)
136 $ git merge --no-ff input-current/for-linus
138 Merging md-current/for-linus (1376512 md/raid10: fix bug which causes all RAID10 reshapes to move no data.)
139 $ git merge --no-ff md-current/for-linus
141 Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
142 $ git merge --no-ff audit-current/for-linus
144 Merging crypto-current/master (9c23b7d crypto: caam - Fixed the memory out of bound overwrite issue)
145 $ git merge --no-ff crypto-current/master
146 Merge made by the 'recursive' strategy.
147 drivers/crypto/caam/caamhash.c | 2 +-
148 1 file changed, 1 insertion(+), 1 deletion(-)
149 Merging ide/master (6d128e1 Revert "Makefile: Fix install error with make -j option")
150 $ git merge --no-ff ide/master
152 Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff)
153 $ git merge --no-ff dwmw2/master
155 Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
156 $ git merge --no-ff sh-current/sh-fixes-for-linus
158 Merging irqdomain-current/irqdomain/merge (d94ea3f irqchip: Return -EPERM for reserved IRQs)
159 $ git merge --no-ff irqdomain-current/irqdomain/merge
161 Merging devicetree-current/devicetree/merge (706b78f dtc: ensure #line directives don't consume data from the next line)
162 $ git merge --no-ff devicetree-current/devicetree/merge
164 Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error)
165 $ git merge --no-ff spi-current/spi/merge
167 Merging gpio-current/gpio/merge (397eada gpio/omap: don't use linear domain mapping for OMAP1)
168 $ git merge --no-ff gpio-current/gpio/merge
170 Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header)
171 $ git merge --no-ff rr-fixes/fixes
173 Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata)
174 $ git merge --no-ff mfd-fixes/master
176 Merging vfio-fixes/for-linus (7d13205 Linux 3.10-rc6)
177 $ git merge --no-ff vfio-fixes/for-linus
179 Merging drm-intel-fixes/drm-intel-fixes (bcf53de drm/i915: Preserve the DDI_A_4_LANES bit from the bios)
180 $ git merge --no-ff drm-intel-fixes/drm-intel-fixes
181 Auto-merging drivers/gpu/drm/i915/intel_lvds.c
182 Auto-merging drivers/gpu/drm/i915/i915_gem.c
183 Merge made by the 'recursive' strategy.
184 drivers/gpu/drm/i915/i915_drv.c | 4 +-
185 drivers/gpu/drm/i915/i915_gem.c | 83 +++++++++++++--------------------
186 drivers/gpu/drm/i915/intel_ddi.c | 10 ++--
187 drivers/gpu/drm/i915/intel_display.c | 11 ++---
188 drivers/gpu/drm/i915/intel_dp.c | 5 ++
189 drivers/gpu/drm/i915/intel_drv.h | 2 +-
190 drivers/gpu/drm/i915/intel_lvds.c | 12 +++--
191 drivers/gpu/drm/i915/intel_panel.c | 3 ++
192 drivers/gpu/drm/i915/intel_pm.c | 31 +++++++++++-
193 drivers/gpu/drm/i915/intel_ringbuffer.c | 38 +++++++++------
194 10 files changed, 115 insertions(+), 84 deletions(-)
195 Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
196 $ git merge --no-ff asm-generic/master
198 Merging arc/for-next (ad81f05 Linux 3.11-rc1)
199 $ git merge --no-ff arc/for-next
201 Merging arm/for-next (dd44230 Merge branch 'fixes' into for-next)
202 $ git merge --no-ff arm/for-next
204 Merge made by the 'recursive' strategy.
205 Merging arm-perf/for-next/perf (ad81f05 Linux 3.11-rc1)
206 $ git merge --no-ff arm-perf/for-next/perf
208 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
209 $ git merge --no-ff davinci/davinci-next
211 Merging xilinx/arm-next (b028161 Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
212 $ git merge --no-ff xilinx/arm-next
214 Merging arm64/upstream (97bf0cf arm64: Use reboot_mode and new pm_restart prototype)
215 $ git merge --no-ff arm64/upstream
216 Merge made by the 'recursive' strategy.
217 arch/arm64/include/asm/system_misc.h | 3 ++-
218 arch/arm64/kernel/process.c | 5 +++--
219 2 files changed, 5 insertions(+), 3 deletions(-)
220 Merging blackfin/for-linus (eb043d3 smp: blackfin: fix check error, using atomic_ops to handle atomic_t type)
221 $ git merge --no-ff blackfin/for-linus
222 Merge made by the 'recursive' strategy.
223 Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore)
224 $ git merge --no-ff c6x/for-linux-next
226 Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file)
227 $ git merge --no-ff cris/for-next
228 Resolved 'arch/cris/arch-v32/drivers/Kconfig' using previous resolution.
229 Auto-merging arch/cris/include/asm/processor.h
230 Auto-merging arch/cris/arch-v32/drivers/Kconfig
231 CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig
232 Auto-merging arch/cris/arch-v10/drivers/Kconfig
233 Auto-merging arch/cris/Kconfig
234 Automatic merge failed; fix conflicts and then commit the result.
236 [master 4f7b9c5] Merge remote-tracking branch 'cris/for-next'
237 $ git diff -M --stat --summary HEAD^..
238 arch/cris/Kconfig | 81 -------
239 arch/cris/arch-v10/drivers/Kconfig | 70 ------
240 arch/cris/arch-v10/drivers/Makefile | 2 -
241 arch/cris/arch-v32/drivers/Kconfig | 394 ----------------------------------
242 arch/cris/arch-v32/mach-a3/Kconfig | 4 -
243 arch/cris/include/asm/processor.h | 1 -
244 arch/cris/include/uapi/asm/kvm_para.h | 1 +
245 7 files changed, 1 insertion(+), 552 deletions(-)
246 create mode 100644 arch/cris/include/uapi/asm/kvm_para.h
247 Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
248 $ git merge --no-ff hexagon/linux-next
250 Merging ia64/next (9c510f7 [IA64] dmi.h: Make dmi_alloc use kzalloc)
251 $ git merge --no-ff ia64/next
252 Merge made by the 'recursive' strategy.
253 arch/ia64/configs/generic_defconfig | 2 +-
254 arch/ia64/configs/gensparse_defconfig | 2 +-
255 arch/ia64/configs/tiger_defconfig | 2 +-
256 arch/ia64/configs/xen_domu_defconfig | 2 +-
257 arch/ia64/include/asm/dmi.h | 2 +-
258 5 files changed, 5 insertions(+), 5 deletions(-)
259 Merging m68k/for-next (ad81f05 Linux 3.11-rc1)
260 $ git merge --no-ff m68k/for-next
262 Merging m68knommu/for-next (1a2ac3e m68knommu: Mark functions only called from setup_arch() __init)
263 $ git merge --no-ff m68knommu/for-next
264 Merge made by the 'recursive' strategy.
265 arch/m68k/kernel/setup_no.c | 2 +-
266 arch/m68k/platform/68000/m68328.c | 3 ++-
267 arch/m68k/platform/68000/m68EZ328.c | 3 ++-
268 arch/m68k/platform/68000/m68VZ328.c | 9 +++++----
269 arch/m68k/platform/68360/commproc.c | 3 ++-
270 arch/m68k/platform/68360/config.c | 3 ++-
271 6 files changed, 14 insertions(+), 9 deletions(-)
272 Merging metag/for-next (c20eb0f metag: move EXPORT_SYMBOL(csum_partial) to metag_ksyms.c)
273 $ git merge --no-ff metag/for-next
275 Merging microblaze/next (9903883 Merge tag 'dm-3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm)
276 $ git merge --no-ff microblaze/next
278 Merging mips/mips-for-linux-next (075a8d5 Merge branch '3.10-fixes' into mips-for-linux-next)
279 $ git merge --no-ff mips/mips-for-linux-next
280 Merge made by the 'recursive' strategy.
281 Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS)
282 $ git merge --no-ff openrisc/for-upstream
284 Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
285 $ git merge --no-ff parisc/for-next
287 Merging parisc-hd/for-next (3b02818 parisc: agp/parisc-agp: allow binding of user memory to the AGP GART)
288 $ git merge --no-ff parisc-hd/for-next
289 Merge made by the 'recursive' strategy.
290 drivers/char/agp/parisc-agp.c | 6 ++++--
291 1 file changed, 4 insertions(+), 2 deletions(-)
292 Merging powerpc/next (1d8b368 pstore: Add hsize argument in write_buf call of pstore_ftrace_call)
293 $ git merge --no-ff powerpc/next
295 Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
296 $ git merge --no-ff 4xx/next
298 Merging mpc5xxx/next (dd0120d powerpc/mpc512x: enable USB support in defconfig)
299 $ git merge --no-ff mpc5xxx/next
301 Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
302 $ git merge --no-ff galak/next
304 Merging s390/features (dae7fd4 s390/qdio: remove unused variable)
305 $ git merge --no-ff s390/features
306 Merge made by the 'recursive' strategy.
307 arch/s390/include/asm/processor.h | 10 +++++++-
308 arch/s390/include/asm/switch_to.h | 4 +--
309 arch/s390/include/uapi/asm/ptrace.h | 1 +
310 arch/s390/kernel/ptrace.c | 50 +++++++++++++++++++++++++++++--------
311 drivers/s390/cio/qdio_main.c | 4 +--
312 5 files changed, 53 insertions(+), 16 deletions(-)
313 Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
314 $ git merge --no-ff sh/sh-latest
315 Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution.
316 Resolved 'include/linux/serial_sci.h' using previous resolution.
317 Auto-merging include/linux/serial_sci.h
318 CONFLICT (content): Merge conflict in include/linux/serial_sci.h
319 Auto-merging drivers/tty/serial/sh-sci.c
320 Auto-merging arch/sh/kernel/cpu/sh2a/Makefile
321 CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
322 Automatic merge failed; fix conflicts and then commit the result.
324 [master f113863] Merge remote-tracking branch 'sh/sh-latest'
325 $ git diff -M --stat --summary HEAD^..
326 .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++
327 arch/sh/include/asm/hw_breakpoint.h | 12 +-
328 arch/sh/include/cpu-common/cpu/ubc.h | 17 +++
329 arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++
330 arch/sh/kernel/cpu/sh2a/Makefile | 1 +
331 arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++
332 arch/sh/kernel/hw_breakpoint.c | 8 ++
333 drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++-
334 include/linux/serial_sci.h | 4 +
335 9 files changed, 375 insertions(+), 15 deletions(-)
336 create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt
337 create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h
338 create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h
339 create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c
340 Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
341 $ git merge --no-ff sparc-next/master
343 Merging tile/master (317ddd2 Linux 3.10-rc5)
344 $ git merge --no-ff tile/master
346 Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
347 $ git merge --no-ff unicore32/unicore32
349 Merging xtensa/for_next (0eb5afb xtensa: remove the second argument of __bio_kmap_atomic())
350 $ git merge --no-ff xtensa/for_next
352 Merging btrfs/next (cbacd76 Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into next)
353 $ git merge --no-ff btrfs/next
355 Merge made by the 'recursive' strategy.
356 Merging ceph/master (8b8cf89 libceph: fix invalid unsigned->signed conversion for timespec encoding)
357 $ git merge --no-ff ceph/master
359 Merging cifs/for-next (f004296 Do not attemp to do cifs operations reading symlinks with SMB2)
360 $ git merge --no-ff cifs/for-next
361 Merge made by the 'recursive' strategy.
362 fs/cifs/cifsglob.h | 3 ++
363 fs/cifs/cifsproto.h | 4 ++-
364 fs/cifs/link.c | 84 +++++++++++++++++++++++++++++++++--------------------
365 fs/cifs/smb1ops.c | 1 +
366 4 files changed, 60 insertions(+), 32 deletions(-)
367 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
368 $ git merge --no-ff configfs/linux-next
370 Merging ecryptfs/next (cc18ec3 Use ecryptfs_dentry_to_lower_path in a couple of places)
371 $ git merge --no-ff ecryptfs/next
373 Merging ext3/for_next (e628753 quota: Convert use of typedef ctl_table to struct ctl_table)
374 $ git merge --no-ff ext3/for_next
376 Merging ext4/dev (3223fd0 ext4: yield during large unlinks)
377 $ git merge --no-ff ext4/dev
378 Merge made by the 'recursive' strategy.
379 fs/ext4/extents.c | 18 +++++++++++++++--
380 fs/ext4/extents_status.c | 51 ++++++++++++++++++++++++++++++++++++------------
381 fs/ext4/inode.c | 10 ++++++++--
382 3 files changed, 63 insertions(+), 16 deletions(-)
383 Merging f2fs/dev (2ffda5d f2fs: introduce help function F2FS_NODE())
384 $ git merge --no-ff f2fs/dev
385 Merge made by the 'recursive' strategy.
386 Documentation/filesystems/f2fs.txt | 43 +++++++++++++++++++++++++++++++----
387 fs/f2fs/data.c | 2 +-
388 fs/f2fs/debug.c | 16 ++++++-------
390 fs/f2fs/f2fs.h | 21 ++++++++++++-----
391 fs/f2fs/file.c | 9 ++++----
392 fs/f2fs/inode.c | 4 ++--
393 fs/f2fs/node.c | 10 ++++-----
394 fs/f2fs/node.h | 40 +++++++++++++--------------------
395 fs/f2fs/recovery.c | 6 ++---
396 fs/f2fs/super.c | 46 ++++++++++++++++++++++++++++++++++++++
397 11 files changed, 141 insertions(+), 58 deletions(-)
398 Merging fscache/fscache (bcd7351 Merge tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
399 $ git merge --no-ff fscache/fscache
401 Merging fuse/for-next (e5c5f05 fuse: fix alignment in short read optimization for async_dio)
402 $ git merge --no-ff fuse/for-next
404 Merging gfs2/master (05fad00 GFS2: Move gfs2_sync_meta to lops.c)
405 $ git merge --no-ff gfs2/master
406 Merge made by the 'recursive' strategy.
407 fs/gfs2/lops.c | 18 ++++++++++++++++++
408 fs/gfs2/meta_io.c | 18 ------------------
409 fs/gfs2/meta_io.h | 26 +++++++++++---------------
410 3 files changed, 29 insertions(+), 33 deletions(-)
411 Merging jfs/jfs-next (eb8630d jfs: Update jfs_error)
412 $ git merge --no-ff jfs/jfs-next
414 Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
415 $ git merge --no-ff logfs/master
416 Auto-merging fs/logfs/super.c
417 Merge made by the 'recursive' strategy.
418 fs/logfs/dev_mtd.c | 2 +-
419 fs/logfs/super.c | 6 +++---
420 2 files changed, 4 insertions(+), 4 deletions(-)
421 Merging nfs/linux-next (ad81f05 Linux 3.11-rc1)
422 $ git merge --no-ff nfs/linux-next
424 Merging nfsd/nfsd-next (1c327d9 lockd: protect nlm_blocked access in nlmsvc_retry_blocked)
425 $ git merge --no-ff nfsd/nfsd-next
426 Auto-merging fs/lockd/svclock.c
427 Merge made by the 'recursive' strategy.
428 fs/lockd/svclock.c | 4 ++++
429 1 file changed, 4 insertions(+)
430 Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
431 $ git merge --no-ff ocfs2/linux-next
432 Auto-merging fs/ocfs2/dlm/dlmrecovery.c
433 Auto-merging fs/ocfs2/dlm/dlmmaster.c
434 Auto-merging fs/ocfs2/cluster/heartbeat.c
435 Merge made by the 'recursive' strategy.
436 fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
437 fs/ocfs2/cluster/masklog.h | 3 ++-
438 fs/ocfs2/dlm/dlmmaster.c | 8 +++++++-
439 fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
440 4 files changed, 25 insertions(+), 33 deletions(-)
441 Merging omfs/for-next (976d167 Linux 3.1-rc9)
442 $ git merge --no-ff omfs/for-next
444 Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
445 $ git merge --no-ff squashfs/master
447 Merging v9fs/for-next (ad81f05 Linux 3.11-rc1)
448 $ git merge --no-ff v9fs/for-next
450 Merging ubifs/linux-next (beadadf UBIFS: correct mount message)
451 $ git merge --no-ff ubifs/linux-next
453 Merging xfs/for-next (ad81f05 Linux 3.11-rc1)
454 $ git merge --no-ff xfs/for-next
456 Merging vfs/for-next (d405be4 ext4: ->tmpfile() support)
457 $ git merge --no-ff vfs/for-next
458 Auto-merging fs/coredump.c
459 Auto-merging fs/binfmt_elf.c
460 Auto-merging fs/binfmt_aout.c
461 Auto-merging arch/x86/ia32/ia32_aout.c
462 Merge made by the 'recursive' strategy.
463 arch/ia64/kernel/elfcore.c | 13 ++---
464 arch/powerpc/include/asm/spu.h | 3 +-
465 arch/powerpc/platforms/cell/spu_syscalls.c | 4 +-
466 arch/powerpc/platforms/cell/spufs/coredump.c | 64 ++++----------------
467 arch/powerpc/platforms/cell/spufs/spufs.h | 2 +-
468 arch/x86/ia32/ia32_aout.c | 20 +++----
469 arch/x86/um/elfcore.c | 16 ++---
470 fs/binfmt_aout.c | 9 ++-
471 fs/binfmt_elf.c | 84 +++++++++++----------------
472 fs/binfmt_elf_fdpic.c | 87 ++++++++++------------------
473 fs/coredump.c | 62 ++++++++++++--------
474 include/linux/binfmts.h | 1 +
475 include/linux/coredump.h | 5 +-
476 include/linux/elf.h | 7 ++-
477 include/linux/elfcore.h | 5 +-
478 kernel/elfcore.c | 6 +-
479 16 files changed, 152 insertions(+), 236 deletions(-)
480 Merging pci/next (a0f75f9 Merge branch 'pci/misc' into next)
481 $ git merge --no-ff pci/next
483 Merging hid/for-next (6d4c6fe Merge branch 'for-3.12/upstream' into for-next)
484 $ git merge --no-ff hid/for-next
485 Auto-merging drivers/hid/hid-ids.h
486 Auto-merging drivers/hid/hid-core.c
487 Merge made by the 'recursive' strategy.
488 drivers/hid/hid-core.c | 3 ++-
489 drivers/hid/hid-ids.h | 1 +
490 drivers/hid/hid-kye.c | 45 +++++++++++++++++++++++++++----------------
491 drivers/hid/hid-logitech-dj.c | 10 +++++-----
492 4 files changed, 36 insertions(+), 23 deletions(-)
493 Merging i2c/i2c/for-next (97191d7 i2c-designware: use div_u64 to fix link)
494 $ git merge --no-ff i2c/i2c/for-next
496 Merging jdelvare-hwmon/master (6f7e0b6 hwmon: (w83792d) Update module author)
497 $ git merge --no-ff jdelvare-hwmon/master
498 Merge made by the 'recursive' strategy.
499 Documentation/hwmon/w83791d | 2 +-
500 Documentation/hwmon/w83792d | 3 +--
501 drivers/hwmon/w83792d.c | 4 ++--
502 3 files changed, 4 insertions(+), 5 deletions(-)
503 Merging hwmon-staging/hwmon-next (7de362d hwmon: (nct6775) Avoid using device platform data outside probe function)
504 $ git merge --no-ff hwmon-staging/hwmon-next
505 Merge made by the 'recursive' strategy.
506 drivers/hwmon/abx500.c | 2 +-
507 drivers/hwmon/coretemp.c | 14 +-
508 drivers/hwmon/nct6775.c | 2523 +++++++++++++++++++++++-----------------------
509 3 files changed, 1261 insertions(+), 1278 deletions(-)
510 Merging v4l-dvb/master (2217438 Merge /home/v4l/v4l/for_upstream)
511 $ git merge --no-ff v4l-dvb/master
513 Merge made by the 'recursive' strategy.
514 Merging kbuild/for-next (cca867d Merge branch 'kbuild/kbuild' into kbuild/for-next)
515 $ git merge --no-ff kbuild/for-next
517 Merge made by the 'recursive' strategy.
518 Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
519 $ git merge --no-ff kconfig/for-next
521 Merging libata/for-next (76b962d Merge branch 'for-3.11-fixes' into for-next)
522 $ git merge --no-ff libata/for-next
523 Merge made by the 'recursive' strategy.
524 drivers/ata/ata_piix.c | 2 +-
525 include/linux/ata.h | 102 -------------------------------------------------
526 include/linux/libata.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++++
527 3 files changed, 103 insertions(+), 103 deletions(-)
528 Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
529 $ git merge --no-ff pstore/master
531 Merging pm/linux-next (88565cc Merge branch 'pm-cpuidle-next' into linux-next)
532 $ git merge --no-ff pm/linux-next
533 Removing drivers/cpufreq/mperf.h
534 Removing drivers/cpufreq/mperf.c
535 Merge made by the 'recursive' strategy.
536 arch/x86/include/asm/processor.h | 29 ---
537 drivers/acpi/acpi_memhotplug.c | 1 +
538 drivers/acpi/acpica/aclocal.h | 13 --
539 drivers/acpi/battery.c | 19 +-
540 drivers/acpi/bus.c | 22 +--
541 drivers/acpi/dock.c | 396 ++++++++++++-------------------------
542 drivers/acpi/ec.c | 4 +-
543 drivers/acpi/internal.h | 11 ++
544 drivers/acpi/power.c | 4 +-
545 drivers/acpi/processor_perflib.c | 22 +--
546 drivers/acpi/resource.c | 4 +-
547 drivers/acpi/scan.c | 202 +++++++------------
548 drivers/acpi/sleep.c | 15 +-
549 drivers/acpi/thermal.c | 18 +-
550 drivers/acpi/utils.c | 70 +++++++
551 drivers/acpi/video.c | 127 +++++++-----
552 drivers/acpi/video_detect.c | 40 ++--
553 drivers/cpufreq/Makefile | 2 +-
554 drivers/cpufreq/acpi-cpufreq.c | 5 -
555 drivers/cpufreq/cpufreq.c | 16 +-
556 drivers/cpufreq/cpufreq_governor.c | 10 +-
557 drivers/cpufreq/cpufreq_governor.h | 1 -
558 drivers/cpufreq/cpufreq_ondemand.c | 39 +---
559 drivers/cpufreq/cpufreq_stats.c | 6 +-
560 drivers/cpufreq/mperf.c | 51 -----
561 drivers/cpufreq/mperf.h | 9 -
562 drivers/cpufreq/s3c24xx-cpufreq.c | 4 +-
563 drivers/cpuidle/cpuidle.c | 94 +++++----
564 drivers/cpuidle/governors/ladder.c | 12 +-
565 drivers/cpuidle/governors/menu.c | 12 +-
566 drivers/cpuidle/sysfs.c | 101 +++++++---
567 drivers/gpu/drm/i915/i915_dma.c | 2 +-
568 drivers/pci/hotplug/acpiphp.h | 1 -
569 drivers/pci/hotplug/acpiphp_glue.c | 48 ++---
570 drivers/pnp/pnpacpi/rsparser.c | 2 +-
571 drivers/pnp/resource.c | 1 +
572 include/acpi/acpi_bus.h | 12 +-
573 include/acpi/acpi_drivers.h | 14 +-
574 include/acpi/acpixf.h | 1 +
575 include/acpi/actypes.h | 15 ++
576 include/acpi/video.h | 11 +-
577 include/linux/acpi.h | 1 +
578 include/linux/cpufreq.h | 6 -
579 include/linux/cpuidle.h | 9 +-
580 include/linux/pm_wakeup.h | 4 +-
581 kernel/power/autosleep.c | 3 +-
582 46 files changed, 615 insertions(+), 874 deletions(-)
583 delete mode 100644 drivers/cpufreq/mperf.c
584 delete mode 100644 drivers/cpufreq/mperf.h
585 Merging idle/next (5c99726b Merge branch 'fspin' into next)
586 $ git merge --no-ff idle/next
587 Merge made by the 'recursive' strategy.
588 tools/power/fspin/Makefile | 21 +++
589 tools/power/fspin/fspin.1 | 68 +++++++
590 tools/power/fspin/fspin.c | 443 +++++++++++++++++++++++++++++++++++++++++++++
591 3 files changed, 532 insertions(+)
592 create mode 100644 tools/power/fspin/Makefile
593 create mode 100644 tools/power/fspin/fspin.1
594 create mode 100644 tools/power/fspin/fspin.c
595 Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
596 $ git merge --no-ff apm/for-next
598 Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
599 $ git merge --no-ff cpupowerutils/master
601 Merging thermal/next (94e791f Thermal: x86_pkg_temp: Limit number of pkg temp zones)
602 $ git merge --no-ff thermal/next
603 Merge made by the 'recursive' strategy.
604 drivers/thermal/x86_pkg_temp_thermal.c | 17 ++++++++++++-----
605 1 file changed, 12 insertions(+), 5 deletions(-)
606 Merging ieee1394/for-next (bcabcfd firewire: remove support of fw_driver.driver.probe and .remove methods)
607 $ git merge --no-ff ieee1394/for-next
609 Merging ubi/linux-next (83ff59a UBI: support ubi_num on mtd.ubi command line)
610 $ git merge --no-ff ubi/linux-next
612 Merging dlm/next (cfa805f dlm: Avoid LVB truncation)
613 $ git merge --no-ff dlm/next
615 Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
616 $ git merge --no-ff swiotlb/linux-next
618 Merging slave-dma/next (4eb3883 Merge branch 'topic/api_caps' into next)
619 $ git merge --no-ff slave-dma/next
620 Merge made by the 'recursive' strategy.
621 drivers/dma/edma.c | 2 --
622 drivers/dma/ep93xx_dma.c | 10 +---------
623 drivers/dma/fsldma.c | 10 +---------
624 drivers/dma/imx-sdma.c | 9 +++------
625 drivers/dma/ipu/ipu_idmac.c | 5 +----
626 drivers/dma/mmp_pdma.c | 10 +---------
627 drivers/dma/mmp_tdma.c | 3 ++-
628 drivers/dma/mpc512x_dma.c | 10 +---------
629 drivers/dma/mxs-dma.c | 4 +---
630 drivers/dma/pch_dma.c | 9 +--------
631 drivers/dma/pl330.c | 27 ++++++++++++++++++++++++++
632 drivers/dma/tegra20-apb-dma.c | 8 +++-----
633 drivers/dma/txx9dmac.c | 13 ++++++-------
634 include/linux/dmaengine.h | 44 +++++++++++++++++++++++++++++++++++++++++++
635 14 files changed, 92 insertions(+), 72 deletions(-)
636 Merging dmaengine/next (41ef2d5 Linux 3.9-rc7)
637 $ git merge --no-ff dmaengine/next
639 Merging net-next/master (47188d3 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
640 $ git merge --no-ff net-next/master
642 Merging ipsec-next/master (0289094 af_key: constify lookup tables)
643 $ git merge --no-ff ipsec-next/master
644 Auto-merging net/key/af_key.c
645 Merge made by the 'recursive' strategy.
646 include/net/xfrm.h | 2 +-
647 net/key/af_key.c | 6 +++---
648 net/xfrm/xfrm_state.c | 12 +++++++-----
649 3 files changed, 11 insertions(+), 9 deletions(-)
650 Merging wireless-next/master (63345b4 Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86)
651 $ git merge --no-ff wireless-next/master
653 Merging bluetooth/master (f0868e1 Bluetooth: hidp: remove wrong send_report at init)
654 $ git merge --no-ff bluetooth/master
655 Auto-merging net/bluetooth/hidp/core.c
656 Auto-merging net/bluetooth/hci_core.c
657 Merge made by the 'recursive' strategy.
658 drivers/bluetooth/ath3k.c | 2 ++
659 drivers/bluetooth/btusb.c | 1 +
660 include/net/bluetooth/hci.h | 6 ++++++
661 net/bluetooth/hci_core.c | 2 +-
662 net/bluetooth/hci_event.c | 22 +++++++++++++---------
663 net/bluetooth/hidp/core.c | 40 ++++++++++++++++++++++++++--------------
664 net/bluetooth/l2cap_core.c | 3 ++-
665 7 files changed, 51 insertions(+), 25 deletions(-)
666 Merging infiniband/for-next (e04abfa Merge branches 'mlx5', 'qib' and 'srp' into for-next)
667 $ git merge --no-ff infiniband/for-next
669 Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd)
670 $ git merge --no-ff mtd/master
672 Merging l2-mtd/master (fb1585b mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe)
673 $ git merge --no-ff l2-mtd/master
674 Auto-merging drivers/mtd/nand/Kconfig
675 Auto-merging arch/mips/bcm63xx/nvram.c
676 Auto-merging arch/avr32/mach-at32ap/at32ap700x.c
677 Merge made by the 'recursive' strategy.
678 .../devicetree/bindings/mtd/atmel-nand.txt | 1 +
679 .../devicetree/bindings/mtd/fsmc-nand.txt | 25 +-
680 arch/avr32/mach-at32ap/at32ap700x.c | 3 +
681 arch/mips/bcm63xx/nvram.c | 11 +
682 arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 +
683 drivers/mtd/bcm63xxpart.c | 9 +-
684 drivers/mtd/chips/cfi_cmdset_0002.c | 4 +-
685 drivers/mtd/devices/bcm47xxsflash.c | 68 +++
686 drivers/mtd/devices/bcm47xxsflash.h | 2 +
687 drivers/mtd/devices/block2mtd.c | 58 +--
688 drivers/mtd/devices/elm.c | 124 ++++-
689 drivers/mtd/devices/m25p80.c | 44 +-
690 drivers/mtd/devices/mtd_dataflash.c | 8 +-
691 drivers/mtd/devices/spear_smi.c | 11 +-
692 drivers/mtd/devices/sst25l.c | 6 +-
693 drivers/mtd/maps/ixp4xx.c | 2 -
694 drivers/mtd/maps/latch-addr-flash.c | 1 -
695 drivers/mtd/maps/physmap.c | 1 -
696 drivers/mtd/maps/plat-ram.c | 2 -
697 drivers/mtd/maps/pxa2xx-flash.c | 2 -
698 drivers/mtd/maps/rbtx4939-flash.c | 1 -
699 drivers/mtd/maps/sa1100-flash.c | 1 -
700 drivers/mtd/nand/Kconfig | 2 +-
701 drivers/mtd/nand/ams-delta.c | 1 -
702 drivers/mtd/nand/atmel_nand.c | 25 +-
703 drivers/mtd/nand/bf5xx_nand.c | 3 -
704 drivers/mtd/nand/davinci_nand.c | 13 +-
705 drivers/mtd/nand/docg4.c | 2 -
706 drivers/mtd/nand/fsl_ifc_nand.c | 3 +-
707 drivers/mtd/nand/fsmc_nand.c | 26 +-
708 drivers/mtd/nand/gpio.c | 227 +++------
709 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 +-
710 drivers/mtd/nand/jz4740_nand.c | 2 -
711 drivers/mtd/nand/lpc32xx_mlc.c | 2 -
712 drivers/mtd/nand/lpc32xx_slc.c | 2 -
713 drivers/mtd/nand/mxc_nand.c | 2 -
714 drivers/mtd/nand/nand_base.c | 27 +-
715 drivers/mtd/nand/nuc900_nand.c | 2 -
716 drivers/mtd/nand/omap2.c | 505 ++++++++++-----------
717 drivers/mtd/nand/orion_nand.c | 1 -
718 drivers/mtd/nand/plat_nand.c | 1 -
719 drivers/mtd/nand/pxa3xx_nand.c | 110 ++---
720 drivers/mtd/nand/r852.c | 5 +-
721 drivers/mtd/nand/s3c2410.c | 2 -
722 drivers/mtd/nand/sharpsl.c | 3 -
723 drivers/mtd/nand/txx9ndfmc.c | 1 -
724 drivers/mtd/onenand/generic.c | 2 -
725 drivers/mtd/onenand/omap2.c | 1 -
726 drivers/mtd/onenand/samsung.c | 1 -
727 drivers/mtd/tests/mtd_oobtest.c | 12 +-
728 drivers/mtd/tests/mtd_pagetest.c | 20 +-
729 drivers/mtd/tests/mtd_readtest.c | 12 +-
730 drivers/mtd/tests/mtd_speedtest.c | 8 +-
731 drivers/mtd/tests/mtd_stresstest.c | 8 +-
732 drivers/mtd/tests/mtd_subpagetest.c | 12 +-
733 include/linux/mtd/fsmc.h | 1 +
734 include/linux/mtd/nand.h | 9 +-
735 include/linux/platform_data/atmel.h | 4 +
736 include/linux/platform_data/elm.h | 4 +
737 59 files changed, 759 insertions(+), 702 deletions(-)
738 Merging crypto/master (aa2faec crypto: caam - Moved macro DESC_JOB_IO_LEN to desc_constr.h)
739 $ git merge --no-ff crypto/master
740 Auto-merging drivers/crypto/caam/caamhash.c
741 Merge made by the 'recursive' strategy.
742 drivers/crypto/caam/caamalg.c | 2 --
743 drivers/crypto/caam/caamhash.c | 2 --
744 drivers/crypto/caam/desc_constr.h | 1 +
745 3 files changed, 1 insertion(+), 4 deletions(-)
746 Merging drm/drm-next (774d8e3 Merge branch 'drm-next-3.11' of git://people.freedesktop.org/~agd5f/linux into drm-next)
747 $ git merge --no-ff drm/drm-next
749 Merging drm-intel/for-linux-next (10cd45b drm/i915: introduce i915_queue_hangcheck)
750 $ git merge --no-ff drm-intel/for-linux-next
751 Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution.
752 Auto-merging include/drm/drm_mm.h
753 Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
754 Auto-merging drivers/gpu/drm/i915/intel_pm.c
755 Auto-merging drivers/gpu/drm/i915/intel_lvds.c
756 Auto-merging drivers/gpu/drm/i915/intel_drv.h
757 Auto-merging drivers/gpu/drm/i915/intel_dp.c
758 Auto-merging drivers/gpu/drm/i915/intel_display.c
759 Auto-merging drivers/gpu/drm/i915/i915_gem_stolen.c
760 Auto-merging drivers/gpu/drm/i915/i915_gem.c
761 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
762 Auto-merging drivers/gpu/drm/i915/i915_drv.h
763 Auto-merging drivers/gpu/drm/i915/i915_drv.c
764 Auto-merging drivers/gpu/drm/i915/i915_dma.c
765 Auto-merging drivers/gpu/drm/drm_mm.c
766 Automatic merge failed; fix conflicts and then commit the result.
768 [master 01a75f2] Merge remote-tracking branch 'drm-intel/for-linux-next'
769 $ git diff -M --stat --summary HEAD^..
770 drivers/gpu/drm/drm_mm.c | 31 +-
771 drivers/gpu/drm/i915/Makefile | 1 +
772 drivers/gpu/drm/i915/i915_debugfs.c | 672 ++++----------------
773 drivers/gpu/drm/i915/i915_dma.c | 32 +-
774 drivers/gpu/drm/i915/i915_drv.c | 33 +-
775 drivers/gpu/drm/i915/i915_drv.h | 190 ++++--
776 drivers/gpu/drm/i915/i915_gem.c | 172 +++--
777 drivers/gpu/drm/i915/i915_gem_context.c | 25 +-
778 drivers/gpu/drm/i915/i915_gem_evict.c | 6 +-
779 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 27 +-
780 drivers/gpu/drm/i915/i915_gem_gtt.c | 134 ++--
781 drivers/gpu/drm/i915/i915_gem_stolen.c | 76 ++-
782 drivers/gpu/drm/i915/i915_gem_tiling.c | 14 +-
783 drivers/gpu/drm/i915/i915_gpu_error.c | 971 +++++++++++++++++++++++++++++
784 drivers/gpu/drm/i915/i915_irq.c | 893 ++++++--------------------
785 drivers/gpu/drm/i915/i915_reg.h | 10 +-
786 drivers/gpu/drm/i915/i915_sysfs.c | 71 +++
787 drivers/gpu/drm/i915/i915_trace.h | 8 +-
788 drivers/gpu/drm/i915/intel_display.c | 626 ++++++++++++-------
789 drivers/gpu/drm/i915/intel_dp.c | 7 +
790 drivers/gpu/drm/i915/intel_drv.h | 24 +-
791 drivers/gpu/drm/i915/intel_dvo.c | 3 -
792 drivers/gpu/drm/i915/intel_fb.c | 8 +-
793 drivers/gpu/drm/i915/intel_lvds.c | 21 +-
794 drivers/gpu/drm/i915/intel_overlay.c | 18 +-
795 drivers/gpu/drm/i915/intel_pm.c | 173 +++--
796 drivers/gpu/drm/i915/intel_ringbuffer.c | 43 +-
797 drivers/gpu/drm/i915/intel_ringbuffer.h | 5 +-
798 drivers/gpu/drm/i915/intel_sdvo.c | 27 +-
799 drivers/gpu/drm/i915/intel_sprite.c | 8 +-
800 include/drm/drm_mm.h | 6 +-
801 31 files changed, 2369 insertions(+), 1966 deletions(-)
802 create mode 100644 drivers/gpu/drm/i915/i915_gpu_error.c
803 Merging drm-tegra/drm/for-next (ebae30b gpu: host1x: Rework CPU syncpoint increment)
804 $ git merge --no-ff drm-tegra/drm/for-next
806 Merging sound/for-next (e4c3bce ALSA: hda - Headphone mic support for an Asus/Conexant device)
807 $ git merge --no-ff sound/for-next
808 Merge made by the 'recursive' strategy.
809 sound/firewire/speakers.c | 4 +-
810 sound/pci/hda/patch_analog.c | 4662 +++-------------------------------------
811 sound/pci/hda/patch_conexant.c | 79 +-
812 sound/pci/rme9652/hdspm.c | 767 +++++--
813 4 files changed, 862 insertions(+), 4650 deletions(-)
814 Merging sound-asoc/for-next (7ba7602 Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next)
815 $ git merge --no-ff sound-asoc/for-next
816 Auto-merging sound/soc/atmel/atmel-pcm-dma.c
817 Merge made by the 'recursive' strategy.
818 Documentation/devicetree/bindings/sound/ak4554.c | 11 ++
819 .../{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} | 0
820 .../devicetree/bindings/sound/tlv320aic3x.txt | 9 +-
821 include/linux/atmel-ssc.h | 2 +-
822 include/linux/mfd/arizona/gpio.h | 96 +++++++++++++++++
823 sound/soc/atmel/Kconfig | 1 +
824 sound/soc/atmel/atmel-pcm-dma.c | 118 +++------------------
825 sound/soc/atmel/atmel_ssc_dai.c | 36 ++++---
826 sound/soc/au1x/db1200.c | 4 +
827 sound/soc/codecs/Kconfig | 4 +
828 sound/soc/codecs/Makefile | 2 +
829 sound/soc/codecs/adav80x.c | 13 ++-
830 sound/soc/codecs/ak4554.c | 86 +++++++++++++++
831 sound/soc/codecs/arizona.c | 36 +++++++
832 sound/soc/codecs/arizona.h | 1 +
833 sound/soc/codecs/max98088.c | 2 +-
834 sound/soc/codecs/pcm3008.c | 108 +++++++------------
835 sound/soc/codecs/sgtl5000.c | 4 +
836 sound/soc/codecs/tlv320aic3x.c | 4 +
837 sound/soc/codecs/wm5102.c | 6 ++
838 sound/soc/codecs/wm5110.c | 9 ++
839 sound/soc/codecs/wm8994.c | 10 +-
840 sound/soc/fsl/Kconfig | 2 +-
841 sound/soc/fsl/fsl_ssi.c | 12 +--
842 sound/soc/fsl/imx-mc13783.c | 1 +
843 sound/soc/fsl/imx-pcm-dma.c | 1 -
844 sound/soc/fsl/imx-pcm-fiq.c | 18 ++--
845 sound/soc/fsl/imx-pcm.h | 15 ++-
846 sound/soc/fsl/imx-ssi.c | 7 +-
847 sound/soc/fsl/imx-ssi.h | 1 +
848 sound/soc/kirkwood/Kconfig | 6 +-
849 sound/soc/kirkwood/kirkwood-i2s.c | 35 +++---
850 sound/soc/kirkwood/kirkwood-openrd.c | 2 -
851 sound/soc/kirkwood/kirkwood-t5325.c | 2 -
852 sound/soc/omap/Kconfig | 6 +-
853 sound/soc/pxa/brownstone.c | 1 +
854 sound/soc/pxa/ttc-dkb.c | 1 +
855 sound/soc/samsung/spdif.c | 8 +-
856 sound/soc/tegra/Kconfig | 12 +--
857 sound/soc/tegra/tegra20_ac97.c | 2 -
858 sound/soc/tegra/tegra_alc5632.c | 2 -
859 sound/soc/tegra/tegra_wm8753.c | 2 -
860 sound/soc/tegra/trimslice.c | 2 -
861 sound/soc/ux500/mop500.c | 1 +
862 44 files changed, 426 insertions(+), 275 deletions(-)
863 create mode 100644 Documentation/devicetree/bindings/sound/ak4554.c
864 rename Documentation/devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} (100%)
865 create mode 100644 include/linux/mfd/arizona/gpio.h
866 create mode 100644 sound/soc/codecs/ak4554.c
867 $ git reset --hard HEAD^
868 HEAD is now at b310233 Merge remote-tracking branch 'sound/for-next'
869 Merging next-20130715 version of sound-asoc
870 $ git merge -m next-20130715/sound-asoc 049f3b47cb170485e48967f29fa0e7a4548a17bc
872 Merge made by the 'recursive' strategy.
873 Merging modules/modules-next (9eb76d7 module: cleanup call chain.)
874 $ git merge --no-ff modules/modules-next
876 Merging virtio/virtio-next (c893c8d MAINTAINERS: add tools/virtio/ under virtio)
877 $ git merge --no-ff virtio/virtio-next
879 Merging input/next (46146e7 Input: nspire-keypad - replace magic offset with define)
880 $ git merge --no-ff input/next
882 Merging input-mt/for-next (257867d Input: MT - Specify that ABS_MT_SLOT must have a minimum of 0)
883 $ git merge --no-ff input-mt/for-next
885 Merging cgroup/for-next (ed55cff Merge branch 'for-3.12' into for-next)
886 $ git merge --no-ff cgroup/for-next
887 Auto-merging kernel/cgroup.c
888 Merge made by the 'recursive' strategy.
889 include/linux/cgroup.h | 3 +-
890 include/linux/cgroup_subsys.h | 45 +-----
891 kernel/cgroup.c | 336 +++++++++++++++++++++---------------------
892 3 files changed, 174 insertions(+), 210 deletions(-)
893 Merging block/for-next (4841577 Merge branch 'for-3.11/core' into for-next)
894 $ git merge --no-ff block/for-next
895 Auto-merging drivers/md/bcache/bset.c
896 Auto-merging drivers/block/xen-blkback/xenbus.c
897 Auto-merging MAINTAINERS
898 Auto-merging Documentation/bcache.txt
899 Merge made by the 'recursive' strategy.
900 Documentation/ABI/testing/sysfs-driver-xen-blkback | 17 +
901 .../ABI/testing/sysfs-driver-xen-blkfront | 10 +
902 Documentation/bcache.txt | 37 +-
904 drivers/block/Kconfig | 4 +-
905 drivers/block/drbd/drbd_actlog.c | 21 +
906 drivers/block/drbd/drbd_int.h | 15 +-
907 drivers/block/drbd/drbd_main.c | 61 +-
908 drivers/block/drbd/drbd_nl.c | 185 ++++-
909 drivers/block/drbd/drbd_receiver.c | 12 +-
910 drivers/block/drbd/drbd_state.c | 4 +-
911 drivers/block/rsxx/core.c | 359 ++++++++-
912 drivers/block/rsxx/cregs.c | 14 +
913 drivers/block/rsxx/dev.c | 33 +-
914 drivers/block/rsxx/dma.c | 185 ++---
915 drivers/block/rsxx/rsxx_priv.h | 10 +-
916 drivers/block/xen-blkback/blkback.c | 872 +++++++++++++--------
917 drivers/block/xen-blkback/common.h | 147 +++-
918 drivers/block/xen-blkback/xenbus.c | 85 ++
919 drivers/block/xen-blkfront.c | 532 ++++++++++---
920 drivers/md/bcache/alloc.c | 44 +-
921 drivers/md/bcache/bcache.h | 56 +-
922 drivers/md/bcache/bset.c | 56 +-
923 drivers/md/bcache/bset.h | 4 +
924 drivers/md/bcache/btree.c | 447 +++++------
925 drivers/md/bcache/btree.h | 35 +-
926 drivers/md/bcache/debug.c | 178 +----
927 drivers/md/bcache/debug.h | 11 +-
928 drivers/md/bcache/io.c | 68 +-
929 drivers/md/bcache/journal.c | 18 +-
930 drivers/md/bcache/movinggc.c | 24 +-
931 drivers/md/bcache/request.c | 189 ++---
932 drivers/md/bcache/request.h | 2 +-
933 drivers/md/bcache/super.c | 131 +++-
934 drivers/md/bcache/sysfs.c | 66 +-
935 drivers/md/bcache/trace.c | 47 +-
936 drivers/md/bcache/util.c | 17 -
937 drivers/md/bcache/util.h | 6 -
938 drivers/md/bcache/writeback.c | 133 +++-
939 drivers/md/bcache/writeback.h | 64 ++
940 include/linux/drbd.h | 6 +-
941 include/linux/drbd_genl.h | 2 +
942 include/linux/drbd_limits.h | 9 +
943 include/trace/events/bcache.h | 381 ++++++---
944 include/xen/interface/io/blkif.h | 53 ++
945 include/xen/interface/io/ring.h | 5 +
946 46 files changed, 3131 insertions(+), 1528 deletions(-)
947 create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkback
948 create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkfront
949 create mode 100644 drivers/md/bcache/writeback.h
950 Merging device-mapper/master (9903883 Merge tag 'dm-3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm)
951 $ git merge --no-ff device-mapper/master
953 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
954 $ git merge --no-ff embedded/master
956 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
957 $ git merge --no-ff firmware/master
959 Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
960 $ git merge --no-ff pcmcia/master
962 Merging mmc/mmc-next (bfffbea Merge tag 'mmc-updates-for-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
963 $ git merge --no-ff mmc/mmc-next
965 Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
966 $ git merge --no-ff kgdb/kgdb-next
967 Merge made by the 'recursive' strategy.
968 Merging slab/for-next (f267bfc Merge branch 'slab/next' into for-next)
969 $ git merge --no-ff slab/for-next
970 Merge made by the 'recursive' strategy.
971 Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
972 $ git merge --no-ff uclinux/for-next
974 Merging md/for-next (cbc5bdc md: raid1: use bio_rewind() before bio_copy_data())
975 $ git merge --no-ff md/for-next
976 Auto-merging include/linux/bio.h
977 Merge made by the 'recursive' strategy.
978 drivers/md/raid1.c | 28 +++++-----------------------
979 fs/bio.c | 27 +++++++++++++++++++++++++++
980 include/linux/bio.h | 1 +
981 3 files changed, 33 insertions(+), 23 deletions(-)
982 Merging mfd/master (25f311f mfd: sec: Provide max_register to regmap)
983 $ git merge --no-ff mfd/master
985 Merging battery/master (5a6c220 charger-manager: Fix regulator_get() return check)
986 $ git merge --no-ff battery/master
988 Merging fbdev/for-next (5e8be02 video: atmel_lcdfb: add device tree suport)
989 $ git merge --no-ff fbdev/for-next
990 Auto-merging arch/avr32/mach-at32ap/at32ap700x.c
991 Merge made by the 'recursive' strategy.
992 .../devicetree/bindings/video/atmel,lcdc.txt | 75 +++++
993 arch/arm/mach-at91/at91sam9261_devices.c | 6 +-
994 arch/arm/mach-at91/at91sam9263_devices.c | 6 +-
995 arch/arm/mach-at91/at91sam9g45_devices.c | 6 +-
996 arch/arm/mach-at91/at91sam9rl_devices.c | 6 +-
997 arch/arm/mach-at91/board-sam9261ek.c | 10 +-
998 arch/arm/mach-at91/board-sam9263ek.c | 6 +-
999 arch/arm/mach-at91/board-sam9m10g45ek.c | 4 +-
1000 arch/arm/mach-at91/board-sam9rlek.c | 6 +-
1001 arch/arm/mach-at91/board.h | 4 +-
1002 arch/avr32/boards/atngw100/evklcd10x.c | 8 +-
1003 arch/avr32/boards/atngw100/mrmt.c | 4 +-
1004 arch/avr32/boards/atstk1000/atstk1000.h | 2 +-
1005 arch/avr32/boards/atstk1000/setup.c | 2 +-
1006 arch/avr32/boards/favr-32/setup.c | 2 +-
1007 arch/avr32/boards/hammerhead/setup.c | 2 +-
1008 arch/avr32/boards/merisc/display.c | 2 +-
1009 arch/avr32/boards/mimc200/setup.c | 4 +-
1010 arch/avr32/mach-at32ap/at32ap700x.c | 8 +-
1011 arch/avr32/mach-at32ap/include/mach/board.h | 4 +-
1012 drivers/video/Kconfig | 2 +
1013 drivers/video/atmel_lcdfb.c | 343 +++++++++++++++++----
1014 include/video/atmel_lcdc.h | 25 +-
1015 23 files changed, 402 insertions(+), 135 deletions(-)
1016 create mode 100644 Documentation/devicetree/bindings/video/atmel,lcdc.txt
1017 Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
1018 $ git merge --no-ff viafb/viafb-next
1020 Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning)
1021 $ git merge --no-ff omap_dss2/for-next
1022 Merge made by the 'recursive' strategy.
1023 Merging regulator/for-next (ece21cd Merge remote-tracking branch 'regulator/topic/sec' into regulator-next)
1024 $ git merge --no-ff regulator/for-next
1025 Merge made by the 'recursive' strategy.
1026 .../devicetree/bindings/regulator/regulator.txt | 2 +
1027 drivers/regulator/core.c | 99 ++++++++-
1028 drivers/regulator/lp872x.c | 9 +-
1029 drivers/regulator/lp8755.c | 1 +
1030 drivers/regulator/of_regulator.c | 12 +-
1031 drivers/regulator/s2mps11.c | 241 +++++++++++++++++----
1032 drivers/regulator/wm831x-ldo.c | 104 ++-------
1033 drivers/regulator/wm8350-regulator.c | 55 ++---
1034 drivers/regulator/wm8400-regulator.c | 50 ++---
1035 include/linux/mfd/samsung/s2mps11.h | 11 +
1036 include/linux/regulator/consumer.h | 7 +-
1037 include/linux/regulator/driver.h | 25 +++
1038 include/linux/regulator/machine.h | 1 +
1039 13 files changed, 407 insertions(+), 210 deletions(-)
1040 Merging security/next (572e5b0 tpm/tpm_i2c_infineon: Remove unused header file)
1041 $ git merge --no-ff security/next
1043 Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
1044 $ git merge --no-ff selinux/master
1046 Merge made by the 'recursive' strategy.
1047 Merging lblnet/master (d4b6739 SELinux: fix selinuxfs policy file on big endian systems)
1048 $ git merge --no-ff lblnet/master
1049 Auto-merging security/capability.c
1050 Merge made by the 'recursive' strategy.
1051 include/linux/security.h | 26 ++-
1052 security/capability.c | 15 +-
1053 security/security.c | 13 +-
1054 security/selinux/hooks.c | 18 +-
1055 security/selinux/include/xfrm.h | 45 ++--
1056 security/selinux/netnode.c | 2 +
1057 security/selinux/ss/ebitmap.c | 20 +-
1058 security/selinux/ss/ebitmap.h | 10 +-
1059 security/selinux/ss/mls.c | 22 +-
1060 security/selinux/ss/mls_types.h | 2 +-
1061 security/selinux/ss/policydb.c | 3 +-
1062 security/selinux/xfrm.c | 453 ++++++++++++++++++----------------------
1063 12 files changed, 306 insertions(+), 323 deletions(-)
1064 Merging watchdog/master (47188d3 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
1065 $ git merge --no-ff watchdog/master
1067 Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
1068 $ git merge --no-ff dwmw2-iommu/master
1070 Merging iommu/next (01ce784 Merge branches 'x86/vt-d', 'arm/omap', 'core', 'x86/amd' and 'arm/smmu' into next)
1071 $ git merge --no-ff iommu/next
1073 Merging vfio/next (47188d3 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
1074 $ git merge --no-ff vfio/next
1076 Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
1077 $ git merge --no-ff osd/linux-next
1079 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
1080 $ git merge --no-ff jc_docs/docs-next
1082 Merging trivial/for-next (8ecada1 doc: printk-formats: fix format specifier to %p[Ii]4[hnbl])
1083 $ git merge --no-ff trivial/for-next
1084 Auto-merging Documentation/printk-formats.txt
1085 Merge made by the 'recursive' strategy.
1086 Documentation/printk-formats.txt | 2 +-
1087 1 file changed, 1 insertion(+), 1 deletion(-)
1088 Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
1089 $ git merge --no-ff audit/for-next
1091 Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
1092 $ git merge --no-ff fsnotify/for-next
1094 Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device)
1095 $ git merge --no-ff edac/linux_next
1097 Merging edac-amd/for-next (aad19e5 EDAC, MCE, AMD: Add an MCE signature for new Fam15h models)
1098 $ git merge --no-ff edac-amd/for-next
1100 Merging devicetree/devicetree/next (6dd18e4 of: Fix address decoding on Bimini and js2x machines)
1101 $ git merge --no-ff devicetree/devicetree/next
1103 Merging dt-rh/for-next (d683b96 Linux 3.10-rc4)
1104 $ git merge --no-ff dt-rh/for-next
1106 Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration)
1107 $ git merge --no-ff spi/spi/next
1109 Merging spi-mb/for-next (44c2bc3 Merge remote-tracking branch 'spi/topic/xilinx' into spi-next)
1110 $ git merge --no-ff spi-mb/for-next
1111 Merge made by the 'recursive' strategy.
1112 drivers/spi/Kconfig | 11 +-
1113 drivers/spi/Makefile | 1 +
1114 drivers/spi/spi-bfin-v3.c | 973 ++++++++++++++++++++++++++++++++++++++++
1115 drivers/spi/spi-bitbang.c | 260 +++++------
1116 drivers/spi/spi-clps711x.c | 6 -
1117 drivers/spi/spi-ep93xx.c | 186 +++-----
1118 drivers/spi/spi-imx.c | 75 ++--
1119 drivers/spi/spi-mxs.c | 21 +-
1120 drivers/spi/spi-omap-100k.c | 276 ++++--------
1121 drivers/spi/spi-pxa2xx.c | 9 +-
1122 drivers/spi/spi-s3c64xx.c | 41 +-
1123 drivers/spi/spi-sirf.c | 1 +
1124 drivers/spi/spi-tegra114.c | 1 -
1125 drivers/spi/spi-tle62x0.c | 3 +-
1126 drivers/spi/spi-xilinx.c | 170 +++----
1127 drivers/spi/spi.c | 12 +
1128 include/linux/spi/spi.h | 6 +
1129 include/linux/spi/spi_bitbang.h | 5 -
1130 18 files changed, 1376 insertions(+), 681 deletions(-)
1131 create mode 100644 drivers/spi/spi-bfin-v3.c
1132 Merging tip/auto-latest (53e8bb8 Merge branch 'x86/tracing')
1133 $ git merge --no-ff tip/auto-latest
1134 Merge made by the 'recursive' strategy.
1135 arch/x86/include/asm/cpufeature.h | 17 +++++++++++------
1136 arch/x86/include/asm/mutex_64.h | 30 ++++++++++++++++++++++++++++++
1137 arch/x86/kernel/head_32.S | 2 +-
1138 3 files changed, 42 insertions(+), 7 deletions(-)
1139 Merging ftrace/for-next (dcc3022 tracing: Make tracing_open_generic_{tr,tc}() static)
1140 $ git merge --no-ff ftrace/for-next
1142 Merging rcu/rcu/next (0f791c9 nohz_full: Force RCU's grace-period kthreads onto timekeeping CPU)
1143 $ git merge --no-ff rcu/rcu/next
1144 Merge made by the 'recursive' strategy.
1145 Documentation/RCU/RTFP.txt | 855 ++++++++++++++++++++++++--------------
1146 Documentation/RCU/rcubarrier.txt | 12 +-
1147 Documentation/RCU/torture.txt | 10 +
1148 Documentation/memory-barriers.txt | 10 +-
1149 Documentation/timers/NO_HZ.txt | 44 +-
1150 include/linux/debugobjects.h | 6 +-
1151 include/linux/rcupdate.h | 22 +-
1152 kernel/rcu.h | 10 +-
1153 kernel/rcupdate.c | 100 -----
1154 kernel/rcutorture.c | 340 +++++++--------
1155 kernel/rcutree.c | 139 ++++---
1156 kernel/rcutree.h | 21 +-
1157 kernel/rcutree_plugin.h | 419 ++++++++++++++++++-
1158 kernel/time/Kconfig | 23 +
1159 lib/debugobjects.c | 20 +-
1160 15 files changed, 1327 insertions(+), 704 deletions(-)
1161 Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
1162 $ git merge --no-ff cputime/cputime
1164 Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
1165 $ git merge --no-ff uprobes/for-next
1167 Merging kvm/linux-next (6d128e1 Revert "Makefile: Fix install error with make -j option")
1168 $ git merge --no-ff kvm/linux-next
1170 Merging kvm-arm/kvm-arm-next (8bd4ffd ARM: kvm: don't include drivers/virtio/Kconfig)
1171 $ git merge --no-ff kvm-arm/kvm-arm-next
1173 Merging kvm-ppc/kvm-ppc-next (20f7462 Merge remote-tracking branch 'cmadma/for-v3.12-cma-dma' into kvm-ppc-next)
1174 $ git merge --no-ff kvm-ppc/kvm-ppc-next
1175 Resolved 'mm/Kconfig' using previous resolution.
1176 Auto-merging mm/Kconfig
1177 CONFLICT (content): Merge conflict in mm/Kconfig
1178 Auto-merging drivers/base/Makefile
1179 Auto-merging arch/arm/mm/dma-mapping.c
1180 Automatic merge failed; fix conflicts and then commit the result.
1182 [master 2b98636] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
1183 $ git diff -M --stat --summary HEAD^..
1184 arch/arm/include/asm/dma-contiguous.h | 2 +-
1185 arch/arm/mm/dma-mapping.c | 6 +++---
1186 drivers/base/Kconfig | 20 ++++----------------
1187 drivers/base/Makefile | 2 +-
1188 include/linux/dma-contiguous.h | 2 +-
1189 mm/Kconfig | 24 ++++++++++++++++++++++++
1190 6 files changed, 34 insertions(+), 22 deletions(-)
1191 Merging oprofile/for-next (f722406 Linux 3.10-rc1)
1192 $ git merge --no-ff oprofile/for-next
1194 Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
1195 $ git merge --no-ff fw-nohz/nohz/next
1197 Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
1198 $ git merge --no-ff xen/upstream/xen
1200 Merging xen-two/linux-next (21f3c04 Merge branch 'stable/for-linus-3.11' into linux-next)
1201 $ git merge --no-ff xen-two/linux-next
1203 Merge made by the 'recursive' strategy.
1204 Merging xen-arm/linux-next (176455e xen/arm and xen/arm64: implement HYPERVISOR_tmem_op)
1205 $ git merge --no-ff xen-arm/linux-next
1207 Merging percpu/for-next (a424445 percpu-refcount: use RCU-sched insted of normal RCU)
1208 $ git merge --no-ff percpu/for-next
1210 Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for-next)
1211 $ git merge --no-ff workqueues/for-next
1213 Merge made by the 'recursive' strategy.
1214 Merging drivers-x86/linux-next (de91b53 x86 platform drivers: fix gpio leak)
1215 $ git merge --no-ff drivers-x86/linux-next
1216 Merge made by the 'recursive' strategy.
1217 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
1218 $ git merge --no-ff hwpoison/hwpoison
1220 Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
1221 $ git merge --no-ff sysctl/master
1223 Merging regmap/for-next (78fd817 Merge remote-tracking branch 'regmap/topic/patch' into regmap-next)
1224 $ git merge --no-ff regmap/for-next
1225 Merge made by the 'recursive' strategy.
1226 drivers/base/regmap/regmap.c | 17 ++++++++---------
1227 1 file changed, 8 insertions(+), 9 deletions(-)
1228 Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
1229 $ git merge --no-ff hsi/for-next
1231 Merging leds/for-next (9394690 leds: support new LP8501 device - another LP55xx common)
1232 $ git merge --no-ff leds/for-next
1233 Merge made by the 'recursive' strategy.
1234 .../devicetree/bindings/leds/leds-lp55xx.txt | 72 +++-
1235 Documentation/devicetree/bindings/leds/pca9633.txt | 45 +++
1236 Documentation/leds/leds-lp55xx.txt | 30 +-
1237 drivers/leds/Kconfig | 18 +-
1238 drivers/leds/Makefile | 1 +
1239 drivers/leds/leds-lp55xx-common.c | 3 +
1240 drivers/leds/leds-lp8501.c | 410 +++++++++++++++++++++
1241 drivers/leds/leds-pca9633.c | 71 ++++
1242 include/linux/platform_data/leds-lp55xx.h | 10 +
1243 9 files changed, 653 insertions(+), 7 deletions(-)
1244 create mode 100644 Documentation/devicetree/bindings/leds/pca9633.txt
1245 create mode 100644 drivers/leds/leds-lp8501.c
1246 Merging driver-core/driver-core-next (ad81f05 Linux 3.11-rc1)
1247 $ git merge --no-ff driver-core/driver-core-next
1249 Merging tty/tty-next (ad81f05 Linux 3.11-rc1)
1250 $ git merge --no-ff tty/tty-next
1252 Merging usb/usb-next (ad81f05 Linux 3.11-rc1)
1253 $ git merge --no-ff usb/usb-next
1255 Merging usb-gadget/next (b1fd6cb usb: dwc3: omap: Adds dwc3_omap_readl/writel wrappers)
1256 $ git merge --no-ff usb-gadget/next
1258 Merging staging/staging-next (ad81f05 Linux 3.11-rc1)
1259 $ git merge --no-ff staging/staging-next
1261 Merging char-misc/char-misc-next (ad81f05 Linux 3.11-rc1)
1262 $ git merge --no-ff char-misc/char-misc-next
1264 Merging scsi/for-next (d26911a Merge branch 'misc' into for-next)
1265 $ git merge --no-ff scsi/for-next
1267 Merge made by the 'recursive' strategy.
1268 Merging target-updates/for-next (ca40d24 iser-target: Ignore non TEXT + LOGOUT opcodes for discovery)
1269 $ git merge --no-ff target-updates/for-next
1271 Merging target-merge/for-next-merge (317ddd2 Linux 3.10-rc5)
1272 $ git merge --no-ff target-merge/for-next-merge
1274 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
1275 $ git merge --no-ff ibft/linux-next
1277 Merging isci/all (6734092 isci: add a couple __iomem annotations)
1278 $ git merge --no-ff isci/all
1280 Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation)
1281 $ git merge --no-ff bcon/master
1282 Resolved 'drivers/block/Kconfig' using previous resolution.
1283 Auto-merging kernel/printk.c
1284 Auto-merging init/do_mounts.c
1285 Auto-merging include/linux/mount.h
1286 Auto-merging include/linux/console.h
1287 Auto-merging drivers/net/netconsole.c
1288 Auto-merging drivers/block/Makefile
1289 Auto-merging drivers/block/Kconfig
1290 CONFLICT (content): Merge conflict in drivers/block/Kconfig
1291 Auto-merging block/partitions/check.h
1292 Auto-merging block/partitions/check.c
1293 Auto-merging block/partitions/Makefile
1294 Auto-merging Documentation/networking/netconsole.txt
1295 Automatic merge failed; fix conflicts and then commit the result.
1297 [master 21b9990] Merge remote-tracking branch 'bcon/master'
1298 $ git diff -M --stat --summary HEAD^..
1299 Documentation/block/blockconsole.txt | 94 ++++
1300 Documentation/block/blockconsole/bcon_tail | 82 ++++
1301 Documentation/block/blockconsole/mkblockconsole | 29 ++
1302 Documentation/networking/netconsole.txt | 16 +-
1303 block/partitions/Makefile | 1 +
1304 block/partitions/blockconsole.c | 22 +
1305 block/partitions/check.c | 3 +
1306 block/partitions/check.h | 3 +
1307 drivers/block/Kconfig | 6 +
1308 drivers/block/Makefile | 1 +
1309 drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++
1310 drivers/net/netconsole.c | 2 +-
1311 include/linux/blockconsole.h | 7 +
1312 include/linux/console.h | 1 +
1313 include/linux/mount.h | 2 +-
1314 init/do_mounts.c | 2 +-
1315 kernel/printk.c | 5 +-
1316 17 files changed, 885 insertions(+), 9 deletions(-)
1317 create mode 100644 Documentation/block/blockconsole.txt
1318 create mode 100755 Documentation/block/blockconsole/bcon_tail
1319 create mode 100755 Documentation/block/blockconsole/mkblockconsole
1320 create mode 100644 block/partitions/blockconsole.c
1321 create mode 100644 drivers/block/blockconsole.c
1322 create mode 100644 include/linux/blockconsole.h
1323 Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
1324 $ git merge --no-ff tmem/linux-next
1326 Merging writeback/writeback-for-next (8bb495e Linux 3.10)
1327 $ git merge --no-ff writeback/writeback-for-next
1329 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
1330 $ git merge --no-ff arm-dt/devicetree/arm-next
1332 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
1333 $ git merge --no-ff hwspinlock/linux-next
1335 Merging pinctrl/for-next (5b81d55 pinctrl: remove bindings for pinconf options needing more thought)
1336 $ git merge --no-ff pinctrl/for-next
1338 Merging vhost/linux-next (22fa90c vhost: Remove custom vhost rcu usage)
1339 $ git merge --no-ff vhost/linux-next
1340 Auto-merging drivers/vhost/scsi.c
1341 Merge made by the 'recursive' strategy.
1342 drivers/vhost/net.c | 37 ++++++++++++++++---------------------
1343 drivers/vhost/scsi.c | 17 ++++++-----------
1344 drivers/vhost/test.c | 6 ++----
1345 drivers/vhost/vhost.h | 10 ++--------
1346 4 files changed, 26 insertions(+), 44 deletions(-)
1347 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
1348 $ git merge --no-ff memblock/memblock-kill-early_node_map
1350 Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO)
1351 $ git merge --no-ff remoteproc/for-next
1353 Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO)
1354 $ git merge --no-ff rpmsg/for-next
1356 Merging irqdomain/irqdomain/next (798f0fd irq: fix checkpatch error)
1357 $ git merge --no-ff irqdomain/irqdomain/next
1359 Merging gpio/gpio/next (644c8df gpio: sx150x: convert to use devm_* functions)
1360 $ git merge --no-ff gpio/gpio/next
1362 Merging gpio-lw/for-next (69acf2e Merge branch 'merge' into for-next)
1363 $ git merge --no-ff gpio-lw/for-next
1364 Merge made by the 'recursive' strategy.
1365 drivers/gpio/gpio-omap.c | 84 ++++++++++++++++++++++++++++++++++++++++--------
1366 1 file changed, 70 insertions(+), 14 deletions(-)
1367 Merging arm-soc/for-next (f681e48 Merge branch 'fixes' into for-next)
1368 $ git merge --no-ff arm-soc/for-next
1369 Merge made by the 'recursive' strategy.
1370 arch/arm/arm-soc-for-next-contents.txt | 345 +++++++++++++++++++++++++++++++++
1371 1 file changed, 345 insertions(+)
1372 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
1373 Merging bcm2835/for-next (7d13205 Linux 3.10-rc6)
1374 $ git merge --no-ff bcm2835/for-next
1376 Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function)
1377 $ git merge --no-ff cortex/for-next
1378 Merge made by the 'recursive' strategy.
1379 arch/arm/kernel/entry-v7m.S | 2 +-
1380 1 file changed, 1 insertion(+), 1 deletion(-)
1381 Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
1382 $ git merge --no-ff ep93xx/ep93xx-for-next
1384 Merge made by the 'recursive' strategy.
1385 Merging imx-mxs/for-next (acd9791 Merge branch 'mxs/dt' into for-next)
1386 $ git merge --no-ff imx-mxs/for-next
1387 Merge made by the 'recursive' strategy.
1388 Documentation/devicetree/bindings/bus/imx-weim.txt | 17 +-
1389 .../devicetree/bindings/clock/imx27-clock.txt | 1 +
1390 arch/arm/boot/dts/Makefile | 4 +
1391 arch/arm/boot/dts/imx23.dtsi | 15 +-
1392 arch/arm/boot/dts/imx25.dtsi | 35 +-
1393 arch/arm/boot/dts/imx27-apf27dev.dts | 5 +
1394 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 93 +
1395 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 44 +
1396 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 13 +
1397 arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 98 +-
1398 arch/arm/boot/dts/imx27.dtsi | 114 +-
1399 arch/arm/boot/dts/imx28-apx4devkit.dts | 2 +-
1400 arch/arm/boot/dts/imx28-cfa10036.dts | 7 +-
1401 arch/arm/boot/dts/imx28-cfa10037.dts | 19 +-
1402 arch/arm/boot/dts/imx28-cfa10049.dts | 73 +-
1403 arch/arm/boot/dts/imx28-cfa10055.dts | 38 +-
1404 arch/arm/boot/dts/imx28-cfa10056.dts | 119 ++
1405 arch/arm/boot/dts/imx28-cfa10057.dts | 23 +-
1406 arch/arm/boot/dts/imx28-cfa10058.dts | 141 ++
1407 arch/arm/boot/dts/imx28-evk.dts | 2 +-
1408 arch/arm/boot/dts/imx28-m28evk.dts | 15 +-
1409 arch/arm/boot/dts/imx28.dtsi | 47 +-
1410 arch/arm/boot/dts/imx31.dtsi | 17 +
1411 arch/arm/boot/dts/imx51-babbage.dts | 14 +-
1412 arch/arm/boot/dts/imx51.dtsi | 106 +-
1413 arch/arm/boot/dts/imx53-mba53.dts | 2 +-
1414 arch/arm/boot/dts/imx53-qsb.dts | 4 +
1415 arch/arm/boot/dts/imx53.dtsi | 90 +-
1416 arch/arm/boot/dts/imx6dl-pinfunc.h | 2138 ++++++++++----------
1417 arch/arm/boot/dts/imx6dl-sabreauto.dts | 22 -
1418 arch/arm/boot/dts/imx6dl-sabresd.dts | 19 -
1419 arch/arm/boot/dts/imx6dl-wandboard.dts | 97 +
1420 arch/arm/boot/dts/imx6dl.dtsi | 248 +--
1421 arch/arm/boot/dts/imx6q-arm2.dts | 14 +-
1422 arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 6 +-
1423 arch/arm/boot/dts/imx6q-pinfunc.h | 2050 +++++++++----------
1424 arch/arm/boot/dts/imx6q-sabreauto.dts | 22 +-
1425 arch/arm/boot/dts/imx6q-sabrelite.dts | 20 +-
1426 arch/arm/boot/dts/imx6q-sabresd.dts | 19 +-
1427 arch/arm/boot/dts/imx6q.dtsi | 387 +---
1428 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 22 +
1429 arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 35 +
1430 arch/arm/boot/dts/imx6qdl.dtsi | 779 ++++++-
1431 arch/arm/boot/dts/imx6sl.dtsi | 26 +-
1432 arch/arm/boot/dts/vf610.dtsi | 8 +-
1433 arch/arm/configs/imx_v4_v5_defconfig | 1 +
1434 arch/arm/configs/imx_v6_v7_defconfig | 9 +
1435 arch/arm/mach-imx/Kconfig | 1 +
1436 arch/arm/mach-imx/Makefile | 3 +-
1437 arch/arm/mach-imx/clk-fixup-div.c | 129 ++
1438 arch/arm/mach-imx/clk-fixup-mux.c | 107 +
1439 arch/arm/mach-imx/clk-imx6q.c | 29 +-
1440 arch/arm/mach-imx/clk-imx6sl.c | 20 +-
1441 arch/arm/mach-imx/clk-pllv3.c | 15 +-
1442 arch/arm/mach-imx/clk-vf610.c | 2 +
1443 arch/arm/mach-imx/clk.c | 26 +
1444 arch/arm/mach-imx/clk.h | 10 +
1445 arch/arm/mach-imx/common.h | 6 +
1446 arch/arm/mach-imx/mach-imx6q.c | 102 +-
1447 arch/arm/mach-imx/mach-imx6sl.c | 3 +-
1448 arch/arm/mach-imx/mx27.h | 2 +-
1449 arch/arm/mach-imx/system.c | 33 +
1450 arch/arm/mach-mxs/mach-mxs.c | 5 +-
1451 drivers/bus/Kconfig | 3 +-
1452 drivers/bus/imx-weim.c | 129 +-
1453 include/dt-bindings/clock/vf610-clock.h | 4 +-
1454 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 16 +-
1455 67 files changed, 4586 insertions(+), 3139 deletions(-)
1456 create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
1457 create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
1458 create mode 100644 arch/arm/boot/dts/imx28-cfa10056.dts
1459 create mode 100644 arch/arm/boot/dts/imx28-cfa10058.dts
1460 create mode 100644 arch/arm/mach-imx/clk-fixup-div.c
1461 create mode 100644 arch/arm/mach-imx/clk-fixup-mux.c
1462 Merging ixp4xx/next (19f949f Linux 3.8)
1463 $ git merge --no-ff ixp4xx/next
1465 Merging msm/for-next (d701eda ARM: dts: msm: Fix merge resolution)
1466 $ git merge --no-ff msm/for-next
1467 Merge made by the 'recursive' strategy.
1468 Merging mvebu/for-next (ad81f05 Linux 3.11-rc1)
1469 $ git merge --no-ff mvebu/for-next
1471 Merging renesas/next (4bfc0fa Merge branch 'fixes' into for-next)
1472 $ git merge --no-ff renesas/next
1474 Merging samsung/for-next (ad81f05 Linux 3.11-rc1)
1475 $ git merge --no-ff samsung/for-next
1477 Merging tegra/for-next (2459c39 Merge branch for-3.12/defconfig into for-next)
1478 $ git merge --no-ff tegra/for-next
1479 Removing arch/arm/boot/dts/tegra114-pluto.dts
1480 Auto-merging arch/arm/boot/dts/Makefile
1481 Merge made by the 'recursive' strategy.
1482 arch/arm/boot/dts/Makefile | 3 +--
1483 arch/arm/boot/dts/tegra114-dalmore.dts | 29 +++++++++++++++++++++++++++++
1484 arch/arm/boot/dts/tegra114-pluto.dts | 33 ---------------------------------
1485 arch/arm/boot/dts/tegra30-cardhu.dtsi | 33 ++++++++++++++++++++-------------
1486 arch/arm/configs/tegra_defconfig | 2 ++
1487 arch/arm/mach-tegra/Kconfig | 1 +
1488 6 files changed, 53 insertions(+), 48 deletions(-)
1489 delete mode 100644 arch/arm/boot/dts/tegra114-pluto.dts
1490 Merging dma-mapping/dma-mapping-next (f7d8f1e Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next)
1491 $ git merge --no-ff dma-mapping/dma-mapping-next
1492 Merge made by the 'recursive' strategy.
1493 Merging pwm/for-next (b388f15 pwm: pwm-tiehrpwm: Use clk_enable/disable instead clk_prepare/unprepare.)
1494 $ git merge --no-ff pwm/for-next
1496 Merging dma-buf/for-next (8bb495e Linux 3.10)
1497 $ git merge --no-ff dma-buf/for-next
1499 Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem)
1500 $ git merge --no-ff userns/for-next
1501 Auto-merging fs/proc/root.c
1502 Merge made by the 'recursive' strategy.
1503 fs/proc/root.c | 3 ++-
1504 1 file changed, 2 insertions(+), 1 deletion(-)
1505 Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines)
1506 $ git merge --no-ff ktest/for-next
1508 Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
1509 $ git merge --no-ff signal/for-next
1511 Merging clk/clk-next (45e3ec3 clk: tegra: fix ifdef for tegra_periph_reset_assert inline)
1512 $ git merge --no-ff clk/clk-next
1514 Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock)
1515 $ git merge --no-ff random/dev
1517 Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
1518 $ git merge --no-ff lzo-update/lzo-update
1519 Merge made by the 'recursive' strategy.
1520 lib/lzo/lzo1x_decompress_safe.c | 4 ++++
1521 lib/lzo/lzodefs.h | 6 ++++++
1522 2 files changed, 10 insertions(+)
1523 Merging arm64-hugepages/for-next/hugepages (af07484 ARM64: mm: THP support.)
1524 $ git merge --no-ff arm64-hugepages/for-next/hugepages
1526 Merging ptr-ret/PTR_RET (6b4f2b5 mm/oom_kill: remove weird use of ERR_PTR()/PTR_ERR().)
1527 $ git merge --no-ff ptr-ret/PTR_RET
1528 Merge made by the 'recursive' strategy.
1529 arch/arm/mach-omap2/i2c.c | 2 +-
1530 arch/m68k/amiga/platform.c | 2 +-
1531 arch/m68k/kernel/time.c | 2 +-
1532 arch/m68k/q40/config.c | 2 +-
1533 arch/powerpc/kernel/iommu.c | 2 +-
1534 arch/powerpc/kernel/time.c | 2 +-
1535 arch/powerpc/platforms/ps3/time.c | 2 +-
1536 arch/powerpc/sysdev/rtc_cmos_setup.c | 2 +-
1537 arch/s390/hypfs/hypfs_dbfs.c | 2 +-
1538 arch/s390/kvm/gaccess.h | 12 ++++++++----
1539 drivers/acpi/acpi_pad.c | 13 ++++++++-----
1540 drivers/char/tile-srom.c | 2 +-
1541 drivers/infiniband/core/cma.c | 2 +-
1542 drivers/net/appletalk/cops.c | 2 +-
1543 drivers/net/appletalk/ltpc.c | 2 +-
1544 drivers/net/ethernet/amd/atarilance.c | 2 +-
1545 drivers/net/ethernet/amd/mvme147.c | 2 +-
1546 drivers/net/ethernet/amd/ni65.c | 2 +-
1547 drivers/net/ethernet/amd/sun3lance.c | 2 +-
1548 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 2 +-
1549 drivers/net/wireless/brcm80211/brcmsmac/debug.c | 2 +-
1550 drivers/pinctrl/mvebu/pinctrl-dove.c | 2 +-
1551 drivers/platform/x86/samsung-q10.c | 2 +-
1552 drivers/regulator/fan53555.c | 2 +-
1553 drivers/remoteproc/da8xx_remoteproc.c | 2 +-
1554 drivers/spi/spi-fsl-spi.c | 2 +-
1555 drivers/spi/spidev.c | 2 +-
1556 drivers/staging/zcache/zcache-main.c | 2 +-
1557 drivers/video/omap2/dss/core.c | 2 +-
1558 fs/btrfs/dev-replace.c | 2 +-
1559 fs/btrfs/inode.c | 2 +-
1560 include/linux/err.h | 5 ++++-
1561 mm/oom_kill.c | 6 +++---
1562 net/bluetooth/hci_sysfs.c | 2 +-
1563 net/bridge/netfilter/ebtable_broute.c | 2 +-
1564 net/bridge/netfilter/ebtable_filter.c | 2 +-
1565 net/bridge/netfilter/ebtable_nat.c | 2 +-
1566 net/ipv4/netfilter/arptable_filter.c | 2 +-
1567 net/ipv4/netfilter/iptable_filter.c | 2 +-
1568 net/ipv4/netfilter/iptable_mangle.c | 2 +-
1569 net/ipv4/netfilter/iptable_nat.c | 2 +-
1570 net/ipv4/netfilter/iptable_raw.c | 2 +-
1571 net/ipv4/netfilter/iptable_security.c | 2 +-
1572 net/ipv6/netfilter/ip6table_filter.c | 2 +-
1573 net/ipv6/netfilter/ip6table_mangle.c | 2 +-
1574 net/ipv6/netfilter/ip6table_nat.c | 2 +-
1575 net/ipv6/netfilter/ip6table_raw.c | 2 +-
1576 net/ipv6/netfilter/ip6table_security.c | 2 +-
1577 scripts/coccinelle/api/ptr_ret.cocci | 10 +++++-----
1578 sound/soc/soc-io.c | 2 +-
1579 50 files changed, 73 insertions(+), 63 deletions(-)
1580 Merging aio/master (36bc08c fs/aio: Add support to aio ring pages migration)
1581 $ git merge --no-ff aio/master
1582 Merge made by the 'recursive' strategy.
1583 fs/aio.c | 119 ++++++++++++++++++++++++++++++++++++++++----
1584 fs/anon_inodes.c | 66 ++++++++++++++++++++++++
1585 include/linux/anon_inodes.h | 3 ++
1586 include/linux/migrate.h | 3 ++
1588 5 files changed, 181 insertions(+), 12 deletions(-)
1589 Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
1590 Merging akpm-current/current (7f0ef02 Merge branch 'akpm' (updates from Andrew Morton))
1591 $ git merge akpm-current/current
1593 $ git clone -s -l -n -q . ../rebase-tmp
1595 $ git checkout -b akpm remotes/origin/akpm/master
1596 Switched to a new branch 'akpm'
1597 $ git rebase --onto master remotes/origin/akpm/master-base
1598 First, rewinding head to replay your work on top of it...
1599 Applying: x86: make 'mem=' option to work for efi platform
1600 Applying: drivers/pcmcia/pd6729.c: convert to module_pci_driver
1601 Applying: drivers/pcmcia/yenta_socket.c: convert to module_pci_driver
1602 Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
1603 Applying: drm/cirrus: correct register values for 16bpp
1604 Applying: drm/nouveau: make vga_switcheroo code depend on VGA_SWITCHEROO
1605 Applying: drivers/video/acornfb.c: remove dead code
1606 Applying: cyber2000fb: avoid palette corruption at higher clocks
1607 Applying: include/linux/interrupt.h: add dummy irq_set_irq_wake() for "!GENERIC_HARDIRQS"
1608 Applying: hrtimer: one more expiry time overflow check in hrtimer_interrupt
1609 Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic()
1610 Applying: drivers/mtd/chips/gen_probe.c: refactor call to request_module()
1611 Applying: drivers/net/ethernet/ibm/ehea/ehea_main.c: add alias entry for portN properties
1612 Applying: mISDN: add support for group membership check
1613 Applying: drivers/atm/he.c: convert to module_pci_driver
1614 Applying: isdn: clean up debug format string usage
1615 Applying: ocfs2: should call ocfs2_journal_access_di() before ocfs2_delete_entry() in ocfs2_orphan_del()
1616 Applying: ocfs2: llseek requires ocfs2 inode lock for the file in SEEK_END
1617 Applying: ocfs2: fix issue that ocfs2_setattr() does not deal with new_i_size==i_size
1618 Applying: ocfs2-fix-issue-that-ocfs2_setattr-does-not-deal-with-new_i_size==i_size-v2
1619 Applying: include/linux/sched.h: don't use task->pid/tgid in same_thread_group/has_group_leader_pid
1620 Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros
1621 Applying: lglock: update lockdep annotations to report recursive local locks
1622 Applying: drivers/scsi/a100u2w.c: convert to module_pci_driver
1623 Applying: drivers/scsi/dc395x.c: convert to module_pci_driver
1624 Applying: drivers/scsi/dmx3191d.c: convert to module_pci_driver
1625 Applying: drivers/scsi/initio.c: convert to module_pci_driver
1626 Applying: drivers/scsi/mvumi.c: convert to module_pci_driver
1627 Applying: drivers/net/irda/donauboe.c: convert to module_pci_driver
1628 Applying: block: restore /proc/partitions to not display non-partitionable removable devices
1629 Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
1630 Applying: swap: add a simple detector for inappropriate swapin readahead
1631 Applying: swap: swapin_nr_pages() can be static
1632 Applying: vmcore: allow user process to remap ELF note segment buffer
1633 Applying: vmcore-allow-user-process-to-remap-elf-note-segment-buffer-fix
1634 Applying: vmcore: disable mmap_vmcore() if CONFIG_MMU is not defined
1635 Applying: mm-use-a-dedicated-lock-to-protect-totalram_pages-and-zone-managed_pages-fix
1636 Applying: mm-correctly-update-zone-managed_pages-fix-fix-fix
1637 Applying: fs: bump inode and dentry counters to long
1638 Applying: super: fix calculation of shrinkable objects for small numbers
1639 Applying: dcache: convert dentry_stat.nr_unused to per-cpu counters
1640 Applying: dentry: move to per-sb LRU locks
1641 Applying: dcache: remove dentries from LRU before putting on dispose list
1642 Applying: mm: new shrinker API
1643 Applying: shrinker: convert superblock shrinkers to new API
1644 Applying: shrinker-convert-superblock-shrinkers-to-new-api-fix
1645 Applying: list: add a new LRU list type
1646 Applying: inode: convert inode lru list to generic lru list code.
1647 Applying: inode: move inode to a different list inside lock
1648 Applying: dcache: convert to use new lru list infrastructure
1649 Applying: list_lru: per-node list infrastructure
1650 Applying: list_lru: per-node list infrastructure fix
1651 Applying: list_lru: per-node API
1652 Applying: list_lru: remove special case function list_lru_dispose_all.
1653 Applying: shrinker: add node awareness
1654 Applying: vmscan: per-node deferred work
1655 Applying: fs: convert inode and dentry shrinking to be node aware
1656 Applying: xfs: convert buftarg LRU to generic code
1657 Applying: xfs-convert-buftarg-lru-to-generic-code-fix
1658 Applying: xfs: rework buffer dispose list tracking
1659 Applying: xfs: convert dquot cache lru to list_lru
1660 Applying: xfs-convert-dquot-cache-lru-to-list_lru-fix
1661 Applying: fs: convert fs shrinkers to new scan/count API
1662 Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix
1663 Applying: UBIFS: signedness bug in ubifs_shrink_count()
1664 Applying: drivers: convert shrinkers to new count/scan API
1665 Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix
1666 Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix-2
1667 Applying: i915: bail out earlier when shrinker cannot acquire mutex
1668 Applying: shrinker: convert remaining shrinkers to count/scan API
1669 Applying: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix
1670 Applying: hugepage: convert huge zero page shrinker to new shrinker API
1671 Applying: hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix
1672 Applying: shrinker: Kill old ->shrink API.
1673 Applying: shrinker-kill-old-shrink-api-fix
1674 Applying: list_lru: dynamically adjust node arrays
1675 Applying: super: fix for destroy lrus
1676 Applying: include/linux/mmzone.h: cleanups
1677 Applying: mm: memmap_init_zone() performance improvement
1678 Applying: drop_caches: add some documentation and info message
1679 Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
1680 Applying: mm/dmapool.c: fix null dev in dma_pool_create()
1681 Applying: mm: add vm event counters for balloon pages compaction
1682 Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
1683 Applying: list: remove __list_for_each()
1684 Applying: checkpatch: warn when networking block comment lines don't start with *
1685 Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
1686 Applying: autofs4: allow autofs to work outside the initial PID namespace
1687 Applying: autofs4: translate pids to the right namespace for the daemon
1688 Applying: fat: additions to support fat_fallocate
1689 Applying: fat-additions-to-support-fat_fallocate-fix
1690 Applying: signals: eventpoll: set ->saved_sigmask at the start
1691 Applying: coredump: '% at the end' shouldn't bypass core_uses_pid logic
1692 Applying: move-exit_task_namespaces-outside-of-exit_notify-fix
1693 Applying: relay: fix timer madness
1694 Applying: drivers/iio/inkern.c: fix iio_convert_raw_to_processed_unlocked()
1695 Applying: staging/lustre/ldlm: convert to shrinkers to count/scan API
1696 Applying: staging/lustre/obdclass: convert lu_object shrinker to count/scan API
1697 Applying: staging/lustre/ptlrpc: convert to new shrinker API
1698 Applying: staging/lustre/libcfs: cleanup linux-mem.h
1699 Applying: staging/lustre: replace num_physpages with totalram_pages
1701 $ git fetch -f ../rebase-tmp akpm:akpm/master
1703 + 7acb35e...7bc3b65 akpm -> akpm/master (forced update)
1704 $ rm -rf ../rebase-tmp
1705 Merging akpm/master (7bc3b65 staging/lustre: replace num_physpages with totalram_pages)
1706 $ git merge --no-ff akpm/master
1707 Merge made by the 'recursive' strategy.
1708 Documentation/sysctl/vm.txt | 33 ++-
1709 arch/x86/include/asm/e820.h | 2 +
1710 arch/x86/kernel/e820.c | 72 +++++-
1711 arch/x86/kvm/mmu.c | 25 +-
1712 arch/x86/platform/efi/efi.c | 15 +-
1713 block/genhd.c | 2 +-
1714 drivers/atm/he.c | 13 +-
1715 drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +-
1716 drivers/gpu/drm/drm_fb_helper.c | 8 +
1717 drivers/gpu/drm/i915/i915_dma.c | 4 +-
1718 drivers/gpu/drm/i915/i915_gem.c | 78 ++++--
1719 drivers/gpu/drm/nouveau/nouveau_acpi.c | 5 +
1720 drivers/gpu/drm/ttm/ttm_page_alloc.c | 44 ++--
1721 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 51 ++--
1722 drivers/iio/inkern.c | 2 +-
1723 drivers/infiniband/core/cm.c | 5 +-
1724 drivers/isdn/hisax/amd7930_fn.c | 4 +-
1725 drivers/isdn/hisax/avm_pci.c | 4 +-
1726 drivers/isdn/hisax/config.c | 2 +-
1727 drivers/isdn/hisax/diva.c | 4 +-
1728 drivers/isdn/hisax/elsa.c | 2 +-
1729 drivers/isdn/hisax/elsa_ser.c | 2 +-
1730 drivers/isdn/hisax/hfc_pci.c | 2 +-
1731 drivers/isdn/hisax/hfc_sx.c | 2 +-
1732 drivers/isdn/hisax/hscx_irq.c | 4 +-
1733 drivers/isdn/hisax/icc.c | 4 +-
1734 drivers/isdn/hisax/ipacx.c | 8 +-
1735 drivers/isdn/hisax/isac.c | 4 +-
1736 drivers/isdn/hisax/isar.c | 6 +-
1737 drivers/isdn/hisax/jade.c | 18 +-
1738 drivers/isdn/hisax/jade_irq.c | 4 +-
1739 drivers/isdn/hisax/l3_1tr6.c | 50 ++--
1740 drivers/isdn/hisax/netjet.c | 2 +-
1741 drivers/isdn/hisax/q931.c | 6 +-
1742 drivers/isdn/hisax/w6692.c | 8 +-
1743 drivers/isdn/mISDN/core.c | 6 +
1744 drivers/isdn/mISDN/core.h | 1 +
1745 drivers/isdn/mISDN/socket.c | 9 +
1746 drivers/md/bcache/btree.c | 45 ++--
1747 drivers/md/bcache/sysfs.c | 2 +-
1748 drivers/md/dm-bufio.c | 64 +++--
1749 drivers/mtd/chips/gen_probe.c | 4 +-
1750 drivers/net/ethernet/ibm/ehea/ehea_main.c | 14 +-
1751 drivers/net/irda/donauboe.c | 15 +-
1752 drivers/pcmcia/pd6729.c | 13 +-
1753 drivers/pcmcia/yenta_socket.c | 16 +-
1754 drivers/scsi/a100u2w.c | 12 +-
1755 drivers/scsi/dc395x.c | 24 +-
1756 drivers/scsi/dmx3191d.c | 13 +-
1757 drivers/scsi/initio.c | 13 +-
1758 drivers/scsi/mvumi.c | 20 +-
1759 drivers/staging/android/ashmem.c | 44 ++--
1760 drivers/staging/android/lowmemorykiller.c | 43 ++--
1761 .../lustre/include/linux/libcfs/linux/linux-mem.h | 42 +--
1762 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 10 +-
1763 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 139 +++++-----
1764 .../lustre/lustre/libcfs/linux/linux-tracefile.c | 2 +-
1765 drivers/staging/lustre/lustre/llite/lproc_llite.c | 8 +-
1766 drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 +-
1767 .../lustre/lustre/obdclass/linux/linux-sysctl.c | 6 +-
1768 drivers/staging/lustre/lustre/obdclass/lu_object.c | 100 ++++----
1769 drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 +-
1770 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 2 +-
1771 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 80 +++---
1772 drivers/staging/zcache/zcache-main.c | 29 ++-
1773 drivers/usb/gadget/amd5536udc.c | 4 +-
1774 drivers/video/acornfb.c | 266 +------------------
1775 drivers/video/acornfb.h | 29 ---
1776 drivers/video/cyber2000fb.c | 3 +
1777 fs/autofs4/autofs_i.h | 4 +-
1778 fs/autofs4/dev-ioctl.c | 16 +-
1779 fs/autofs4/inode.c | 33 ++-
1780 fs/autofs4/waitq.c | 16 +-
1781 fs/binfmt_elf.c | 21 +-
1783 fs/dcache.c | 279 ++++++++++++--------
1784 fs/drop_caches.c | 3 +
1785 fs/eventpoll.c | 34 ++-
1786 fs/ext4/extents_status.c | 40 +--
1787 fs/fat/file.c | 108 +++++++-
1788 fs/fat/inode.c | 54 ++++
1789 fs/file_table.c | 3 +-
1790 fs/gfs2/glock.c | 30 ++-
1791 fs/gfs2/main.c | 3 +-
1792 fs/gfs2/quota.c | 18 +-
1793 fs/gfs2/quota.h | 6 +-
1794 fs/inode.c | 193 ++++++--------
1795 fs/internal.h | 6 +-
1796 fs/mbcache.c | 49 ++--
1797 fs/nfs/dir.c | 16 +-
1798 fs/nfs/internal.h | 6 +-
1799 fs/nfs/super.c | 3 +-
1800 fs/nfsd/nfscache.c | 32 ++-
1801 fs/ocfs2/alloc.c | 2 +-
1802 fs/ocfs2/file.c | 20 +-
1803 fs/ocfs2/namei.c | 12 +-
1804 fs/quota/dquot.c | 34 +--
1805 fs/super.c | 111 +++++---
1806 fs/ubifs/shrinker.c | 29 ++-
1807 fs/ubifs/super.c | 3 +-
1808 fs/ubifs/ubifs.h | 5 +-
1809 fs/xfs/xfs_buf.c | 253 +++++++++---------
1810 fs/xfs/xfs_buf.h | 17 +-
1811 fs/xfs/xfs_dquot.c | 7 +-
1812 fs/xfs/xfs_icache.c | 4 +-
1813 fs/xfs/xfs_icache.h | 2 +-
1814 fs/xfs/xfs_qm.c | 285 +++++++++++----------
1815 fs/xfs/xfs_qm.h | 4 +-
1816 fs/xfs/xfs_super.c | 12 +-
1817 include/linux/balloon_compaction.h | 7 +
1818 include/linux/dcache.h | 14 +-
1819 include/linux/fs.h | 25 +-
1820 include/linux/hardirq.h | 5 +
1821 include/linux/interrupt.h | 23 +-
1822 include/linux/list.h | 11 -
1823 include/linux/list_lru.h | 131 ++++++++++
1824 include/linux/lockdep.h | 92 ++-----
1825 include/linux/mmzone.h | 13 +-
1826 include/linux/page-flags.h | 4 +-
1827 include/linux/sched.h | 8 +-
1828 include/linux/shrinker.h | 54 +++-
1829 include/linux/vm_event_item.h | 7 +-
1830 include/trace/events/vmscan.h | 4 +-
1831 include/uapi/linux/fs.h | 6 +-
1832 kernel/hrtimer.c | 2 +
1833 kernel/lglock.c | 12 +-
1834 kernel/relay.c | 14 +-
1835 kernel/smp.c | 11 +-
1836 kernel/sysctl.c | 6 +-
1837 kernel/watchdog.c | 10 +-
1839 mm/balloon_compaction.c | 2 +
1841 mm/huge_memory.c | 17 +-
1842 mm/list_lru.c | 144 +++++++++++
1843 mm/memory-failure.c | 2 +
1845 mm/page_alloc.c | 5 +-
1846 mm/swap_state.c | 63 ++++-
1847 mm/vmscan.c | 241 +++++++++--------
1849 net/sunrpc/auth.c | 41 ++-
1850 scripts/checkpatch.pl | 8 +
1851 143 files changed, 2473 insertions(+), 1887 deletions(-)
1852 create mode 100644 include/linux/list_lru.h
1853 create mode 100644 mm/list_lru.c
1854 $ git am -3 ../patches/0001-fixup-for-ext4-and-shrinker-changes.patch
1855 Applying: fixup for ext4 and shrinker changes
1857 Unstaged changes after reset:
1858 M fs/ext4/extents_status.c
1859 M include/trace/events/ext4.h
1861 $ git commit -v -a --amend
1862 [master bb74ce7] Merge branch 'akpm/master'
1863 $ git clone -s -l -n -q . ../rebase-tmp
1865 $ git checkout -b cpuinit remotes/origin/cpuinit/master
1866 Switched to a new branch 'cpuinit'
1867 $ git rebase --onto master remotes/origin/cpuinit/master-base
1868 First, rewinding head to replay your work on top of it...
1869 Applying: alpha: delete __cpuinit usage from all users
1870 Applying: parisc: delete __cpuinit usage from all users
1871 Applying: MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code
1872 Applying: arm: delete __cpuinit/__CPUINIT usage from all ARM users
1873 Applying: sparc: delete __cpuinit/__CPUINIT usage from all users
1874 Applying: arm64: delete __cpuinit usage from all users
1875 Applying: blackfin: delete __cpuinit usage from all blackfin files
1876 Applying: s390: delete __cpuinit usage from all s390 files
1877 Applying: sh: delete __cpuinit usage from all sh files
1878 Applying: tile: delete __cpuinit usage from all tile files
1879 Applying: metag: delete __cpuinit usage from all metag files
1880 Applying: cris: delete __cpuinit usage from all cris files
1881 Applying: frv: delete __cpuinit usage from all frv files
1882 Applying: hexagon: delete __cpuinit usage from all hexagon files
1883 Applying: m32r: delete __cpuinit usage from all m32r files
1884 Applying: openrisc: delete __cpuinit usage from all openrisc files
1885 Applying: xtensa: delete __cpuinit usage from all xtensa files
1886 Applying: score: delete __cpuinit usage from all score files
1887 Applying: x86: delete __cpuinit usage from all x86 files
1888 Applying: clocksource+irqchip: delete __cpuinit usage from all related files
1889 Applying: cpufreq: delete __cpuinit usage from all cpufreq files
1890 Applying: hwmon: delete __cpuinit usage from all hwmon files
1891 Applying: acpi: delete __cpuinit usage from all acpi files
1892 Applying: net: delete __cpuinit usage from all net files
1893 Applying: kernel: delete __cpuinit usage from all core kernel files
1894 Applying: drivers: delete __cpuinit usage from all remaining drivers files
1895 Applying: block: delete __cpuinit usage from all block files
1897 $ git fetch -f ../rebase-tmp cpuinit:cpuinit/master
1899 + 6323401...6bb500d cpuinit -> cpuinit/master (forced update)
1900 $ rm -rf ../rebase-tmp
1901 Merging cpuinit/master (6bb500d block: delete __cpuinit usage from all block files)
1902 $ git merge --no-ff cpuinit/master
1903 Merge made by the 'recursive' strategy.
1904 Documentation/cpu-hotplug.txt | 6 +-
1905 arch/alpha/kernel/smp.c | 10 +-
1906 arch/alpha/kernel/traps.c | 4 +-
1907 arch/arm/common/mcpm_platsmp.c | 4 +-
1908 arch/arm/include/asm/arch_timer.h | 2 +-
1909 arch/arm/kernel/head-common.S | 1 -
1910 arch/arm/kernel/head-nommu.S | 1 -
1911 arch/arm/kernel/head.S | 1 -
1912 arch/arm/kernel/hw_breakpoint.c | 4 +-
1913 arch/arm/kernel/perf_event_cpu.c | 6 +-
1914 arch/arm/kernel/psci_smp.c | 3 +-
1915 arch/arm/kernel/smp.c | 18 ++--
1916 arch/arm/kernel/smp_twd.c | 6 +-
1917 arch/arm/lib/delay.c | 2 +-
1918 arch/arm/mach-exynos/headsmp.S | 2 -
1919 arch/arm/mach-exynos/platsmp.c | 4 +-
1920 arch/arm/mach-highbank/platsmp.c | 2 +-
1921 arch/arm/mach-imx/platsmp.c | 2 +-
1922 arch/arm/mach-keystone/platsmp.c | 2 +-
1923 arch/arm/mach-msm/headsmp.S | 2 -
1924 arch/arm/mach-msm/platsmp.c | 6 +-
1925 arch/arm/mach-msm/timer.c | 4 +-
1926 arch/arm/mach-mvebu/coherency.c | 2 +-
1927 arch/arm/mach-mvebu/headsmp.S | 2 -
1928 arch/arm/mach-mvebu/platsmp.c | 5 +-
1929 arch/arm/mach-omap2/omap-headsmp.S | 2 -
1930 arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
1931 arch/arm/mach-omap2/omap-smp.c | 4 +-
1932 arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
1933 arch/arm/mach-prima2/headsmp.S | 2 -
1934 arch/arm/mach-prima2/platsmp.c | 4 +-
1935 arch/arm/mach-shmobile/headsmp-scu.S | 1 -
1936 arch/arm/mach-shmobile/headsmp.S | 2 -
1937 arch/arm/mach-shmobile/smp-emev2.c | 2 +-
1938 arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
1939 arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
1940 arch/arm/mach-socfpga/headsmp.S | 1 -
1941 arch/arm/mach-socfpga/platsmp.c | 2 +-
1942 arch/arm/mach-spear/generic.h | 2 +-
1943 arch/arm/mach-spear/platsmp.c | 4 +-
1944 arch/arm/mach-sti/platsmp.c | 6 +-
1945 arch/arm/mach-tegra/platsmp.c | 4 +-
1946 arch/arm/mach-tegra/pm.c | 2 +-
1947 arch/arm/mach-ux500/platsmp.c | 4 +-
1948 arch/arm/mach-zynq/common.h | 2 +-
1949 arch/arm/mach-zynq/headsmp.S | 2 -
1950 arch/arm/mach-zynq/platsmp.c | 6 +-
1951 arch/arm/mm/proc-arm1020.S | 2 -
1952 arch/arm/mm/proc-arm1020e.S | 2 -
1953 arch/arm/mm/proc-arm1022.S | 2 -
1954 arch/arm/mm/proc-arm1026.S | 3 -
1955 arch/arm/mm/proc-arm720.S | 2 -
1956 arch/arm/mm/proc-arm740.S | 2 -
1957 arch/arm/mm/proc-arm7tdmi.S | 2 -
1958 arch/arm/mm/proc-arm920.S | 2 -
1959 arch/arm/mm/proc-arm922.S | 2 -
1960 arch/arm/mm/proc-arm925.S | 2 -
1961 arch/arm/mm/proc-arm926.S | 2 -
1962 arch/arm/mm/proc-arm940.S | 2 -
1963 arch/arm/mm/proc-arm946.S | 2 -
1964 arch/arm/mm/proc-arm9tdmi.S | 2 -
1965 arch/arm/mm/proc-fa526.S | 2 -
1966 arch/arm/mm/proc-feroceon.S | 2 -
1967 arch/arm/mm/proc-mohawk.S | 2 -
1968 arch/arm/mm/proc-sa110.S | 2 -
1969 arch/arm/mm/proc-sa1100.S | 2 -
1970 arch/arm/mm/proc-v6.S | 2 -
1971 arch/arm/mm/proc-v7-2level.S | 4 -
1972 arch/arm/mm/proc-v7-3level.S | 4 -
1973 arch/arm/mm/proc-v7.S | 2 -
1974 arch/arm/mm/proc-xsc3.S | 2 -
1975 arch/arm/mm/proc-xscale.S | 2 -
1976 arch/arm/plat-versatile/platsmp.c | 6 +-
1977 arch/arm64/include/asm/arch_timer.h | 2 +-
1978 arch/arm64/kernel/debug-monitors.c | 6 +-
1979 arch/arm64/kernel/hw_breakpoint.c | 4 +-
1980 arch/arm64/kernel/smp.c | 8 +-
1981 arch/blackfin/kernel/perf_event.c | 2 +-
1982 arch/blackfin/kernel/setup.c | 4 +-
1983 arch/blackfin/mach-bf561/smp.c | 6 +-
1984 arch/blackfin/mach-common/cache-c.c | 4 +-
1985 arch/blackfin/mach-common/ints-priority.c | 2 +-
1986 arch/blackfin/mach-common/smp.c | 12 +--
1987 arch/cris/arch-v32/kernel/smp.c | 2 +-
1988 arch/frv/kernel/setup.c | 2 +-
1989 arch/hexagon/kernel/setup.c | 2 +-
1990 arch/hexagon/kernel/smp.c | 4 +-
1991 arch/m32r/kernel/smpboot.c | 2 +-
1992 arch/metag/kernel/perf/perf_event.c | 6 +-
1993 arch/metag/kernel/smp.c | 22 ++--
1994 arch/metag/kernel/traps.c | 2 +-
1995 arch/mips/ath79/setup.c | 2 +-
1996 arch/mips/cavium-octeon/octeon-irq.c | 12 +--
1997 arch/mips/cavium-octeon/smp.c | 6 +-
1998 arch/mips/include/asm/uasm.h | 37 +++----
1999 arch/mips/kernel/bmips_vec.S | 4 -
2000 arch/mips/kernel/cevt-bcm1480.c | 2 +-
2001 arch/mips/kernel/cevt-gic.c | 2 +-
2002 arch/mips/kernel/cevt-r4k.c | 2 +-
2003 arch/mips/kernel/cevt-sb1250.c | 2 +-
2004 arch/mips/kernel/cevt-smtc.c | 2 +-
2005 arch/mips/kernel/cpu-bugs64.c | 2 +-
2006 arch/mips/kernel/cpu-probe.c | 14 +--
2007 arch/mips/kernel/head.S | 4 -
2008 arch/mips/kernel/smp-bmips.c | 6 +-
2009 arch/mips/kernel/smp-mt.c | 6 +-
2010 arch/mips/kernel/smp-up.c | 6 +-
2011 arch/mips/kernel/smp.c | 6 +-
2012 arch/mips/kernel/smtc.c | 2 +-
2013 arch/mips/kernel/spram.c | 14 +--
2014 arch/mips/kernel/sync-r4k.c | 12 +--
2015 arch/mips/kernel/traps.c | 12 +--
2016 arch/mips/kernel/watch.c | 2 +-
2017 arch/mips/lantiq/irq.c | 2 +-
2018 arch/mips/lib/uncached.c | 2 +-
2019 arch/mips/mm/c-octeon.c | 6 +-
2020 arch/mips/mm/c-r3k.c | 8 +-
2021 arch/mips/mm/c-r4k.c | 34 +++---
2022 arch/mips/mm/c-tx39.c | 2 +-
2023 arch/mips/mm/cache.c | 2 +-
2024 arch/mips/mm/cex-sb1.S | 4 -
2025 arch/mips/mm/page.c | 40 +++----
2026 arch/mips/mm/sc-ip22.c | 2 +-
2027 arch/mips/mm/sc-mips.c | 2 +-
2028 arch/mips/mm/sc-r5k.c | 2 +-
2029 arch/mips/mm/sc-rm7k.c | 12 +--
2030 arch/mips/mm/tlb-r3k.c | 2 +-
2031 arch/mips/mm/tlb-r4k.c | 4 +-
2032 arch/mips/mm/tlb-r8k.c | 4 +-
2033 arch/mips/mm/tlbex.c | 144 ++++++++++++--------------
2034 arch/mips/mm/uasm-micromips.c | 10 +-
2035 arch/mips/mm/uasm-mips.c | 10 +-
2036 arch/mips/mm/uasm.c | 106 +++++++++----------
2037 arch/mips/mti-malta/malta-smtc.c | 6 +-
2038 arch/mips/mti-malta/malta-time.c | 2 +-
2039 arch/mips/mti-sead3/sead3-time.c | 2 +-
2040 arch/mips/netlogic/common/smp.c | 4 +-
2041 arch/mips/netlogic/common/smpboot.S | 4 -
2042 arch/mips/netlogic/common/time.c | 2 +-
2043 arch/mips/netlogic/xlr/wakeup.c | 2 +-
2044 arch/mips/pci/pci-ip27.c | 2 +-
2045 arch/mips/pmcs-msp71xx/msp_smtc.c | 7 +-
2046 arch/mips/pmcs-msp71xx/msp_time.c | 2 +-
2047 arch/mips/pnx833x/common/interrupts.c | 2 +-
2048 arch/mips/powertv/time.c | 2 +-
2049 arch/mips/ralink/irq.c | 2 +-
2050 arch/mips/sgi-ip27/ip27-init.c | 4 +-
2051 arch/mips/sgi-ip27/ip27-smp.c | 6 +-
2052 arch/mips/sgi-ip27/ip27-timer.c | 6 +-
2053 arch/mips/sgi-ip27/ip27-xtalk.c | 6 +-
2054 arch/mips/sibyte/bcm1480/smp.c | 8 +-
2055 arch/mips/sibyte/sb1250/smp.c | 8 +-
2056 arch/openrisc/kernel/setup.c | 2 +-
2057 arch/parisc/kernel/firmware.c | 14 +--
2058 arch/parisc/kernel/hardware.c | 2 +-
2059 arch/parisc/kernel/processor.c | 6 +-
2060 arch/parisc/kernel/smp.c | 8 +-
2061 arch/s390/kernel/cache.c | 15 ++-
2062 arch/s390/kernel/perf_cpum_cf.c | 4 +-
2063 arch/s390/kernel/processor.c | 2 +-
2064 arch/s390/kernel/smp.c | 17 ++-
2065 arch/s390/kernel/sysinfo.c | 2 +-
2066 arch/s390/kernel/vtime.c | 6 +-
2067 arch/s390/mm/fault.c | 4 +-
2068 arch/score/mm/tlb-score.c | 2 +-
2069 arch/sh/kernel/cpu/init.c | 18 ++--
2070 arch/sh/kernel/cpu/sh2/probe.c | 2 +-
2071 arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
2072 arch/sh/kernel/cpu/sh3/probe.c | 2 +-
2073 arch/sh/kernel/cpu/sh4/probe.c | 2 +-
2074 arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +-
2075 arch/sh/kernel/cpu/sh5/probe.c | 2 +-
2076 arch/sh/kernel/perf_event.c | 4 +-
2077 arch/sh/kernel/process.c | 2 +-
2078 arch/sh/kernel/setup.c | 2 +-
2079 arch/sh/kernel/smp.c | 8 +-
2080 arch/sh/kernel/traps_32.c | 2 +-
2081 arch/sh/kernel/traps_64.c | 2 +-
2082 arch/sh/mm/tlb-sh5.c | 2 +-
2083 arch/sparc/kernel/ds.c | 11 +-
2084 arch/sparc/kernel/entry.h | 2 +-
2085 arch/sparc/kernel/hvtramp.S | 1 -
2086 arch/sparc/kernel/irq_64.c | 5 +-
2087 arch/sparc/kernel/leon_smp.c | 10 +-
2088 arch/sparc/kernel/mdesc.c | 34 +++---
2089 arch/sparc/kernel/smp_32.c | 20 ++--
2090 arch/sparc/kernel/smp_64.c | 9 +-
2091 arch/sparc/kernel/sun4d_smp.c | 6 +-
2092 arch/sparc/kernel/sun4m_smp.c | 6 +-
2093 arch/sparc/kernel/sysfs.c | 4 +-
2094 arch/sparc/kernel/trampoline_32.S | 3 -
2095 arch/sparc/kernel/trampoline_64.S | 2 -
2096 arch/sparc/mm/init_64.c | 2 +-
2097 arch/sparc/mm/srmmu.c | 12 +--
2098 arch/tile/kernel/irq.c | 2 +-
2099 arch/tile/kernel/messaging.c | 2 +-
2100 arch/tile/kernel/setup.c | 12 +--
2101 arch/tile/kernel/smpboot.c | 8 +-
2102 arch/tile/kernel/time.c | 2 +-
2103 arch/x86/include/asm/cpu.h | 2 +-
2104 arch/x86/include/asm/microcode.h | 4 +-
2105 arch/x86/include/asm/microcode_amd.h | 4 +-
2106 arch/x86/include/asm/microcode_intel.h | 4 +-
2107 arch/x86/include/asm/mmconfig.h | 4 +-
2108 arch/x86/include/asm/mpspec.h | 2 +-
2109 arch/x86/include/asm/numa.h | 6 +-
2110 arch/x86/include/asm/processor.h | 2 +-
2111 arch/x86/include/asm/prom.h | 2 +-
2112 arch/x86/include/asm/smp.h | 2 +-
2113 arch/x86/kernel/acpi/boot.c | 6 +-
2114 arch/x86/kernel/apic/apic.c | 30 +++---
2115 arch/x86/kernel/apic/apic_numachip.c | 2 +-
2116 arch/x86/kernel/apic/es7000_32.c | 2 +-
2117 arch/x86/kernel/apic/numaq_32.c | 2 +-
2118 arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
2119 arch/x86/kernel/apic/x2apic_uv_x.c | 14 +--
2120 arch/x86/kernel/cpu/amd.c | 33 +++---
2121 arch/x86/kernel/cpu/centaur.c | 26 ++---
2122 arch/x86/kernel/cpu/common.c | 64 ++++++------
2123 arch/x86/kernel/cpu/cyrix.c | 40 +++----
2124 arch/x86/kernel/cpu/hypervisor.c | 2 +-
2125 arch/x86/kernel/cpu/intel.c | 30 +++---
2126 arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++-----
2127 arch/x86/kernel/cpu/mcheck/mce.c | 23 ++--
2128 arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 ++-
2129 arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 +-
2130 arch/x86/kernel/cpu/perf_event.c | 2 +-
2131 arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
2132 arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++---
2133 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++--
2134 arch/x86/kernel/cpu/rdrand.c | 2 +-
2135 arch/x86/kernel/cpu/scattered.c | 4 +-
2136 arch/x86/kernel/cpu/topology.c | 2 +-
2137 arch/x86/kernel/cpu/transmeta.c | 6 +-
2138 arch/x86/kernel/cpu/umc.c | 2 +-
2139 arch/x86/kernel/cpu/vmware.c | 2 +-
2140 arch/x86/kernel/cpuid.c | 7 +-
2141 arch/x86/kernel/devicetree.c | 2 +-
2142 arch/x86/kernel/head_32.S | 1 -
2143 arch/x86/kernel/i387.c | 10 +-
2144 arch/x86/kernel/irq_32.c | 2 +-
2145 arch/x86/kernel/kvm.c | 10 +-
2146 arch/x86/kernel/kvmclock.c | 2 +-
2147 arch/x86/kernel/microcode_amd_early.c | 8 +-
2148 arch/x86/kernel/microcode_core.c | 2 +-
2149 arch/x86/kernel/microcode_core_early.c | 6 +-
2150 arch/x86/kernel/microcode_intel_early.c | 26 ++---
2151 arch/x86/kernel/mmconf-fam10h_64.c | 12 +--
2152 arch/x86/kernel/msr.c | 6 +-
2153 arch/x86/kernel/process.c | 2 +-
2154 arch/x86/kernel/setup.c | 2 +-
2155 arch/x86/kernel/smpboot.c | 28 ++---
2156 arch/x86/kernel/tboot.c | 6 +-
2157 arch/x86/kernel/tsc.c | 4 +-
2158 arch/x86/kernel/tsc_sync.c | 18 ++--
2159 arch/x86/kernel/vsyscall_64.c | 6 +-
2160 arch/x86/kernel/x86_init.c | 4 +-
2161 arch/x86/kernel/xsave.c | 4 +-
2162 arch/x86/mm/mmio-mod.c | 4 +-
2163 arch/x86/mm/numa.c | 12 +--
2164 arch/x86/mm/numa_emulation.c | 12 +--
2165 arch/x86/mm/setup_nx.c | 4 +-
2166 arch/x86/pci/amd_bus.c | 8 +-
2167 arch/x86/platform/ce4100/ce4100.c | 2 +-
2168 arch/x86/platform/mrst/mrst.c | 4 +-
2169 arch/x86/xen/enlighten.c | 6 +-
2170 arch/x86/xen/setup.c | 6 +-
2171 arch/x86/xen/smp.c | 12 +--
2172 arch/x86/xen/spinlock.c | 2 +-
2173 arch/x86/xen/xen-ops.h | 2 +-
2174 arch/xtensa/kernel/time.c | 2 +-
2175 block/blk-iopoll.c | 6 +-
2176 block/blk-softirq.c | 6 +-
2177 drivers/acpi/acpi_processor.c | 2 +-
2178 drivers/acpi/processor_core.c | 8 +-
2179 drivers/acpi/processor_driver.c | 8 +-
2180 drivers/acpi/processor_idle.c | 6 +-
2181 drivers/base/cpu.c | 2 +-
2182 drivers/base/topology.c | 10 +-
2183 drivers/clocksource/arm_arch_timer.c | 8 +-
2184 drivers/clocksource/arm_global_timer.c | 8 +-
2185 drivers/clocksource/dummy_timer.c | 6 +-
2186 drivers/clocksource/exynos_mct.c | 4 +-
2187 drivers/clocksource/metag_generic.c | 6 +-
2188 drivers/clocksource/time-armada-370-xp.c | 4 +-
2189 drivers/clocksource/timer-marco.c | 4 +-
2190 drivers/cpufreq/cpufreq.c | 2 +-
2191 drivers/cpufreq/cpufreq_stats.c | 2 +-
2192 drivers/cpufreq/dbx500-cpufreq.c | 2 +-
2193 drivers/cpufreq/intel_pstate.c | 4 +-
2194 drivers/cpufreq/longhaul.c | 6 +-
2195 drivers/cpufreq/longhaul.h | 26 ++---
2196 drivers/cpufreq/longrun.c | 6 +-
2197 drivers/cpufreq/omap-cpufreq.c | 2 +-
2198 drivers/cpufreq/powernow-k7.c | 8 +-
2199 drivers/cpufreq/powernow-k8.c | 6 +-
2200 drivers/hwmon/coretemp.c | 39 ++++---
2201 drivers/hwmon/via-cputemp.c | 8 +-
2202 drivers/irqchip/irq-gic.c | 8 +-
2203 drivers/oprofile/timer_int.c | 4 +-
2204 drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
2205 include/linux/cpu.h | 2 +-
2206 include/linux/perf_event.h | 2 +-
2207 init/calibrate.c | 13 ++-
2209 kernel/events/core.c | 4 +-
2210 kernel/fork.c | 2 +-
2211 kernel/hrtimer.c | 6 +-
2212 kernel/printk.c | 2 +-
2213 kernel/profile.c | 2 +-
2214 kernel/relay.c | 2 +-
2215 kernel/sched/core.c | 12 +--
2216 kernel/sched/fair.c | 2 +-
2218 kernel/smpboot.c | 2 +-
2219 kernel/softirq.c | 8 +-
2220 kernel/time/tick-sched.c | 2 +-
2221 kernel/timer.c | 10 +-
2222 kernel/workqueue.c | 4 +-
2223 lib/Kconfig.debug | 2 +-
2224 lib/earlycpio.c | 2 +-
2225 lib/percpu_counter.c | 2 +-
2226 mm/memcontrol.c | 2 +-
2227 mm/page-writeback.c | 4 +-
2231 net/core/flow.c | 4 +-
2232 net/iucv/iucv.c | 2 +-
2233 329 files changed, 1068 insertions(+), 1210 deletions(-)
2234 $ git revert 36bc08cc0170
2235 [master 7547971] Revert "fs/aio: Add support to aio ring pages migration"
2236 3 files changed, 12 insertions(+), 112 deletions(-)
projects / karo-tx-linux.git / blob