Add linux-next specific files for 20121221
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..d2ddaad
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,215 @@
+Name SHA1
+---- ----
+origin 810a4855513b9cb1a191301eb5e4e28b276cc318
+fixes 4458315d22e05958d57f5cf7b04d7fc5f6d3d182
+kbuild-current bad9955db1b73d7286f74a8136a0628a9b1ac017
+arm-current e6ee4b2b57a8e0d8e551031173de080b338d3969
+m68k-current 5fec45a20db3656ce36fac24639aac76c6641215
+powerpc-merge e716e014384688d1a50d1aa5213ee74748c6d4e0
+sparc f01af9f85855e38fbd601e033a8eac204cc4cc1c
+net f01af9f85855e38fbd601e033a8eac204cc4cc1c
+sound-current d846b17475d52f037437d125cd19c28f1d36e4f0
+pci-current ff8e59bc4ec3f31789a47dce9b6fe44bd7bc5fcc
+wireless 009b969632137f91534db91c19d62f1ae21ba8a0
+driver-core.current 1800098549fc310cffffefdcb3722adaad0edda8
+tty.current 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf
+usb.current 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf
+staging.current 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf
+char-misc.current 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf
+input-current 022573c275500e1a50889949f679d04b5446edf6
+md-current a9add5d92b64ea57fb4c3b557c3891cdeb15fa0c
+audit-current c158a35c8a681cf68d36f22f058f9f5466386c71
+crypto-current a2c0911c09190125f52c9941b9d187f601c2f7be
+ide 9974e43d900af7979e0a571b8e0c9674c7399b79
+dwmw2 084a0ec1e3704d6c3714a665db755d581f797f67
+sh-current 44033109e99cf584d6285226ed521098f5ef7250
+irqdomain-current a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
+devicetree-current ab28698d33af05abab0bcf8021eafe38f7434f24
+spi-current d3601e56cf64a3f2df6f6380cccb3644274406e2
+gpio-current bc1008cf7d243cf6ad87b1e16d3dbbd8c8d6f35c
+rr-fixes f3537f91f9be2ce5fcbaa1aa6d787ad0436daec6
+asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced
+arm c5a04d528b25162d6b426ee8660318c74b17e677
+arm-perf 3d70f8c617a436c7146ecb81df2265b4626dfe89
+davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625
+xilinx b4c582a92f41417154131083127e24b66cc4b31b
+arm64 d19766ec52218007d45888860dd40a24bb7f6651
+blackfin 86794b43569c9b8936dff2e8eed503393379af6e
+c6x 93bbd0c087eb299e0fe11c59d340932180c082b5
+cris 77c8006d8df4d5bafeb1d15eafa0886ae96e9b17
+hexagon e1858b2a21cd84a855945a4747fb2db41b250c22
+ia64 7843ae0ec641fe3acd02f966d45909f3e42e3e63
+m68k 5fec45a20db3656ce36fac24639aac76c6641215
+m68knommu 280ef31a00073b4092bb47814fcb0a1f1f27b2bd
+microblaze a4f1de176614f634c367e5994a7bcc428c940df0
+mips fcc638e1ff69159334568a522812d021997958cb
+openrisc 634bd40a894d64df09ba36c12bb6e70787989ba9
+parisc 949a05d03490e39e773e8652ccab9157e6f595b4
+powerpc 376bddd34433065aeb9b9a140870537feecf90ef
+4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d
+mpc5xxx 667b504a2c411e4d5915a6e2260a3857ba9f797a
+galak 1723d90915d4689fa2e8cd4151d45ea38c96cb99
+s390 1f1c96102ff848778cd596e81bdbd45f81a40119
+sh 0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb
+sparc-next 66cdd0ceaf65a18996f561b770eedde1d123b019
+tile e6cdebdf5aeccb5cbcf81e5e2764ad28a80f3185
+unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2
+xtensa 055d4db1e1ef6f983c3565110fbe6737087e9103
+btrfs fb8ec37f5160f8911837d8bf25cc00eb50c0dae3
+ceph c3e946ce7276faf0b302acd25c7b874edbeba661
+cifs 9acbd26b0a5ac4a3d52d31034feb3d935e39032a
+configfs b930c26416c4ea6855726fd977145ccea9afbdda
+ecryptfs 37028758f92d0a3eb74bcfbecf6bc477072e9e28
+ext3 56df127855b593cc4b2e94ce8df5c609b0109b42
+ext4 bd9926e80330d43f15b710c2935fa41b792d56fd
+f2fs 9475ef788c6ac48f301c2a04b8fd0ca0b990078d
+fuse 23ab0c76c0855eca2beffcdc9ed4a5a41043fb69
+gfs2 1e2d9d44f3ceb7dac7cb14d2476d0a8128c8e169
+jfs 4e7a4b01222343481d8ff084dbef9b80f7089a19
+logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c
+nfs cd6c5968582a273561464fe6b1e8cc8214be02df
+nfsd 24ffb93872f7363a01ad639e3c8a9889b46c3f0a
+ocfs2 4538df64655dcfe17b33080b219dc783161a262e
+omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84
+squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa
+v9fs 3d59eebc5e137bd89c6351e4c70e90ba1d0dc234
+ubifs a28ad42a4a0c6f302f488f26488b8b37c9b30024
+xfs ec47eb6b0b450a4e82340b6de674104de3f0dc0a
+vfs a77cfcb429ed98845a4e4df72473b8f37acd890b
+pci 1cb73f8c479e66541fefd3f7fa547b1fa56cdc54
+hid 01c4f7e6429bf0698c9570f820b44e360d70f5bc
+i2c-embedded cda2826abea9a78d21b5e35d71db328657b756e5
+jdelvare-hwmon c24c39b9a343b9645864957691d65ecfa036078b
+hwmon-staging 7764b5282e7e04ede3020d86787122887840e016
+v4l-dvb db46f44f32c26ac6b61fe2b4240d61b6074ba450
+kbuild f853c4aa0cbb15d4bcf23dca32f93fa5978ddb82
+kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb
+libata 72d5f2da2c3717f1be484d97e35d67dde0efb4c0
+infiniband d72623b665d84b1e07fe43854e83387fce8dd134
+pstore ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6
+acpi 61dc7fca11b981ce1a30c0eea91a2357e6533b0a
+cpuidle 3cf7997a389de59498c966c529456696ce8bc1a7
+cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37
+thermal d12250ef8dc1bbc811d505776be053e358ba82f5
+ieee1394 db2cad2f55078e90f84960b84b721291efa83d36
+ubi eab737722ed6a5638f6251e83f0d293c2ffe549f
+dlm da8c66638ae684c99abcb30e89d2803402e7ca20
+swiotlb af51a9f1848ff50079a10def56a2c064f326af22
+scsi e3ff197a750d2912d0bb2a0161c23c18bad250ad
+target-updates 79e62fc3827bd437c304c1810f36896fc1e717b1
+target-merge 6f0c0580b70c89094b3422ba81118c7b959c7556
+ibft 935a9fee51c945b8942be2d7b4bae069167b4886
+isci 6734092e66011def7875bd67beef889d0fee1cc9
+slave-dma 3226658ca2eab83047d2de62b94f719bd04753e3
+dmaengine 7f3498666c7b44f979720404d9ba883c309e60ad
+net-next 66cdd0ceaf65a18996f561b770eedde1d123b019
+wireless-next eca2a43bb0d2c6ebd528be6acb30a88435abe307
+bluetooth 3101c5362d7a28767346a7c0422dc30d54497ad4
+mtd ca2a88f56aa385890c7fd4ce9d2722b0848ca990
+l2-mtd d4d4f1bf6a343b25220fdcdf559fd593dd3e25a7
+crypto a2c0911c09190125f52c9941b9d187f601c2f7be
+drm 0953e76e91f4b6206cef50bd680696dc6bf1ef99
+sound cb99864d40e46dea9c2aa3eaa97517b776f91024
+sound-asoc 17f890423e8e12cf8569822604c9a9cb7a31e825
+modules 2f0bf92513be58d2d65c0a4cc05c5779a7cd81e1
+virtio ec2894e1ef881217da9af314261a6ae598709737
+input a455e2985f57e2a71566bb8850094af38b2c932d
+input-mt 6f0c0580b70c89094b3422ba81118c7b959c7556
+cgroup 15ef4ffaa797034d5ff82844daf8f595d7c6d53c
+block b6c46cfa312639a5416959258e6a81bea2fdaf8a
+device-mapper ab31b3f5836e4425010f75a0502a74211ee72eb8
+embedded 4744b43431e8613f920c5cba88346756f53c5165
+firmware 6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98
+mmc 6be35c700f742e911ecedd07fcc43d4439922334
+kgdb 58bcdf6847831913b41e9dfee1cbc579f939ef8b
+slab ce343df24893ec45102d82782a975ccf7fa08598
+uclinux b69f0859dc8e633c5d8c06845811588fe17e68b3
+md eb9efc4ca2d06fc148e40633806931bf71aac4a5
+mfd 1881b68b8961a86d40c3c5c205e533515a2dc9c6
+battery f36b9ddbab408f5f5ed9105d857189b84337af48
+fbdev cd9d6f10d07f26dd8a70e519c22b6b4f8a9e3e7a
+viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77
+omap_dss2 e7f5c9a16ea2648a3e85af8e34191026bf3dcb62
+regulator a824b57f33e3532b13357d29203afe8785e9f263
+security e93072374112db9dc86635934ee761249be28370
+selinux c2d7b247f0c028d325a5da5b9611b60ba160f237
+lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02
+watchdog 82444d815883eb018dcb66c5db5df3500a7c2f5e
+dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351
+iommu 9c6ecf6a3ade2dc4b03a239af68058b22897af41
+vfio 9a92c5091a42c565ede818fdf204c4f60004d0d8
+osd 861d66601acda6d7a2038fb3c95f68009128003a
+jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193
+trivial 106f9d9337f65bd428c0c79f650e3489e458d771
+audit dcd6c92267155e70a94b3927bce681ce74b80d1f
+pm 8ab67855554360e1928a62771c8c06bca75c1d1d
+apm fb9d78aca709b7a6389c79d6211fb384c69bb79f
+fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06
+edac c215786e009a4310f3ab4c18cb365def571d3d9b
+edac-amd 3bfe5aae8edd8436d26cddfeab783492d8950821
+devicetree 93c667ca2598bd84f1bd3f2fa176af69707699fe
+dt-rh 58fea354d887fddddd342a8d14b02069161ca904
+spi 7cb943615aabbd72624f77f0a84b8c5d627cf846
+spi-mb 227c4ce6eac9fe6566d9718546a0e31b5b4633cd
+tip 35fabb60ce3c519d4c853d4a84c1e0b152b70eca
+ftrace 2faffc4d7cc48196153bab9c26abf1302a7833a0
+rcu 91d1aa43d30505b0b825db8898ffc80a8eca96c7
+cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee
+uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa
+kvm e11ae1a102b46f76441e328a2743ae5d6e201423
+kvm-ppc 26cb7725048bc57e4c4a5b24dd46b78b2c285262
+oprofile 44009105081b51417f311f4c3be0061870b6b8ed
+fw-cputime fa09205783d11cc05122ad6e4ce06074624b2c0c
+fw-sched 1b2852b152be5150fbef7b585388ec43cf6f4415
+fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa
+xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495
+xen-two 9736dea1be21e5ba87bd453b94f02be474b589dc
+xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59
+percpu 5479c78ac6f688ea5ea8c49b44cf90ea87b63931
+workqueues 023f27d3d6fcc9048754d879fe5e7d63402a5b16
+drivers-x86 455f38ccba672b33cda0a96cf9089be312ba95de
+hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49
+sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00
+regmap 7c8a2994309214cbb6dba33cd72ec85f91fd6fcd
+hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a
+leds 2f05e1d4458f9cb68d4d36fb47e6830fec03c80e
+driver-core 1800098549fc310cffffefdcb3722adaad0edda8
+tty 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf
+usb 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf
+staging 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf
+char-misc 962b686c450493adb8596e813bdfd0e1613482e6
+tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
+writeback 2f60d628ffd042e65e0b1d3431fb3e38d6f7c1be
+arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268
+hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad
+pinctrl e5b4c9d4ab55fa520b4e5e6504cb22b8a34b9f0c
+vhost 0e9ff68cfd66b15cc80e622c11eff64aae00cba5
+memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077
+remoteproc 6f0c0580b70c89094b3422ba81118c7b959c7556
+irqdomain 023bba36387de704b3ea2a69bf9f9ed2301cfbcc
+gpio fc13d5a5b17c657b7682c145d367dcb859c507d9
+gpio-lw fc13d5a5b17c657b7682c145d367dcb859c507d9
+arm-soc e691d77e8825054376b31e79a9b5f9fa79fe764d
+bcm2835 29594404d7fe73cd80eaa4ee8c43dcc53970c60e
+cortex 77a3018e38b901f565b36f16924a3f86ad3e7328
+ep93xx cf92d8632cc73503b62ff58c32bfbdb2459a1e60
+ixp4xx b94740b3b38fd8e37fcd3bb06a18ec2796061c7d
+msm a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
+renesas e438fd87ae48765d0530ab4be59ed1eb4b4527d3
+samsung d1a8169e923d749477935a5984c2dc204a0824c4
+tegra 3c8d1fc07405e749b019372df1c971a884926592
+kvmtool 5f2ad679ad79dd6208ca96b6fe650383b088e0e5
+dma-mapping 0c375cf32e25def1bc86c8dc51c082c9f16bd9c2
+pwm 20e8ac3eea4dcfeea6ebeae57cd2c739fa48da11
+dma-buf 1d40cc8b5fc256dfaaa0c9373c726eea7c2631cc
+userns 5155040ed349950e16c093ba8e65ad534994df2a
+ktest 95f57838418358e93212e9dddd60d3502c7f8e2e
+signal 50ececcfa7d1acee085b2c518cad495062db6379
+clk 8f87189653d60656e262060665f52c855508a301
+random 6133705494bb02953e1e2cc3018a4373981b3c97
+lzo-update ba32bf9f4149eeab14bb97ca2edd2f8d1619dfd8
+drop-experimental dddaa921b2aad3118e918d752ab7e8ce43290a48
+scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47
+akpm-current 3605cce5dbe784b88ecd309d34a2ac311aa222d3
+akpm a1f06ec095bab3e4094965185d0a8bc8c9966b84
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..9a5916c
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,217 @@
+Trees included into this release:
+
+Name Type URL
+---- ---- ---
+origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master
+fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master
+kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes
+arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes
+m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus
+wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master
+driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+md-current git git://neil.brown.name/md#for-linus
+audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master
+dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master
+sh-current git git://github.com/pmundt/linux-sh.git#sh-fixes-for-linus
+irqdomain-current git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/merge
+devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge
+spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge
+gpio-current git git://git.secretlab.ca/git/linux-2.6#gpio/merge
+rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next
+xilinx git git://git.xilinx.com/linux-xlnx.git#arm-next
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git#upstream
+blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus
+c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next
+cris git git://www.jni.nu/cris.git#for-next
+hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next
+ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next
+m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next
+openrisc git git://openrisc.net/jonas/linux#for-upstream
+parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next
+4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next
+mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next
+galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features
+sh git git://github.com/pmundt/linux-sh.git#sh-latest
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master
+unicore32 git git://github.com/gxt/linux.git#unicore32
+xtensa git git://github.com/czankel/xtensa-linux.git#for_next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next
+ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+logfs git git://github.com/prasad-joshi/logfs_upstream.git#master
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next
+ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next
+omfs git git://github.com/bcopeland/omfs.git#for-next
+squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master
+v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next
+ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next
+xfs git git://oss.sgi.com/xfs/xfs.git#for-next
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
+pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next
+hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next
+i2c-embedded git git://git.pengutronix.de/git/wsa/linux.git#i2c-embedded/for-next
+jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/
+hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next
+kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT
+infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next
+pstore git git://git.infradead.org/users/cbou/linux-pstore.git#master
+acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+cpuidle git git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next
+cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+ubi git git://git.infradead.org/ubi-2.6.git#linux-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next
+target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge
+ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git#linux-next
+isci git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git#all
+slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next
+dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master
+wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+mtd git git://git.infradead.org/mtd-2.6.git#master
+l2-mtd git git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://people.freedesktop.org/~airlied/linux.git#drm-next
+sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next
+virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+input-mt git git://github.com/rydberg/linux.git#for-next
+cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+block git git://git.kernel.dk/linux-block.git#for-next
+device-mapper quilt http://people.redhat.com/agk/patches/linux/editing/
+embedded git git://git.infradead.org/embedded-2.6.git#master
+firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next
+slab git git://github.com/penberg/linux.git#for-next
+uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next
+md git git://neil.brown.name/md#for-next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next
+battery git git://git.infradead.org/battery-2.6.git#master
+fbdev git git://github.com/schandinat/linux-2.6.git#fbdev-next
+viafb git git://github.com/schandinat/linux-2.6.git#viafb-next
+omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next
+selinux git git://git.infradead.org/users/eparis/selinux.git#master
+lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master
+watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master
+dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master
+iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+vfio git git://github.com/awilliam/linux-vfio.git#next
+osd git git://git.open-osd.org/linux-open-osd.git#linux-next
+jc_docs git git://git.lwn.net/linux-2.6.git#docs-next
+trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-next
+pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next
+fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next
+edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next
+dt-rh git git://sources.calxeda.com/kernel/linux.git#for-next
+spi git git://git.secretlab.ca/git/linux-2.6#spi/next
+spi-mb git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git#spi-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+cputime git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#cputime
+uprobes git git://github.com/srikard/linux.git#for-next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next
+kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next
+oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next
+fw-cputime git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#cputime/adjustment-v2
+fw-sched git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#sched/cputime-v2
+fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/printk-v8
+xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen
+xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next
+xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86 git git://cavan.codon.org.uk/platform-drivers-x86.git#linux-next
+hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison
+sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+hsi git git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next
+leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next
+driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+tmem git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next
+writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next
+arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next
+hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map
+remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next
+irqdomain git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next
+gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next
+gpio-lw git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next
+bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next
+cortex git git://git.pengutronix.de/git/ukl/linux-2.6.git#for-next
+ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next
+ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next
+msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next
+kvmtool git git://github.com/penberg/linux-kvm.git#master
+dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next
+pwm git git://gitorious.org/linux-pwm/linux-pwm.git#for-next
+dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next
+userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next
+ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next
+signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next
+clk git git://git.linaro.org/people/mturquette/linux.git#clk-next
+random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev
+lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update
+drop-experimental git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#linux-next
+scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master
+akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/
+akpm mmotm http://www.ozlabs.org/~akpm/mmotm/
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 0000000..54eaf56
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,3196 @@
+$ date
+Friday 21 December 10:31:30 EST 2012
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 2f0bf92 Merge tag 'xtensa-20121218' of git://github.com/czankel/xtensa-linux
+Merging origin/master (810a485 Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild)
+$ git merge origin/master
+Updating 2f0bf92..810a485
+Fast-forward
+ Documentation/ABI/testing/sysfs-bus-rbd | 4 +
+ Documentation/DMA-API-HOWTO.txt | 126 ++
+ Documentation/DMA-API.txt | 12 +
+ .../bindings/spi/nvidia,tegra20-sflash.txt | 2 +-
+ .../bindings/spi/nvidia,tegra20-slink.txt | 2 +-
+ .../devicetree/bindings/spi/spi_atmel.txt | 26 +
+ Documentation/filesystems/00-INDEX | 2 +
+ Documentation/filesystems/f2fs.txt | 421 +++++
+ Documentation/filesystems/nfs/nfs41-server.txt | 20 +-
+ Documentation/hwmon/it87 | 10 +
+ Makefile | 10 +-
+ arch/arm/boot/dts/Makefile | 5 +-
+ arch/arm/boot/dts/at91sam9263.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9g45.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9x5.dtsi | 2 +-
+ arch/arm/boot/dts/imx27-3ds.dts | 8 +-
+ arch/arm/boot/dts/imx27-phytec-phycore.dts | 13 +-
+ arch/arm/boot/dts/imx27.dtsi | 11 +-
+ arch/arm/boot/dts/omap2420-h4.dts | 2 +-
+ arch/arm/boot/dts/sun4i-cubieboard.dts | 4 +-
+ arch/arm/boot/dts/sun5i-olinuxino.dts | 4 +-
+ arch/arm/include/asm/dma-mapping.h | 1 +
+ arch/arm/mach-davinci/board-da850-evm.c | 1 +
+ arch/arm/mach-ep93xx/include/mach/uncompress.h | 10 +-
+ arch/arm/mach-exynos/common.h | 2 +-
+ arch/arm/mach-imx/clk-imx51-imx53.c | 16 +
+ .../devices/platform-mx2-emma.c | 4 +-
+ arch/arm/mach-omap2/Kconfig | 3 +-
+ arch/arm/mach-omap2/board-3430sdp.c | 1 +
+ arch/arm/mach-omap2/board-am3517evm.c | 1 +
+ arch/arm/mach-omap2/board-cm-t35.c | 1 +
+ arch/arm/mach-omap2/board-devkit8000.c | 1 +
+ arch/arm/mach-omap2/board-h4.c | 83 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 1 +
+ arch/arm/mach-omap2/board-omap3stalker.c | 1 +
+ arch/arm/mach-omap2/cclock44xx_data.c | 78 +-
+ arch/arm/mach-omap2/clock.h | 10 +
+ arch/arm/mach-omap2/clockdomain.c | 3 +-
+ arch/arm/mach-omap2/common.c | 3 -
+ arch/arm/mach-omap2/cpuidle34xx.c | 14 +-
+ arch/arm/mach-omap2/cpuidle44xx.c | 28 +-
+ arch/arm/mach-omap2/devices.c | 2 +-
+ arch/arm/mach-omap2/dpll3xxx.c | 46 +-
+ arch/arm/mach-omap2/dpll44xx.c | 64 +-
+ arch/arm/mach-omap2/i2c.c | 1 +
+ arch/arm/mach-omap2/mux.c | 10 +-
+ arch/arm/mach-omap2/mux.h | 20 +-
+ arch/arm/mach-omap2/mux34xx.c | 2 +-
+ arch/arm/mach-omap2/omap-iommu.c | 167 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 +-
+ arch/arm/mach-omap2/serial.c | 3 +-
+ arch/arm/mach-omap2/timer.c | 6 +-
+ arch/arm/mach-omap2/usb-host.c | 4 +
+ arch/arm/mach-tegra/common.c | 2 +-
+ arch/arm/mach-tegra/tegra30_clocks.c | 4 +-
+ arch/arm/mach-u300/core.c | 34 -
+ arch/arm/mach-ux500/devices-db8500.h | 1 +
+ arch/arm/plat-omap/Makefile | 1 -
+ arch/arm/plat-omap/debug-devices.c | 92 -
+ arch/arm/plat-omap/include/plat/debug-devices.h | 2 -
+ arch/arm64/include/asm/dma-mapping.h | 1 +
+ arch/c6x/include/asm/dma-mapping.h | 1 +
+ arch/cris/include/arch-v10/arch/Kbuild | 5 +-
+ arch/cris/include/arch-v32/arch/Kbuild | 3 +-
+ arch/cris/include/arch-v32/arch/cryptocop.h | 116 +-
+ arch/cris/include/arch-v32/arch/spinlock.h | 2 +-
+ arch/cris/include/asm/Kbuild | 5 -
+ arch/cris/include/asm/ptrace.h | 5 +-
+ arch/cris/include/asm/signal.h | 121 +-
+ arch/cris/include/asm/swab.h | 3 +-
+ arch/cris/include/asm/termios.h | 43 +-
+ arch/cris/include/asm/types.h | 5 +-
+ arch/cris/include/asm/unistd.h | 342 +---
+ arch/cris/include/uapi/arch-v10/arch/Kbuild | 4 +
+ .../include/{ => uapi}/arch-v10/arch/sv_addr.agh | 0
+ .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h | 0
+ .../cris/include/{ => uapi}/arch-v10/arch/svinto.h | 0
+ arch/cris/include/{ => uapi}/arch-v10/arch/user.h | 0
+ arch/cris/include/uapi/arch-v32/arch/Kbuild | 2 +
+ arch/cris/include/uapi/arch-v32/arch/cryptocop.h | 122 ++
+ arch/cris/include/{ => uapi}/arch-v32/arch/user.h | 0
+ arch/cris/include/uapi/asm/Kbuild | 34 +
+ arch/cris/include/{ => uapi}/asm/auxvec.h | 0
+ arch/cris/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/cris/include/{ => uapi}/asm/byteorder.h | 0
+ arch/cris/include/{ => uapi}/asm/errno.h | 0
+ arch/cris/include/{ => uapi}/asm/ethernet.h | 0
+ arch/cris/include/{ => uapi}/asm/etraxgpio.h | 0
+ arch/cris/include/{ => uapi}/asm/fcntl.h | 0
+ arch/cris/include/{ => uapi}/asm/ioctl.h | 0
+ arch/cris/include/{ => uapi}/asm/ioctls.h | 0
+ arch/cris/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/cris/include/{ => uapi}/asm/mman.h | 0
+ arch/cris/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/cris/include/{ => uapi}/asm/param.h | 0
+ arch/cris/include/{ => uapi}/asm/poll.h | 0
+ arch/cris/include/{ => uapi}/asm/posix_types.h | 0
+ arch/cris/include/uapi/asm/ptrace.h | 1 +
+ arch/cris/include/{ => uapi}/asm/resource.h | 0
+ arch/cris/include/{ => uapi}/asm/rs485.h | 0
+ arch/cris/include/{ => uapi}/asm/sembuf.h | 0
+ arch/cris/include/{ => uapi}/asm/setup.h | 0
+ arch/cris/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/cris/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/cris/include/{ => uapi}/asm/siginfo.h | 0
+ arch/cris/include/uapi/asm/signal.h | 122 ++
+ arch/cris/include/{ => uapi}/asm/socket.h | 0
+ arch/cris/include/{ => uapi}/asm/sockios.h | 0
+ arch/cris/include/{ => uapi}/asm/stat.h | 0
+ arch/cris/include/{ => uapi}/asm/statfs.h | 0
+ arch/cris/include/uapi/asm/swab.h | 3 +
+ arch/cris/include/{ => uapi}/asm/sync_serial.h | 0
+ arch/cris/include/{ => uapi}/asm/termbits.h | 0
+ arch/cris/include/uapi/asm/termios.h | 45 +
+ arch/cris/include/uapi/asm/types.h | 1 +
+ arch/cris/include/uapi/asm/unistd.h | 344 ++++
+ arch/cris/kernel/asm-offsets.c | 6 +-
+ arch/h8300/include/asm/Kbuild | 1 -
+ arch/h8300/include/asm/param.h | 15 +-
+ arch/h8300/include/asm/ptrace.h | 40 +-
+ arch/h8300/include/asm/signal.h | 121 +-
+ arch/h8300/include/asm/termios.h | 44 +-
+ arch/h8300/include/asm/types.h | 5 +-
+ arch/h8300/include/asm/unistd.h | 328 +---
+ arch/h8300/include/uapi/asm/Kbuild | 31 +
+ arch/h8300/include/{ => uapi}/asm/auxvec.h | 0
+ arch/h8300/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/h8300/include/{ => uapi}/asm/byteorder.h | 0
+ arch/h8300/include/{ => uapi}/asm/errno.h | 0
+ arch/h8300/include/{ => uapi}/asm/fcntl.h | 0
+ arch/h8300/include/{ => uapi}/asm/ioctl.h | 0
+ arch/h8300/include/{ => uapi}/asm/ioctls.h | 0
+ arch/h8300/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/h8300/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/h8300/include/{ => uapi}/asm/mman.h | 0
+ arch/h8300/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/h8300/include/uapi/asm/param.h | 16 +
+ arch/h8300/include/{ => uapi}/asm/poll.h | 0
+ arch/h8300/include/{ => uapi}/asm/posix_types.h | 0
+ arch/h8300/include/uapi/asm/ptrace.h | 44 +
+ arch/h8300/include/{ => uapi}/asm/resource.h | 0
+ arch/h8300/include/{ => uapi}/asm/sembuf.h | 0
+ arch/h8300/include/{ => uapi}/asm/setup.h | 0
+ arch/h8300/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/h8300/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/h8300/include/{ => uapi}/asm/siginfo.h | 0
+ arch/h8300/include/uapi/asm/signal.h | 121 ++
+ arch/h8300/include/{ => uapi}/asm/socket.h | 0
+ arch/h8300/include/{ => uapi}/asm/sockios.h | 0
+ arch/h8300/include/{ => uapi}/asm/stat.h | 0
+ arch/h8300/include/{ => uapi}/asm/statfs.h | 0
+ arch/h8300/include/{ => uapi}/asm/swab.h | 0
+ arch/h8300/include/{ => uapi}/asm/termbits.h | 0
+ arch/h8300/include/uapi/asm/termios.h | 44 +
+ arch/h8300/include/uapi/asm/types.h | 1 +
+ arch/h8300/include/uapi/asm/unistd.h | 330 ++++
+ arch/ia64/include/asm/dma-mapping.h | 1 +
+ arch/m32r/include/asm/Kbuild | 1 -
+ arch/m32r/include/asm/ptrace.h | 110 +-
+ arch/m32r/include/asm/setup.h | 9 +-
+ arch/m32r/include/asm/signal.h | 123 +-
+ arch/m32r/include/asm/termios.h | 42 +-
+ arch/m32r/include/asm/types.h | 5 +-
+ arch/m32r/include/asm/unistd.h | 333 +---
+ arch/m32r/include/uapi/asm/Kbuild | 30 +
+ arch/m32r/include/{ => uapi}/asm/auxvec.h | 0
+ arch/m32r/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/m32r/include/{ => uapi}/asm/byteorder.h | 0
+ arch/m32r/include/{ => uapi}/asm/errno.h | 0
+ arch/m32r/include/{ => uapi}/asm/fcntl.h | 0
+ arch/m32r/include/{ => uapi}/asm/ioctl.h | 0
+ arch/m32r/include/{ => uapi}/asm/ioctls.h | 0
+ arch/m32r/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/m32r/include/{ => uapi}/asm/mman.h | 0
+ arch/m32r/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/m32r/include/{ => uapi}/asm/param.h | 0
+ arch/m32r/include/{ => uapi}/asm/poll.h | 0
+ arch/m32r/include/{ => uapi}/asm/posix_types.h | 0
+ arch/m32r/include/uapi/asm/ptrace.h | 117 ++
+ arch/m32r/include/{ => uapi}/asm/resource.h | 0
+ arch/m32r/include/{ => uapi}/asm/sembuf.h | 0
+ arch/m32r/include/uapi/asm/setup.h | 11 +
+ arch/m32r/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/m32r/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/m32r/include/{ => uapi}/asm/siginfo.h | 0
+ arch/m32r/include/uapi/asm/signal.h | 123 ++
+ arch/m32r/include/{ => uapi}/asm/socket.h | 0
+ arch/m32r/include/{ => uapi}/asm/sockios.h | 0
+ arch/m32r/include/{ => uapi}/asm/stat.h | 0
+ arch/m32r/include/{ => uapi}/asm/statfs.h | 0
+ arch/m32r/include/{ => uapi}/asm/swab.h | 0
+ arch/m32r/include/{ => uapi}/asm/termbits.h | 0
+ arch/m32r/include/uapi/asm/termios.h | 43 +
+ arch/m32r/include/uapi/asm/types.h | 1 +
+ arch/m32r/include/uapi/asm/unistd.h | 335 ++++
+ arch/microblaze/include/asm/dma-mapping.h | 2 +
+ arch/mips/include/asm/dma-mapping.h | 2 +
+ arch/powerpc/include/asm/dma-mapping.h | 1 +
+ arch/score/include/asm/Kbuild | 1 -
+ arch/score/include/asm/ptrace.h | 74 +-
+ arch/score/include/asm/setup.h | 7 +-
+ arch/score/include/uapi/asm/Kbuild | 31 +
+ arch/score/include/{ => uapi}/asm/auxvec.h | 0
+ arch/score/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/score/include/{ => uapi}/asm/byteorder.h | 0
+ arch/score/include/{ => uapi}/asm/errno.h | 0
+ arch/score/include/{ => uapi}/asm/fcntl.h | 0
+ arch/score/include/{ => uapi}/asm/ioctl.h | 0
+ arch/score/include/{ => uapi}/asm/ioctls.h | 0
+ arch/score/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/score/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/score/include/{ => uapi}/asm/mman.h | 0
+ arch/score/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/score/include/{ => uapi}/asm/param.h | 0
+ arch/score/include/{ => uapi}/asm/poll.h | 0
+ arch/score/include/{ => uapi}/asm/posix_types.h | 0
+ arch/score/include/uapi/asm/ptrace.h | 76 +
+ arch/score/include/{ => uapi}/asm/resource.h | 0
+ arch/score/include/{ => uapi}/asm/sembuf.h | 0
+ arch/score/include/uapi/asm/setup.h | 9 +
+ arch/score/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/score/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/score/include/{ => uapi}/asm/siginfo.h | 0
+ arch/score/include/{ => uapi}/asm/signal.h | 0
+ arch/score/include/{ => uapi}/asm/socket.h | 0
+ arch/score/include/{ => uapi}/asm/sockios.h | 0
+ arch/score/include/{ => uapi}/asm/stat.h | 0
+ arch/score/include/{ => uapi}/asm/statfs.h | 0
+ arch/score/include/{ => uapi}/asm/swab.h | 0
+ arch/score/include/{ => uapi}/asm/termbits.h | 0
+ arch/score/include/{ => uapi}/asm/termios.h | 0
+ arch/score/include/{ => uapi}/asm/types.h | 0
+ arch/score/include/{ => uapi}/asm/unistd.h | 0
+ arch/sh/include/asm/dma-mapping.h | 1 +
+ arch/sparc/crypto/aes_asm.S | 20 +-
+ arch/sparc/crypto/aes_glue.c | 31 +-
+ arch/sparc/crypto/camellia_glue.c | 3 +
+ arch/sparc/crypto/des_asm.S | 1 +
+ arch/sparc/crypto/des_glue.c | 6 +
+ arch/sparc/include/asm/dma-mapping.h | 1 +
+ arch/sparc/include/asm/hugetlb.h | 10 +-
+ arch/sparc/include/asm/pgtable_64.h | 8 +-
+ arch/tile/include/asm/dma-mapping.h | 1 +
+ arch/x86/include/asm/dma-mapping.h | 1 +
+ drivers/amba/tegra-ahb.c | 2 +
+ drivers/atm/solos-pci.c | 186 +-
+ drivers/base/dma-buf.c | 2 +
+ drivers/block/rbd.c | 1389 ++++++++++-----
+ drivers/block/rbd_types.h | 2 -
+ drivers/char/random.c | 40 +-
+ drivers/char/virtio_console.c | 329 ++--
+ drivers/gpio/Kconfig | 1 +
+ drivers/gpio/gpio-ich.c | 1 +
+ drivers/gpio/gpio-mvebu.c | 17 -
+ drivers/gpu/drm/ttm/ttm_bo.c | 2 +-
+ drivers/hwmon/hwmon-vid.c | 10 +
+ drivers/hwmon/hwmon.c | 26 +-
+ drivers/hwmon/it87.c | 918 +++++-----
+ drivers/hwmon/w83627ehf.c | 99 +-
+ drivers/hwmon/w83627hf.c | 81 +-
+ drivers/iommu/amd_iommu.c | 196 ++-
+ drivers/iommu/amd_iommu_types.h | 1 +
+ drivers/iommu/intel-iommu.c | 42 +-
+ drivers/iommu/omap-iommu.c | 68 +-
+ drivers/iommu/omap-iommu.h | 3 -
+ drivers/iommu/omap-iommu2.c | 36 -
+ drivers/iommu/tegra-gart.c | 2 +-
+ drivers/iommu/tegra-smmu.c | 6 +-
+ drivers/isdn/mISDN/dsp_core.c | 3 +-
+ drivers/lguest/core.c | 2 +-
+ drivers/mfd/omap-usb-host.c | 3 +-
+ drivers/mtd/ubi/attach.c | 23 +-
+ drivers/mtd/ubi/build.c | 12 +-
+ drivers/mtd/ubi/debug.c | 34 +-
+ drivers/mtd/ubi/debug.h | 57 +-
+ drivers/mtd/ubi/fastmap.c | 6 +-
+ drivers/mtd/ubi/gluebi.c | 28 +-
+ drivers/mtd/ubi/io.c | 14 +-
+ drivers/mtd/ubi/ubi.h | 40 +-
+ drivers/mtd/ubi/upd.c | 6 +-
+ drivers/mtd/ubi/vmt.c | 4 +-
+ drivers/mtd/ubi/vtbl.c | 2 +-
+ drivers/mtd/ubi/wl.c | 7 +-
+ drivers/net/bonding/bond_main.c | 2 -
+ drivers/net/can/sja1000/sja1000_of_platform.c | 2 +-
+ drivers/net/ethernet/emulex/benet/be.h | 2 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 5 +
+ drivers/net/ethernet/emulex/benet/be_main.c | 59 +-
+ drivers/net/ethernet/freescale/Kconfig | 3 +-
+ drivers/net/ethernet/micrel/ksz884x.c | 12 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 5 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 5 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 5 -
+ .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 3 +-
+ drivers/net/ethernet/realtek/8139cp.c | 18 +-
+ drivers/net/ethernet/smsc/smc91x.c | 4 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 +-
+ drivers/net/ethernet/ti/cpts.c | 2 -
+ drivers/net/tun.c | 87 +-
+ drivers/net/usb/cdc_ether.c | 45 +-
+ drivers/net/usb/cdc_ncm.c | 10 +-
+ drivers/net/usb/qmi_wwan.c | 15 +
+ drivers/net/usb/usbnet.c | 25 +-
+ drivers/net/virtio_net.c | 48 +-
+ drivers/net/wimax/i2400m/i2400m-usb.h | 3 +
+ drivers/net/wimax/i2400m/usb.c | 6 +
+ drivers/net/wireless/Makefile | 2 +-
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +
+ drivers/of/base.c | 2 +-
+ drivers/rpmsg/virtio_rpmsg_bus.c | 6 +-
+ drivers/scsi/virtio_scsi.c | 24 +-
+ drivers/spi/spi-atmel.c | 17 +-
+ drivers/spi/spi-s3c64xx.c | 10 +-
+ drivers/spi/spi-sh-hspi.c | 2 +-
+ drivers/spi/spi.c | 5 +-
+ drivers/tty/serial/omap-serial.c | 3 +-
+ drivers/virtio/virtio.c | 30 +-
+ drivers/virtio/virtio_balloon.c | 7 +-
+ drivers/virtio/virtio_mmio.c | 30 +-
+ drivers/virtio/virtio_pci.c | 20 +-
+ drivers/virtio/virtio_ring.c | 46 +-
+ fs/Kconfig | 1 +
+ fs/Makefile | 1 +
+ fs/btrfs/ctree.c | 14 +-
+ fs/ceph/addr.c | 60 +-
+ fs/ceph/caps.c | 18 +-
+ fs/ceph/file.c | 73 +-
+ fs/ceph/inode.c | 15 +-
+ fs/ceph/mds_client.c | 11 +-
+ fs/ceph/super.c | 4 +-
+ fs/exportfs/expfs.c | 4 +-
+ fs/f2fs/Kconfig | 53 +
+ fs/f2fs/Makefile | 7 +
+ fs/f2fs/acl.c | 414 +++++
+ fs/f2fs/acl.h | 57 +
+ fs/f2fs/checkpoint.c | 794 +++++++++
+ fs/f2fs/data.c | 702 ++++++++
+ fs/f2fs/debug.c | 361 ++++
+ fs/f2fs/dir.c | 672 ++++++++
+ fs/f2fs/f2fs.h | 1083 ++++++++++++
+ fs/f2fs/file.c | 636 +++++++
+ fs/f2fs/gc.c | 742 ++++++++
+ fs/f2fs/gc.h | 117 ++
+ fs/f2fs/hash.c | 97 ++
+ fs/f2fs/inode.c | 268 +++
+ fs/f2fs/namei.c | 503 ++++++
+ fs/f2fs/node.c | 1764 +++++++++++++++++++
+ fs/f2fs/node.h | 353 ++++
+ fs/f2fs/recovery.c | 375 ++++
+ fs/f2fs/segment.c | 1791 ++++++++++++++++++++
+ fs/f2fs/segment.h | 618 +++++++
+ fs/f2fs/super.c | 657 +++++++
+ fs/f2fs/xattr.c | 440 +++++
+ fs/f2fs/xattr.h | 145 ++
+ fs/fhandle.c | 2 +-
+ fs/nfsd/fault_inject.c | 113 +-
+ fs/nfsd/fault_inject.h | 28 -
+ fs/nfsd/netns.h | 66 +
+ fs/nfsd/nfs2acl.c | 2 +-
+ fs/nfsd/nfs3acl.c | 2 +-
+ fs/nfsd/nfs3proc.c | 6 +-
+ fs/nfsd/nfs3xdr.c | 47 +-
+ fs/nfsd/nfs4callback.c | 69 +-
+ fs/nfsd/nfs4proc.c | 74 +-
+ fs/nfsd/nfs4recover.c | 561 ++++--
+ fs/nfsd/nfs4state.c | 1015 ++++++-----
+ fs/nfsd/nfs4xdr.c | 324 ++--
+ fs/nfsd/nfsctl.c | 100 +-
+ fs/nfsd/nfsd.h | 36 +-
+ fs/nfsd/nfsfh.c | 4 +-
+ fs/nfsd/nfssvc.c | 203 ++-
+ fs/nfsd/nfsxdr.c | 11 +-
+ fs/nfsd/state.h | 64 +-
+ fs/nfsd/vfs.c | 53 +-
+ fs/nfsd/xdr4.h | 15 +-
+ include/linux/backing-dev.h | 1 +
+ include/linux/ceph/libceph.h | 2 -
+ include/linux/ceph/osdmap.h | 1 +
+ include/linux/ceph/rados.h | 2 +
+ include/linux/dma-buf.h | 99 --
+ include/linux/dma-debug.h | 7 +
+ include/linux/exportfs.h | 5 +
+ include/linux/f2fs_fs.h | 413 +++++
+ include/linux/of_platform.h | 1 +
+ include/linux/platform_data/iommu-omap.h | 9 +-
+ .../linux/platform_data/serial-omap.h | 0
+ include/linux/platform_data/usb-omap.h | 3 +
+ include/linux/sunrpc/cache.h | 6 +-
+ include/linux/sunrpc/svc.h | 6 +-
+ include/linux/sunrpc/svcsock.h | 21 +-
+ include/linux/usb/usbnet.h | 3 +
+ include/linux/virtio.h | 25 +-
+ include/linux/virtio_scsi.h | 28 +-
+ include/net/inet_connection_sock.h | 1 +
+ include/net/ndisc.h | 7 +
+ include/sound/soc-dai.h | 1 -
+ include/sound/soc.h | 1 +
+ include/uapi/linux/if_bridge.h | 3 +
+ include/uapi/linux/magic.h | 1 +
+ include/uapi/linux/virtio_ids.h | 1 +
+ include/video/omap-panel-tfp410.h | 2 +-
+ kernel/posix-cpu-timers.c | 3 +
+ kernel/sched/fair.c | 5 +-
+ lib/atomic64.c | 17 +-
+ lib/dma-debug.c | 66 +-
+ mm/highmem.c | 1 +
+ mm/ksm.c | 16 +-
+ mm/vmscan.c | 12 +-
+ net/9p/trans_virtio.c | 3 +-
+ net/atm/atm_sysfs.c | 40 +-
+ net/bridge/br_mdb.c | 22 +-
+ net/bridge/br_multicast.c | 13 +-
+ net/bridge/br_netlink.c | 1 -
+ net/bridge/br_private.h | 5 +-
+ net/ceph/ceph_common.c | 3 +-
+ net/ceph/messenger.c | 107 +-
+ net/ceph/osd_client.c | 59 +-
+ net/ceph/osdmap.c | 47 +-
+ net/dccp/ipv4.c | 4 +-
+ net/dccp/ipv6.c | 3 +-
+ net/ipv4/inet_connection_sock.c | 16 +
+ net/ipv4/tcp_ipv4.c | 6 +-
+ net/ipv6/Makefile | 2 +-
+ net/ipv6/addrconf.c | 3 +-
+ net/ipv6/ndisc.c | 17 +
+ net/ipv6/tcp_ipv6.c | 3 +-
+ net/mac802154/ieee802154_dev.c | 4 +-
+ net/netlink/af_netlink.c | 5 +-
+ net/sctp/Kconfig | 27 +-
+ net/sctp/probe.c | 3 +-
+ net/sctp/protocol.c | 4 +-
+ net/sunrpc/rpcb_clnt.c | 1 -
+ net/sunrpc/svc.c | 8 +-
+ net/sunrpc/svcsock.c | 98 +-
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 10 +-
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c | 4 +-
+ scripts/pnmtologo.c | 7 +
+ security/selinux/nlmsgtab.c | 2 +
+ sound/pci/hda/hda_intel.c | 4 +-
+ sound/pci/hda/patch_hdmi.c | 46 +-
+ sound/pci/hda/patch_realtek.c | 5 +-
+ sound/pci/hda/patch_sigmatel.c | 2 +-
+ sound/soc/codecs/cs42l73.c | 116 +-
+ sound/soc/codecs/sigmadsp.c | 2 +-
+ sound/soc/codecs/tpa6130a2.c | 23 +-
+ sound/soc/soc-compress.c | 2 +-
+ sound/soc/soc-core.c | 10 +-
+ sound/soc/soc-pcm.c | 12 +-
+ sound/usb/midi.c | 4 +
+ sound/usb/quirks-table.h | 123 ++
+ sound/usb/quirks.c | 91 +
+ sound/usb/usbaudio.h | 1 +
+ tools/lguest/lguest.c | 84 +-
+ tools/virtio/virtio_test.c | 4 +-
+ 457 files changed, 21770 insertions(+), 5480 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi_atmel.txt
+ create mode 100644 Documentation/filesystems/f2fs.txt
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-emma.c (94%)
+ delete mode 100644 arch/arm/plat-omap/debug-devices.c
+ delete mode 100644 arch/arm/plat-omap/include/plat/debug-devices.h
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr.agh (100%)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr_ag.h (100%)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/svinto.h (100%)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/user.h (100%)
+ create mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h
+ rename arch/cris/include/{ => uapi}/arch-v32/arch/user.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ethernet.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/etraxgpio.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/param.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/ptrace.h
+ rename arch/cris/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/rs485.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/sembuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/siginfo.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/signal.h
+ rename arch/cris/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/statfs.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/swab.h
+ rename arch/cris/include/{ => uapi}/asm/sync_serial.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/termios.h
+ create mode 100644 arch/cris/include/uapi/asm/types.h
+ create mode 100644 arch/cris/include/uapi/asm/unistd.h
+ rename arch/h8300/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/msgbuf.h (100%)
+ create mode 100644 arch/h8300/include/uapi/asm/param.h
+ rename arch/h8300/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/h8300/include/uapi/asm/ptrace.h
+ rename arch/h8300/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/sembuf.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/siginfo.h (100%)
+ create mode 100644 arch/h8300/include/uapi/asm/signal.h
+ rename arch/h8300/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/h8300/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/h8300/include/uapi/asm/termios.h
+ create mode 100644 arch/h8300/include/uapi/asm/types.h
+ create mode 100644 arch/h8300/include/uapi/asm/unistd.h
+ rename arch/m32r/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/param.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/m32r/include/uapi/asm/ptrace.h
+ rename arch/m32r/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/sembuf.h (100%)
+ create mode 100644 arch/m32r/include/uapi/asm/setup.h
+ rename arch/m32r/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/siginfo.h (100%)
+ create mode 100644 arch/m32r/include/uapi/asm/signal.h
+ rename arch/m32r/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/m32r/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/m32r/include/uapi/asm/termios.h
+ create mode 100644 arch/m32r/include/uapi/asm/types.h
+ create mode 100644 arch/m32r/include/uapi/asm/unistd.h
+ rename arch/score/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/score/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/score/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/score/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/score/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/score/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/score/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/score/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/score/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/score/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/score/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/score/include/{ => uapi}/asm/param.h (100%)
+ rename arch/score/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/score/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/score/include/uapi/asm/ptrace.h
+ rename arch/score/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/score/include/{ => uapi}/asm/sembuf.h (100%)
+ create mode 100644 arch/score/include/uapi/asm/setup.h
+ rename arch/score/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/score/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/score/include/{ => uapi}/asm/siginfo.h (100%)
+ rename arch/score/include/{ => uapi}/asm/signal.h (100%)
+ rename arch/score/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/score/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/score/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/score/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/score/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/score/include/{ => uapi}/asm/termbits.h (100%)
+ rename arch/score/include/{ => uapi}/asm/termios.h (100%)
+ rename arch/score/include/{ => uapi}/asm/types.h (100%)
+ rename arch/score/include/{ => uapi}/asm/unistd.h (100%)
+ create mode 100644 fs/f2fs/Kconfig
+ create mode 100644 fs/f2fs/Makefile
+ create mode 100644 fs/f2fs/acl.c
+ create mode 100644 fs/f2fs/acl.h
+ create mode 100644 fs/f2fs/checkpoint.c
+ create mode 100644 fs/f2fs/data.c
+ create mode 100644 fs/f2fs/debug.c
+ create mode 100644 fs/f2fs/dir.c
+ create mode 100644 fs/f2fs/f2fs.h
+ create mode 100644 fs/f2fs/file.c
+ create mode 100644 fs/f2fs/gc.c
+ create mode 100644 fs/f2fs/gc.h
+ create mode 100644 fs/f2fs/hash.c
+ create mode 100644 fs/f2fs/inode.c
+ create mode 100644 fs/f2fs/namei.c
+ create mode 100644 fs/f2fs/node.c
+ create mode 100644 fs/f2fs/node.h
+ create mode 100644 fs/f2fs/recovery.c
+ create mode 100644 fs/f2fs/segment.c
+ create mode 100644 fs/f2fs/segment.h
+ create mode 100644 fs/f2fs/super.c
+ create mode 100644 fs/f2fs/xattr.c
+ create mode 100644 fs/f2fs/xattr.h
+ delete mode 100644 fs/nfsd/fault_inject.h
+ create mode 100644 include/linux/f2fs_fs.h
+ rename arch/arm/plat-omap/include/plat/omap-serial.h => include/linux/platform_data/serial-omap.h (100%)
+Merging fixes/master (4458315 ARM: OMAP: fix build error in arch/arm/mach-omap2/timer.c)
+$ git merge fixes/master
+Updating 810a485..4458315
+Fast-forward
+ arch/arm/mach-omap2/timer.c | 2 +-
+ drivers/staging/sb105x/Kconfig | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arm-current/fixes (e6ee4b2 ARM: 7607/1: realview: fix private peripheral memory base for EB rev. B boards)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/compressed/head.S | 2 +-
+ arch/arm/kernel/setup.c | 2 +-
+ arch/arm/kernel/swp_emulate.c | 2 ++
+ arch/arm/kernel/vmlinux.lds.S | 4 ++--
+ arch/arm/mach-realview/include/mach/board-eb.h | 2 +-
+ arch/arm/mm/cache-v7.S | 6 ++++--
+ 6 files changed, 11 insertions(+), 7 deletions(-)
+Merging m68k-current/for-linus (5fec45a m68k/sun3: Fix instruction faults)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge (e716e01 powerpc/eeh: Do not invalidate PE properly)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (f01af9f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (f01af9f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
+$ git merge net/master
+Already up-to-date.
+Merging sound-current/for-linus (d846b17 ALSA: hda - Fix build without CONFIG_PM)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (ff8e59b PCI/portdrv: Don't create hotplug slots unless port supports hotplug)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (009b969 wireless: fix Atheros drivers compilation)
+$ git merge wireless/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (1800098 ARM: OMAP: Fix build breakage due to missing include in i2c.c)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (022573c Merge branch 'next' into for-linus)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (a9add5d md/raid5: add blktrace calls)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (a2c0911 crypto: caam - Updated SEC-4.0 device tree binding for ERA information.)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option)
+$ git merge dwmw2/master
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 1 +
+ arch/x86/Kconfig | 1 +
+ arch/x86/Kconfig.cpu | 4 ++++
+ arch/x86/Makefile | 1 +
+ 4 files changed, 7 insertions(+)
+Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6)
+$ git merge irqdomain-current/irqdomain/merge
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS)
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().)
+$ git merge spi-current/spi/merge
+Already up-to-date.
+Merging gpio-current/gpio/merge (bc1008c gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG)
+$ git merge gpio-current/gpio/merge
+Already up-to-date.
+Merging rr-fixes/fixes (f3537f9 ASN.1: Fix an indefinite length skip error)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
+$ git merge asm-generic/master
+Auto-merging include/asm-generic/io.h
+Removing arch/xtensa/include/asm/nommu.h
+Removing arch/h8300/include/asm/mmu.h
+Auto-merging arch/h8300/include/asm/Kbuild
+Removing arch/c6x/include/asm/mmu.h
+Auto-merging arch/c6x/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ arch/c6x/include/asm/Kbuild | 1 +
+ arch/c6x/include/asm/mmu.h | 22 ----------------------
+ arch/h8300/include/asm/Kbuild | 1 +
+ arch/h8300/include/asm/mmu.h | 10 ----------
+ arch/openrisc/include/asm/io.h | 1 +
+ arch/xtensa/include/asm/mmu.h | 2 +-
+ arch/xtensa/include/asm/nommu.h | 3 ---
+ include/asm-generic/io.h | 31 -------------------------------
+ include/asm-generic/mmu.h | 6 +++++-
+ 9 files changed, 9 insertions(+), 68 deletions(-)
+ delete mode 100644 arch/c6x/include/asm/mmu.h
+ delete mode 100644 arch/h8300/include/asm/mmu.h
+ delete mode 100644 arch/xtensa/include/asm/nommu.h
+Merging arm/for-next (c5a04d52 Merge branch 'fixes' into for-next)
+$ git merge arm/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging arm-perf/for-next/perf (3d70f8c Linux 3.7-rc4)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging xilinx/arm-next (b4c582a serial: xilinx_uartps: get clock rate info from dts)
+$ git merge xilinx/arm-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/zynq-7000.dtsi | 4 ++--
+ drivers/tty/serial/xilinx_uartps.c | 30 +++++++++++++++++-------------
+ 2 files changed, 19 insertions(+), 15 deletions(-)
+Merging arm64/upstream (d19766e arm64: Update the MAINTAINERS entry)
+$ git merge arm64/upstream
+Already up-to-date.
+Merging blackfin/for-linus (86794b4 blackfin: SEC: clean up SEC interrupt initialization)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (93bbd0c c6x: use generic kvm_para.h)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (77c8006 UAPI: Fix up empty files in arch/cris/)
+$ git merge cris/for-next
+Already up-to-date.
+Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (7843ae0 Merge branch 'pstore_mevent' into next)
+$ git merge ia64/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging m68k/for-next (5fec45a m68k/sun3: Fix instruction faults)
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (280ef31 m68knommu: modify clock code so it can be used by all ColdFire CPU types)
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging microblaze/next (a4f1de1 mm: fix kernel BUG at huge_memory.c:1474!)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (fcc638e Merge branch 'current/for-linus' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/mips/alchemy/common/time.c | 25 +++++-----------------
+ arch/mips/include/asm/thread_info.h | 9 ++++----
+ arch/mips/kernel/perf_event_mipsxx.c | 38 ----------------------------------
+ arch/mips/mm/tlbex.c | 16 --------------
+ 4 files changed, 10 insertions(+), 78 deletions(-)
+Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c)
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next (949a05d [PARISC] fix virtual aliasing issue in get_shared_area())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging powerpc/next (376bddd Merge remote-tracking branch 'agust/next' into next)
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
+$ git merge 4xx/next
+Already up-to-date.
+Merging mpc5xxx/next (667b504 powerpc: mpc5200: Add a3m071 board support)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging galak/next (1723d90 powerpc/dma/raidengine: add raidengine device)
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features (1f1c961 s390/ccwdev: Include asm/schid.h.)
+$ git merge s390/features
+Already up-to-date.
+Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.)
+$ git merge sh/sh-latest
+Already up-to-date.
+Merging sparc-next/master (66cdd0c Merge tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (e6cdebd arch/tile: set CORE_DUMP_USE_REGSET on tile)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (055d4db xtensa: don't try to build DTB when OF is disabled)
+$ git merge xtensa/for_next
+Already up-to-date.
+Merging btrfs/next (fb8ec37 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into linus-merge)
+$ git merge btrfs/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ceph/master (c3e946c rbd: get rid of rbd_{get,put}_dev())
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (9acbd26 cifs: eliminate cifsERROR variable)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifs_debug.h | 6 +-----
+ fs/cifs/cifsfs.c | 1 -
+ fs/cifs/connect.c | 9 ++-------
+ fs/cifs/readdir.c | 19 +++++++++++++++----
+ 4 files changed, 18 insertions(+), 17 deletions(-)
+Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (3702875 fs/ecryptfs/crypto.c: make ecryptfs_encode_for_filename() static)
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/ecryptfs/kthread.c | 6 +++---
+ fs/ecryptfs/mmap.c | 12 ++++++++++--
+ 3 files changed, 14 insertions(+), 6 deletions(-)
+Merging ext3/for_next (56df127 quota: Use the pre-processor to compile out quotactl_cmd_write when !CONFIG_BLOCK)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (bd9926e ext4: zero out inline data using memset() instead of empty_zero_page)
+$ git merge ext4/dev
+Already up-to-date.
+Merging f2fs/dev (9475ef7 f2fs: invalidate the node page if allocation is failed)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/checkpoint.c | 23 ++++--
+ fs/f2fs/data.c | 25 +++---
+ fs/f2fs/dir.c | 6 +-
+ fs/f2fs/f2fs.h | 4 +-
+ fs/f2fs/file.c | 10 ++-
+ fs/f2fs/gc.c | 218 ++++++++++++++++----------------------------------
+ fs/f2fs/gc.h | 9 ---
+ fs/f2fs/hash.c | 4 +
+ fs/f2fs/inode.c | 17 +---
+ fs/f2fs/namei.c | 28 +++----
+ fs/f2fs/node.c | 3 +-
+ fs/f2fs/segment.c | 4 +-
+ fs/f2fs/super.c | 11 +--
+ 13 files changed, 138 insertions(+), 224 deletions(-)
+Merging fuse/for-next (23ab0c7 cuse: do not register multiple devices with identical names)
+$ git merge fuse/for-next
+Auto-merging include/linux/fs.h
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/fuse/fuse_i.h
+Auto-merging fs/fuse/file.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/fuse/dev.c
+Auto-merging fs/Kconfig
+Merge made by the 'recursive' strategy.
+ fs/Kconfig | 10 --
+ fs/fuse/Kconfig | 16 ++-
+ fs/fuse/cuse.c | 44 ++++++---
+ fs/fuse/dev.c | 122 ++++++++++++++++-------
+ fs/fuse/dir.c | 199 ++++++++++++++++++++++++++++++++-----
+ fs/fuse/file.c | 240 +++++++++++++++++++++++++++++----------------
+ fs/fuse/fuse_i.h | 58 ++++++++---
+ fs/fuse/inode.c | 11 ++-
+ include/linux/fs.h | 2 +-
+ include/uapi/linux/fuse.h | 12 +++
+ mm/filemap.c | 2 +-
+ 11 files changed, 527 insertions(+), 189 deletions(-)
+Merging gfs2/master (1e2d9d4 GFS2: Set gl_object during inode create)
+$ git merge gfs2/master
+Already up-to-date.
+Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
+$ git merge logfs/master
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ fs/logfs/super.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (cd6c596 SUNRPC: continue run over clients list on PipeFS event instead of break)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (24ffb93 nfsd4: don't leave freed stateid hashed)
+$ git merge nfsd/nfsd-next
+Already up-to-date.
+Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/cluster/heartbeat.c
+Merge made by the 'recursive' strategy.
+ fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
+ fs/ocfs2/cluster/masklog.h | 3 ++-
+ fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
+ fs/ocfs2/symlink.c | 2 +-
+ 5 files changed, 27 insertions(+), 35 deletions(-)
+Merging omfs/for-next (976d167 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (3d59eeb Merge tag 'balancenuma-v11' of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux-balancenuma)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (ec47eb6 xfs remove the XFS_TRANS_DEBUG routines)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/xfs/xfs_buf.c | 12 ++--
+ fs/xfs/xfs_buf.h | 6 +-
+ fs/xfs/xfs_buf_item.c | 153 ++++++++++------------------------------------
+ fs/xfs/xfs_buf_item.h | 16 +----
+ fs/xfs/xfs_inode.c | 6 --
+ fs/xfs/xfs_inode_item.c | 16 -----
+ fs/xfs/xfs_inode_item.h | 4 --
+ fs/xfs/xfs_trans_ail.c | 14 -----
+ fs/xfs/xfs_trans_buf.c | 27 ++++----
+ fs/xfs/xfs_trans_inode.c | 41 -------------
+ 10 files changed, 57 insertions(+), 238 deletions(-)
+Merging vfs/for-next (a77cfcb fix off-by-one in argument passed by iterate_fd() to callbacks)
+$ git merge vfs/for-next
+Already up-to-date.
+Merging pci/next (1cb73f8 Merge branch 'pci/mjg-pci-roms-from-efi' into next)
+$ git merge pci/next
+Already up-to-date.
+Merging hid/for-next (01c4f7e Merge branch 'for-3.8/i2c-hid' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+Merging i2c-embedded/i2c-embedded/for-next (cda2826 i2c: remove __dev* attributes from subsystem)
+$ git merge i2c-embedded/i2c-embedded/for-next
+Merge made by the 'recursive' strategy.
+ drivers/i2c/busses/i2c-ali1535.c | 8 +++---
+ drivers/i2c/busses/i2c-ali1563.c | 10 +++----
+ drivers/i2c/busses/i2c-ali15x3.c | 8 +++---
+ drivers/i2c/busses/i2c-amd756.c | 7 +++--
+ drivers/i2c/busses/i2c-amd8111.c | 7 +++--
+ drivers/i2c/busses/i2c-at91.c | 14 +++++-----
+ drivers/i2c/busses/i2c-au1550.c | 6 ++---
+ drivers/i2c/busses/i2c-cpm.c | 8 +++---
+ drivers/i2c/busses/i2c-designware-pcidrv.c | 6 ++---
+ drivers/i2c/busses/i2c-designware-platdrv.c | 6 ++---
+ drivers/i2c/busses/i2c-eg20t.c | 6 ++---
+ drivers/i2c/busses/i2c-elektor.c | 8 +++---
+ drivers/i2c/busses/i2c-gpio.c | 8 +++---
+ drivers/i2c/busses/i2c-highlander.c | 6 ++---
+ drivers/i2c/busses/i2c-hydra.c | 6 ++---
+ drivers/i2c/busses/i2c-i801.c | 28 +++++++++-----------
+ drivers/i2c/busses/i2c-ibm_iic.c | 8 +++---
+ drivers/i2c/busses/i2c-intel-mid.c | 6 ++---
+ drivers/i2c/busses/i2c-isch.c | 6 ++---
+ drivers/i2c/busses/i2c-mpc.c | 38 +++++++++++++--------------
+ drivers/i2c/busses/i2c-mv64xxx.c | 18 ++++++-------
+ drivers/i2c/busses/i2c-mxs.c | 6 ++---
+ drivers/i2c/busses/i2c-nforce2.c | 12 ++++-----
+ drivers/i2c/busses/i2c-nuc900.c | 6 ++---
+ drivers/i2c/busses/i2c-ocores.c | 6 ++---
+ drivers/i2c/busses/i2c-octeon.c | 10 +++----
+ drivers/i2c/busses/i2c-omap.c | 6 ++---
+ drivers/i2c/busses/i2c-parport-light.c | 6 ++---
+ drivers/i2c/busses/i2c-pasemi.c | 6 ++---
+ drivers/i2c/busses/i2c-pca-isa.c | 8 +++---
+ drivers/i2c/busses/i2c-pca-platform.c | 6 ++---
+ drivers/i2c/busses/i2c-piix4.c | 32 +++++++++++-----------
+ drivers/i2c/busses/i2c-pmcmsp.c | 6 ++---
+ drivers/i2c/busses/i2c-pnx.c | 6 ++---
+ drivers/i2c/busses/i2c-powermac.c | 16 +++++------
+ drivers/i2c/busses/i2c-puv3.c | 6 ++---
+ drivers/i2c/busses/i2c-pxa-pci.c | 6 ++---
+ drivers/i2c/busses/i2c-rcar.c | 6 ++---
+ drivers/i2c/busses/i2c-s6000.c | 8 +++---
+ drivers/i2c/busses/i2c-sh7760.c | 8 +++---
+ drivers/i2c/busses/i2c-sh_mobile.c | 2 +-
+ drivers/i2c/busses/i2c-sirf.c | 8 +++---
+ drivers/i2c/busses/i2c-sis5595.c | 4 +--
+ drivers/i2c/busses/i2c-sis630.c | 8 +++---
+ drivers/i2c/busses/i2c-sis96x.c | 6 ++---
+ drivers/i2c/busses/i2c-tegra.c | 8 +++---
+ drivers/i2c/busses/i2c-via.c | 6 ++---
+ drivers/i2c/busses/i2c-viapro.c | 4 +--
+ drivers/i2c/busses/i2c-viperboard.c | 6 ++---
+ drivers/i2c/busses/i2c-xiic.c | 8 +++---
+ drivers/i2c/busses/i2c-xlr.c | 6 ++---
+ drivers/i2c/busses/scx200_acb.c | 16 +++++------
+ drivers/i2c/muxes/i2c-mux-gpio.c | 14 +++++-----
+ drivers/i2c/muxes/i2c-mux-pinctrl.c | 8 +++---
+ 54 files changed, 241 insertions(+), 247 deletions(-)
+Merging jdelvare-hwmon/master (c24c39b hwmon: (emc6w201) Fix DIV_ROUND_CLOSEST problem with unsigned divisors)
+$ git merge jdelvare-hwmon/master
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/emc6w201.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging hwmon-staging/hwmon-next (7764b52 hwmon: (twl4030-madc-hwmon) Fix warning message caused by removal of __devexit)
+$ git merge hwmon-staging/hwmon-next
+Already up-to-date.
+Merging v4l-dvb/master (db46f44 Merge /home/v4l/v4l/for_upstream)
+$ git merge v4l-dvb/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging kbuild/for-next (f853c4a Merge branch 'kbuild/kconfig' into kbuild/for-next)
+$ git merge kbuild/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/kbuild/kconfig-language.txt | 23 ------
+ scripts/coccinelle/misc/warn.cocci | 109 ++++++++++++++++++++++++++++
+ scripts/config | 1 -
+ scripts/kconfig/Makefile | 3 +
+ scripts/kconfig/expr.c | 10 +--
+ scripts/kconfig/gconf.c | 2 +-
+ scripts/kconfig/lkc.h | 8 ++
+ scripts/kconfig/lxdialog/check-lxdialog.sh | 1 +
+ scripts/kconfig/mconf.c | 10 ++-
+ scripts/kconfig/menu.c | 4 +-
+ scripts/kconfig/merge_config.sh | 20 ++++-
+ scripts/kconfig/nconf.c | 12 ++-
+ scripts/kconfig/symbol.c | 12 +--
+ scripts/kconfig/util.c | 23 +++++-
+ scripts/kconfig/zconf.l | 8 +-
+ scripts/kconfig/zconf.lex.c_shipped | 8 +-
+ scripts/tags.sh | 57 +++++++++++++--
+ 17 files changed, 247 insertions(+), 64 deletions(-)
+ create mode 100644 scripts/coccinelle/misc/warn.cocci
+Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/NEXT (72d5f2d sata_dwc_460ex: remove file exec bit (chmod 0755 -> 0644))
+$ git merge libata/NEXT
+Already up-to-date.
+Merging infiniband/for-next (d72623b Merge branches 'cxgb4', 'ipoib' and 'mlx4' into for-next)
+$ git merge infiniband/for-next
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/hw/cxgb4/cm.c | 791 +++++++++++++++++---
+ drivers/infiniband/hw/cxgb4/device.c | 210 +++++-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 33 +
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 3 +
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 136 ++++
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 459 +++++++++++-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 23 +-
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c | 32 +
+ drivers/net/ethernet/chelsio/cxgb4/l2t.h | 3 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 22 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 66 ++
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 37 +
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 418 +++++++++++
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 15 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.h | 1 +
+ drivers/net/ethernet/mellanox/mlx4/main.c | 115 ++-
+ drivers/net/ethernet/mellanox/mlx4/mcg.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 6 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 28 +-
+ drivers/scsi/csiostor/t4fw_api_stor.h | 39 -
+ include/linux/mlx4/device.h | 1 +
+ 22 files changed, 2234 insertions(+), 214 deletions(-)
+Merging pstore/master (ebacfd1 pstore/ftrace: Adjust for ftrace_ops->func prototype change)
+$ git merge pstore/master
+Already up-to-date.
+Merging acpi/next (61dc7fc tools/power turbostat: fix build error due to uapi changes)
+$ git merge acpi/next
+Merge made by the 'recursive' strategy.
+Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
+$ git merge cpuidle/cpuidle-next
+Resolved 'drivers/acpi/processor_driver.c' using previous resolution.
+Resolved 'drivers/cpuidle/Kconfig' using previous resolution.
+Resolved 'drivers/cpuidle/Makefile' using previous resolution.
+Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
+Resolved 'drivers/cpuidle/cpuidle.c' using previous resolution.
+Auto-merging include/linux/cpuidle.h
+Auto-merging drivers/cpuidle/cpuidle.h
+Auto-merging drivers/cpuidle/cpuidle.c
+CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
+Auto-merging drivers/cpuidle/coupled.c
+CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
+Auto-merging drivers/cpuidle/Makefile
+CONFLICT (content): Merge conflict in drivers/cpuidle/Makefile
+Auto-merging drivers/cpuidle/Kconfig
+CONFLICT (content): Merge conflict in drivers/cpuidle/Kconfig
+Auto-merging drivers/acpi/processor_driver.c
+CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1f70d68] Merge remote-tracking branch 'cpuidle/cpuidle-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/cpuidle/cpuidle.h | 30 ++++++++++++++++++++++++++++++
+ include/linux/cpuidle.h | 4 ++++
+ 2 files changed, 34 insertions(+)
+$ git am -3 ../patches/0001-cpuidle-fix-mismerge.patch
+Applying: cpuidle: fix mismerge
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/cpuidle/cpuidle.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 864444b] Merge remote-tracking branch 'cpuidle/cpuidle-next'
+Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (d12250e thermal: rcar: add rcar_zone_to_priv() macro)
+$ git merge thermal/next
+Already up-to-date.
+Merging ieee1394/for-next (db2cad2 firewire: net: remove unused variable in fwnet_receive_broadcast())
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (eab7377 UBI: embed ubi_debug_info field in ubi_device struct)
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next (da8c666 dlm: fix lvb invalidation conditions)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging scsi/for-next (e3ff197 [SCSI] mpt3sas: remove unused variables)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/qla2xxx/qla_target.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 7 +-
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +-
+ drivers/scsi/csiostor/csio_init.c | 9 +-
+ drivers/scsi/fnic/fnic.h | 42 ++
+ drivers/scsi/fnic/fnic_fcs.c | 6 +-
+ drivers/scsi/fnic/fnic_io.h | 2 +-
+ drivers/scsi/fnic/fnic_main.c | 3 +
+ drivers/scsi/fnic/fnic_scsi.c | 396 +++++++++-
+ drivers/scsi/gdth.c | 10 +-
+ drivers/scsi/ipr.c | 1041 ++++++++++++++++++++-------
+ drivers/scsi/ipr.h | 91 ++-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 5 +-
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 1 -
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 -
+ drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 1 -
+ drivers/scsi/qla2xxx/qla_bsg.c | 2 +-
+ drivers/scsi/qla2xxx/qla_dbg.c | 9 +-
+ drivers/scsi/qla2xxx/qla_def.h | 30 +-
+ drivers/scsi/qla2xxx/qla_fw.h | 3 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 4 +
+ drivers/scsi/qla2xxx/qla_init.c | 60 +-
+ drivers/scsi/qla2xxx/qla_inline.h | 19 +
+ drivers/scsi/qla2xxx/qla_iocb.c | 37 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 30 +-
+ drivers/scsi/qla2xxx/qla_mbx.c | 8 +-
+ drivers/scsi/qla2xxx/qla_mid.c | 7 +-
+ drivers/scsi/qla2xxx/qla_nx.c | 2 +-
+ drivers/scsi/qla2xxx/qla_os.c | 123 +++-
+ drivers/scsi/qla2xxx/qla_target.c | 169 ++++-
+ drivers/scsi/qla2xxx/qla_target.h | 19 +-
+ drivers/scsi/qla4xxx/ql4_83xx.c | 53 +-
+ drivers/scsi/qla4xxx/ql4_def.h | 2 +
+ drivers/scsi/qla4xxx/ql4_glbl.h | 5 +-
+ drivers/scsi/qla4xxx/ql4_init.c | 10 +
+ drivers/scsi/qla4xxx/ql4_isr.c | 17 +-
+ drivers/scsi/qla4xxx/ql4_mbx.c | 41 +-
+ drivers/scsi/qla4xxx/ql4_nx.c | 8 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 29 +-
+ drivers/scsi/qla4xxx/ql4_version.h | 2 +-
+ drivers/scsi/scsi_transport_iscsi.c | 12 +
+ 41 files changed, 1849 insertions(+), 474 deletions(-)
+Merging target-updates/for-next (79e62fc target/iscsi_target: Add NodeACL tags for initiator group support)
+$ git merge target-updates/for-next
+Already up-to-date.
+Merging target-merge/for-next-merge (6f0c058 Linux 3.7-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
+$ git merge ibft/linux-next
+Already up-to-date.
+Merging isci/all (6734092 isci: add a couple __iomem annotations)
+$ git merge isci/all
+Already up-to-date.
+Merging slave-dma/next (3226658 Merge git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git/next)
+$ git merge slave-dma/next
+Resolved 'arch/arm/boot/dts/spear1340.dtsi' using previous resolution.
+Resolved 'arch/arm/mach-spear13xx/spear1310.c' using previous resolution.
+Resolved 'arch/arm/mach-spear13xx/spear13xx.c' using previous resolution.
+Resolved 'drivers/dma/dmatest.c' using previous resolution.
+Resolved 'drivers/dma/dw_dmac.c' using previous resolution.
+Resolved 'drivers/dma/mv_xor.c' using previous resolution.
+Auto-merging net/ipv4/tcp.c
+Auto-merging drivers/mtd/nand/fsmc_nand.c
+Auto-merging drivers/dma/sirf-dma.c
+Auto-merging drivers/dma/sh/shdma.c
+Auto-merging drivers/dma/pl330.c
+Auto-merging drivers/dma/pch_dma.c
+Auto-merging drivers/dma/mv_xor.c
+CONFLICT (content): Merge conflict in drivers/dma/mv_xor.c
+Auto-merging drivers/dma/ipu/ipu_irq.c
+Auto-merging drivers/dma/iop-adma.c
+Auto-merging drivers/dma/ioat/pci.c
+Auto-merging drivers/dma/dw_dmac.c
+CONFLICT (content): Merge conflict in drivers/dma/dw_dmac.c
+Auto-merging drivers/dma/dmatest.c
+CONFLICT (content): Merge conflict in drivers/dma/dmatest.c
+Auto-merging arch/arm/mach-spear13xx/spear13xx.c
+CONFLICT (content): Merge conflict in arch/arm/mach-spear13xx/spear13xx.c
+Auto-merging arch/arm/mach-spear13xx/spear1310.c
+CONFLICT (content): Merge conflict in arch/arm/mach-spear13xx/spear1310.c
+Auto-merging arch/arm/mach-spear13xx/include/mach/spear.h
+Auto-merging arch/arm/boot/dts/spear13xx.dtsi
+Auto-merging arch/arm/boot/dts/spear1340.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/spear1340.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8fc8907] Merge remote-tracking branch 'slave-dma/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/dma/dma.txt | 81 ++++++
+ Documentation/devicetree/bindings/dma/snps-dma.txt | 44 ++++
+ arch/arm/boot/dts/spear1340.dtsi | 19 ++
+ arch/arm/boot/dts/spear13xx.dtsi | 38 +++
+ arch/arm/mach-spear13xx/include/mach/spear.h | 2 -
+ arch/arm/mach-spear13xx/spear1310.c | 2 -
+ arch/arm/mach-spear13xx/spear1340.c | 27 +-
+ arch/arm/mach-spear13xx/spear13xx.c | 54 +---
+ crypto/async_tx/async_memcpy.c | 6 +
+ crypto/async_tx/async_memset.c | 1 +
+ crypto/async_tx/async_tx.c | 9 +-
+ crypto/async_tx/async_xor.c | 4 +-
+ drivers/dca/dca-core.c | 5 +
+ drivers/dma/Kconfig | 7 +-
+ drivers/dma/amba-pl08x.c | 8 +-
+ drivers/dma/at_hdmac_regs.h | 8 +-
+ drivers/dma/dmaengine.c | 21 +-
+ drivers/dma/dmatest.c | 22 +-
+ drivers/dma/dw_dmac.c | 167 +++++++++++--
+ drivers/dma/dw_dmac_regs.h | 6 +
+ drivers/dma/ioat/dma.c | 11 +-
+ drivers/dma/ioat/dma_v3.c | 105 ++++++--
+ drivers/dma/ioat/hw.h | 11 +
+ drivers/dma/ioat/pci.c | 11 -
+ drivers/dma/iop-adma.c | 45 ++--
+ drivers/dma/ipu/ipu_irq.c | 1 -
+ drivers/dma/mv_xor.c | 13 +-
+ drivers/dma/pch_dma.c | 13 +-
+ drivers/dma/pl330.c | 37 +--
+ drivers/dma/sh/shdma.c | 2 +-
+ drivers/dma/sirf-dma.c | 25 +-
+ drivers/misc/carma/carma-fpga-program.c | 2 +-
+ drivers/misc/carma/carma-fpga.c | 6 +-
+ drivers/mtd/nand/fsmc_nand.c | 22 +-
+ drivers/of/Makefile | 2 +-
+ drivers/of/dma.c | 264 ++++++++++++++++++++
+ include/linux/dmaengine.h | 43 ++--
+ include/linux/dw_dmac.h | 45 ++--
+ include/linux/of_dma.h | 74 ++++++
+ net/ipv4/tcp.c | 8 +-
+ 40 files changed, 973 insertions(+), 298 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/dma.txt
+ create mode 100644 drivers/of/dma.c
+ create mode 100644 include/linux/of_dma.h
+Merging dmaengine/next (7f34986 dma: ipu: Drop unused spinlock)
+$ git merge dmaengine/next
+Already up-to-date.
+Merging net-next/master (66cdd0c Merge tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge net-next/master
+Already up-to-date.
+Merging wireless-next/master (eca2a43 bridge: fix icmpv6 endian bug and other sparse warnings)
+$ git merge wireless-next/master
+Already up-to-date.
+Merging bluetooth/master (3101c536 Bluetooth: Remove unnecessary include l2cap.h)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ net/bluetooth/bnep/core.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging mtd/master (ca2a88f Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (d4d4f1b mtd: nand: typo in nand_id_has_period() comments)
+$ git merge l2-mtd/master
+Already up-to-date.
+Merging crypto/master (a2c0911 crypto: caam - Updated SEC-4.0 device tree binding for ERA information.)
+$ git merge crypto/master
+Already up-to-date.
+Merging drm/drm-next (0953e76 drm/ttm: fix delayed ttm_bo_cleanup_refs_and_unlock delayed handling)
+$ git merge drm/drm-next
+Already up-to-date.
+Merging sound/for-next (cb99864 ALSA: usb-audio: Support for Digidesign Mbox 2 USB sound card:)
+$ git merge sound/for-next
+Already up-to-date.
+Merging sound-asoc/for-next (17f8904 Merge remote-tracking branch 'asoc/fix/core' into asoc-next)
+$ git merge sound-asoc/for-next
+Merge made by the 'recursive' strategy.
+ include/sound/soc.h | 10 ++++++----
+ sound/soc/codecs/arizona.c | 3 ++-
+ sound/soc/codecs/sta529.c | 9 +++++----
+ sound/soc/soc-core.c | 32 ++++++++++++++++++++++++++++++--
+ sound/soc/soc-pcm.c | 1 +
+ 5 files changed, 44 insertions(+), 11 deletions(-)
+Merging modules/modules-next (2f0bf92 Merge tag 'xtensa-20121218' of git://github.com/czankel/xtensa-linux)
+$ git merge modules/modules-next
+Already up-to-date.
+Merging virtio/virtio-next (ec2894e Merge branch 'master' into virtio-next)
+$ git merge virtio/virtio-next
+Recorded preimage for 'drivers/net/virtio_net.c'
+Recorded preimage for 'drivers/virtio/virtio_balloon.c'
+Auto-merging drivers/virtio/virtio_balloon.c
+CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
+Auto-merging drivers/net/virtio_net.c
+CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/net/virtio_net.c'.
+Recorded resolution for 'drivers/virtio/virtio_balloon.c'.
+[master 4c78122] Merge remote-tracking branch 'virtio/virtio-next'
+$ git diff -M --stat --summary HEAD^..
+$ git am -3 ../patches/0001-virtnet-for-up-for-virtqueue_get_queue_index-removal.patch
+Applying: virtnet: for up for virtqueue_get_queue_index removal
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/net/virtio_net.c
+$ git add -A .
+$ git commit -v -a --amend
+[master e3f508a] Merge remote-tracking branch 'virtio/virtio-next'
+Merging input/next (a455e29 Input: walkera0701 - fix crash on startup)
+$ git merge input/next
+Already up-to-date.
+Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (15ef4ff cgroup: update Documentation/cgroups/00-INDEX)
+$ git merge cgroup/for-next
+Already up-to-date.
+Merging block/for-next (b6c46cf Merge branch 'stable/for-jens-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus)
+$ git merge block/for-next
+Merge made by the 'recursive' strategy.
+ block/genhd.c | 42 ++++++++++++++++++++++++++---------
+ drivers/block/xen-blkback/blkback.c | 18 +++++++++------
+ drivers/block/xen-blkfront.c | 10 +++++----
+ include/linux/llist.h | 25 +++++++++++++++++++++
+ 4 files changed, 74 insertions(+), 21 deletions(-)
+Merging device-mapper/master (ab31b3f If the parameter buffer is small enough, try to allocate it with kmalloc() rather than vmalloc().)
+$ git merge device-mapper/master
+Auto-merging drivers/md/persistent-data/dm-block-manager.c
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-bio-prison.c | 25 ---
+ drivers/md/dm-bio-prison.h | 1 -
+ drivers/md/dm-crypt.c | 9 +-
+ drivers/md/dm-io.c | 23 ++-
+ drivers/md/dm-ioctl.c | 64 +++++---
+ drivers/md/dm-kcopyd.c | 18 +-
+ drivers/md/dm-raid.c | 4 +-
+ drivers/md/dm-raid1.c | 10 +-
+ drivers/md/dm-snap.c | 5 +-
+ drivers/md/dm-thin-metadata.c | 2 +-
+ drivers/md/dm-thin.c | 172 ++++++++++++--------
+ drivers/md/persistent-data/dm-block-manager.c | 12 +-
+ drivers/md/persistent-data/dm-btree-internal.h | 16 +-
+ drivers/md/persistent-data/dm-btree-remove.c | 50 +++---
+ drivers/md/persistent-data/dm-btree-spine.c | 20 +--
+ drivers/md/persistent-data/dm-btree.c | 31 ++--
+ drivers/md/persistent-data/dm-space-map-common.c | 16 +-
+ drivers/md/persistent-data/dm-space-map-metadata.c | 2 +-
+ include/uapi/linux/dm-ioctl.h | 4 +-
+ 19 files changed, 275 insertions(+), 209 deletions(-)
+Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (6be35c7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
+$ git merge mmc/mmc-next
+Already up-to-date.
+Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+Merging slab/for-next (ce343df Merge branch 'slab/next' into for-next)
+$ git merge slab/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging uclinux/for-next (b69f085 Linux 3.7-rc8)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (eb9efc4 raid5: create multiple threads to handle stripes)
+$ git merge md/for-next
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/md.h
+Auto-merging drivers/md/md.c
+Merge made by the 'recursive' strategy.
+ drivers/md/md.c | 8 +-
+ drivers/md/md.h | 8 ++
+ drivers/md/raid5.c | 408 +++++++++++++++++++++++++++++++++++++++++++++++++---
+ drivers/md/raid5.h | 19 +++
+ 4 files changed, 419 insertions(+), 24 deletions(-)
+Merging mfd/for-next (1881b68 mfd: tps6507x: Convert to devm_kzalloc)
+$ git merge mfd/for-next
+Already up-to-date.
+Merging battery/master (f36b9dd charger-manager: Fix bug when check dropped voltage after fullbatt event)
+$ git merge battery/master
+Already up-to-date.
+Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
+$ git merge fbdev/fbdev-next
+Already up-to-date.
+Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (e7f5c9a Merge tag 'omapdss-for-3.8' of git://gitorious.org/linux-omap-dss2/linux into for-linus)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (a824b57 Merge remote-tracking branch 'regulator/fix/core' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ drivers/regulator/core.c | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+Merging security/next (e930723 Smack: create a sysfs mount point for smackfs)
+$ git merge security/next
+Already up-to-date.
+Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
+$ git merge selinux/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (82444d8 Merge branch 'master' of ../linux-watchdog)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/watchdog/davinci-wdt.txt | 12 +
+ drivers/misc/mei/wd.c | 2 +-
+ drivers/watchdog/Kconfig | 18 +-
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/ath79_wdt.c | 13 +-
+ drivers/watchdog/cpu5wdt.c | 1 +
+ drivers/watchdog/da9052_wdt.c | 4 -
+ drivers/watchdog/da9055_wdt.c | 216 +++++++++++++
+ drivers/watchdog/davinci_wdt.c | 11 +-
+ drivers/watchdog/hpwdt.c | 2 +-
+ drivers/watchdog/mpcore_wdt.c | 19 +-
+ drivers/watchdog/omap_wdt.c | 311 ++++++++-----------
+ drivers/watchdog/orion_wdt.c | 2 +
+ drivers/watchdog/s3c2410_wdt.c | 6 +-
+ drivers/watchdog/sp5100_tco.c | 321 +++++++++++++++++---
+ drivers/watchdog/sp5100_tco.h | 46 ++-
+ drivers/watchdog/sp805_wdt.c | 11 +-
+ drivers/watchdog/twl4030_wdt.c | 185 +++--------
+ include/linux/watchdog.h | 2 +-
+ 19 files changed, 738 insertions(+), 445 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
+ create mode 100644 drivers/watchdog/da9055_wdt.c
+Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (9c6ecf6 Merge branches 'iommu/fixes', 'dma-debug', 'x86/amd', 'x86/vt-d', 'arm/tegra' and 'arm/omap' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging vfio/next (9a92c50 vfio-pci: Enable device before attempting reset)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci.c | 83 ++++++++++++++++++++++++-------------------
+ drivers/vfio/vfio.c | 34 +++++++++---------
+ 2 files changed, 64 insertions(+), 53 deletions(-)
+Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
+$ git merge osd/linux-next
+Already up-to-date.
+Merging jc_docs/docs-next (5c050fb docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (106f9d9 HOWTO: fix double words typo)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next (8ab6785 Merge branch 'pm-sleep-next' into linux-next)
+$ git merge pm/linux-next
+Removing drivers/acpi/acpica/utclib.c
+Merge made by the 'recursive' strategy.
+ Documentation/power/runtime_pm.txt | 9 +-
+ drivers/acpi/acpi_memhotplug.c | 18 -
+ drivers/acpi/acpica/Makefile | 2 +-
+ drivers/acpi/acpica/utclib.c | 749 ------------------------------------
+ drivers/acpi/apei/erst-dbg.c | 11 +-
+ drivers/acpi/device_pm.c | 3 +-
+ drivers/acpi/glue.c | 9 +-
+ drivers/base/power/main.c | 9 +-
+ drivers/base/power/qos.c | 10 +-
+ drivers/cpufreq/cpufreq_stats.c | 11 +-
+ drivers/cpufreq/longhaul.c | 10 +-
+ drivers/cpuidle/coupled.c | 2 +-
+ drivers/cpuidle/cpuidle.c | 2 +-
+ drivers/cpuidle/governors/menu.c | 2 +-
+ drivers/idle/intel_idle.c | 2 +-
+ drivers/pnp/interface.c | 105 +++--
+ drivers/pnp/manager.c | 25 +-
+ 17 files changed, 142 insertions(+), 837 deletions(-)
+ delete mode 100644 drivers/acpi/acpica/utclib.c
+Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
+$ git merge apm/for-next
+Already up-to-date.
+Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Auto-merging kernel/audit_watch.c
+Auto-merging fs/notify/notification.c
+Auto-merging fs/notify/inotify/inotify_user.c
+Auto-merging fs/notify/inode_mark.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Auto-merging fs/notify/fanotify/fanotify.c
+Merge made by the 'recursive' strategy.
+ fs/notify/dnotify/dnotify.c | 4 +-
+ fs/notify/fanotify/fanotify.c | 6 +++
+ fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
+ fs/notify/group.c | 47 ++++++++++--------
+ fs/notify/inode_mark.c | 14 ++++--
+ fs/notify/inotify/inotify_fsnotify.c | 4 +-
+ fs/notify/inotify/inotify_user.c | 34 ++++++-------
+ fs/notify/mark.c | 91 +++++++++++++++++++---------------
+ fs/notify/notification.c | 1 +
+ fs/notify/vfsmount_mark.c | 14 ++++--
+ include/linux/fsnotify_backend.h | 31 ++++++++----
+ kernel/audit_tree.c | 10 ++--
+ kernel/audit_watch.c | 4 +-
+ 13 files changed, 178 insertions(+), 119 deletions(-)
+$ git am -3 ../patches/0001-fsnotify-cope-with-change-from-spinlock-to-mutex.patch
+Applying: fsnotify: cope with change from spinlock to mutex
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/notify/fdinfo.c
+$ git add -A .
+$ git commit -v -a --amend
+[master b889215] Merge remote-tracking branch 'fsnotify/for-next'
+Merging edac/linux_next (c215786 Merge branch 'fixes' into next)
+$ git merge edac/linux_next
+Auto-merging include/linux/edac.h
+Auto-merging drivers/edac/edac_mc.c
+Merge made by the 'recursive' strategy.
+ drivers/edac/edac_mc.c | 7 -
+ drivers/edac/i82975x_edac.c | 454 ++++++++++++++++++++++++++-----------------
+ drivers/edac/sb_edac.c | 2 +-
+ include/linux/edac.h | 1 -
+ 4 files changed, 273 insertions(+), 191 deletions(-)
+Merging edac-amd/for-next (3bfe5aa EDAC, pci_sysfs: Use for_each_pci_dev to simplify the code)
+$ git merge edac-amd/for-next
+Already up-to-date.
+Merging devicetree/devicetree/next (93c667c of: *node argument to of_parse_phandle_with_args should be const)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (58fea35 arm64: Fix the dtbs target building)
+$ git merge dt-rh/for-next
+Already up-to-date.
+Merging spi/spi/next (7cb9436 spi/sparc: Allow of_register_spi_devices for sparc)
+$ git merge spi/spi/next
+Already up-to-date.
+Merging spi-mb/spi-next (227c4ce spi: omap2-mcspi: remove duplicate inclusion of linux/err.h)
+$ git merge spi-mb/spi-next
+Already up-to-date.
+Merging tip/auto-latest (35fabb6 Merge branch 'linus')
+$ git merge tip/auto-latest
+Auto-merging scripts/kconfig/Makefile
+Auto-merging arch/x86/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 8 +
+ arch/x86/Kconfig | 31 +
+ kernel/irq/spurious.c | 7 +-
+ scripts/kconfig/Makefile | 7 +-
+ tools/kvm/.gitignore | 12 +
+ tools/kvm/CREDITS-Git | 30 +
+ tools/kvm/Documentation/kernel-debugging.txt | 15 +
+ tools/kvm/Documentation/kvm-balloon.txt | 24 +
+ tools/kvm/Documentation/kvm-debug.txt | 16 +
+ tools/kvm/Documentation/kvm-list.txt | 16 +
+ tools/kvm/Documentation/kvm-pause.txt | 16 +
+ tools/kvm/Documentation/kvm-resume.txt | 16 +
+ tools/kvm/Documentation/kvm-run.txt | 62 +
+ tools/kvm/Documentation/kvm-sandbox.txt | 16 +
+ tools/kvm/Documentation/kvm-setup.txt | 15 +
+ tools/kvm/Documentation/kvm-stat.txt | 19 +
+ tools/kvm/Documentation/kvm-stop.txt | 16 +
+ tools/kvm/Documentation/kvm-version.txt | 21 +
+ tools/kvm/Documentation/virtio-console.txt | 41 +
+ tools/kvm/Makefile | 482 +++++++
+ tools/kvm/README | 112 ++
+ tools/kvm/arm/aarch32/cortex-a15.c | 98 ++
+ tools/kvm/arm/aarch32/include/kvm/barrier.h | 10 +
+ tools/kvm/arm/aarch32/include/kvm/kvm-arch.h | 30 +
+ tools/kvm/arm/aarch32/kvm-cpu.c | 111 ++
+ tools/kvm/arm/aarch32/smp-pen.S | 39 +
+ tools/kvm/arm/fdt.c | 266 ++++
+ tools/kvm/arm/gic.c | 92 ++
+ tools/kvm/arm/include/arm-common/gic.h | 37 +
+ tools/kvm/arm/include/arm-common/kvm-arch.h | 34 +
+ tools/kvm/arm/include/kvm/kvm-config-arch.h | 7 +
+ tools/kvm/arm/include/kvm/kvm-cpu-arch.h | 46 +
+ tools/kvm/arm/ioport.c | 5 +
+ tools/kvm/arm/irq.c | 17 +
+ tools/kvm/arm/kvm-cpu.c | 107 ++
+ tools/kvm/arm/kvm.c | 69 +
+ tools/kvm/arm/smp.c | 21 +
+ tools/kvm/builtin-balloon.c | 80 ++
+ tools/kvm/builtin-debug.c | 110 ++
+ tools/kvm/builtin-help.c | 63 +
+ tools/kvm/builtin-list.c | 149 ++
+ tools/kvm/builtin-pause.c | 88 ++
+ tools/kvm/builtin-resume.c | 88 ++
+ tools/kvm/builtin-run.c | 702 +++++++++
+ tools/kvm/builtin-sandbox.c | 9 +
+ tools/kvm/builtin-setup.c | 258 ++++
+ tools/kvm/builtin-stat.c | 127 ++
+ tools/kvm/builtin-stop.c | 70 +
+ tools/kvm/builtin-version.c | 15 +
+ tools/kvm/code16gcc.h | 15 +
+ tools/kvm/command-list.txt | 15 +
+ tools/kvm/config/feature-tests.mak | 177 +++
+ tools/kvm/config/utilities.mak | 196 +++
+ tools/kvm/devices.c | 86 ++
+ tools/kvm/disk/blk.c | 76 +
+ tools/kvm/disk/core.c | 356 +++++
+ tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++
+ tools/kvm/disk/raw.c | 141 ++
+ tools/kvm/framebuffer.c | 80 ++
+ tools/kvm/guest/init.c | 76 +
+ tools/kvm/guest_compat.c | 99 ++
+ tools/kvm/hw/i8042.c | 355 +++++
+ tools/kvm/hw/pci-shmem.c | 411 ++++++
+ tools/kvm/hw/rtc.c | 155 ++
+ tools/kvm/hw/serial.c | 452 ++++++
+ tools/kvm/hw/vesa.c | 95 ++
+ tools/kvm/include/asm/hweight.h | 8 +
+ tools/kvm/include/bios/memcpy.h | 9 +
+ tools/kvm/include/kvm/8250-serial.h | 11 +
+ tools/kvm/include/kvm/apic.h | 17 +
+ tools/kvm/include/kvm/brlock.h | 41 +
+ tools/kvm/include/kvm/builtin-balloon.h | 9 +
+ tools/kvm/include/kvm/builtin-debug.h | 20 +
+ tools/kvm/include/kvm/builtin-help.h | 6 +
+ tools/kvm/include/kvm/builtin-list.h | 10 +
+ tools/kvm/include/kvm/builtin-pause.h | 9 +
+ tools/kvm/include/kvm/builtin-resume.h | 9 +
+ tools/kvm/include/kvm/builtin-run.h | 11 +
+ tools/kvm/include/kvm/builtin-sandbox.h | 6 +
+ tools/kvm/include/kvm/builtin-setup.h | 11 +
+ tools/kvm/include/kvm/builtin-stat.h | 9 +
+ tools/kvm/include/kvm/builtin-stop.h | 9 +
+ tools/kvm/include/kvm/builtin-version.h | 6 +
+ tools/kvm/include/kvm/compiler.h | 10 +
+ tools/kvm/include/kvm/devices.h | 27 +
+ tools/kvm/include/kvm/disk-image.h | 96 ++
+ tools/kvm/include/kvm/e820.h | 13 +
+ tools/kvm/include/kvm/fdt.h | 26 +
+ tools/kvm/include/kvm/framebuffer.h | 36 +
+ tools/kvm/include/kvm/guest_compat.h | 9 +
+ tools/kvm/include/kvm/i8042.h | 12 +
+ tools/kvm/include/kvm/ioeventfd.h | 28 +
+ tools/kvm/include/kvm/ioport.h | 70 +
+ tools/kvm/include/kvm/irq.h | 33 +
+ tools/kvm/include/kvm/kvm-cmd.h | 17 +
+ tools/kvm/include/kvm/kvm-config.h | 61 +
+ tools/kvm/include/kvm/kvm-cpu.h | 26 +
+ tools/kvm/include/kvm/kvm-ipc.h | 26 +
+ tools/kvm/include/kvm/kvm.h | 133 ++
+ tools/kvm/include/kvm/msi.h | 10 +
+ tools/kvm/include/kvm/mutex.h | 39 +
+ tools/kvm/include/kvm/parse-options.h | 221 +++
+ tools/kvm/include/kvm/pci-shmem.h | 32 +
+ tools/kvm/include/kvm/pci.h | 93 ++
+ tools/kvm/include/kvm/qcow.h | 133 ++
+ tools/kvm/include/kvm/rbtree-interval.h | 30 +
+ tools/kvm/include/kvm/read-write.h | 43 +
+ tools/kvm/include/kvm/rtc.h | 9 +
+ tools/kvm/include/kvm/rwsem.h | 39 +
+ tools/kvm/include/kvm/sdl.h | 28 +
+ tools/kvm/include/kvm/segment.h | 21 +
+ tools/kvm/include/kvm/strbuf.h | 20 +
+ tools/kvm/include/kvm/symbol.h | 30 +
+ tools/kvm/include/kvm/term.h | 24 +
+ tools/kvm/include/kvm/threadpool.h | 38 +
+ tools/kvm/include/kvm/types.h | 7 +
+ tools/kvm/include/kvm/uip.h | 360 +++++
+ tools/kvm/include/kvm/util-init.h | 51 +
+ tools/kvm/include/kvm/util.h | 97 ++
+ tools/kvm/include/kvm/vesa.h | 18 +
+ tools/kvm/include/kvm/virtio-9p.h | 76 +
+ tools/kvm/include/kvm/virtio-balloon.h | 9 +
+ tools/kvm/include/kvm/virtio-blk.h | 12 +
+ tools/kvm/include/kvm/virtio-console.h | 10 +
+ tools/kvm/include/kvm/virtio-mmio.h | 59 +
+ tools/kvm/include/kvm/virtio-net.h | 30 +
+ tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
+ tools/kvm/include/kvm/virtio-pci.h | 51 +
+ tools/kvm/include/kvm/virtio-rng.h | 9 +
+ tools/kvm/include/kvm/virtio-scsi.h | 26 +
+ tools/kvm/include/kvm/virtio.h | 102 ++
+ tools/kvm/include/kvm/vnc.h | 22 +
+ tools/kvm/include/linux/bitops.h | 33 +
+ tools/kvm/include/linux/byteorder.h | 7 +
+ tools/kvm/include/linux/compiler.h | 20 +
+ tools/kvm/include/linux/kernel.h | 41 +
+ tools/kvm/include/linux/module.h | 6 +
+ tools/kvm/include/linux/prefetch.h | 6 +
+ tools/kvm/include/linux/stddef.h | 10 +
+ tools/kvm/include/linux/types.h | 51 +
+ tools/kvm/ioeventfd.c | 218 +++
+ tools/kvm/ioport.c | 198 +++
+ tools/kvm/kvm-cmd.c | 91 ++
+ tools/kvm/kvm-cpu.c | 242 ++++
+ tools/kvm/kvm-ipc.c | 500 +++++++
+ tools/kvm/kvm.c | 512 +++++++
+ tools/kvm/main.c | 19 +
+ tools/kvm/mmio.c | 139 ++
+ tools/kvm/net/uip/arp.c | 30 +
+ tools/kvm/net/uip/buf.c | 114 ++
+ tools/kvm/net/uip/core.c | 190 +++
+ tools/kvm/net/uip/csum.c | 92 ++
+ tools/kvm/net/uip/dhcp.c | 202 +++
+ tools/kvm/net/uip/icmp.c | 29 +
+ tools/kvm/net/uip/ipv4.c | 29 +
+ tools/kvm/net/uip/tcp.c | 348 +++++
+ tools/kvm/net/uip/udp.c | 239 ++++
+ tools/kvm/pci.c | 200 +++
+ tools/kvm/powerpc/boot.c | 8 +
+ tools/kvm/powerpc/cpu_info.c | 195 +++
+ tools/kvm/powerpc/cpu_info.h | 42 +
+ tools/kvm/powerpc/include/kvm/barrier.h | 6 +
+ tools/kvm/powerpc/include/kvm/kvm-arch.h | 59 +
+ tools/kvm/powerpc/include/kvm/kvm-config-arch.h | 7 +
+ tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 +
+ tools/kvm/powerpc/ioport.c | 18 +
+ tools/kvm/powerpc/irq.c | 50 +
+ tools/kvm/powerpc/kvm-cpu.c | 290 ++++
+ tools/kvm/powerpc/kvm.c | 529 +++++++
+ tools/kvm/powerpc/spapr.h | 93 ++
+ tools/kvm/powerpc/spapr_hcall.c | 134 ++
+ tools/kvm/powerpc/spapr_hvcons.c | 108 ++
+ tools/kvm/powerpc/spapr_hvcons.h | 19 +
+ tools/kvm/powerpc/spapr_pci.c | 427 ++++++
+ tools/kvm/powerpc/spapr_pci.h | 57 +
+ tools/kvm/powerpc/spapr_rtas.c | 233 +++
+ tools/kvm/powerpc/xics.c | 522 +++++++
+ tools/kvm/powerpc/xics.h | 18 +
+ tools/kvm/symbol.c | 133 ++
+ tools/kvm/term.c | 171 +++
+ tools/kvm/tests/Makefile | 19 +
+ tools/kvm/tests/boot/Makefile | 13 +
+ tools/kvm/tests/boot/init.c | 11 +
+ tools/kvm/tests/kernel/.gitignore | 2 +
+ tools/kvm/tests/kernel/Makefile | 20 +
+ tools/kvm/tests/kernel/README | 16 +
+ tools/kvm/tests/kernel/kernel.S | 8 +
+ tools/kvm/tests/pit/.gitignore | 2 +
+ tools/kvm/tests/pit/Makefile | 20 +
+ tools/kvm/tests/pit/README | 16 +
+ tools/kvm/tests/pit/tick.S | 101 ++
+ tools/kvm/ui/sdl.c | 323 +++++
+ tools/kvm/ui/vnc.c | 250 ++++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
+ tools/kvm/util/generate-cmdlist.sh | 23 +
+ tools/kvm/util/init.c | 69 +
+ tools/kvm/util/kvm-ifup-vbr0 | 6 +
+ tools/kvm/util/parse-options.c | 577 ++++++++
+ tools/kvm/util/rbtree-interval.c | 58 +
+ tools/kvm/util/read-write.c | 354 +++++
+ tools/kvm/util/set_private_br.sh | 51 +
+ tools/kvm/util/strbuf.c | 62 +
+ tools/kvm/util/threadpool.c | 175 +++
+ tools/kvm/util/util.c | 133 ++
+ tools/kvm/virtio/9p-pdu.c | 287 ++++
+ tools/kvm/virtio/9p.c | 1440 +++++++++++++++++++
+ tools/kvm/virtio/balloon.c | 278 ++++
+ tools/kvm/virtio/blk.c | 318 +++++
+ tools/kvm/virtio/console.c | 211 +++
+ tools/kvm/virtio/core.c | 233 +++
+ tools/kvm/virtio/mmio.c | 271 ++++
+ tools/kvm/virtio/net.c | 674 +++++++++
+ tools/kvm/virtio/pci.c | 408 ++++++
+ tools/kvm/virtio/rng.c | 203 +++
+ tools/kvm/virtio/scsi.c | 310 ++++
+ tools/kvm/x86/bios.c | 174 +++
+ tools/kvm/x86/bios/.gitignore | 3 +
+ tools/kvm/x86/bios/bios-rom.S | 12 +
+ tools/kvm/x86/bios/e820.c | 72 +
+ tools/kvm/x86/bios/entry.S | 92 ++
+ tools/kvm/x86/bios/gen-offsets.sh | 14 +
+ tools/kvm/x86/bios/int10.c | 110 ++
+ tools/kvm/x86/bios/int15.c | 18 +
+ tools/kvm/x86/bios/local.S | 7 +
+ tools/kvm/x86/bios/macro.S | 25 +
+ tools/kvm/x86/bios/memcpy.c | 23 +
+ tools/kvm/x86/bios/rom.ld.S | 16 +
+ tools/kvm/x86/boot.c | 41 +
+ tools/kvm/x86/cpuid.c | 60 +
+ tools/kvm/x86/include/kvm/assembly.h | 24 +
+ tools/kvm/x86/include/kvm/barrier.h | 20 +
+ tools/kvm/x86/include/kvm/bios-export.h | 13 +
+ tools/kvm/x86/include/kvm/bios.h | 93 ++
+ tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
+ tools/kvm/x86/include/kvm/cpufeature.h | 41 +
+ tools/kvm/x86/include/kvm/interrupt.h | 26 +
+ tools/kvm/x86/include/kvm/kvm-arch.h | 36 +
+ tools/kvm/x86/include/kvm/kvm-config-arch.h | 15 +
+ tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
+ tools/kvm/x86/include/kvm/mptable.h | 9 +
+ tools/kvm/x86/interrupt.c | 28 +
+ tools/kvm/x86/ioport.c | 99 ++
+ tools/kvm/x86/irq.c | 222 +++
+ tools/kvm/x86/kvm-cpu.c | 425 ++++++
+ tools/kvm/x86/kvm.c | 381 +++++
+ tools/kvm/x86/mptable.c | 289 ++++
+ tools/perf/Makefile | 3 +-
+ tools/perf/bench/bench.h | 1 +
+ tools/perf/bench/numa.c | 1731 +++++++++++++++++++++++
+ tools/perf/builtin-bench.c | 13 +
+ 250 files changed, 28593 insertions(+), 6 deletions(-)
+ create mode 100644 tools/kvm/.gitignore
+ create mode 100644 tools/kvm/CREDITS-Git
+ create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
+ create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
+ create mode 100644 tools/kvm/Documentation/kvm-debug.txt
+ create mode 100644 tools/kvm/Documentation/kvm-list.txt
+ create mode 100644 tools/kvm/Documentation/kvm-pause.txt
+ create mode 100644 tools/kvm/Documentation/kvm-resume.txt
+ create mode 100644 tools/kvm/Documentation/kvm-run.txt
+ create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
+ create mode 100644 tools/kvm/Documentation/kvm-setup.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stat.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stop.txt
+ create mode 100644 tools/kvm/Documentation/kvm-version.txt
+ create mode 100644 tools/kvm/Documentation/virtio-console.txt
+ create mode 100644 tools/kvm/Makefile
+ create mode 100644 tools/kvm/README
+ create mode 100644 tools/kvm/arm/aarch32/cortex-a15.c
+ create mode 100644 tools/kvm/arm/aarch32/include/kvm/barrier.h
+ create mode 100644 tools/kvm/arm/aarch32/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/arm/aarch32/kvm-cpu.c
+ create mode 100644 tools/kvm/arm/aarch32/smp-pen.S
+ create mode 100644 tools/kvm/arm/fdt.c
+ create mode 100644 tools/kvm/arm/gic.c
+ create mode 100644 tools/kvm/arm/include/arm-common/gic.h
+ create mode 100644 tools/kvm/arm/include/arm-common/kvm-arch.h
+ create mode 100644 tools/kvm/arm/include/kvm/kvm-config-arch.h
+ create mode 100644 tools/kvm/arm/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/arm/ioport.c
+ create mode 100644 tools/kvm/arm/irq.c
+ create mode 100644 tools/kvm/arm/kvm-cpu.c
+ create mode 100644 tools/kvm/arm/kvm.c
+ create mode 100644 tools/kvm/arm/smp.c
+ create mode 100644 tools/kvm/builtin-balloon.c
+ create mode 100644 tools/kvm/builtin-debug.c
+ create mode 100644 tools/kvm/builtin-help.c
+ create mode 100644 tools/kvm/builtin-list.c
+ create mode 100644 tools/kvm/builtin-pause.c
+ create mode 100644 tools/kvm/builtin-resume.c
+ create mode 100644 tools/kvm/builtin-run.c
+ create mode 100644 tools/kvm/builtin-sandbox.c
+ create mode 100644 tools/kvm/builtin-setup.c
+ create mode 100644 tools/kvm/builtin-stat.c
+ create mode 100644 tools/kvm/builtin-stop.c
+ create mode 100644 tools/kvm/builtin-version.c
+ create mode 100644 tools/kvm/code16gcc.h
+ create mode 100644 tools/kvm/command-list.txt
+ create mode 100644 tools/kvm/config/feature-tests.mak
+ create mode 100644 tools/kvm/config/utilities.mak
+ create mode 100644 tools/kvm/devices.c
+ create mode 100644 tools/kvm/disk/blk.c
+ create mode 100644 tools/kvm/disk/core.c
+ create mode 100644 tools/kvm/disk/qcow.c
+ create mode 100644 tools/kvm/disk/raw.c
+ create mode 100644 tools/kvm/framebuffer.c
+ create mode 100644 tools/kvm/guest/init.c
+ create mode 100644 tools/kvm/guest_compat.c
+ create mode 100644 tools/kvm/hw/i8042.c
+ create mode 100644 tools/kvm/hw/pci-shmem.c
+ create mode 100644 tools/kvm/hw/rtc.c
+ create mode 100644 tools/kvm/hw/serial.c
+ create mode 100644 tools/kvm/hw/vesa.c
+ create mode 100644 tools/kvm/include/asm/hweight.h
+ create mode 100644 tools/kvm/include/bios/memcpy.h
+ create mode 100644 tools/kvm/include/kvm/8250-serial.h
+ create mode 100644 tools/kvm/include/kvm/apic.h
+ create mode 100644 tools/kvm/include/kvm/brlock.h
+ create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
+ create mode 100644 tools/kvm/include/kvm/builtin-debug.h
+ create mode 100644 tools/kvm/include/kvm/builtin-help.h
+ create mode 100644 tools/kvm/include/kvm/builtin-list.h
+ create mode 100644 tools/kvm/include/kvm/builtin-pause.h
+ create mode 100644 tools/kvm/include/kvm/builtin-resume.h
+ create mode 100644 tools/kvm/include/kvm/builtin-run.h
+ create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
+ create mode 100644 tools/kvm/include/kvm/builtin-setup.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stat.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stop.h
+ create mode 100644 tools/kvm/include/kvm/builtin-version.h
+ create mode 100644 tools/kvm/include/kvm/compiler.h
+ create mode 100644 tools/kvm/include/kvm/devices.h
+ create mode 100644 tools/kvm/include/kvm/disk-image.h
+ create mode 100644 tools/kvm/include/kvm/e820.h
+ create mode 100644 tools/kvm/include/kvm/fdt.h
+ create mode 100644 tools/kvm/include/kvm/framebuffer.h
+ create mode 100644 tools/kvm/include/kvm/guest_compat.h
+ create mode 100644 tools/kvm/include/kvm/i8042.h
+ create mode 100644 tools/kvm/include/kvm/ioeventfd.h
+ create mode 100644 tools/kvm/include/kvm/ioport.h
+ create mode 100644 tools/kvm/include/kvm/irq.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
+ create mode 100644 tools/kvm/include/kvm/kvm-config.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
+ create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
+ create mode 100644 tools/kvm/include/kvm/kvm.h
+ create mode 100644 tools/kvm/include/kvm/msi.h
+ create mode 100644 tools/kvm/include/kvm/mutex.h
+ create mode 100644 tools/kvm/include/kvm/parse-options.h
+ create mode 100644 tools/kvm/include/kvm/pci-shmem.h
+ create mode 100644 tools/kvm/include/kvm/pci.h
+ create mode 100644 tools/kvm/include/kvm/qcow.h
+ create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
+ create mode 100644 tools/kvm/include/kvm/read-write.h
+ create mode 100644 tools/kvm/include/kvm/rtc.h
+ create mode 100644 tools/kvm/include/kvm/rwsem.h
+ create mode 100644 tools/kvm/include/kvm/sdl.h
+ create mode 100644 tools/kvm/include/kvm/segment.h
+ create mode 100644 tools/kvm/include/kvm/strbuf.h
+ create mode 100644 tools/kvm/include/kvm/symbol.h
+ create mode 100644 tools/kvm/include/kvm/term.h
+ create mode 100644 tools/kvm/include/kvm/threadpool.h
+ create mode 100644 tools/kvm/include/kvm/types.h
+ create mode 100644 tools/kvm/include/kvm/uip.h
+ create mode 100644 tools/kvm/include/kvm/util-init.h
+ create mode 100644 tools/kvm/include/kvm/util.h
+ create mode 100644 tools/kvm/include/kvm/vesa.h
+ create mode 100644 tools/kvm/include/kvm/virtio-9p.h
+ create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
+ create mode 100644 tools/kvm/include/kvm/virtio-blk.h
+ create mode 100644 tools/kvm/include/kvm/virtio-console.h
+ create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
+ create mode 100644 tools/kvm/include/kvm/virtio-net.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci.h
+ create mode 100644 tools/kvm/include/kvm/virtio-rng.h
+ create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
+ create mode 100644 tools/kvm/include/kvm/virtio.h
+ create mode 100644 tools/kvm/include/kvm/vnc.h
+ create mode 100644 tools/kvm/include/linux/bitops.h
+ create mode 100644 tools/kvm/include/linux/byteorder.h
+ create mode 100644 tools/kvm/include/linux/compiler.h
+ create mode 100644 tools/kvm/include/linux/kernel.h
+ create mode 100644 tools/kvm/include/linux/module.h
+ create mode 100644 tools/kvm/include/linux/prefetch.h
+ create mode 100644 tools/kvm/include/linux/stddef.h
+ create mode 100644 tools/kvm/include/linux/types.h
+ create mode 100644 tools/kvm/ioeventfd.c
+ create mode 100644 tools/kvm/ioport.c
+ create mode 100644 tools/kvm/kvm-cmd.c
+ create mode 100644 tools/kvm/kvm-cpu.c
+ create mode 100644 tools/kvm/kvm-ipc.c
+ create mode 100644 tools/kvm/kvm.c
+ create mode 100644 tools/kvm/main.c
+ create mode 100644 tools/kvm/mmio.c
+ create mode 100644 tools/kvm/net/uip/arp.c
+ create mode 100644 tools/kvm/net/uip/buf.c
+ create mode 100644 tools/kvm/net/uip/core.c
+ create mode 100644 tools/kvm/net/uip/csum.c
+ create mode 100644 tools/kvm/net/uip/dhcp.c
+ create mode 100644 tools/kvm/net/uip/icmp.c
+ create mode 100644 tools/kvm/net/uip/ipv4.c
+ create mode 100644 tools/kvm/net/uip/tcp.c
+ create mode 100644 tools/kvm/net/uip/udp.c
+ create mode 100644 tools/kvm/pci.c
+ create mode 100644 tools/kvm/powerpc/boot.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-config-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/powerpc/ioport.c
+ create mode 100644 tools/kvm/powerpc/irq.c
+ create mode 100644 tools/kvm/powerpc/kvm-cpu.c
+ create mode 100644 tools/kvm/powerpc/kvm.c
+ create mode 100644 tools/kvm/powerpc/spapr.h
+ create mode 100644 tools/kvm/powerpc/spapr_hcall.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
+ create mode 100644 tools/kvm/powerpc/spapr_pci.c
+ create mode 100644 tools/kvm/powerpc/spapr_pci.h
+ create mode 100644 tools/kvm/powerpc/spapr_rtas.c
+ create mode 100644 tools/kvm/powerpc/xics.c
+ create mode 100644 tools/kvm/powerpc/xics.h
+ create mode 100644 tools/kvm/symbol.c
+ create mode 100644 tools/kvm/term.c
+ create mode 100644 tools/kvm/tests/Makefile
+ create mode 100644 tools/kvm/tests/boot/Makefile
+ create mode 100644 tools/kvm/tests/boot/init.c
+ create mode 100644 tools/kvm/tests/kernel/.gitignore
+ create mode 100644 tools/kvm/tests/kernel/Makefile
+ create mode 100644 tools/kvm/tests/kernel/README
+ create mode 100644 tools/kvm/tests/kernel/kernel.S
+ create mode 100644 tools/kvm/tests/pit/.gitignore
+ create mode 100644 tools/kvm/tests/pit/Makefile
+ create mode 100644 tools/kvm/tests/pit/README
+ create mode 100644 tools/kvm/tests/pit/tick.S
+ create mode 100644 tools/kvm/ui/sdl.c
+ create mode 100644 tools/kvm/ui/vnc.c
+ create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
+ create mode 100755 tools/kvm/util/generate-cmdlist.sh
+ create mode 100644 tools/kvm/util/init.c
+ create mode 100755 tools/kvm/util/kvm-ifup-vbr0
+ create mode 100644 tools/kvm/util/parse-options.c
+ create mode 100644 tools/kvm/util/rbtree-interval.c
+ create mode 100644 tools/kvm/util/read-write.c
+ create mode 100755 tools/kvm/util/set_private_br.sh
+ create mode 100644 tools/kvm/util/strbuf.c
+ create mode 100644 tools/kvm/util/threadpool.c
+ create mode 100644 tools/kvm/util/util.c
+ create mode 100644 tools/kvm/virtio/9p-pdu.c
+ create mode 100644 tools/kvm/virtio/9p.c
+ create mode 100644 tools/kvm/virtio/balloon.c
+ create mode 100644 tools/kvm/virtio/blk.c
+ create mode 100644 tools/kvm/virtio/console.c
+ create mode 100644 tools/kvm/virtio/core.c
+ create mode 100644 tools/kvm/virtio/mmio.c
+ create mode 100644 tools/kvm/virtio/net.c
+ create mode 100644 tools/kvm/virtio/pci.c
+ create mode 100644 tools/kvm/virtio/rng.c
+ create mode 100644 tools/kvm/virtio/scsi.c
+ create mode 100644 tools/kvm/x86/bios.c
+ create mode 100644 tools/kvm/x86/bios/.gitignore
+ create mode 100644 tools/kvm/x86/bios/bios-rom.S
+ create mode 100644 tools/kvm/x86/bios/e820.c
+ create mode 100644 tools/kvm/x86/bios/entry.S
+ create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
+ create mode 100644 tools/kvm/x86/bios/int10.c
+ create mode 100644 tools/kvm/x86/bios/int15.c
+ create mode 100644 tools/kvm/x86/bios/local.S
+ create mode 100644 tools/kvm/x86/bios/macro.S
+ create mode 100644 tools/kvm/x86/bios/memcpy.c
+ create mode 100644 tools/kvm/x86/bios/rom.ld.S
+ create mode 100644 tools/kvm/x86/boot.c
+ create mode 100644 tools/kvm/x86/cpuid.c
+ create mode 100644 tools/kvm/x86/include/kvm/assembly.h
+ create mode 100644 tools/kvm/x86/include/kvm/barrier.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios.h
+ create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
+ create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
+ create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-config-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/mptable.h
+ create mode 100644 tools/kvm/x86/interrupt.c
+ create mode 100644 tools/kvm/x86/ioport.c
+ create mode 100644 tools/kvm/x86/irq.c
+ create mode 100644 tools/kvm/x86/kvm-cpu.c
+ create mode 100644 tools/kvm/x86/kvm.c
+ create mode 100644 tools/kvm/x86/mptable.c
+ create mode 100644 tools/perf/bench/numa.c
+Merging ftrace/for-next (2faffc4 Merge branch 'trace/tip/perf/urgent' into trace/for-next)
+$ git merge ftrace/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging rcu/rcu/next (91d1aa43 context_tracking: New context tracking susbsystem)
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
+$ git merge cputime/cputime
+Already up-to-date.
+Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kvm/linux-next (e11ae1a KVM: remove unused variable.)
+$ git merge kvm/linux-next
+Auto-merging arch/x86/include/asm/vmx.h
+Merge made by the 'recursive' strategy.
+ arch/ia64/include/asm/kvm_host.h | 4 +-
+ arch/ia64/kvm/kvm-ia64.c | 8 ++--
+ arch/powerpc/include/asm/kvm_host.h | 6 +--
+ arch/powerpc/kvm/book3s_hv.c | 2 +-
+ arch/powerpc/kvm/powerpc.c | 4 +-
+ arch/s390/include/asm/kvm_host.h | 4 +-
+ arch/s390/kvm/kvm-s390.c | 4 +-
+ arch/x86/include/asm/kvm_host.h | 8 ++--
+ arch/x86/include/asm/vmx.h | 6 +--
+ arch/x86/kvm/emulate.c | 35 +++++++++++++++--
+ arch/x86/kvm/i8259.c | 2 +
+ arch/x86/kvm/irq.c | 30 ++++-----------
+ arch/x86/kvm/vmx.c | 6 +--
+ arch/x86/kvm/x86.c | 10 ++---
+ include/linux/kvm_host.h | 24 +++++++-----
+ virt/kvm/kvm_main.c | 71 +++++++++++++++++++++++------------
+ 16 files changed, 131 insertions(+), 93 deletions(-)
+Merging kvm-ppc/kvm-ppc-next (26cb772 powerpc: Corrected include header path in kvm_para.h)
+$ git merge kvm-ppc/kvm-ppc-next
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 2 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 1 +
+ arch/powerpc/include/uapi/asm/kvm_para.h | 2 +-
+ arch/powerpc/kvm/book3s_emulate.c | 28 ++++++++++++++++++++++++++++
+ arch/powerpc/kvm/book3s_pr.c | 5 +++++
+ arch/powerpc/kvm/powerpc.c | 3 ++-
+ 6 files changed, 38 insertions(+), 3 deletions(-)
+Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging fw-cputime/cputime/adjustment-v2 (fa09205 cputime: Comment cputime's adjusting code)
+$ git merge fw-cputime/cputime/adjustment-v2
+Already up-to-date.
+Merging fw-sched/sched/cputime-v2 (1b2852b vtime: Warn if irqs aren't disabled on system time accounting APIs)
+$ git merge fw-sched/sched/cputime-v2
+Already up-to-date.
+Merging fw-nohz/nohz/printk-v8 (74876a9 printk: Wake up klogd using irq_work)
+$ git merge fw-nohz/nohz/printk-v8
+Auto-merging kernel/time/tick-sched.c
+Auto-merging kernel/printk.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/tick.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/sh/Kconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/hexagon/Kconfig
+Auto-merging arch/blackfin/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/alpha/Kconfig | 1 -
+ arch/arm/Kconfig | 1 -
+ arch/arm64/Kconfig | 1 -
+ arch/blackfin/Kconfig | 1 -
+ arch/frv/Kconfig | 1 -
+ arch/hexagon/Kconfig | 1 -
+ arch/mips/Kconfig | 1 -
+ arch/parisc/Kconfig | 1 -
+ arch/powerpc/Kconfig | 1 -
+ arch/s390/Kconfig | 1 -
+ arch/sh/Kconfig | 1 -
+ arch/sparc/Kconfig | 1 -
+ arch/x86/Kconfig | 1 -
+ drivers/staging/iio/trigger/Kconfig | 1 -
+ include/linux/irq_work.h | 20 ++++++
+ include/linux/printk.h | 3 -
+ include/linux/tick.h | 17 ++++-
+ init/Kconfig | 5 +-
+ kernel/irq_work.c | 131 ++++++++++++++++++++++++++---------
+ kernel/printk.c | 36 +++++-----
+ kernel/time/tick-sched.c | 7 +-
+ kernel/timer.c | 1 -
+ 22 files changed, 161 insertions(+), 73 deletions(-)
+Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
+$ git merge xen/upstream/xen
+Already up-to-date.
+Merging xen-two/linux-next (9736dea Merge commit '74b84233458e9db7c160cec67638efdbec748ca9' into linux-next)
+$ git merge xen-two/linux-next
+Resolved 'arch/arm/xen/enlighten.c' using previous resolution.
+Auto-merging arch/x86/xen/Kconfig
+Auto-merging arch/arm/xen/enlighten.c
+CONFLICT (content): Merge conflict in arch/arm/xen/enlighten.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2d9586c] Merge remote-tracking branch 'xen-two/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/include/asm/xen/interface.h | 11 ++-
+ arch/x86/include/asm/xen/page.h | 3 +
+ arch/x86/xen/Kconfig | 10 ++
+ arch/x86/xen/enlighten.c | 76 +++++++++++----
+ arch/x86/xen/irq.c | 5 +-
+ arch/x86/xen/mmu.c | 172 +++++++++++++++++++++++++++++++---
+ arch/x86/xen/mmu.h | 2 +
+ arch/x86/xen/p2m.c | 2 +-
+ arch/x86/xen/setup.c | 64 ++++++++++---
+ arch/x86/xen/smp.c | 75 ++++++++++-----
+ arch/x86/xen/xen-head.S | 11 ++-
+ drivers/net/xen-netback/netback.c | 11 ++-
+ drivers/xen/balloon.c | 14 ++-
+ drivers/xen/cpu_hotplug.c | 4 +-
+ drivers/xen/events.c | 9 +-
+ drivers/xen/gntdev.c | 3 +-
+ drivers/xen/grant-table.c | 78 +++++----------
+ drivers/xen/privcmd.c | 2 +-
+ drivers/xen/xenbus/xenbus_client.c | 9 +-
+ include/xen/grant_table.h | 12 ---
+ include/xen/interface/physdev.h | 10 ++
+ 21 files changed, 425 insertions(+), 158 deletions(-)
+Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
+$ git merge xen-pvhvm/linux-next
+Already up-to-date.
+Merging percpu/for-next (5479c78 mm, percpu: Make sure percpu_alloc early parameter has an argument)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (023f27d workqueue: fix find_worker_executing_work() brekage from hashtable conversion)
+$ git merge workqueues/for-next
+Merge made by the 'recursive' strategy.
+ kernel/workqueue.c | 117 +++++++++++++++++++---------------------------------
+ 1 file changed, 42 insertions(+), 75 deletions(-)
+Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
+$ git merge drivers-x86/linux-next
+Auto-merging drivers/platform/x86/asus-wmi.c
+Merge made by the 'recursive' strategy.
+ drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 76 insertions(+)
+Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (7c8a299 Merge remote-tracking branch 'regmap/topic/type' into regmap-next)
+$ git merge regmap/for-next
+Already up-to-date.
+Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (2f05e1d leds: leds-lp5521: return an error code on error in probe())
+$ git merge leds/for-next
+Already up-to-date.
+Merging driver-core/driver-core-next (1800098 ARM: OMAP: Fix build breakage due to missing include in i2c.c)
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge tty/tty-next
+Already up-to-date.
+Merging usb/usb-next (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge usb/usb-next
+Already up-to-date.
+Merging staging/staging-next (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge staging/staging-next
+Already up-to-date.
+Merging char-misc/char-misc-next (962b686 Merge tag 'pull_req_20121122' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx/extcon into char-misc-next)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
+$ git merge tmem/linux-next
+Already up-to-date.
+Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
+$ git merge writeback/writeback-for-next
+Already up-to-date.
+Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (e5b4c9d pinctrl: exynos5440: Fix compile error in pinctrl-exynos5440/samsung.c)
+$ git merge pinctrl/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pinctrl/pinctrl-sirf.txt | 47 +++++++++++++++++++
+ arch/arm/boot/dts/dbx5x0.dtsi | 4 +-
+ arch/arm/common/vic.c | 9 +++-
+ arch/arm/mach-ux500/cpu-db8500.c | 3 +-
+ arch/arm/mach-versatile/include/mach/irqs.h | 6 +--
+ drivers/pinctrl/core.c | 2 +-
+ drivers/pinctrl/pinctrl-at91.c | 2 +-
+ drivers/pinctrl/pinctrl-exynos5440.c | 2 +-
+ drivers/pinctrl/pinctrl-imx53.c | 2 +-
+ drivers/pinctrl/pinctrl-nomadik.c | 11 ++++-
+ drivers/pinctrl/pinctrl-samsung.c | 2 +-
+ drivers/pinctrl/pinctrl-sirf.c | 48 ++++++++++++++++++++
+ 12 files changed, 125 insertions(+), 13 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt
+Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency)
+$ git merge vhost/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/vhost/Kconfig | 1 +
+ drivers/vhost/Kconfig.blk | 10 +
+ drivers/vhost/Makefile | 2 +
+ drivers/vhost/blk.c | 727 +++++++++++++++++++++++++++++++++++++++++++++
+ drivers/vhost/blk.h | 8 +
+ 5 files changed, 748 insertions(+)
+ create mode 100644 drivers/vhost/Kconfig.blk
+ create mode 100644 drivers/vhost/blk.c
+ create mode 100644 drivers/vhost/blk.h
+Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
+$ git merge memblock/memblock-kill-early_node_map
+Already up-to-date.
+Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging irqdomain/irqdomain/next (023bba3 irqdomain: update documentation)
+$ git merge irqdomain/irqdomain/next
+Already up-to-date.
+Merging gpio/gpio/next (fc13d5a gpio: Provide the STMPE GPIO driver with its own IRQ Domain)
+$ git merge gpio/gpio/next
+Already up-to-date.
+Merging gpio-lw/for-next (fc13d5a gpio: Provide the STMPE GPIO driver with its own IRQ Domain)
+$ git merge gpio-lw/for-next
+Already up-to-date.
+Merging arm-soc/for-next (e691d77 Merge branch 'late/omap-cleanup' into for-next)
+$ git merge arm-soc/for-next
+Recorded preimage for 'drivers/pinctrl/pinctrl-exynos5440.c'
+Auto-merging drivers/pinctrl/pinctrl-samsung.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-samsung.c
+Auto-merging drivers/pinctrl/pinctrl-exynos5440.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-exynos5440.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+Auto-merging arch/arm/mach-omap2/fb.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/pinctrl/pinctrl-exynos5440.c'.
+Resolved 'drivers/pinctrl/pinctrl-samsung.c' using previous resolution.
+[master 7063e03] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 9 ++
+ ...n4i-cubieboard.dts => sun4i-a10-cubieboard.dts} | 0
+ arch/arm/boot/dts/{sun4i.dtsi => sun4i-a10.dtsi} | 0
+ ...sun5i-olinuxino.dts => sun5i-a13-olinuxino.dts} | 0
+ arch/arm/boot/dts/{sun5i.dtsi => sun5i-a13.dtsi} | 0
+ arch/arm/configs/omap2plus_defconfig | 5 +
+ arch/arm/mach-exynos/clock-exynos4.c | 4 +-
+ arch/arm/mach-exynos/common.c | 3 +-
+ arch/arm/mach-exynos/dev-audio.c | 12 --
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 2 +
+ arch/arm/mach-exynos/mach-origen.c | 4 +-
+ arch/arm/mach-exynos/mach-smdk4x12.c | 4 +-
+ arch/arm/mach-exynos/mach-smdkv310.c | 4 +-
+ arch/arm/mach-exynos/platsmp.c | 2 +-
+ arch/arm/mach-omap1/Makefile | 2 +-
+ arch/arm/mach-omap1/fb.c | 80 +++++++++++++
+ arch/arm/mach-omap2/Makefile | 2 +-
+ arch/arm/mach-omap2/control.h | 2 +-
+ arch/arm/mach-omap2/dpll3xxx.c | 3 +-
+ arch/arm/mach-omap2/drm.c | 1 -
+ arch/arm/mach-omap2/dss-common.c | 3 +-
+ arch/arm/{plat-omap => mach-omap2}/fb.c | 50 +-------
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1 -
+ arch/arm/mach-omap2/omap_twl.c | 8 +-
+ arch/arm/mach-omap2/pmu.c | 2 -
+ arch/arm/mach-omap2/prm2xxx.c | 3 +-
+ arch/arm/mach-omap2/prm3xxx.c | 3 +-
+ arch/arm/mach-s3c64xx/clock.c | 126 ++++++++++++--------
+ arch/arm/mach-s3c64xx/dev-audio.c | 11 --
+ arch/arm/mach-s5p64x0/clock-s5p6440.c | 49 +++++---
+ arch/arm/mach-s5p64x0/clock-s5p6450.c | 61 +++++++---
+ arch/arm/mach-s5p64x0/dev-audio.c | 12 --
+ arch/arm/mach-s5pc100/clock.c | 48 +++++---
+ arch/arm/mach-s5pc100/dev-audio.c | 16 ---
+ arch/arm/mach-s5pv210/dev-audio.c | 16 ---
+ arch/arm/plat-omap/Makefile | 2 +-
+ arch/arm/plat-omap/dmtimer.c | 13 +-
+ arch/arm/plat-omap/include/plat/cpu.h | 4 -
+ arch/arm/plat-samsung/include/plat/gpio-core.h | 5 +
+ drivers/media/platform/omap3isp/isp.c | 2 -
+ drivers/pinctrl/pinctrl-samsung.h | 2 +-
+ drivers/power/avs/smartreflex.c | 2 -
+ 42 files changed, 310 insertions(+), 268 deletions(-)
+ rename arch/arm/boot/dts/{sun4i-cubieboard.dts => sun4i-a10-cubieboard.dts} (100%)
+ rename arch/arm/boot/dts/{sun4i.dtsi => sun4i-a10.dtsi} (100%)
+ rename arch/arm/boot/dts/{sun5i-olinuxino.dts => sun5i-a13-olinuxino.dts} (100%)
+ rename arch/arm/boot/dts/{sun5i.dtsi => sun5i-a13.dtsi} (100%)
+ create mode 100644 arch/arm/mach-omap1/fb.c
+ rename arch/arm/{plat-omap => mach-omap2}/fb.c (76%)
+Merging bcm2835/for-next (2959440 Linux 3.7)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling)
+$ git merge cortex/for-next
+Resolved 'arch/arm/kernel/process.c' using previous resolution.
+Auto-merging arch/arm/mm/mmu.c
+Auto-merging arch/arm/mm/alignment.c
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/kernel/ptrace.c
+Auto-merging arch/arm/kernel/process.c
+CONFLICT (content): Merge conflict in arch/arm/kernel/process.c
+Auto-merging arch/arm/kernel/head-nommu.S
+Auto-merging arch/arm/kernel/entry-common.S
+Auto-merging arch/arm/include/asm/cputype.h
+Auto-merging arch/arm/include/asm/assembler.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 67647e4] Merge remote-tracking branch 'cortex/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/include/asm/assembler.h | 13 ++-
+ arch/arm/include/asm/cp15.h | 11 ++-
+ arch/arm/include/asm/cputype.h | 3 +
+ arch/arm/include/asm/glue-cache.h | 25 ++++++
+ arch/arm/include/asm/glue-df.h | 8 ++
+ arch/arm/include/asm/glue-proc.h | 9 ++
+ arch/arm/include/asm/irqflags.h | 22 +++--
+ arch/arm/include/asm/processor.h | 7 ++
+ arch/arm/include/asm/ptrace.h | 8 ++
+ arch/arm/include/asm/system_info.h | 1 +
+ arch/arm/include/uapi/asm/ptrace.h | 36 ++++++--
+ arch/arm/kernel/asm-offsets.c | 3 +
+ arch/arm/kernel/entry-common.S | 4 +
+ arch/arm/kernel/entry-header.S | 148 +++++++++++++++++++++++++++++++++
+ arch/arm/kernel/entry-v7m.S | 134 ++++++++++++++++++++++++++++++
+ arch/arm/kernel/head-common.S | 9 +-
+ arch/arm/kernel/head-nommu.S | 9 +-
+ arch/arm/kernel/process.c | 4 +
+ arch/arm/kernel/ptrace.c | 3 +
+ arch/arm/kernel/setup.c | 13 ++-
+ arch/arm/kernel/traps.c | 2 +
+ arch/arm/mm/alignment.c | 2 +
+ arch/arm/mm/mmu.c | 17 ++++
+ arch/arm/mm/nommu.c | 2 +
+ arch/arm/mm/proc-v7m.S | 161 ++++++++++++++++++++++++++++++++++++
+ 25 files changed, 632 insertions(+), 22 deletions(-)
+ create mode 100644 arch/arm/kernel/entry-v7m.S
+ create mode 100644 arch/arm/mm/proc-v7m.S
+Merging ep93xx/ep93xx-for-next (cf92d86 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
+$ git merge ixp4xx/next
+Merge made by the 'recursive' strategy.
+Merging msm/for-next (a0d271c Linux 3.6)
+$ git merge msm/for-next
+Already up-to-date.
+Merging renesas/next (e438fd8 Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards4', 'heads/soc5' and 'heads/maintainers'; commit 'ab6f6d85210c4d0265cf48e9958c04e08595055a' into next)
+$ git merge renesas/next
+Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/sh7372-mackerel.dts | 2 +-
+ arch/arm/configs/mackerel_defconfig | 3 +-
+ arch/arm/mach-shmobile/clock-r8a7740.c | 6 +-
+ arch/arm/mach-shmobile/clock-sh7372.c | 9 +++
+ arch/arm/mach-shmobile/clock-sh73a0.c | 22 ++++----
+ arch/arm/mach-shmobile/intc-sh73a0.c | 7 +--
+ arch/arm/mach-shmobile/pfc-r8a7779.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7740.c | 95 +++++++++++++++++++++++++++++++-
+ 8 files changed, 124 insertions(+), 22 deletions(-)
+Merging samsung/for-next (d1a8169 Merge branch 'next/cleanup-samsung-3' into for-next)
+$ git merge samsung/for-next
+Resolved 'arch/arm/boot/dts/Makefile' using previous resolution.
+Resolved 'arch/arm/boot/dts/exynos5250-smdk5250.dts' using previous resolution.
+Resolved 'arch/arm/boot/dts/exynos5250.dtsi' using previous resolution.
+Resolved 'arch/arm/mach-exynos/mach-exynos5-dt.c' using previous resolution.
+Auto-merging arch/arm/mach-exynos/mach-exynos5-dt.c
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos/mach-exynos5-dt.c
+Auto-merging arch/arm/mach-exynos/common.c
+Auto-merging arch/arm/boot/dts/exynos5250.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5250.dtsi
+Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5250-smdk5250.dts
+Auto-merging arch/arm/boot/dts/Makefile
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bd4dd31] Merge remote-tracking branch 'samsung/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 14 +++
+ arch/arm/boot/dts/exynos5250.dtsi | 36 +++++++-
+ arch/arm/mach-exynos/clock-exynos5.c | 117 ++++++++++++++++++++++++
+ arch/arm/mach-exynos/common.c | 5 +
+ arch/arm/mach-exynos/include/mach/map.h | 2 +
+ arch/arm/mach-exynos/include/mach/regs-audss.h | 7 +-
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 6 ++
+ arch/arm/plat-samsung/include/plat/map-s5p.h | 2 +
+ 8 files changed, 187 insertions(+), 2 deletions(-)
+Merging tegra/for-next (3c8d1fc Merge branch 'for-3.8/fixes-for-rc1' into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+Merging kvmtool/master (5f2ad67 kvm tools: remove max_high field in rb_int_node structure)
+$ git merge kvmtool/master
+Already up-to-date.
+Merging dma-mapping/dma-mapping-next (0c375cf ARM: iommu: Include linux/kref.h in asm/dma-iommu.h)
+$ git merge dma-mapping/dma-mapping-next
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/dma-iommu.h | 1 +
+ arch/arm/mm/dma-mapping.c | 12 ++++++------
+ drivers/base/dma-contiguous.c | 6 +++---
+ include/linux/dma-contiguous.h | 8 ++++----
+ 4 files changed, 14 insertions(+), 13 deletions(-)
+Merging pwm/for-next (20e8ac3 pwm: samsung: add missing s3c->pwm_id assignment)
+$ git merge pwm/for-next
+Already up-to-date.
+Merging dma-buf/for-next (1d40cc8 dma-buf: remove fallback for !CONFIG_DMA_SHARED_BUFFER)
+$ git merge dma-buf/for-next
+Merge made by the 'recursive' strategy.
+Merging userns/for-next (5155040 userns: Fix typo in description of the limitation of userns_install)
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (50ececc alpha: switch to generic sigaltstack)
+$ git merge signal/for-next
+Recorded preimage for 'arch/h8300/include/asm/ptrace.h'
+Recorded preimage for 'arch/h8300/include/asm/signal.h'
+Recorded preimage for 'arch/m32r/include/asm/signal.h'
+Resolved 'arch/alpha/include/asm/signal.h' using previous resolution.
+Resolved 'arch/cris/include/asm/signal.h' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'arch/x86/include/asm/signal.h' using previous resolution.
+Auto-merging kernel/signal.c
+Auto-merging kernel/fork.c
+Auto-merging init/main.c
+Auto-merging include/linux/syscalls.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/ptrace.h
+Auto-merging include/linux/compat.h
+Auto-merging include/linux/binfmts.h
+Auto-merging fs/exec.c
+Auto-merging arch/xtensa/include/asm/ptrace.h
+Auto-merging arch/xtensa/Kconfig
+Auto-merging arch/x86/um/Kconfig
+Auto-merging arch/x86/syscalls/syscall_64.tbl
+Auto-merging arch/x86/syscalls/syscall_32.tbl
+Auto-merging arch/x86/kernel/signal.c
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/include/asm/unistd.h
+Auto-merging arch/x86/include/asm/signal.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/signal.h
+Auto-merging arch/x86/include/asm/ptrace.h
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/tile/include/asm/unistd.h
+Auto-merging arch/tile/include/asm/ptrace.h
+Auto-merging arch/sparc/include/asm/unistd.h
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/sh/Kconfig
+Auto-merging arch/score/include/uapi/asm/unistd.h
+Auto-merging arch/score/include/asm/ptrace.h
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/include/asm/unistd.h
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/openrisc/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/microblaze/include/asm/unistd.h
+Auto-merging arch/microblaze/include/asm/ptrace.h
+Auto-merging arch/m32r/include/asm/unistd.h
+Auto-merging arch/m32r/include/asm/signal.h
+CONFLICT (content): Merge conflict in arch/m32r/include/asm/signal.h
+Auto-merging arch/m32r/include/asm/ptrace.h
+Auto-merging arch/hexagon/Kconfig
+Auto-merging arch/h8300/include/asm/unistd.h
+Auto-merging arch/h8300/include/asm/signal.h
+CONFLICT (content): Merge conflict in arch/h8300/include/asm/signal.h
+Auto-merging arch/h8300/include/asm/ptrace.h
+CONFLICT (content): Merge conflict in arch/h8300/include/asm/ptrace.h
+Auto-merging arch/h8300/Kconfig
+Auto-merging arch/frv/Kconfig
+Auto-merging arch/cris/include/asm/unistd.h
+Auto-merging arch/cris/include/asm/signal.h
+CONFLICT (content): Merge conflict in arch/cris/include/asm/signal.h
+Auto-merging arch/cris/include/asm/ptrace.h
+Auto-merging arch/blackfin/include/asm/unistd.h
+Auto-merging arch/blackfin/include/asm/ptrace.h
+Auto-merging arch/blackfin/Kconfig
+Auto-merging arch/avr32/Kconfig
+Auto-merging arch/arm64/include/asm/unistd.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/alpha/include/asm/unistd.h
+Auto-merging arch/alpha/include/asm/signal.h
+CONFLICT (content): Merge conflict in arch/alpha/include/asm/signal.h
+Auto-merging arch/alpha/include/asm/ptrace.h
+Auto-merging arch/alpha/Kconfig
+Auto-merging arch/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/h8300/include/asm/ptrace.h'.
+Recorded resolution for 'arch/h8300/include/asm/signal.h'.
+Recorded resolution for 'arch/m32r/include/asm/signal.h'.
+[master de46bbc] Merge remote-tracking branch 'signal/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/Kconfig | 9 ++--
+ arch/alpha/Kconfig | 3 +-
+ arch/alpha/include/asm/ptrace.h | 1 +
+ arch/alpha/include/asm/unistd.h | 1 -
+ arch/alpha/kernel/signal.c | 10 +---
+ arch/arm/Kconfig | 2 -
+ arch/arm/include/asm/unistd.h | 1 -
+ arch/arm/include/uapi/asm/signal.h | 7 ---
+ arch/arm64/Kconfig | 2 -
+ arch/arm64/include/asm/compat.h | 5 +-
+ arch/arm64/include/asm/unistd.h | 1 -
+ arch/avr32/Kconfig | 2 -
+ arch/avr32/include/asm/ptrace.h | 1 +
+ arch/avr32/include/asm/unistd.h | 1 -
+ arch/avr32/include/uapi/asm/signal.h | 6 ---
+ arch/blackfin/Kconfig | 2 -
+ arch/blackfin/include/asm/ptrace.h | 1 +
+ arch/blackfin/include/asm/unistd.h | 1 -
+ arch/c6x/Kconfig | 2 -
+ arch/c6x/include/uapi/asm/unistd.h | 1 -
+ arch/cris/Kconfig | 2 -
+ arch/cris/include/asm/ptrace.h | 1 +
+ arch/cris/include/asm/unistd.h | 1 -
+ arch/frv/Kconfig | 2 -
+ arch/frv/include/asm/unistd.h | 1 -
+ arch/h8300/Kconfig | 2 -
+ arch/h8300/include/asm/ptrace.h | 1 +
+ arch/h8300/include/asm/unistd.h | 1 -
+ arch/hexagon/Kconfig | 2 -
+ arch/hexagon/include/uapi/asm/unistd.h | 1 -
+ arch/ia64/Kconfig | 2 -
+ arch/ia64/include/asm/ptrace.h | 5 ++
+ arch/ia64/include/asm/unistd.h | 1 -
+ arch/ia64/include/uapi/asm/signal.h | 6 ---
+ arch/m32r/Kconfig | 2 -
+ arch/m32r/include/asm/ptrace.h | 1 +
+ arch/m32r/include/asm/unistd.h | 1 -
+ arch/m68k/Kconfig | 2 -
+ arch/m68k/include/asm/ptrace.h | 1 +
+ arch/m68k/include/asm/unistd.h | 1 -
+ arch/m68k/include/uapi/asm/signal.h | 6 ---
+ arch/microblaze/Kconfig | 2 -
+ arch/microblaze/include/asm/ptrace.h | 1 +
+ arch/microblaze/include/asm/unistd.h | 1 -
+ arch/mips/Kconfig | 2 -
+ arch/mips/include/asm/ptrace.h | 1 +
+ arch/mips/include/asm/unistd.h | 1 -
+ arch/mips/include/uapi/asm/signal.h | 6 ---
+ arch/mn10300/Kconfig | 2 -
+ arch/mn10300/include/asm/unistd.h | 1 -
+ arch/mn10300/include/uapi/asm/signal.h | 6 ---
+ arch/openrisc/Kconfig | 2 -
+ arch/openrisc/include/uapi/asm/unistd.h | 1 -
+ arch/parisc/Kconfig | 2 -
+ arch/parisc/include/asm/unistd.h | 1 -
+ arch/parisc/include/uapi/asm/signal.h | 6 ---
+ arch/powerpc/Kconfig | 2 -
+ arch/powerpc/include/asm/unistd.h | 1 -
+ arch/powerpc/include/uapi/asm/signal.h | 6 ---
+ arch/s390/Kconfig | 2 -
+ arch/s390/include/asm/compat.h | 3 ++
+ arch/s390/include/asm/unistd.h | 1 -
+ arch/s390/include/uapi/asm/signal.h | 6 ---
+ arch/score/Kconfig | 2 -
+ arch/score/include/asm/ptrace.h | 1 +
+ arch/score/include/uapi/asm/unistd.h | 1 -
+ arch/sh/Kconfig | 2 -
+ arch/sh/include/asm/unistd.h | 1 -
+ arch/sparc/Kconfig | 2 -
+ arch/sparc/include/asm/unistd.h | 1 -
+ arch/sparc/include/uapi/asm/signal.h | 6 ---
+ arch/tile/Kconfig | 2 -
+ arch/tile/include/asm/ptrace.h | 1 +
+ arch/tile/include/asm/unistd.h | 1 -
+ arch/um/kernel/signal.c | 5 --
+ arch/unicore32/Kconfig | 2 -
+ arch/unicore32/include/asm/ptrace.h | 1 +
+ arch/unicore32/include/uapi/asm/unistd.h | 1 -
+ arch/x86/Kconfig | 3 +-
+ arch/x86/ia32/ia32_signal.c | 55 +---------------------
+ arch/x86/ia32/ia32entry.S | 1 -
+ arch/x86/include/asm/ia32.h | 10 +---
+ arch/x86/include/asm/ptrace.h | 7 +++
+ arch/x86/include/asm/sys_ia32.h | 2 -
+ arch/x86/include/asm/syscalls.h | 3 --
+ arch/x86/include/asm/unistd.h | 1 -
+ arch/x86/kernel/entry_32.S | 1 -
+ arch/x86/kernel/entry_64.S | 3 --
+ arch/x86/kernel/signal.c | 29 ++----------
+ arch/x86/syscalls/syscall_32.tbl | 2 +-
+ arch/x86/syscalls/syscall_64.tbl | 4 +-
+ arch/x86/um/Kconfig | 3 +-
+ arch/x86/um/asm/ptrace.h | 1 +
+ arch/x86/um/signal.c | 9 +---
+ arch/x86/um/sys_call_table_32.c | 1 -
+ arch/x86/um/sys_call_table_64.c | 1 -
+ arch/xtensa/Kconfig | 2 -
+ arch/xtensa/include/asm/ptrace.h | 2 +
+ arch/xtensa/include/asm/unistd.h | 1 -
+ arch/xtensa/include/uapi/asm/signal.h | 6 ---
+ fs/exec.c | 21 ---------
+ include/linux/binfmts.h | 4 --
+ include/linux/compat.h | 62 +++++++++++++++++++++++++
+ include/linux/ptrace.h | 4 ++
+ include/linux/sched.h | 2 -
+ include/linux/signal.h | 3 ++
+ include/linux/syscalls.h | 15 +++---
+ include/uapi/asm-generic/signal.h | 6 ---
+ include/uapi/linux/signal.h | 2 +
+ init/main.c | 4 +-
+ kernel/fork.c | 2 -
+ kernel/kmod.c | 6 +--
+ kernel/signal.c | 74 ++++++++++++++++++++++++++++++
+ 113 files changed, 211 insertions(+), 327 deletions(-)
+$ git am -3 ../patches/0001-fix-up-for-unify-SS_ONSTACK-SS_DISABLE-definitions.patch
+Applying: fix up for unify SS_ONSTACK/SS_DISABLE definitions
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/alpha/include/uapi/asm/signal.h
+M arch/cris/include/uapi/asm/signal.h
+M arch/h8300/include/uapi/asm/signal.h
+M arch/m32r/include/uapi/asm/signal.h
+M arch/x86/include/uapi/asm/signal.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 64c9b35] Merge remote-tracking branch 'signal/for-next'
+Merging clk/clk-next (8f87189 MAINTAINERS: bad email address for Mike Turquette)
+$ git merge clk/clk-next
+Already up-to-date.
+Merging random/dev (6133705 random: Mix cputime from each thread that exits to the pool)
+$ git merge random/dev
+Already up-to-date.
+Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
+$ git merge lzo-update/lzo-update
+Removing lib/lzo/lzo1x_decompress.c
+Auto-merging crypto/testmgr.h
+Merge made by the 'recursive' strategy.
+ crypto/testmgr.h | 38 ++---
+ include/linux/lzo.h | 15 +-
+ lib/decompress_unlzo.c | 2 +-
+ lib/lzo/Makefile | 2 +-
+ lib/lzo/lzo1x_compress.c | 335 +++++++++++++++++++++++----------------
+ lib/lzo/lzo1x_decompress.c | 255 -----------------------------
+ lib/lzo/lzo1x_decompress_safe.c | 237 +++++++++++++++++++++++++++
+ lib/lzo/lzodefs.h | 34 +++-
+ 8 files changed, 488 insertions(+), 430 deletions(-)
+ delete mode 100644 lib/lzo/lzo1x_decompress.c
+ create mode 100644 lib/lzo/lzo1x_decompress_safe.c
+Merging drop-experimental/linux-next (dddaa92 tools/lguest: remove depends on CONFIG_EXPERIMENTAL)
+$ git merge drop-experimental/linux-next
+Resolved 'drivers/net/ethernet/intel/Kconfig' using previous resolution.
+Resolved 'drivers/ptp/Kconfig' using previous resolution.
+Resolved 'init/Kconfig' using previous resolution.
+Resolved 'net/dsa/Kconfig' using previous resolution.
+Auto-merging net/tipc/Kconfig
+Auto-merging net/sctp/Kconfig
+Auto-merging net/mac80211/Kconfig
+Auto-merging net/dsa/Kconfig
+CONFLICT (content): Merge conflict in net/dsa/Kconfig
+Auto-merging init/Kconfig
+CONFLICT (content): Merge conflict in init/Kconfig
+Auto-merging fs/xfs/Kconfig
+Auto-merging drivers/ptp/Kconfig
+CONFLICT (content): Merge conflict in drivers/ptp/Kconfig
+Auto-merging drivers/net/usb/Kconfig
+Auto-merging drivers/net/ethernet/ti/Kconfig
+Auto-merging drivers/net/ethernet/intel/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/Kconfig
+Auto-merging drivers/mtd/nand/Kconfig
+Auto-merging drivers/mmc/host/Kconfig
+Auto-merging drivers/cpufreq/Kconfig.arm
+Auto-merging crypto/Kconfig
+Auto-merging arch/x86/um/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/alpha/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master cc7f3c2] Merge remote-tracking branch 'drop-experimental/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/CodingStyle | 10 +-----
+ Documentation/DocBook/kernel-hacking.tmpl | 7 ----
+ Documentation/DocBook/kgdb.tmpl | 6 ++--
+ Documentation/intel_txt.txt | 2 +-
+ Documentation/zh_CN/CodingStyle | 7 ----
+ arch/alpha/Kconfig | 3 +-
+ arch/cris/arch-v32/drivers/Kconfig | 4 +--
+ arch/ia64/Kconfig | 8 ++---
+ arch/ia64/kvm/Kconfig | 2 +-
+ arch/ia64/xen/Kconfig | 2 +-
+ arch/powerpc/platforms/ps3/Kconfig | 2 +-
+ arch/s390/Kconfig | 4 +--
+ arch/s390/kvm/Kconfig | 2 +-
+ arch/um/Kconfig.net | 2 +-
+ arch/um/Kconfig.um | 8 ++---
+ arch/x86/Kconfig | 22 ++++++------
+ arch/x86/um/Kconfig | 3 +-
+ crypto/Kconfig | 15 +++-----
+ drivers/cpufreq/Kconfig.arm | 4 +--
+ drivers/cpufreq/Kconfig.x86 | 6 ++--
+ drivers/gpu/drm/udl/Kconfig | 2 +-
+ drivers/i2c/muxes/Kconfig | 2 --
+ drivers/ide/Kconfig | 8 ++---
+ drivers/lguest/Kconfig | 2 +-
+ drivers/media/Kconfig | 7 ++--
+ drivers/media/pci/cx25821/Kconfig | 2 +-
+ drivers/media/platform/s5p-fimc/Kconfig | 1 -
+ drivers/media/platform/s5p-tv/Kconfig | 3 +-
+ drivers/media/usb/pvrusb2/Kconfig | 8 ++---
+ drivers/mmc/core/Kconfig | 3 +-
+ drivers/mmc/host/Kconfig | 20 +++++------
+ drivers/mtd/Kconfig | 2 +-
+ drivers/mtd/chips/Kconfig | 2 +-
+ drivers/mtd/devices/Kconfig | 4 +--
+ drivers/mtd/nand/Kconfig | 7 ++--
+ drivers/net/Kconfig | 9 +++--
+ drivers/net/ethernet/8390/Kconfig | 21 +++++------
+ drivers/net/ethernet/atheros/Kconfig | 8 ++---
+ drivers/net/ethernet/dec/tulip/Kconfig | 4 +--
+ drivers/net/ethernet/i825xx/Kconfig | 12 +++----
+ drivers/net/ethernet/intel/Kconfig | 5 ---
+ drivers/net/ethernet/natsemi/Kconfig | 3 --
+ drivers/net/ethernet/packetengines/Kconfig | 4 +--
+ drivers/net/ethernet/realtek/Kconfig | 4 +--
+ drivers/net/ethernet/silan/Kconfig | 6 ++--
+ drivers/net/ethernet/ti/Kconfig | 4 +--
+ drivers/net/team/Kconfig | 3 +-
+ drivers/net/usb/Kconfig | 16 ++++-----
+ drivers/net/wan/Kconfig | 8 ++---
+ drivers/pcmcia/Kconfig | 4 +--
+ drivers/rpmsg/Kconfig | 3 +-
+ drivers/sbus/char/Kconfig | 7 ++--
+ drivers/virtio/Kconfig | 8 ++---
+ fs/ceph/Kconfig | 4 +--
+ fs/ecryptfs/Kconfig | 4 +--
+ fs/nilfs2/Kconfig | 3 +-
+ fs/xfs/Kconfig | 4 +--
+ init/Kconfig | 54 +++++++---------------------
+ kernel/gcov/Kconfig | 2 +-
+ net/9p/Kconfig | 2 +-
+ net/Kconfig | 5 ++-
+ net/ceph/Kconfig | 4 +--
+ net/dccp/Kconfig | 4 +--
+ net/dccp/ccids/Kconfig | 5 ++-
+ net/decnet/Kconfig | 4 +--
+ net/decnet/netfilter/Kconfig | 2 +-
+ net/ieee802154/Kconfig | 3 +-
+ net/ipv4/Kconfig | 11 +-----
+ net/ipv4/netfilter/Kconfig | 4 +--
+ net/ipv6/Kconfig | 24 ++++++-------
+ net/l2tp/Kconfig | 4 +--
+ net/lapb/Kconfig | 3 +-
+ net/mac80211/Kconfig | 2 +-
+ net/mac802154/Kconfig | 2 +-
+ net/netfilter/Kconfig | 24 +++++--------
+ net/rds/Kconfig | 4 +--
+ net/rxrpc/Kconfig | 2 +-
+ net/sctp/Kconfig | 4 +--
+ net/sunrpc/Kconfig | 2 +-
+ net/tipc/Kconfig | 4 +--
+ net/wanrouter/Kconfig | 1 -
+ net/x25/Kconfig | 3 +-
+ net/xfrm/Kconfig | 16 ++++-----
+ tools/lguest/lguest.txt | 8 ++---
+ 84 files changed, 206 insertions(+), 333 deletions(-)
+Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
+Merging akpm-current/current (3605cce keys: use keyring_alloc() to create module signing keyring)
+$ git merge akpm-current/current
+Auto-merging include/linux/binfmts.h
+Auto-merging fs/exec.c
+Removing Documentation/ABI/testing/sysfs-devices-node
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-devices-node | 7 ---
+ Documentation/kernel-parameters.txt | 6 --
+ drivers/firmware/dmi_scan.c | 78 ++++++++++++++++++++------
+ drivers/misc/sgi-xp/xpc_main.c | 34 ++++++++++-
+ drivers/rtc/class.c | 1 -
+ drivers/rtc/rtc-imxdi.c | 1 +
+ fs/binfmt_misc.c | 5 +-
+ fs/binfmt_script.c | 4 +-
+ fs/exec.c | 15 +++++
+ fs/fat/dir.c | 5 +-
+ fs/fat/inode.c | 2 +-
+ fs/fat/misc.c | 4 ++
+ fs/hfsplus/bitmap.c | 13 ++++-
+ fs/hfsplus/btree.c | 5 +-
+ fs/hfsplus/extents.c | 24 ++++++--
+ fs/hfsplus/hfsplus_fs.h | 2 +-
+ fs/hfsplus/super.c | 15 ++++-
+ fs/proc/generic.c | 12 ++--
+ fs/read_write.c | 2 +
+ include/linux/binfmts.h | 1 +
+ include/linux/kernel.h | 6 +-
+ kernel/kcmp.c | 1 +
+ kernel/modsign_pubkey.c | 15 ++---
+ mm/compaction.c | 26 +++++++--
+ mm/huge_memory.c | 6 +-
+ mm/memcontrol.c | 14 ++++-
+ mm/page-writeback.c | 25 +++++++--
+ mm/page_alloc.c | 11 +++-
+ scripts/checkpatch.pl | 7 ++-
+ security/keys/process_keys.c | 2 -
+ 30 files changed, 261 insertions(+), 88 deletions(-)
+ delete mode 100644 Documentation/ABI/testing/sysfs-devices-node
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/heads/akpm/master:akpm
+From ../next
+ * [new branch] akpm/master -> akpm
+$ git fetch --no-tags ../next refs/heads/akpm/master-base:akpm-base
+From ../next
+ * [new branch] akpm/master-base -> akpm-base
+$ git checkout akpm
+Switched to branch 'akpm'
+$ git rebase --onto master akpm-base
+First, rewinding head to replay your work on top of it...
+Applying: drivers/rtc/rtc-tegra.c: convert to DT driver
+Applying: mm: cond_resched in tlb_flush_mmu to fix soft lockups on !CONFIG_PREEMPT
+Applying: mm: fix zone_watermark_ok_safe() accounting of isolated pages
+Applying: mm: limit mmu_gather batching to fix soft lockups on !CONFIG_PREEMPT
+Applying: vfs: d_obtain_alias() needs to use "/" as default name.
+Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
+Applying: x86 numa: don't check if node is NUMA_NO_NODE
+Applying: arch/x86/tools/insn_sanity.c: identify source of messages
+Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
+Applying: olpc: fix olpc-xo1-sci.c build errors
+Applying: x86: convert update_mmu_cache() and update_mmu_cache_pmd() to functions
+Applying: x86: fix the argument passed to sync_global_pgds()
+Applying: arch/x86/kernel/cpu/perf_event_p6.c: fix section warning
+Applying: x86: make 'mem=' option to work for efi platform
+Applying: audit: create explicit AUDIT_SECCOMP event type
+Applying: audit: catch possible NULL audit buffers
+Applying: cris: Use "int" for ssize_t to match size_t
+Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
+Applying: drivers/gpu/drm/drm_fb_helper.c: avoid sleeping in unblank_screen() if oops in progress
+Applying: fb: rework locking to fix lock ordering on takeover
+Applying: fb-rework-locking-to-fix-lock-ordering-on-takeover-fix
+Applying: fb-rework-locking-to-fix-lock-ordering-on-takeover-fix-2
+Applying: cyber2000fb: avoid palette corruption at higher clocks
+Applying: timeconst.pl: remove deprecated defined(@array)
+Applying: time: don't inline EXPORT_SYMBOL functions
+Applying: mm, mempolicy: introduce spinlock to read shared policy tree
+Applying: block: restore /proc/partitions to not display non-partitionable removable devices
+Applying: fs: change return values from -EACCES to -EPERM
+Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
+Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
+Applying: memcg, oom: provide more precise dump info while memcg oom happening
+Applying: mm/memcontrol.c: convert printk(KERN_FOO) to pr_foo()
+Applying: mm/hugetlb.c: convert to pr_foo()
+Applying: CMA: make putback_lru_pages() call conditional
+Applying: mm/page_alloc.c:__alloc_contig_migrate_range(): cleanup
+Applying: mm: memcg: only evict file pages when we have plenty
+Applying: mm: vmscan: save work scanning (almost) empty LRU lists
+Applying: mm: vmscan: clarify how swappiness, highest priority, memcg interact
+Applying: mm: vmscan: improve comment on low-page cache handling
+Applying: mm: vmscan: clean up get_scan_count()
+Applying: mm-vmscan-clean-up-get_scan_count-fix
+Applying: mm: vmscan: compaction works against zones, not lruvecs
+Applying: mm-vmscan-compaction-works-against-zones-not-lruvecs-fix
+Applying: mm: reduce rmap overhead for ex-KSM page copies created on swap faults
+Applying: mm/page_alloc.c:__setup_per_zone_wmarks: make min_pages unsigned long
+Applying: mm/vmscan.c:__zone_reclaim(): replace max_t() with max()
+Applying: mm: compaction: do not accidentally skip pageblocks in the migrate scanner
+Applying: cma-use-unsigned-type-for-count-argument-fix
+Applying: mm: memmap_init_zone() performance improvement
+Applying: drop_caches: add some documentation and info message
+Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
+Applying: mm/dmapool.c: fix null dev in dma_pool_create()
+Applying: memcg: debugging facility to access dangling memcgs
+Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix
+Applying: mm: add vm event counters for balloon pages compaction
+Applying: ext3, ext4, ocfs2: remove unused macro NAMEI_RA_INDEX
+Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
+Applying: scripts/tags.sh: add magic for declarations of popular kernel type
+Applying: backlight: add lms501kf03 LCD driver
+Applying: backlight-add-lms501kf03-lcd-driver-fix
+Applying: backlight: ld9040: use sleep instead of delay
+Applying: backlight: ld9040: remove unnecessary NULL deference check
+Applying: backlight: ld9040: replace EFAULT with EINVAL
+Applying: backlight: ld9040: remove redundant return variables
+Applying: backlight: ld9040: reorder inclusions of <linux/xxx.h>
+Applying: backlight: s6e63m0: use lowercase names of structs
+Applying: backlight: s6e63m0: use sleep instead of delay
+Applying: backlight: s6e63m0: remove unnecessary NULL deference check
+Applying: backlight: s6e63m0: replace EFAULT with EINVAL
+Applying: backlight: s6e63m0: remove redundant variable 'before_power'
+Applying: backlight: s6e63m0: reorder inclusions of <linux/xxx.h>
+Applying: backlight: ams369fg06: use sleep instead of delay
+Applying: backlight: ams369fg06: remove unnecessary NULL deference check
+Applying: backlight: ams369fg06: replace EFAULT with EINVAL
+Applying: backlight: ams369fg06: remove redundant variable 'before_power'
+Applying: backlight: ams369fg06: reorder inclusions of <linux/xxx.h>
+Applying: epoll: support for disabling items, and a self-test app
+Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
+Applying: drivers/rtc: dump small buffers via %*ph
+Applying: drivers/rtc/rtc-pxa.c: fix alarm not match issue
+Applying: drivers/rtc/rtc-pxa.c: fix alarm can't wake up system issue
+Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue
+Applying: drivers/rtc/rtc-ds1307.c: long block operations bugfix
+Applying: rtc-ds1307-long-block-operations-bugfix-fix
+Applying: rtc: max77686: add Maxim 77686 driver
+Applying: rtc-max77686-add-maxim-77686-driver-fix
+Applying: rtc-pcf8523: add low battery voltage support
+Applying: rtc-pcf8523-add-low-battery-voltage-support-fix
+Applying: drivers/rtc: use of_match_ptr() macro
+Applying: drivers/rtc/rtc-pxa.c: avoid cpuid checking
+Applying: drivers/rtc: remove unnecessary semicolons
+Applying: drivers/rtc/rtc-ds2404.c: use module_platform_driver macro
+Applying: hfsplus: add osx.* prefix for handling namespace of Mac OS X extended attributes
+Applying: hfsplus: add on-disk layout declarations related to attributes tree
+Applying: hfsplus: add functionality of manipulating by records in attributes tree
+Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
+Applying: hfsplus: add support of manipulation by attributes file
+Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
+Applying: fork: unshare: remove dead code
+Applying: kexec: add the values related to buddy system for filtering free pages.
+Applying: ipc: remove forced assignment of selected message
+Applying: ipc: add sysctl to specify desired next object id
+Applying: ipc: message queue receive cleanup
+Applying: ipc: introduce message queue copy feature
+Applying: selftests: IPC message queue copy feature test
+Applying: ipc: simplify free_copy() call
+Applying: ipc: convert prepare_copy() from macro to function
+Applying: ipc: simplify message copying
+Applying: ipc: add more comments to message copying related code
+Applying: Documentation/sysctl/kernel.txt: document /proc/sys/shmall
+Applying: ipc/sem.c: alternatives to preempt_disable()
+Applying: drivers/char/misc.c:misc_register(): do not loop on misc_list unconditionally
+Applying: drivers-char-miscc-misc_register-do-not-loop-on-misc_list-unconditionally-fix
+Applying: mtd: mtd_nandecctest: use prandom_bytes instead of get_random_bytes()
+Applying: mtd: mtd_oobtest: convert to use prandom library
+Applying: mtd: mtd_pagetest: convert to use prandom library
+Applying: mtd: mtd_speedtest: use prandom_bytes
+Applying: mtd: mtd_subpagetest: convert to use prandom library
+Applying: mtd: mtd_stresstest: use prandom_bytes()
+Applying: Documentation/DMA-API-HOWTO.txt: fix typo
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 71a82f3...a1f06ec akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (a1f06ec Documentation/DMA-API-HOWTO.txt: fix typo)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-API-HOWTO.txt | 9 +-
+ Documentation/cgroups/memory.txt | 16 +
+ Documentation/sysctl/kernel.txt | 32 ++
+ Documentation/sysctl/vm.txt | 33 +-
+ arch/arm/mm/dma-mapping.c | 43 +-
+ arch/cris/include/uapi/asm/posix_types.h | 5 -
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/e820.h | 2 +
+ arch/x86/include/asm/pgtable.h | 12 +
+ arch/x86/include/asm/pgtable_32.h | 7 -
+ arch/x86/include/asm/pgtable_64.h | 3 -
+ arch/x86/include/asm/uv/uv.h | 2 +-
+ arch/x86/kernel/cpu/perf_event_p6.c | 2 +-
+ arch/x86/kernel/e820.c | 72 ++-
+ arch/x86/mm/init_64.c | 4 +-
+ arch/x86/mm/numa.c | 3 +-
+ arch/x86/platform/efi/efi.c | 15 +-
+ arch/x86/platform/uv/tlb_uv.c | 10 +-
+ arch/x86/tools/insn_sanity.c | 10 +-
+ block/genhd.c | 2 +-
+ drivers/char/misc.c | 16 +-
+ drivers/gpu/drm/drm_fb_helper.c | 25 +-
+ drivers/mtd/tests/mtd_nandecctest.c | 2 +-
+ drivers/mtd/tests/mtd_oobtest.c | 49 +-
+ drivers/mtd/tests/mtd_pagetest.c | 43 +-
+ drivers/mtd/tests/mtd_speedtest.c | 9 +-
+ drivers/mtd/tests/mtd_stresstest.c | 3 +-
+ drivers/mtd/tests/mtd_subpagetest.c | 42 +-
+ drivers/pcmcia/cs.c | 37 +-
+ drivers/rtc/Kconfig | 10 +
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-cmos.c | 3 +-
+ drivers/rtc/rtc-ds1305.c | 8 +-
+ drivers/rtc/rtc-ds1307.c | 71 ++-
+ drivers/rtc/rtc-ds2404.c | 14 +-
+ drivers/rtc/rtc-fm3130.c | 33 +-
+ drivers/rtc/rtc-isl12022.c | 2 +-
+ drivers/rtc/rtc-max77686.c | 645 +++++++++++++++++++++++++
+ drivers/rtc/rtc-mpc5121.c | 5 +-
+ drivers/rtc/rtc-pcf8523.c | 31 ++
+ drivers/rtc/rtc-pcf8563.c | 2 +-
+ drivers/rtc/rtc-pxa.c | 80 +++-
+ drivers/rtc/rtc-sa1100.c | 4 +-
+ drivers/rtc/rtc-snvs.c | 2 +-
+ drivers/rtc/rtc-stmp3xxx.c | 3 +-
+ drivers/rtc/rtc-tegra.c | 7 +
+ drivers/tty/vt/vt.c | 91 +++-
+ drivers/usb/gadget/amd5536udc.c | 16 +-
+ drivers/video/backlight/Kconfig | 8 +
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/ams369fg06.c | 92 +---
+ drivers/video/backlight/ld9040.c | 88 ++--
+ drivers/video/backlight/lms501kf03.c | 441 +++++++++++++++++
+ drivers/video/backlight/s6e63m0.c | 141 ++----
+ drivers/video/console/fbcon.c | 30 +-
+ drivers/video/cyber2000fb.c | 3 +
+ drivers/video/fbmem.c | 5 +-
+ drivers/video/fbsysfs.c | 3 +
+ fs/autofs4/root.c | 2 +-
+ fs/binfmt_elf.c | 21 +-
+ fs/block_dev.c | 9 +-
+ fs/dcache.c | 2 +-
+ fs/dlm/config.c | 2 +-
+ fs/drop_caches.c | 2 +
+ fs/eventpoll.c | 40 +-
+ fs/ext3/namei.c | 1 -
+ fs/ext4/namei.c | 1 -
+ fs/gfs2/sys.c | 18 +-
+ fs/hfsplus/Makefile | 4 +-
+ fs/hfsplus/attributes.c | 399 ++++++++++++++++
+ fs/hfsplus/bfind.c | 93 +++-
+ fs/hfsplus/bnode.c | 6 +-
+ fs/hfsplus/brec.c | 23 +-
+ fs/hfsplus/btree.c | 8 +
+ fs/hfsplus/catalog.c | 36 +-
+ fs/hfsplus/dir.c | 55 ++-
+ fs/hfsplus/extents.c | 4 +-
+ fs/hfsplus/hfsplus_fs.h | 52 +-
+ fs/hfsplus/hfsplus_raw.h | 68 ++-
+ fs/hfsplus/inode.c | 18 +-
+ fs/hfsplus/ioctl.c | 108 -----
+ fs/hfsplus/super.c | 56 ++-
+ fs/hfsplus/unicode.c | 7 +-
+ fs/hfsplus/xattr.c | 709 ++++++++++++++++++++++++++++
+ fs/hfsplus/xattr.h | 60 +++
+ fs/hfsplus/xattr_security.c | 104 ++++
+ fs/hfsplus/xattr_trusted.c | 63 +++
+ fs/hfsplus/xattr_user.c | 63 +++
+ fs/ncpfs/ioctl.c | 2 +-
+ fs/ocfs2/dir.c | 1 -
+ fs/proc/base.c | 6 +-
+ fs/udf/file.c | 2 +-
+ include/asm-generic/tlb.h | 9 +
+ include/linux/audit.h | 3 +-
+ include/linux/balloon_compaction.h | 7 +
+ include/linux/console.h | 1 +
+ include/linux/ipc_namespace.h | 1 +
+ include/linux/mempolicy.h | 1 +
+ include/linux/mmzone.h | 8 -
+ include/linux/msg.h | 6 +-
+ include/linux/rtc-pxa.h | 18 +
+ include/linux/swap.h | 2 +-
+ include/linux/vm_event_item.h | 7 +-
+ include/uapi/linux/audit.h | 1 +
+ include/uapi/linux/eventpoll.h | 1 +
+ include/uapi/linux/msg.h | 1 +
+ include/uapi/linux/xattr.h | 13 +-
+ init/Kconfig | 17 +
+ ipc/compat.c | 46 +-
+ ipc/ipc_sysctl.c | 32 ++
+ ipc/msg.c | 123 +++--
+ ipc/msgutil.c | 43 ++
+ ipc/sem.c | 250 ++++++----
+ ipc/util.c | 16 +-
+ ipc/util.h | 2 +
+ kernel/audit.c | 4 +
+ kernel/audit_tree.c | 26 +-
+ kernel/audit_watch.c | 2 +
+ kernel/auditsc.c | 20 +-
+ kernel/fork.c | 7 +-
+ kernel/kexec.c | 4 +
+ kernel/time.c | 4 +-
+ kernel/timeconst.pl | 2 +-
+ kernel/watchdog.c | 10 +-
+ mm/balloon_compaction.c | 2 +
+ mm/compaction.c | 5 +-
+ mm/dmapool.c | 5 +-
+ mm/hugetlb.c | 22 +-
+ mm/ksm.c | 6 -
+ mm/memcontrol.c | 254 +++++++++-
+ mm/memory.c | 10 +-
+ mm/mempolicy.c | 23 +-
+ mm/migrate.c | 1 +
+ mm/oom_kill.c | 6 +-
+ mm/page_alloc.c | 47 +-
+ mm/page_isolation.c | 26 +-
+ mm/vmscan.c | 296 +++++++-----
+ mm/vmstat.c | 9 +-
+ scripts/pnmtologo.c | 8 +-
+ scripts/tags.sh | 41 +-
+ tools/testing/selftests/Makefile | 2 +-
+ tools/testing/selftests/epoll/Makefile | 11 +
+ tools/testing/selftests/epoll/test_epoll.c | 364 ++++++++++++++
+ tools/testing/selftests/ipc/Makefile | 25 +
+ tools/testing/selftests/ipc/msgque.c | 246 ++++++++++
+ 145 files changed, 5317 insertions(+), 1173 deletions(-)
+ create mode 100644 drivers/rtc/rtc-max77686.c
+ create mode 100644 drivers/video/backlight/lms501kf03.c
+ create mode 100644 fs/hfsplus/attributes.c
+ create mode 100644 fs/hfsplus/xattr.c
+ create mode 100644 fs/hfsplus/xattr.h
+ create mode 100644 fs/hfsplus/xattr_security.c
+ create mode 100644 fs/hfsplus/xattr_trusted.c
+ create mode 100644 fs/hfsplus/xattr_user.c
+ create mode 100644 include/linux/rtc-pxa.h
+ create mode 100644 tools/testing/selftests/epoll/Makefile
+ create mode 100644 tools/testing/selftests/epoll/test_epoll.c
+ create mode 100644 tools/testing/selftests/ipc/Makefile
+ create mode 100644 tools/testing/selftests/ipc/msgque.c
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..f418cf1
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,93 @@
+Importing jdelvare-hwmon based on 752451f01c4567b506bf4343082682dbb8fb30dd
+$ git clone -s -l -n -q . ../quilt-tmp
+$ cd ../quilt-tmp
+$ git reset --hard 752451f01c4567b506bf4343082682dbb8fb30dd
+HEAD is now at 752451f Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
+$ git am ../quilt/jdelvare-hwmon/hwmon-fix-PCI-device-reference-leak.patch
+Applying: hwmon: Fix PCI device reference leak in quirk
+$ git am ../quilt/jdelvare-hwmon/hwmon-w83627hf-restore-limits-on-resume.patch
+Applying: hwmon: (w83627hf) Add support for suspend
+$ git am ../quilt/jdelvare-hwmon/hwmon-w83627ehf-restore-limits-on-resume.patch
+Applying: hwmon: (w83627ehf) Add support for suspend
+$ git am ../quilt/jdelvare-hwmon/hwmon-w83627hf-dont-touch-nonexistent-I2C-address-registers.patch
+Applying: hwmon: (w83627hf) Don't touch nonexistent I2C address registers
+$ git am ../quilt/jdelvare-hwmon/hwmon-w83627ehf-fix-smatch-warnings.patch
+Applying: hwmon: (w83627ehf) Get rid of smatch warnings
+$ git am ../quilt/jdelvare-hwmon/hwmon-it87-01-save-temperature-registers-in-2-dimensional-array.patch
+Applying: hwmon: (it87) Save temperature registers in 2-dimensional array
+$ git am ../quilt/jdelvare-hwmon/hwmon-it87-02-save-voltage-register-values-in-2-dimensional-array.patch
+Applying: hwmon: (it87) Save voltage register values in 2-dimensional array
+$ git am ../quilt/jdelvare-hwmon/hwmon-it87-03-replace-macro-defining-tempx_type-sensors-with-direct-definitions.patch
+Applying: hwmon: (it87) Replace macro defining tempX_type sensors with direct definitions
+$ git am ../quilt/jdelvare-hwmon/hwmon-it87-04-introduce-support-for-tempx_offset-sysfs-attribute.patch
+Applying: hwmon: (it87) Introduce support for tempX_offset sysfs attribute
+$ git am ../quilt/jdelvare-hwmon/hwmon-it87-05-save-fan-registers-in-2-dimensional-array.patch
+Applying: hwmon: (it87) Save fan registers in 2-dimensional array
+$ git am ../quilt/jdelvare-hwmon/hwmon-it87-06-avoid-quoted-string-splits-across-lines.patch
+Applying: hwmon: (it87) Avoid quoted string splits across lines
+$ git am ../quilt/jdelvare-hwmon/hwmon-it87-07-replace-pwm-group-macro-with-direct-attribute-definitions.patch
+Applying: hwmon: (it87) Replace pwm group macro with direct attribute definitions
+$ git am ../quilt/jdelvare-hwmon/hwmon-it87-08-manage-device-specific-features-with-table.patch
+Applying: hwmon: (it87) Manage device specific features with table
+$ git am ../quilt/jdelvare-hwmon/hwmon-it87-09-report-thermal-sensor-type-as-intel-peci-if-appropriate.patch
+Applying: hwmon: (it87) Report thermal sensor type as Intel PECI if appropriate
+$ git am ../quilt/jdelvare-hwmon/hwmon-it87-10-support-peci-for-additional-chips.patch
+Applying: hwmon: (it87) Support PECI for additional chips
+$ git am ../quilt/jdelvare-hwmon/hwmon-vid-add-AMD-family-11h.patch
+Applying: hwmon-vid: Add support for AMD family 11h to 15h processors
+$ git am ../quilt/jdelvare-hwmon/hwmon-emc6w201-fix-div_round_closest-problem-with-unsigned-divisors.patch
+Applying: hwmon: (emc6w201) Fix DIV_ROUND_CLOSEST problem with unsigned divisors
+$ cd /home/sfr/kernels/next/next
+$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master
+From ../quilt-tmp
+ + d699e68...c24c39b master -> jdelvare-hwmon/master (forced update)
+Importing device-mapper based on v3.7
+$ cd ../quilt-tmp
+$ git reset --hard 29594404d7fe73cd80eaa4ee8c43dcc53970c60e
+HEAD is now at 2959440 Linux 3.7
+$ git am ../quilt/device-mapper/dm-persistent-data-rename-node-to-btree_node.patch
+Applying: This patch fixes a compilation failure on sparc32 by renaming struct node.
+$ git am ../quilt/device-mapper/dm-ioctl-prevent-unsafe-change-to-dm_ioctl-data_size.patch
+Applying: Abort dm ioctl processing if userspace changes the data_size parameter
+$ git am ../quilt/device-mapper/dm-crypt-do-not-support-WRITE_SAME.patch
+Applying: A ciphertext device is incompatible with WRITE SAME bios so we must
+$ git am ../quilt/device-mapper/dm-thin-replace-dm_cell_release_singleton-with-cell_defer_except.patch
+Applying: Change existing users of the function dm_cell_release_singleton to share
+$ git am ../quilt/device-mapper/dm-thin-fix-race-between-simultaneous-io-and-discards-to-same-block.patch
+Applying: There is a race when discard bios and non-discard bios are issued
+$ git am ../quilt/device-mapper/dm-thin-wake-worker-when-discard-is-prepared.patch
+Applying: When discards are prepared it is best to directly wake the worker that
+$ git am ../quilt/device-mapper/dm-persistent-data-fix-nested-btree-deletion.patch
+Applying: When deleting nested btrees, the code forgets to delete the innermost
+$ git am ../quilt/device-mapper/dm-thin-emit-ignore_discard-in-status-when-discards-disabled.patch
+Applying: If "ignore_discard" is specified when creating the thin pool device then
+$ git am ../quilt/device-mapper/dm-raid1-remove-impossible-mempool_alloc-error-test.patch
+Applying: mempool_alloc can't fail if __GFP_WAIT is specified, so the condition
+$ git am ../quilt/device-mapper/dm-raid-use-DM_ENDIO_INCOMPLETE.patch
+Applying: Use a defined macro DM_ENDIO_INCOMPLETE instead of a numeric constant.
+$ git am ../quilt/device-mapper/dm-snap-optimize-track_chunk.patch
+Applying: track_chunk is always called with interrupts enabled. Consequently, we
+$ git am ../quilt/device-mapper/dm-thin-rename-cell_defer_except-to-cell_defer_no_holder.patch
+Applying: Rename cell_defer_except() to cell_defer_no_holder() which describes
+$ git am ../quilt/device-mapper/dm-thin-cleanup-dead-code.patch
+Applying: Remove unused @data_block parameter from cell_defer.
+$ git am ../quilt/device-mapper/dm-raid-round-region_size-to-power-of-two.patch
+Applying: If the user does not supply a bitmap region_size to the dm raid target,
+$ git am ../quilt/device-mapper/dm-kcopyd-add-WRITE-SAME-support-to-dm_kcopyd_zero.patch
+Applying: Add WRITE SAME support to dm-io and make it accessible to
+$ git am ../quilt/device-mapper/dm-block-manager-reinstate-message-when-validator-fails.patch
+Applying: Reinstate a useful error message when the block manager buffer validator fails.
+$ git am ../quilt/device-mapper/dm-persistent-data-use-DMERR_LIMIT-for-errors.patch
+Applying: Nearly all of persistent-data is in the IO path so throttle error
+$ git am ../quilt/device-mapper/dm-thin-use-DMERR_LIMIT-for-errors.patch
+Applying: Throttle all errors logged from the IO path by dm thin.
+$ git am ../quilt/device-mapper/dm-persistent-data-improve-improve-space-map-block-alloc-failure-message.patch
+Applying: Improve space map error message when unable to allocate a new
+$ git am ../quilt/device-mapper/dm-ioctl-remove-PF_MEMALLOC.patch
+Applying: When allocating memory for the userspace ioctl data, set some
+$ git am ../quilt/device-mapper/dm-ioctl-use-kmalloc-if-possible.patch
+Applying: If the parameter buffer is small enough, try to allocate it with kmalloc()
+$ cd /home/sfr/kernels/next/next
+$ git fetch -f ../quilt-tmp master:device-mapper/master
+From ../quilt-tmp
+ + 5cf9de0...ab31b3f master -> device-mapper/master (forced update)
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000..1f66998
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20121221
