From 1fded950c8871b337e93a098a9c367b8f4d59fac Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 31 Jul 2012 15:15:37 +1000 Subject: [PATCH] Add linux-next specific files for 20120731 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 199 ++ Next/Trees | 201 ++ Next/merge.log | 4694 +++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 47 + localversion-next | 1 + 5 files changed, 5142 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/merge.log create mode 100644 Next/quilt-import.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..6f3574ca4a5d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,199 @@ +Name SHA1 +---- ---- +origin 37cd9600a9e20359b0283983c9e3a55d84347168 +fixes 9023a4093d6594040fb8142cdd2615d3461caa7a +kbuild-current f8f5701bdaf9134b1f90e5044a82c66324d2073f +arm-current 66623725b1a5eacdf6da627f986422e1ad87b6c9 +m68k-current 1525e06e4414dbe053ea10cbd8cc03bb150e8e27 +powerpc-merge bac821a6e3404330d509fd3a245bf7701f210c7c +sparc b387e41e523c1aa347cff055455d0dd129357df4 +net 5a0d513b622ee41e117fc37e26e27e8ef42e8dae +sound-current e5b35420ef7e6dc92a6cc5914bc9e5e5c1d48819 +pci-current 314489bd4c7780fde6a069783d5128f6cef52919 +wireless 9dbf5f55f8d35ff9aedc75267f4e4042aaf89755 +driver-core.current 84a1caf1453c3d44050bd22db958af4a7f99315c +tty.current 38bd2a1ac736901d1cf4971c78ef952ba92ef78b +usb.current 84a1caf1453c3d44050bd22db958af4a7f99315c +staging.current 6887a4131da3adaab011613776d865f4bcfb5678 +char-misc.current 84a1caf1453c3d44050bd22db958af4a7f99315c +input-current cf45b5a2525d9e7473db955750a8db9d4160b6ab +md-current 58e94ae18478c08229626daece2fc108a4a23261 +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current 76f16f83ee520d6c10356b0f6ff592441a6f08bd +ide 39a50b42f7026027b54131291ad0f350100eac95 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +irqdomain-current 15e06bf64f686befd2030da867a3dad965b96cc0 +devicetree-current 4e8383b6b06b275999f51337adf7064b2c135a04 +spi-current d1c185bcb15184ebcbc1b2e003e9a6c4658985c4 +gpio-current 96b70641b937e99c1579cb6ebbcdb7b0af98cdd0 +arm 197cd1087c343fd8f22f3e2a87c95b9884892200 +arm-perf dee8c1be71cfca1f8c8b96ee45c6d72799bf81ce +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +blackfin 719154c6d1c1a3a404f4ff570c4b36bb2ef868ca +c6x b9b8722d4704137d1c85b8e62364b487cbbe8bf0 +cris 2608747768e9a1b039b365a460ebe306fc73d9e1 +hexagon 5042ab91c4272e158748180ae70a2e097f9e90e3 +ia64 a119365586b0130dfea06457f584953e0ff6481d +m68k 1525e06e4414dbe053ea10cbd8cc03bb150e8e27 +m68knommu b1f7735ef47a97108f945eac48812855b6599139 +microblaze a01ee165a132fadb57659d26246e340d6ac53265 +mips 68d8848567ef03eb2c2303173934428d0bf0a531 +openrisc 207e715ff17b42e022df107210dc8c736a703eb3 +parisc bba3d8c3b3c0f2123be5bc687d1cddc13437c923 +powerpc bdc0077af574800d24318b6945cf2344e8dbb050 +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx 4d2f4e1644b70b452f8c76c8ab27879bf8acabc9 +galak ae33d08b9a723bd7b980980766a6a2365ae3b9fd +s390 7d25617597ff8dcfe4d0e1d0ac9214e7cc7ded92 +sh b9ccfda293ee6fca9a89a1584f0900e0627b975e +sparc-next 31a67102f4762df5544bc2dfb34a931233d2a5b2 +tile bdc0077af574800d24318b6945cf2344e8dbb050 +unicore32 e4baa56a9a94a75580cffc657c7fad8e1d92e9a6 +ceph a80f7c1752021d46ffb30ca07424f9d7d001e4cc +cifs 1a500f010fb2d121c58f77ddfde2eca1bde3bfcd +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 5f5b331d5c21228a6519dcb793fc1629646c51a6 +ext3 0143fc5e9f6f5aad4764801015bc8d4b4a278200 +ext4 03179fe92318e7934c180d96f12eff2cb36ef7b6 +fuse f3840dc0fb57aef120c5ee8241cdc9aaf3cec8d4 +gfs2 bdc0077af574800d24318b6945cf2344e8dbb050 +logfs 9f0bbd8ca7905fcc0602c038013b095322fec939 +nfs d72a95f2ccf4caa0c17156b7bba67dd88b24760d +nfsd 2c142baa7b237584bae7dc28630851701497e1ef +ocfs2 2dfd06036ba7ae8e7be2daf5a2fff1dac42390bf +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs 5fcb08befaf57faa1b00e514915c1660252b8c26 +ubifs 7074e5eb233343e4bad8c0a3f9e73167cf85a159 +xfs 9a57fa8ee7c29e11c2a29ce058573ba99157eda7 +vfs f8310c59201b183ebee2e3fe0c7242f5729be0af +pci 63b96f7baeba71966c723912c3f8f0274577f877 +hid e8ff13b0bf88b5e696323a1eec877783d965b3c6 +i2c bdc0077af574800d24318b6945cf2344e8dbb050 +bjdooks-i2c fc84fe19ffb9eee7e6b3301bc6cd45b22f187bd7 +i2c-embedded 5db20c49e2d6581797c17057e068d89d6677aa24 +jdelvare-hwmon b2c61462bf9334aa0f93ca8d8a075dc78c3f3079 +hwmon-staging 829917cd7246204d6c5f066c40b66d2b62d0930d +v4l-dvb 331fe70b753b11aa9bf4a246ddc68967afbd4cbb +kbuild 85b170eb0737292a92d39ce83d9be883e37c5a17 +kconfig 4503379cb811809470ebefb58c943fe605bc3e29 +libata 354b2eac3848bddbcb111079138b907ccca70ae8 +infiniband 1da9b6b43e31a5d88a82cc70b8f57090c9dd2be8 +acpi ec033d0a02901551346b9f43f8ff9bad51378891 +cpuidle 3cf7997a389de59498c966c529456696ce8bc1a7 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +ieee1394 e3cbd92002a30aecae8cb8b31a5e1916eb270a14 +ubi 87e773c95eb0b363f2efcc7aff8a347dc18925d0 +dlm c572b7f5d120a6520206aaed3eaf5476de24b7f2 +scsi 641aa03172de0c66fc1d6472562cffeb6a360572 +target-updates bf6932f44a7b3fa7e2246a8b18a44670e5eab6c2 +target-merge 1247c3736bbb0935704c9fd77b88dacd11730a27 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +slave-dma 634332502366554849fe37e88d05ec0a13e550c8 +dmaengine a2bd1140a264b561e38d99e656cd843c2d840e86 +net-next 173f8654746c138a08f51a8a0db7747763a896a2 +wireless-next 36eb22e97a2b621fb707eead58ef915ab0f46e9e +bluetooth 8bd38a6d00c17f40b001d713bc0bc149d5b72c04 +mtd 4800399e335658aae632f587f6759a860f584804 +l2-mtd cd0a30d5deb09f0254c58be5bb4ec45c1d659a37 +crypto d37c0425c03b1d3a16484327e44c56c7a20f32df +drm e2f895fac1e9fb5f59444e07391bfb3da719716f +sound e5b35420ef7e6dc92a6cc5914bc9e5e5c1d48819 +sound-asoc e13ab2aac7a273a890d18bb482849610be178bc5 +rr a5839a8c6350d3775a408e48ed953bb88bfdb198 +input 2b94e2569441099e01b157fc6821d00806e22ed4 +input-mt c45361a1287a74d327d72d4d2b96f4ac170653d9 +cgroup 4b2ebf051905258bfee1a2d420f5b4fa149ca6f5 +block f45d342e164a5278c6c322c7eaeaad3ad18e8d6e +device-mapper 8d5ab5cd9edec7f3e189ba6af7ca5487909831ba +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 30b87c60e9cbfcdfce22aa652fc1e5d061fcb733 +kgdb 3751d3e85cf693e10e2c47c03c8caa65e171099b +slab 73a1180e140d45cb9ef5fbab103d3bbfc4c84606 +uclinux 5e442a493fc59fa536c76db1fff5b49ca36a88c5 +md cd853a64a2ab27024a486db177941a7b6d36d642 +mfd 3c1534c7ecffeb4330bba4c55d17f301528195b6 +battery ecc2edd56c49fa31a0a9ed15a7bf810ae79d3b85 +fbdev a0239073fd75489d25575cf3aaf71ab55b416020 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 974a65825e0b5fbda49605f0416a2c975d66e9e6 +regulator 3384fb98845dc014770caa224d61a2effd258ca5 +security 663728418e3494f8e4a82f5d1b2f23c22d11be35 +selinux c2d7b247f0c028d325a5da5b9611b60ba160f237 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 06a3fa7a858ae1de852fd7c074ab3ce0ebcc6a5a +dwmw2-iommu c3b92c8787367a8bb53d57d9789b558f1295cc96 +iommu 395e51f18d3b26619c1c462b7a1c0226846ac0a9 +vfio 59b94265a1f656555d51e303cf6b4097567a89ed +osd a7fdf6a5d714453c47b655a553c838b8001ec14d +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial e1c9ac420ef15e39c2ead879cda1677d1e5cb2b6 +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +pm 26ba6780a7dad8d79a5b80eb5e3dbc2d95ad10a2 +apm f283d22713b0bdc147097c92c9b45855339cf1c8 +fsnotify 1aec9c0d718693553543349e92138033b0bcea4c +edac a92cdece496c63d7c44da0ff0b92ba2c7600eff0 +edac-amd 305f1c3cfd7eef63bef2128b6934a9054d902976 +devicetree efd68e7254503f3207805f674a1ea1d743f5dfe2 +dt-rh e95d8aafa5d911bf523bc47fe89f3336eb8a1b51 +spi d8e328b3bd65fdefc9c49a27ee80c28e0a44b653 +spi-mb 8ceffa7c4a4c378d8e371fe2f444656e75390b34 +tip adf18da00ef6ddf7706e80839281b459a4d68d5e +rcu 5cf05ad758c30d17ff23c2be346b5de982bc2121 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kmemleak 48786770bf3b3a47bda766ba5f711199e7f24d8f +kvm ade38c311a0ad8c32e902fe1d0ae74d0d44bc71e +kvm-ppc 6d2d82627f4f1e96a33664ace494fa363e0495cb +oprofile c16fa4f2ad19908a47c63d8fa436a1178438c7e7 +xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495 +xen-two 64b0a47991d9c04599311745ec2c998a9d7de7a5 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu 6101167727932a929e37fb8a6eeb68bdbf54d58e +workqueues 6fec10a1a5866dda3cd6a825a521fc7c2f226ba5 +drivers-x86 00d39597e825a2b09ec88d4dd429ff72fe60d9d4 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 38e23194e1c95e73819d25a63bcf94fe4709d4c5 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds d45bb11616c94c76c6e40960a120c0687b708a2e +driver-core 6791457a090d9a234a40b501c2536f0aefaeae4b +tty d155255a344c417acad74156654295a2964e6b81 +usb e387ef5c47ddeaeaa3cbdc54424cdb7a28dae2c0 +staging 419e9266884fa853179ab726c27a63a9d3ae46e3 +char-misc 6078188e2ba1d61a2119ddb2289e88c2c2a015ab +tmem 78821b2c0299ab807d483802f09897728b93bce0 +writeback 331cbdeedeb2f4ef01ccb761513708af0fe77098 +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl c9eebe763c3ae3e31e06202fae1e48bd6ddc02ec +moduleh 6b16351acbd415e66ba16bf7d473ece1574cf0bc +vhost e0953c8b85baaa38d77ebd5dc4051bc3837c1191 +kmap_atomic 2164d3344693d2d4799fe91836d61f55516cbdf0 +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc 6bb697b6b06041d2d0affc862b17b4b443a107e0 +irqdomain f5a1ad057e6da5d0fc9c5677ff44797d193d3e62 +gpio 3e11f7b840b4671213c66817294ad7dd0b572756 +gpio-lw 4fbb0022cba37eef4a263183fdb7dbee89b299f2 +arm-soc deac1d40d62cd2d5c5a03498bab49eaac0c43a14 +ep93xx 9b6a3592bd7a08b91a5eb5c34fa0d3093662e964 +renesas 45c7a01f070146e08f5c838315ffca5ade6e3844 +s5p 6701bcab037f3b74d3a04ccef5f7529e0f21a1b3 +tegra a04ef1f55025c38a0c921b533cfbecbde9b377b6 +kvmtool 8598de5462830b85ac5e43fcfbcd03223e6ae448 +dma-mapping 97ef952a20853fad72087a53fa556fbec45edd8f +pwm 19891b20e7c275feb92d669f4b1879861f7e8c25 +dma-buf ca24a145573124732152daff105ba68cc9a2b545 +userns 491fa9e96019ddd7d544a2f3c154b27bfd645d08 +ktest 648a182c615272f01b5cda01dc87a16de9f695bb +signal 2e117f2dde025f5ca24f8cf97d7dcfbf88748b21 +clk 137f8a7213d80c1388ca48280c1ef0856b6fec30 +random d2e7c96af1e54b507ae2a6a7dd2baf588417a7e5 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm 6e81859e67505899e9d6c4f5b1cd9fbcf65997bd diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..9dd1b2b29e33 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,201 @@ +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 +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 +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +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 +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 +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 +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 quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +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 +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 +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 +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 +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +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 +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 +kmemleak git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git#kmemleak +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 +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 +moduleh git git://openlinux.windriver.com/people/paulg/linux-next#for-sfr +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +kmap_atomic git git://github.com/congwang/linux.git#kmap_atomic +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 +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git#next +s5p 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#from-sfr +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 +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..d29c64ac9518 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4694 @@ +$ date +Tuesday 31 July 11:27:04 EST 2012 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at f7da9cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net +Merging origin/master (37cd960 Merge tag 'for-linus-v3.6-rc1' of git://oss.sgi.com/xfs/xfs) +$ git merge origin/master +Updating f7da9cd..37cd960 +Fast-forward + Documentation/ABI/stable/sysfs-bus-firewire | 11 + + Documentation/ABI/testing/sysfs-devices-edac | 140 + + Documentation/ABI/testing/sysfs-platform-asus-wmi | 7 + + Documentation/DMA-attributes.txt | 42 + + Documentation/device-mapper/striped.txt | 7 +- + Documentation/device-mapper/thin-provisioning.txt | 24 +- + .../devicetree/bindings/arm/calxeda/l2ecc.txt | 15 + + .../devicetree/bindings/arm/calxeda/mem-ctrlr.txt | 14 + + .../bindings/ata/cavium-compact-flash.txt | 30 + + .../bindings/gpio/cavium-octeon-gpio.txt | 49 + + .../devicetree/bindings/i2c/cavium-i2c.txt | 34 + + .../{gpio/gpio_i2c.txt => i2c/gpio-i2c.txt} | 0 + Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 3 + + .../devicetree/bindings/i2c/i2c-ocores.txt | 33 + + Documentation/devicetree/bindings/i2c/mrvl-i2c.txt | 19 +- + Documentation/devicetree/bindings/mfd/ab8500.txt | 123 + + Documentation/devicetree/bindings/mfd/max77686.txt | 59 + + Documentation/devicetree/bindings/mfd/tps65910.txt | 2 +- + Documentation/devicetree/bindings/mfd/twl6040.txt | 2 +- + .../devicetree/bindings/mips/cavium/bootbus.txt | 126 + + .../devicetree/bindings/mips/cavium/ciu.txt | 26 + + .../devicetree/bindings/mips/cavium/ciu2.txt | 27 + + .../devicetree/bindings/mips/cavium/dma-engine.txt | 21 + + .../devicetree/bindings/mips/cavium/uctl.txt | 46 + + .../devicetree/bindings/net/cavium-mdio.txt | 27 + + .../devicetree/bindings/net/cavium-mix.txt | 39 + + .../devicetree/bindings/net/cavium-pip.txt | 98 + + .../devicetree/bindings/pwm/lpc32xx-pwm.txt | 12 + + Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 17 + + .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 18 + + Documentation/devicetree/bindings/pwm/pwm.txt | 57 + + .../devicetree/bindings/serial/cavium-uart.txt | 19 + + .../bindings/video/backlight/pwm-backlight.txt | 28 + + Documentation/dontdiff | 1 - + Documentation/edac.txt | 112 +- + Documentation/input/edt-ft5x06.txt | 54 + + Documentation/kernel-parameters.txt | 2 +- + Documentation/pwm.txt | 76 + + MAINTAINERS | 22 + + Makefile | 24 +- + arch/arm/Kconfig | 1 - + arch/arm/boot/dts/highbank.dts | 12 + + arch/arm/boot/dts/imx28.dtsi | 2 + + arch/arm/boot/dts/r8a7740.dtsi | 21 + + arch/arm/boot/dts/sh7377.dtsi | 21 + + arch/arm/boot/dts/tegra20.dtsi | 6 + + arch/arm/boot/dts/tegra30.dtsi | 6 + + arch/arm/common/dmabounce.c | 1 + + arch/arm/configs/armadillo800eva_defconfig | 25 +- + arch/arm/configs/kzm9d_defconfig | 89 + + arch/arm/configs/kzm9g_defconfig | 8 +- + arch/arm/configs/tegra_defconfig | 1 + + arch/arm/include/asm/dma-mapping.h | 24 +- + arch/arm/mach-exynos/clock-exynos4.c | 41 +- + arch/arm/mach-exynos/clock-exynos4.h | 3 + + arch/arm/mach-exynos/clock-exynos4210.c | 37 + + arch/arm/mach-exynos/clock-exynos4212.c | 41 +- + arch/arm/mach-exynos/mach-nuri.c | 4 - + arch/arm/mach-exynos/mach-origen.c | 1 - + arch/arm/mach-pxa/eseries.h | 14 - + arch/arm/mach-pxa/hx4700.c | 56 +- + arch/arm/mach-s3c64xx/include/mach/pm-core.h | 4 + + arch/arm/mach-shmobile/Kconfig | 13 + + arch/arm/mach-shmobile/Makefile | 2 + + arch/arm/mach-shmobile/board-ag5evm.c | 82 +- + arch/arm/mach-shmobile/board-ap4evb.c | 62 +- + arch/arm/mach-shmobile/board-armadillo800eva.c | 455 +- + arch/arm/mach-shmobile/board-bonito.c | 10 + + arch/arm/mach-shmobile/board-g4evm.c | 52 +- + arch/arm/mach-shmobile/board-kota2.c | 30 + + arch/arm/mach-shmobile/board-kzm9d.c | 10 + + arch/arm/mach-shmobile/board-kzm9g.c | 320 + + arch/arm/mach-shmobile/board-mackerel.c | 83 +- + arch/arm/mach-shmobile/board-marzen.c | 10 + + arch/arm/mach-shmobile/clock-r8a7740.c | 150 +- + arch/arm/mach-shmobile/clock-r8a7779.c | 2 +- + arch/arm/mach-shmobile/clock-sh7367.c | 2 +- + arch/arm/mach-shmobile/clock-sh7372.c | 2 +- + arch/arm/mach-shmobile/clock-sh7377.c | 2 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 12 +- + arch/arm/mach-shmobile/include/mach/common.h | 1 + + arch/arm/mach-shmobile/include/mach/dma-register.h | 84 + + arch/arm/mach-shmobile/include/mach/gpio.h | 32 + + arch/arm/mach-shmobile/include/mach/pm-rmobile.h | 44 + + arch/arm/mach-shmobile/include/mach/r8a7740.h | 33 +- + arch/arm/mach-shmobile/include/mach/sh7372.h | 45 +- + arch/arm/mach-shmobile/include/mach/sh73a0.h | 7 + + arch/arm/mach-shmobile/intc-r8a7740.c | 13 +- + arch/arm/mach-shmobile/pfc-r8a7740.c | 24 +- + arch/arm/mach-shmobile/pm-r8a7740.c | 54 + + arch/arm/mach-shmobile/pm-rmobile.c | 167 + + arch/arm/mach-shmobile/pm-sh7372.c | 297 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 360 ++ + arch/arm/mach-shmobile/setup-sh7372.c | 209 +- + arch/arm/mach-shmobile/setup-sh7377.c | 47 + + arch/arm/mach-shmobile/setup-sh73a0.c | 152 +- + arch/arm/mach-tegra/board-dt-tegra20.c | 3 +- + arch/arm/mach-tegra/board-dt-tegra30.c | 3 + + arch/arm/mach-ux500/board-mop500.c | 32 +- + arch/arm/mach-ux500/cpu-db8500.c | 7 +- + arch/arm/mach-ux500/devices-common.h | 24 +- + arch/arm/mach-ux500/include/mach/setup.h | 3 +- + arch/arm/mach-vt8500/Makefile | 2 - + arch/arm/mach-vt8500/pwm.c | 265 - + arch/arm/mm/dma-mapping.c | 561 +- + arch/arm/mm/mm.h | 3 + + arch/arm/plat-mxc/Kconfig | 6 - + arch/arm/plat-mxc/Makefile | 1 - + arch/arm/plat-mxc/include/mach/i2c.h | 2 +- + arch/arm/plat-pxa/Makefile | 1 - + arch/arm/plat-pxa/pwm.c | 304 - + arch/arm/plat-samsung/Makefile | 4 - + arch/blackfin/Kconfig | 10 - + arch/blackfin/kernel/Makefile | 1 - + arch/blackfin/kernel/pwm.c | 100 - + arch/frv/include/asm/cpumask.h | 6 - + arch/hexagon/include/asm/Kbuild | 2 - + arch/ia64/Kconfig | 3 +- + arch/ia64/include/asm/atomic.h | 4 +- + arch/ia64/include/asm/machvec.h | 2 +- + arch/ia64/include/asm/machvec_dig.h | 2 +- + arch/ia64/include/asm/machvec_dig_vtd.h | 2 +- + arch/ia64/include/asm/machvec_hpsim.h | 2 +- + arch/ia64/include/asm/machvec_hpzx1.h | 2 +- + arch/ia64/include/asm/machvec_hpzx1_swiotlb.h | 2 +- + arch/ia64/include/asm/machvec_sn2.h | 2 +- + arch/ia64/include/asm/machvec_uv.h | 2 +- + arch/ia64/include/asm/machvec_xen.h | 2 +- + arch/ia64/include/asm/processor.h | 2 +- + arch/ia64/kvm/Kconfig | 1 + + arch/ia64/pci/fixup.c | 4 +- + arch/mips/Kbuild.platforms | 1 + + arch/mips/Kconfig | 38 +- + arch/mips/alchemy/board-mtx1.c | 4 +- + arch/mips/alchemy/common/platform.c | 10 +- + arch/mips/alchemy/devboards/Makefile | 2 +- + arch/mips/alchemy/devboards/bcsr.c | 5 +- + arch/mips/alchemy/devboards/pb1100.c | 4 +- + arch/mips/alchemy/devboards/pb1500.c | 4 +- + arch/mips/alchemy/devboards/platform.c | 30 + + arch/mips/alchemy/devboards/prom.c | 69 - + arch/mips/bcm63xx/Kconfig | 4 + + arch/mips/bcm63xx/Makefile | 3 +- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 107 +- + arch/mips/bcm63xx/clk.c | 26 +- + arch/mips/bcm63xx/cpu.c | 63 +- + arch/mips/bcm63xx/dev-dsp.c | 2 +- + arch/mips/bcm63xx/dev-flash.c | 123 + + arch/mips/bcm63xx/dev-rng.c | 40 + + arch/mips/bcm63xx/dev-spi.c | 119 + + arch/mips/bcm63xx/dev-wdt.c | 2 +- + arch/mips/bcm63xx/irq.c | 21 + + arch/mips/bcm63xx/prom.c | 4 +- + arch/mips/bcm63xx/setup.c | 13 +- + arch/mips/boot/compressed/Makefile | 4 + + arch/mips/boot/compressed/uart-16550.c | 5 + + arch/mips/cavium-octeon/.gitignore | 2 + + arch/mips/cavium-octeon/Makefile | 16 + + arch/mips/cavium-octeon/executive/cvmx-fpa.c | 183 - + .../mips/cavium-octeon/executive/cvmx-helper-fpa.c | 243 - + arch/mips/cavium-octeon/octeon-irq.c | 399 +- + arch/mips/cavium-octeon/octeon-memcpy.S | 16 +- + arch/mips/cavium-octeon/octeon-platform.c | 699 ++- + arch/mips/cavium-octeon/octeon_3xxx.dts | 571 ++ + arch/mips/cavium-octeon/octeon_68xx.dts | 625 ++ + arch/mips/cavium-octeon/serial.c | 134 +- + arch/mips/cavium-octeon/setup.c | 45 + + arch/mips/configs/ls1b_defconfig | 109 + + arch/mips/configs/nlm_xlr_defconfig | 4 + + arch/mips/dec/prom/memory.c | 2 +- + arch/mips/include/asm/cpu.h | 3 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 150 +- + .../include/asm/mach-bcm63xx/bcm63xx_dev_flash.h | 12 + + .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 89 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 2 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h | 8 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 286 +- + arch/mips/include/asm/mach-bcm63xx/ioremap.h | 1 + + arch/mips/include/asm/mach-cavium-octeon/irq.h | 45 +- + arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 4 + + arch/mips/include/asm/mach-loongson/loongson.h | 3 +- + arch/mips/include/asm/mach-loongson1/irq.h | 73 + + arch/mips/include/asm/mach-loongson1/loongson1.h | 44 + + arch/mips/include/asm/mach-loongson1/platform.h | 23 + + arch/mips/include/asm/mach-loongson1/prom.h | 24 + + arch/mips/include/asm/mach-loongson1/regs-clk.h | 33 + + arch/mips/include/asm/mach-loongson1/regs-wdt.h | 22 + + arch/mips/include/asm/mach-loongson1/war.h | 25 + + .../asm/mach-netlogic/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-tx49xx/mangle-port.h | 2 +- + arch/mips/include/asm/mipsmtregs.h | 13 + + arch/mips/include/asm/module.h | 2 + + .../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 4 +- + arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 5 +- + arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 76 + + arch/mips/include/asm/netlogic/xlp-hal/pic.h | 4 + + arch/mips/include/asm/netlogic/xlp-hal/usb.h | 64 + + arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 17 +- + arch/mips/include/asm/netlogic/xlr/bridge.h | 104 + + arch/mips/include/asm/netlogic/xlr/flash.h | 55 + + arch/mips/include/asm/netlogic/xlr/gpio.h | 59 +- + arch/mips/include/asm/octeon/cvmx-helper-fpa.h | 64 - + arch/mips/include/asm/octeon/cvmx-helper.h | 2 - + arch/mips/include/asm/octeon/octeon.h | 5 - + arch/mips/include/asm/prom.h | 3 - + arch/mips/include/asm/smtc.h | 6 + + arch/mips/include/asm/uaccess.h | 6 +- + arch/mips/include/asm/uasm.h | 100 +- + arch/mips/jz4740/board-qi_lb60.c | 1 + + arch/mips/jz4740/platform.c | 20 +- + arch/mips/jz4740/reset.c | 49 +- + arch/mips/kernel/cpu-probe.c | 299 +- + arch/mips/kernel/perf_event_mipsxx.c | 5 + + arch/mips/kernel/prom.c | 29 - + arch/mips/kernel/smp.c | 4 +- + arch/mips/kernel/smtc.c | 76 +- + arch/mips/kernel/traps.c | 1 + + arch/mips/lib/Makefile | 2 +- + arch/mips/lib/memcpy-inatomic.S | 451 -- + arch/mips/lib/memcpy.S | 11 + + arch/mips/loongson1/Kconfig | 21 + + arch/mips/loongson1/Makefile | 11 + + arch/mips/loongson1/Platform | 7 + + arch/mips/loongson1/common/Makefile | 5 + + arch/mips/loongson1/common/clock.c | 165 + + arch/mips/loongson1/common/irq.c | 147 + + arch/mips/loongson1/common/platform.c | 124 + + arch/mips/loongson1/common/prom.c | 87 + + arch/mips/loongson1/common/reset.c | 45 + + arch/mips/loongson1/common/setup.c | 29 + + arch/mips/loongson1/ls1b/Makefile | 5 + + arch/mips/loongson1/ls1b/board.c | 33 + + arch/mips/mm/uasm.c | 62 +- + arch/mips/netlogic/common/earlycons.c | 2 +- + arch/mips/netlogic/common/smpboot.S | 157 +- + arch/mips/netlogic/xlp/Makefile | 2 + + arch/mips/netlogic/xlp/nlm_hal.c | 52 + + arch/mips/netlogic/xlp/of.c | 34 + + arch/mips/netlogic/xlp/platform.c | 2 +- + arch/mips/netlogic/xlp/setup.c | 16 + + arch/mips/netlogic/xlp/usb-init.c | 124 + + arch/mips/netlogic/xlr/Makefile | 2 +- + arch/mips/netlogic/xlr/platform-flash.c | 220 + + arch/mips/netlogic/xlr/platform.c | 140 + + arch/mips/netlogic/xlr/setup.c | 2 +- + arch/mips/oprofile/common.c | 1 + + arch/mips/oprofile/op_model_mipsxx.c | 10 +- + arch/mips/pci/Makefile | 1 + + arch/mips/pci/fixup-cobalt.c | 8 +- + arch/mips/pci/fixup-malta.c | 14 + + arch/mips/pci/fixup-rc32434.c | 2 +- + arch/mips/pci/ops-bcm63xx.c | 63 +- + arch/mips/pci/pci-bcm63xx.c | 133 +- + arch/mips/pci/pci-bcm63xx.h | 5 + + arch/mips/pci/pci-xlp.c | 248 + + arch/mips/pci/pci-xlr.c | 4 - + arch/mips/pnx833x/stb22x/board.c | 4 +- + arch/mips/txx9/generic/pci.c | 6 +- + arch/mips/txx9/generic/setup.c | 12 +- + arch/mips/txx9/generic/setup_tx4939.c | 2 +- + arch/mips/txx9/rbtx4939/setup.c | 11 +- + arch/mn10300/include/asm/ipc.h | 1 - + arch/openrisc/include/asm/Kbuild | 2 - + arch/powerpc/include/asm/dma-mapping.h | 8 +- + arch/powerpc/kernel/dma-iommu.c | 1 + + arch/powerpc/kernel/dma-swiotlb.c | 1 + + arch/powerpc/kernel/dma.c | 36 +- + arch/powerpc/kernel/vio.c | 1 + + arch/tile/include/asm/Kbuild | 1 - + arch/xtensa/include/asm/cpumask.h | 16 - + arch/xtensa/include/asm/rmap.h | 16 - + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/video_detect.c | 60 +- + drivers/base/dma-mapping.c | 49 + + drivers/block/virtio_blk.c | 115 +- + drivers/char/hw_random/Kconfig | 14 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/bcm63xx-rng.c | 175 + + drivers/char/hw_random/virtio-rng.c | 37 +- + drivers/char/mspec.c | 2 +- + drivers/cpufreq/exynos5250-cpufreq.c | 55 +- + drivers/edac/Kconfig | 24 +- + drivers/edac/Makefile | 3 + + drivers/edac/amd64_edac.c | 376 +- + drivers/edac/amd64_edac.h | 29 +- + drivers/edac/amd64_edac_dbg.c | 89 +- + drivers/edac/amd64_edac_inj.c | 134 +- + drivers/edac/amd76x_edac.c | 34 +- + drivers/edac/cell_edac.c | 28 +- + drivers/edac/cpc925_edac.c | 96 +- + drivers/edac/e752x_edac.c | 92 +- + drivers/edac/e7xxx_edac.c | 89 +- + drivers/edac/edac_core.h | 39 +- + drivers/edac/edac_device.c | 47 +- + drivers/edac/edac_device_sysfs.c | 71 +- + drivers/edac/edac_mc.c | 395 +- + drivers/edac/edac_mc_sysfs.c | 1355 ++-- + drivers/edac/edac_module.c | 20 +- + drivers/edac/edac_module.h | 26 +- + drivers/edac/edac_pci.c | 26 +- + drivers/edac/edac_pci_sysfs.c | 49 +- + drivers/edac/highbank_l2_edac.c | 149 + + drivers/edac/highbank_mc_edac.c | 264 + + drivers/edac/i3000_edac.c | 47 +- + drivers/edac/i3200_edac.c | 48 +- + drivers/edac/i5000_edac.c | 207 +- + drivers/edac/i5100_edac.c | 14 +- + drivers/edac/i5400_edac.c | 201 +- + drivers/edac/i7300_edac.c | 173 +- + drivers/edac/i7core_edac.c | 520 +- + drivers/edac/i82443bxgx_edac.c | 51 +- + drivers/edac/i82860_edac.c | 45 +- + drivers/edac/i82875p_edac.c | 53 +- + drivers/edac/i82975x_edac.c | 55 +- + drivers/edac/mpc85xx_edac.c | 131 +- + drivers/edac/mv64x60_edac.c | 40 +- + drivers/edac/pasemi_edac.c | 22 +- + drivers/edac/ppc4xx_edac.c | 16 +- + drivers/edac/r82600_edac.c | 48 +- + drivers/edac/sb_edac.c | 257 +- + drivers/edac/tile_edac.c | 12 +- + drivers/edac/x38_edac.c | 48 +- + drivers/extcon/Kconfig | 2 +- + drivers/extcon/extcon-max8997.c | 29 +- + drivers/firewire/core-device.c | 9 + + drivers/firewire/core-iso.c | 2 +- + drivers/firewire/core-transaction.c | 23 +- + drivers/firewire/ohci.c | 30 +- + drivers/gpio/Kconfig | 7 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-tps6586x.c | 158 + + drivers/gpu/drm/exynos/exynos_drm_connector.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_core.c | 5 - + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 294 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.h | 31 - + drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 33 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 9 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 4 + + drivers/gpu/drm/exynos/exynos_drm_encoder.c | 123 +- + drivers/gpu/drm/exynos/exynos_drm_encoder.h | 12 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 40 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 49 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 3 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 246 +- + drivers/gpu/drm/exynos/exynos_drm_plane.h | 12 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 53 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 36 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 48 +- + drivers/hwmon/acpi_power_meter.c | 4 + + drivers/hwmon/applesmc.c | 70 +- + drivers/hwmon/coretemp.c | 2 +- + drivers/hwmon/jc42.c | 26 +- + drivers/hwmon/via-cputemp.c | 2 +- + drivers/i2c/busses/Kconfig | 7 +- + drivers/i2c/busses/i2c-at91.c | 13 +- + drivers/i2c/busses/i2c-bfin-twi.c | 147 +- + drivers/i2c/busses/i2c-imx.c | 75 +- + drivers/i2c/busses/i2c-mv64xxx.c | 133 +- + drivers/i2c/busses/i2c-mxs.c | 68 +- + drivers/i2c/busses/i2c-nomadik.c | 189 +- + drivers/i2c/busses/i2c-ocores.c | 113 +- + drivers/i2c/busses/i2c-octeon.c | 92 +- + drivers/i2c/busses/i2c-omap.c | 155 +- + drivers/i2c/busses/i2c-pnx.c | 19 +- + drivers/i2c/busses/i2c-puv3.c | 15 +- + drivers/i2c/busses/i2c-s3c2410.c | 6 +- + drivers/i2c/busses/i2c-stu300.c | 102 +- + drivers/i2c/busses/i2c-tegra.c | 122 +- + drivers/input/misc/88pm80x_onkey.c | 168 + + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ab8500-ponkey.c | 4 +- + drivers/input/mouse/synaptics.c | 22 + + drivers/input/tablet/wacom_wac.c | 21 +- + drivers/input/tablet/wacom_wac.h | 3 +- + drivers/input/touchscreen/Kconfig | 13 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/edt-ft5x06.c | 898 +++ + drivers/md/Kconfig | 9 - + drivers/md/dm-crypt.c | 219 +- + drivers/md/dm-delay.c | 2 +- + drivers/md/dm-exception-store.c | 13 +- + drivers/md/dm-flakey.c | 2 +- + drivers/md/dm-ioctl.c | 5 +- + drivers/md/dm-linear.c | 2 +- + drivers/md/dm-mpath.c | 49 +- + drivers/md/dm-raid.c | 56 +- + drivers/md/dm-raid1.c | 10 +- + drivers/md/dm-snap.c | 34 +- + drivers/md/dm-stripe.c | 87 +- + drivers/md/dm-table.c | 3 + + drivers/md/dm-thin-metadata.c | 769 ++- + drivers/md/dm-thin-metadata.h | 25 +- + drivers/md/dm-thin.c | 542 +- + drivers/md/dm-verity.c | 2 +- + drivers/md/dm.c | 40 +- + drivers/md/dm.h | 5 + + drivers/md/persistent-data/Makefile | 1 - + drivers/md/persistent-data/dm-block-manager.c | 105 +- + drivers/md/persistent-data/dm-block-manager.h | 21 +- + drivers/md/persistent-data/dm-space-map-checker.c | 446 -- + drivers/md/persistent-data/dm-space-map-checker.h | 26 - + drivers/md/persistent-data/dm-space-map-common.c | 12 +- + drivers/md/persistent-data/dm-space-map-common.h | 1 + + drivers/md/persistent-data/dm-space-map-disk.c | 34 +- + .../md/persistent-data/dm-transaction-manager.c | 91 +- + .../md/persistent-data/dm-transaction-manager.h | 11 +- + drivers/mfd/88pm800.c | 596 ++ + drivers/mfd/88pm805.c | 301 + + drivers/mfd/88pm80x.c | 145 + + drivers/mfd/88pm860x-core.c | 23 + + drivers/mfd/Kconfig | 99 +- + drivers/mfd/Makefile | 15 +- + drivers/mfd/ab3100-core.c | 23 +- + drivers/mfd/ab8500-core.c | 242 +- + drivers/mfd/ab8500-debugfs.c | 12 +- + drivers/mfd/ab8500-gpadc.c | 9 +- + drivers/mfd/ab8500-sysctrl.c | 6 - + drivers/mfd/adp5520.c | 2 +- + drivers/mfd/anatop-mfd.c | 2 +- + drivers/mfd/arizona-core.c | 566 ++ + drivers/mfd/arizona-i2c.c | 97 + + drivers/mfd/arizona-irq.c | 275 + + drivers/mfd/arizona-spi.c | 97 + + drivers/mfd/arizona.h | 40 + + drivers/mfd/da9052-core.c | 1 - + drivers/mfd/db8500-prcmu.c | 92 +- + drivers/mfd/dbx500-prcmu-regs.h | 1 + + drivers/mfd/max77686-irq.c | 319 + + drivers/mfd/max77686.c | 187 + + drivers/mfd/max77693.c | 11 +- + drivers/mfd/max8925-core.c | 8 +- + drivers/mfd/max8997-irq.c | 62 +- + drivers/mfd/max8997.c | 9 +- + drivers/mfd/mc13xxx-core.c | 4 - + drivers/mfd/mc13xxx-i2c.c | 12 +- + drivers/mfd/mc13xxx-spi.c | 15 +- + drivers/mfd/mfd-core.c | 30 +- + drivers/mfd/pcf50633-core.c | 9 +- + drivers/mfd/s5m-core.c | 206 - + drivers/mfd/s5m-irq.c | 495 -- + drivers/mfd/sec-core.c | 216 + + drivers/mfd/sec-irq.c | 317 + + drivers/mfd/tc3589x.c | 9 +- + drivers/mfd/timberdale.c | 2 +- + drivers/mfd/tps65090.c | 4 +- + drivers/mfd/tps6586x.c | 296 +- + drivers/mfd/tps65910.c | 23 +- + drivers/mfd/twl-core.c | 3 +- + drivers/mfd/twl6040-core.c | 24 +- + drivers/mfd/wm5102-tables.c | 2399 +++++++ + drivers/mfd/wm5110-tables.c | 2281 +++++++ + drivers/mfd/wm8350-core.c | 354 +- + drivers/mfd/wm8350-i2c.c | 5 - + drivers/mfd/wm8350-irq.c | 8 +- + drivers/mfd/wm8350-regmap.c | 3222 +--------- + drivers/mfd/wm8994-core.c | 17 +- + drivers/mfd/wm8994-irq.c | 10 +- + drivers/misc/Kconfig | 1 + + drivers/misc/ab8500-pwm.c | 6 - + drivers/mtd/nand/jz4740_nand.c | 228 +- + drivers/net/ethernet/octeon/octeon_mgmt.c | 312 +- + drivers/net/phy/mdio-octeon.c | 92 +- + drivers/platform/x86/acer-wmi.c | 153 +- + drivers/platform/x86/apple-gmux.c | 6 + + drivers/platform/x86/asus-nb-wmi.c | 108 +- + drivers/platform/x86/asus-wmi.c | 23 +- + drivers/platform/x86/asus-wmi.h | 1 + + drivers/platform/x86/classmate-laptop.c | 405 +- + drivers/platform/x86/dell-laptop.c | 54 + + drivers/platform/x86/eeepc-wmi.c | 25 +- + drivers/platform/x86/samsung-laptop.c | 41 +- + drivers/platform/x86/thinkpad_acpi.c | 5 +- + drivers/pwm/Kconfig | 108 + + drivers/pwm/Makefile | 11 + + drivers/pwm/core.c | 713 +++ + drivers/pwm/pwm-bfin.c | 162 + + arch/arm/plat-mxc/pwm.c => drivers/pwm/pwm-imx.c | 204 +- + drivers/pwm/pwm-lpc32xx.c | 148 + + drivers/pwm/pwm-mxs.c | 203 + + drivers/pwm/pwm-pxa.c | 218 + + .../pwm.c => drivers/pwm/pwm-samsung.c | 234 +- + drivers/pwm/pwm-tegra.c | 261 + + drivers/pwm/pwm-tiecap.c | 232 + + drivers/pwm/pwm-tiehrpwm.c | 411 ++ + drivers/pwm/pwm-vt8500.c | 177 + + drivers/regulator/Kconfig | 2 +- + drivers/regulator/ab8500.c | 6 - + drivers/regulator/db8500-prcmu.c | 6 - + drivers/regulator/s5m8767.c | 72 +- + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-88pm80x.c | 371 ++ + drivers/rtc/rtc-max8925.c | 13 +- + drivers/spi/Kconfig | 9 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-falcon.c | 469 ++ + drivers/staging/octeon/ethernet-mdio.c | 28 +- + drivers/staging/octeon/ethernet.c | 153 +- + drivers/staging/octeon/octeon-ethernet.h | 3 + + drivers/usb/host/ehci-omap.c | 8 +- + drivers/video/backlight/Kconfig | 2 +- + drivers/video/backlight/pwm_bl.c | 159 +- + fs/xfs/xfs_alloc_btree.h | 14 - + fs/xfs/xfs_aops.c | 79 +- + fs/xfs/xfs_aops.h | 14 +- + fs/xfs/xfs_attr.c | 78 +- + fs/xfs/xfs_attr_leaf.c | 255 +- + fs/xfs/xfs_attr_leaf.h | 21 +- + fs/xfs/xfs_bmap.c | 2 +- + fs/xfs/xfs_buf.c | 240 +- + fs/xfs/xfs_buf.h | 116 +- + fs/xfs/xfs_buf_item.c | 345 +- + fs/xfs/xfs_buf_item.h | 38 +- + fs/xfs/xfs_da_btree.c | 823 +-- + fs/xfs/xfs_da_btree.h | 38 +- + fs/xfs/xfs_dinode.h | 2 +- + fs/xfs/xfs_dir2.c | 4 +- + fs/xfs/xfs_dir2_block.c | 118 +- + fs/xfs/xfs_dir2_data.c | 50 +- + fs/xfs/xfs_dir2_leaf.c | 621 +- + fs/xfs/xfs_dir2_node.c | 236 +- + fs/xfs/xfs_dir2_priv.h | 46 +- + fs/xfs/xfs_dir2_sf.c | 4 +- + fs/xfs/xfs_file.c | 19 +- + fs/xfs/xfs_ialloc.c | 446 +- + fs/xfs/xfs_ialloc.h | 2 - + fs/xfs/xfs_iget.c | 15 - + fs/xfs/xfs_inode.c | 208 +- + fs/xfs/xfs_inode.h | 13 +- + fs/xfs/xfs_iomap.c | 6 +- + fs/xfs/xfs_iops.c | 45 + + fs/xfs/xfs_itable.c | 2 +- + fs/xfs/xfs_log.c | 223 +- + fs/xfs/xfs_log_priv.h | 18 +- + fs/xfs/xfs_log_recover.c | 142 +- + fs/xfs/xfs_mount.c | 11 +- + fs/xfs/xfs_mount.h | 3 - + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_super.c | 88 +- + fs/xfs/xfs_sync.c | 13 +- + fs/xfs/xfs_trace.h | 2 +- + fs/xfs/xfs_trans.h | 50 +- + fs/xfs/xfs_trans_ail.c | 35 +- + fs/xfs/xfs_trans_buf.c | 68 +- + fs/xfs/xfs_trans_priv.h | 1 + + fs/xfs/xfs_types.h | 14 + + fs/xfs/xfs_utils.c | 17 +- + fs/xfs/xfs_vnodeops.c | 285 +- + include/asm-generic/dma-coherent.h | 1 + + include/asm-generic/dma-mapping-common.h | 55 + + include/drm/exynos_drm.h | 9 - + include/linux/acpi.h | 10 + + include/linux/device-mapper.h | 29 +- + include/linux/dm-ioctl.h | 6 +- + include/linux/dma-attrs.h | 2 + + include/linux/dma-mapping.h | 3 + + include/linux/edac.h | 208 +- + include/linux/firewire.h | 4 +- + include/linux/i2c-ocores.h | 3 +- + include/linux/input/edt-ft5x06.h | 24 + + include/linux/key-type.h | 1 + + include/linux/libfdt.h | 8 + + include/linux/libfdt_env.h | 13 + + include/linux/mempolicy.h | 2 +- + include/linux/mfd/88pm80x.h | 369 ++ + include/linux/mfd/88pm860x.h | 1 + + include/linux/mfd/abx500/ab8500.h | 5 + + include/linux/mfd/arizona/core.h | 114 + + include/linux/mfd/arizona/pdata.h | 119 + + include/linux/mfd/arizona/registers.h | 6594 ++++++++++++++++++++ + include/linux/mfd/core.h | 5 + + include/linux/mfd/db8500-prcmu.h | 7 +- + include/linux/mfd/dbx500-prcmu.h | 7 +- + include/linux/mfd/max77686-private.h | 246 + + include/linux/mfd/max77686.h | 114 + + include/linux/mfd/max77693-private.h | 1 - + include/linux/mfd/max8997-private.h | 4 +- + include/linux/mfd/max8997.h | 1 - + include/linux/mfd/s5m87xx/s5m-core.h | 379 -- + include/linux/mfd/s5m87xx/s5m-pmic.h | 129 - + include/linux/mfd/samsung/core.h | 159 + + include/linux/mfd/samsung/irq.h | 152 + + .../linux/mfd/{s5m87xx/s5m-rtc.h => samsung/rtc.h} | 69 +- + include/linux/mfd/samsung/s2mps11.h | 196 + + include/linux/mfd/samsung/s5m8763.h | 96 + + include/linux/mfd/samsung/s5m8767.h | 188 + + include/linux/mfd/tps65910.h | 1 + + include/linux/mfd/twl6040.h | 6 +- + include/linux/mfd/wm8350/core.h | 26 +- + include/linux/mfd/wm8994/pdata.h | 1 + + include/linux/mm_types.h | 11 +- + include/linux/of.h | 16 + + .../linux/platform_data/i2c-nomadik.h | 6 +- + include/linux/pwm.h | 117 + + include/linux/pwm_backlight.h | 1 + + include/linux/scatterlist.h | 4 + + include/linux/slab.h | 24 + + include/linux/slab_def.h | 12 +- + include/linux/slub_def.h | 3 +- + include/linux/virtio_blk.h | 10 +- + include/linux/virtio_ids.h | 2 +- + include/linux/vmalloc.h | 9 +- + include/ras/ras_event.h | 102 + + lib/Kconfig | 6 + + lib/Makefile | 5 + + lib/fdt.c | 2 + + lib/fdt_ro.c | 2 + + lib/fdt_rw.c | 2 + + lib/fdt_strerror.c | 2 + + lib/fdt_sw.c | 2 + + lib/fdt_wip.c | 2 + + lib/scatterlist.c | 64 + + mm/Makefile | 3 +- + mm/mempolicy.c | 8 +- + mm/slab.c | 406 +- + mm/slab.h | 33 + + mm/slab_common.c | 120 + + mm/slob.c | 152 +- + mm/slub.c | 436 +- + mm/vmalloc.c | 28 +- + scripts/coccinelle/iterators/use_after_iter.cocci | 147 + + scripts/coccinelle/misc/irqf_oneshot.cocci | 65 + + scripts/config | 62 +- + scripts/kconfig/.gitignore | 1 - + scripts/kconfig/Makefile | 41 +- + scripts/kconfig/confdata.c | 61 +- + scripts/kconfig/lxdialog/check-lxdialog.sh | 8 +- + scripts/kconfig/lxdialog/textbox.c | 3 + + scripts/kconfig/mconf.c | 6 +- + scripts/kconfig/nconf.c | 10 +- + scripts/kconfig/nconf.gui.c | 8 +- + scripts/kconfig/streamline_config.pl | 175 +- + scripts/link-vmlinux.sh | 4 +- + scripts/package/builddeb | 7 +- + scripts/tags.sh | 6 +- + security/selinux/hooks.c | 15 +- + security/smack/smackfs.c | 8 +- + sound/soc/codecs/twl6040.c | 2 +- + tools/testing/ktest/ktest.pl | 167 +- + tools/testing/ktest/sample.conf | 52 + + tools/vm/slabinfo.c | 14 +- + 643 files changed, 44499 insertions(+), 17930 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-edac + create mode 100644 Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt + create mode 100644 Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt + create mode 100644 Documentation/devicetree/bindings/ata/cavium-compact-flash.txt + create mode 100644 Documentation/devicetree/bindings/gpio/cavium-octeon-gpio.txt + create mode 100644 Documentation/devicetree/bindings/i2c/cavium-i2c.txt + rename Documentation/devicetree/bindings/{gpio/gpio_i2c.txt => i2c/gpio-i2c.txt} (100%) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-ocores.txt + create mode 100644 Documentation/devicetree/bindings/mfd/ab8500.txt + create mode 100644 Documentation/devicetree/bindings/mfd/max77686.txt + create mode 100644 Documentation/devicetree/bindings/mips/cavium/bootbus.txt + create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu.txt + create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu2.txt + create mode 100644 Documentation/devicetree/bindings/mips/cavium/dma-engine.txt + create mode 100644 Documentation/devicetree/bindings/mips/cavium/uctl.txt + create mode 100644 Documentation/devicetree/bindings/net/cavium-mdio.txt + create mode 100644 Documentation/devicetree/bindings/net/cavium-mix.txt + create mode 100644 Documentation/devicetree/bindings/net/cavium-pip.txt + create mode 100644 Documentation/devicetree/bindings/pwm/lpc32xx-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/mxs-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm.txt + create mode 100644 Documentation/devicetree/bindings/serial/cavium-uart.txt + create mode 100644 Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt + create mode 100644 Documentation/input/edt-ft5x06.txt + create mode 100644 Documentation/pwm.txt + create mode 100644 arch/arm/boot/dts/r8a7740.dtsi + create mode 100644 arch/arm/boot/dts/sh7377.dtsi + create mode 100644 arch/arm/configs/kzm9d_defconfig + delete mode 100644 arch/arm/mach-pxa/eseries.h + create mode 100644 arch/arm/mach-shmobile/include/mach/dma-register.h + create mode 100644 arch/arm/mach-shmobile/include/mach/pm-rmobile.h + create mode 100644 arch/arm/mach-shmobile/pm-r8a7740.c + create mode 100644 arch/arm/mach-shmobile/pm-rmobile.c + delete mode 100644 arch/arm/mach-vt8500/pwm.c + delete mode 100644 arch/arm/plat-pxa/pwm.c + delete mode 100644 arch/blackfin/kernel/pwm.c + delete mode 100644 arch/frv/include/asm/cpumask.h + delete mode 100644 arch/mips/alchemy/devboards/prom.c + create mode 100644 arch/mips/bcm63xx/dev-flash.c + create mode 100644 arch/mips/bcm63xx/dev-rng.c + create mode 100644 arch/mips/bcm63xx/dev-spi.c + create mode 100644 arch/mips/cavium-octeon/.gitignore + delete mode 100644 arch/mips/cavium-octeon/executive/cvmx-fpa.c + delete mode 100644 arch/mips/cavium-octeon/executive/cvmx-helper-fpa.c + create mode 100644 arch/mips/cavium-octeon/octeon_3xxx.dts + create mode 100644 arch/mips/cavium-octeon/octeon_68xx.dts + create mode 100644 arch/mips/configs/ls1b_defconfig + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h + create mode 100644 arch/mips/include/asm/mach-loongson1/irq.h + create mode 100644 arch/mips/include/asm/mach-loongson1/loongson1.h + create mode 100644 arch/mips/include/asm/mach-loongson1/platform.h + create mode 100644 arch/mips/include/asm/mach-loongson1/prom.h + create mode 100644 arch/mips/include/asm/mach-loongson1/regs-clk.h + create mode 100644 arch/mips/include/asm/mach-loongson1/regs-wdt.h + create mode 100644 arch/mips/include/asm/mach-loongson1/war.h + create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/pcibus.h + create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/usb.h + create mode 100644 arch/mips/include/asm/netlogic/xlr/bridge.h + create mode 100644 arch/mips/include/asm/netlogic/xlr/flash.h + delete mode 100644 arch/mips/include/asm/octeon/cvmx-helper-fpa.h + delete mode 100644 arch/mips/lib/memcpy-inatomic.S + create mode 100644 arch/mips/loongson1/Kconfig + create mode 100644 arch/mips/loongson1/Makefile + create mode 100644 arch/mips/loongson1/Platform + create mode 100644 arch/mips/loongson1/common/Makefile + create mode 100644 arch/mips/loongson1/common/clock.c + create mode 100644 arch/mips/loongson1/common/irq.c + create mode 100644 arch/mips/loongson1/common/platform.c + create mode 100644 arch/mips/loongson1/common/prom.c + create mode 100644 arch/mips/loongson1/common/reset.c + create mode 100644 arch/mips/loongson1/common/setup.c + create mode 100644 arch/mips/loongson1/ls1b/Makefile + create mode 100644 arch/mips/loongson1/ls1b/board.c + create mode 100644 arch/mips/netlogic/xlp/of.c + create mode 100644 arch/mips/netlogic/xlp/usb-init.c + create mode 100644 arch/mips/netlogic/xlr/platform-flash.c + create mode 100644 arch/mips/pci/pci-xlp.c + delete mode 100644 arch/mn10300/include/asm/ipc.h + delete mode 100644 arch/xtensa/include/asm/cpumask.h + delete mode 100644 arch/xtensa/include/asm/rmap.h + create mode 100644 drivers/char/hw_random/bcm63xx-rng.c + create mode 100644 drivers/edac/highbank_l2_edac.c + create mode 100644 drivers/edac/highbank_mc_edac.c + create mode 100644 drivers/gpio/gpio-tps6586x.c + create mode 100644 drivers/input/misc/88pm80x_onkey.c + create mode 100644 drivers/input/touchscreen/edt-ft5x06.c + delete mode 100644 drivers/md/persistent-data/dm-space-map-checker.c + delete mode 100644 drivers/md/persistent-data/dm-space-map-checker.h + create mode 100644 drivers/mfd/88pm800.c + create mode 100644 drivers/mfd/88pm805.c + create mode 100644 drivers/mfd/88pm80x.c + create mode 100644 drivers/mfd/arizona-core.c + create mode 100644 drivers/mfd/arizona-i2c.c + create mode 100644 drivers/mfd/arizona-irq.c + create mode 100644 drivers/mfd/arizona-spi.c + create mode 100644 drivers/mfd/arizona.h + create mode 100644 drivers/mfd/max77686-irq.c + create mode 100644 drivers/mfd/max77686.c + delete mode 100644 drivers/mfd/s5m-core.c + delete mode 100644 drivers/mfd/s5m-irq.c + create mode 100644 drivers/mfd/sec-core.c + create mode 100644 drivers/mfd/sec-irq.c + create mode 100644 drivers/mfd/wm5102-tables.c + create mode 100644 drivers/mfd/wm5110-tables.c + create mode 100644 drivers/pwm/Kconfig + create mode 100644 drivers/pwm/Makefile + create mode 100644 drivers/pwm/core.c + create mode 100644 drivers/pwm/pwm-bfin.c + rename arch/arm/plat-mxc/pwm.c => drivers/pwm/pwm-imx.c (50%) + create mode 100644 drivers/pwm/pwm-lpc32xx.c + create mode 100644 drivers/pwm/pwm-mxs.c + create mode 100644 drivers/pwm/pwm-pxa.c + rename arch/arm/plat-samsung/pwm.c => drivers/pwm/pwm-samsung.c (56%) + create mode 100644 drivers/pwm/pwm-tegra.c + create mode 100644 drivers/pwm/pwm-tiecap.c + create mode 100644 drivers/pwm/pwm-tiehrpwm.c + create mode 100644 drivers/pwm/pwm-vt8500.c + create mode 100644 drivers/rtc/rtc-88pm80x.c + create mode 100644 drivers/spi/spi-falcon.c + create mode 100644 include/linux/input/edt-ft5x06.h + create mode 100644 include/linux/libfdt.h + create mode 100644 include/linux/libfdt_env.h + create mode 100644 include/linux/mfd/88pm80x.h + create mode 100644 include/linux/mfd/arizona/core.h + create mode 100644 include/linux/mfd/arizona/pdata.h + create mode 100644 include/linux/mfd/arizona/registers.h + create mode 100644 include/linux/mfd/max77686-private.h + create mode 100644 include/linux/mfd/max77686.h + delete mode 100644 include/linux/mfd/s5m87xx/s5m-core.h + delete mode 100644 include/linux/mfd/s5m87xx/s5m-pmic.h + create mode 100644 include/linux/mfd/samsung/core.h + create mode 100644 include/linux/mfd/samsung/irq.h + rename include/linux/mfd/{s5m87xx/s5m-rtc.h => samsung/rtc.h} (59%) + create mode 100644 include/linux/mfd/samsung/s2mps11.h + create mode 100644 include/linux/mfd/samsung/s5m8763.h + create mode 100644 include/linux/mfd/samsung/s5m8767.h + rename arch/arm/plat-nomadik/include/plat/i2c.h => include/linux/platform_data/i2c-nomadik.h (91%) + create mode 100644 include/ras/ras_event.h + create mode 100644 lib/fdt.c + create mode 100644 lib/fdt_ro.c + create mode 100644 lib/fdt_rw.c + create mode 100644 lib/fdt_strerror.c + create mode 100644 lib/fdt_sw.c + create mode 100644 lib/fdt_wip.c + create mode 100644 mm/slab.h + create mode 100644 mm/slab_common.c + create mode 100644 scripts/coccinelle/iterators/use_after_iter.cocci + create mode 100644 scripts/coccinelle/misc/irqf_oneshot.cocci +Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (f8f5701 Linux 3.5-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/fixes (6662372 ARM: Fix undefined instruction exception handling) +$ git merge arm-current/fixes +Auto-merging arch/arm/kernel/traps.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/mutex.h | 119 ++---------------------------------------- + arch/arm/include/asm/setup.h | 4 +- + arch/arm/kernel/entry-armv.S | 111 +++++++++++++++++++++++++-------------- + arch/arm/kernel/ftrace.c | 17 +++--- + arch/arm/kernel/process.c | 2 + + arch/arm/kernel/setup.c | 6 +-- + arch/arm/kernel/smp.c | 3 +- + arch/arm/kernel/traps.c | 8 --- + arch/arm/mm/tlb-v7.S | 12 +++++ + arch/arm/vfp/entry.S | 16 +++--- + arch/arm/vfp/vfphw.S | 19 ++++--- + arch/arm/vfp/vfpmodule.c | 8 ++- + 12 files changed, 133 insertions(+), 192 deletions(-) +Merging m68k-current/for-linus (1525e06 m68k/apollo: Rename "timer" to "apollo_timer") +$ git merge m68k-current/for-linus +Auto-merging arch/m68k/platform/coldfire/head.S +Removing arch/m68k/include/asm/xor.h +Removing arch/m68k/include/asm/types.h +Removing arch/m68k/include/asm/topology.h +Removing arch/m68k/include/asm/statfs.h +Removing arch/m68k/include/asm/siginfo.h +Removing arch/m68k/include/asm/shm.h +Removing arch/m68k/include/asm/sections.h +Removing arch/m68k/include/asm/scatterlist.h +Removing arch/m68k/include/asm/sbus.h +Removing arch/m68k/include/asm/resource.h +Removing arch/m68k/include/asm/percpu.h +Removing arch/m68k/include/asm/mutex.h +Removing arch/m68k/include/asm/mman.h +Removing arch/m68k/include/asm/mcfmbus.h +Removing arch/m68k/include/asm/mac_mouse.h +Removing arch/m68k/include/asm/local64.h +Removing arch/m68k/include/asm/local.h +Removing arch/m68k/include/asm/kvm_para.h +Removing arch/m68k/include/asm/kmap_types.h +Removing arch/m68k/include/asm/kdebug.h +Removing arch/m68k/include/asm/irq_regs.h +Removing arch/m68k/include/asm/ipcbuf.h +Removing arch/m68k/include/asm/ioctl.h +Removing arch/m68k/include/asm/futex.h +Removing arch/m68k/include/asm/errno.h +Removing arch/m68k/include/asm/emergency-restart.h +Removing arch/m68k/include/asm/device.h +Removing arch/m68k/include/asm/cputime.h +Removing arch/m68k/include/asm/bitsperlong.h +Removing arch/m68k/include/asm/apollodma.h +Removing arch/m68k/include/asm/MC68332.h +Auto-merging arch/m68k/Kconfig.cpu +Merge made by the 'recursive' strategy. + arch/blackfin/kernel/setup.c | 1 - + arch/m68k/Kconfig | 12 -- + arch/m68k/Kconfig.cpu | 14 ++ + arch/m68k/apollo/config.c | 16 +- + arch/m68k/include/asm/Kbuild | 25 +++ + arch/m68k/include/asm/MC68332.h | 152 ------------------ + arch/m68k/include/asm/apollodma.h | 248 ----------------------------- + arch/m68k/include/asm/apollohw.h | 2 +- + arch/m68k/include/asm/bitsperlong.h | 1 - + arch/m68k/include/asm/cputime.h | 6 - + arch/m68k/include/asm/delay.h | 2 +- + arch/m68k/include/asm/device.h | 7 - + arch/m68k/include/asm/emergency-restart.h | 6 - + arch/m68k/include/asm/errno.h | 6 - + arch/m68k/include/asm/futex.h | 6 - + arch/m68k/include/asm/ioctl.h | 1 - + arch/m68k/include/asm/ipcbuf.h | 1 - + arch/m68k/include/asm/irq_regs.h | 1 - + arch/m68k/include/asm/kdebug.h | 1 - + arch/m68k/include/asm/kmap_types.h | 6 - + arch/m68k/include/asm/kvm_para.h | 1 - + arch/m68k/include/asm/local.h | 6 - + arch/m68k/include/asm/local64.h | 1 - + arch/m68k/include/asm/mac_mouse.h | 23 --- + arch/m68k/include/asm/mcfmbus.h | 77 --------- + arch/m68k/include/asm/mman.h | 1 - + arch/m68k/include/asm/mutex.h | 9 -- + arch/m68k/include/asm/percpu.h | 6 - + arch/m68k/include/asm/resource.h | 6 - + arch/m68k/include/asm/sbus.h | 45 ------ + arch/m68k/include/asm/scatterlist.h | 6 - + arch/m68k/include/asm/sections.h | 8 - + arch/m68k/include/asm/shm.h | 31 ---- + arch/m68k/include/asm/siginfo.h | 6 - + arch/m68k/include/asm/statfs.h | 6 - + arch/m68k/include/asm/topology.h | 6 - + arch/m68k/include/asm/types.h | 22 --- + arch/m68k/include/asm/unaligned.h | 4 +- + arch/m68k/include/asm/xor.h | 1 - + arch/m68k/kernel/setup_no.c | 11 +- + arch/m68k/kernel/vmlinux-nommu.lds | 2 - + arch/m68k/kernel/vmlinux-std.lds | 2 - + arch/m68k/kernel/vmlinux-sun3.lds | 2 - + arch/m68k/lib/muldi3.c | 2 +- + arch/m68k/mm/init_mm.c | 2 +- + arch/m68k/mm/init_no.c | 2 +- + arch/m68k/platform/68328/head-de2.S | 8 +- + arch/m68k/platform/68328/head-pilot.S | 10 +- + arch/m68k/platform/68328/head-ram.S | 4 +- + arch/m68k/platform/68328/head-rom.S | 6 +- + arch/m68k/platform/68360/head-ram.S | 6 +- + arch/m68k/platform/68360/head-rom.S | 8 +- + arch/m68k/platform/coldfire/head.S | 10 +- + arch/m68k/sun3/prom/init.c | 48 +----- + arch/microblaze/include/asm/sections.h | 4 - + arch/microblaze/kernel/microblaze_ksyms.c | 3 - + arch/microblaze/kernel/setup.c | 4 +- + arch/microblaze/kernel/vmlinux.lds.S | 1 - + arch/sh/include/asm/sections.h | 1 - + arch/sh/kernel/setup.c | 2 +- + arch/sh/kernel/sh_ksyms_32.c | 1 - + arch/sh/kernel/vmlinux.lds.S | 1 - + arch/sh/lib/mcount.S | 8 +- + drivers/mtd/maps/uclinux.c | 5 +- + drivers/zorro/zorro.c | 2 - + 65 files changed, 94 insertions(+), 840 deletions(-) + delete mode 100644 arch/m68k/include/asm/MC68332.h + delete mode 100644 arch/m68k/include/asm/apollodma.h + delete mode 100644 arch/m68k/include/asm/bitsperlong.h + delete mode 100644 arch/m68k/include/asm/cputime.h + delete mode 100644 arch/m68k/include/asm/device.h + delete mode 100644 arch/m68k/include/asm/emergency-restart.h + delete mode 100644 arch/m68k/include/asm/errno.h + delete mode 100644 arch/m68k/include/asm/futex.h + delete mode 100644 arch/m68k/include/asm/ioctl.h + delete mode 100644 arch/m68k/include/asm/ipcbuf.h + delete mode 100644 arch/m68k/include/asm/irq_regs.h + delete mode 100644 arch/m68k/include/asm/kdebug.h + delete mode 100644 arch/m68k/include/asm/kmap_types.h + delete mode 100644 arch/m68k/include/asm/kvm_para.h + delete mode 100644 arch/m68k/include/asm/local.h + delete mode 100644 arch/m68k/include/asm/local64.h + delete mode 100644 arch/m68k/include/asm/mac_mouse.h + delete mode 100644 arch/m68k/include/asm/mcfmbus.h + delete mode 100644 arch/m68k/include/asm/mman.h + delete mode 100644 arch/m68k/include/asm/mutex.h + delete mode 100644 arch/m68k/include/asm/percpu.h + delete mode 100644 arch/m68k/include/asm/resource.h + delete mode 100644 arch/m68k/include/asm/sbus.h + delete mode 100644 arch/m68k/include/asm/scatterlist.h + delete mode 100644 arch/m68k/include/asm/sections.h + delete mode 100644 arch/m68k/include/asm/shm.h + delete mode 100644 arch/m68k/include/asm/siginfo.h + delete mode 100644 arch/m68k/include/asm/statfs.h + delete mode 100644 arch/m68k/include/asm/topology.h + delete mode 100644 arch/m68k/include/asm/types.h + delete mode 100644 arch/m68k/include/asm/xor.h +Merging powerpc-merge/merge (bac821a powerpc/ftrace: Trace function graph entry before updating index) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (b387e41 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge sparc/master +Already up-to-date. +Merging net/master (5a0d513 bridge: make port attributes const) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 6 -- + drivers/isdn/hardware/mISDN/avmfritz.c | 7 ++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +- + drivers/net/ethernet/broadcom/tg3.c | 71 ++++++++++++++++++++-- + drivers/net/ethernet/broadcom/tg3.h | 8 ++- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 1 + + drivers/net/ethernet/seeq/seeq8005.c | 4 +- + drivers/net/tun.c | 6 +- + include/net/dst.h | 7 +-- + include/net/inet_sock.h | 13 ++++ + include/net/netns/ipv4.h | 2 - + net/bridge/br_sysfs_if.c | 6 +- + net/core/dst.c | 26 ++++++-- + net/core/rtnetlink.c | 8 ++- + net/decnet/dn_route.c | 6 ++ + net/ipv4/fib_semantics.c | 4 +- + net/ipv4/fib_trie.c | 53 ++++++++-------- + net/ipv4/ip_input.c | 2 - + net/ipv4/route.c | 16 ++--- + net/ipv4/sysctl_net_ipv4.c | 11 ---- + net/ipv4/tcp_input.c | 3 +- + net/ipv4/tcp_ipv4.c | 12 ++-- + net/ipv4/tcp_minisocks.c | 3 +- + net/ipv6/ip6_input.c | 2 - + net/ipv6/route.c | 8 +-- + 25 files changed, 176 insertions(+), 112 deletions(-) +Merging sound-current/for-linus (e5b3542 ALSA: es1688 - freeup resources on init failure) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + Documentation/sound/alsa/HD-Audio-Models.txt | 1 + + include/sound/es1688.h | 1 + + sound/drivers/mpu401/mpu401_uart.c | 1 + + sound/isa/es1688/es1688_lib.c | 34 +++++++++++++++++--------- + sound/pci/hda/patch_hdmi.c | 14 +++++------ + sound/pci/hda/patch_realtek.c | 22 ++++++++++++++++- + sound/pci/hda/patch_sigmatel.c | 10 +++++++- + sound/pci/hda/patch_via.c | 7 ++++-- + 8 files changed, 68 insertions(+), 22 deletions(-) +Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (9dbf5f5 bcma: add missing iounmap on error path) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (84a1caf Linux 3.5-rc7) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (38bd2a1 pch_uart: Fix parity setting issue) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (84a1caf Linux 3.5-rc7) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (6887a41 Linux 3.5-rc5) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (84a1caf Linux 3.5-rc7) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (cf45b5a Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (58e94ae md/raid1: close some possible races on write errors during resync) +$ 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 (76f16f8 crypto: hifn_795x - fix 64bit division and undefined __divdi3 on 32bit archs) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/hifn_795x.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging ide/master (39a50b4 Merge branch 'hfsplus') +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) +$ git merge dwmw2/master +Already up-to-date. +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 (15e06bf irqdomain: Fix debugfs formatting) +$ git merge irqdomain-current/irqdomain/merge +Already up-to-date. +Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args) +$ git merge devicetree-current/devicetree/merge +Auto-merging drivers/of/base.c +Merge made by the 'recursive' strategy. + drivers/of/base.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.) +$ git merge spi-current/spi/merge +Auto-merging drivers/spi/spi.c +Auto-merging drivers/spi/spi-s3c64xx.c +Auto-merging drivers/spi/spi-bcm63xx.c +Merge made by the 'recursive' strategy. + drivers/spi/spi-bcm63xx.c | 16 ++++++---------- + drivers/spi/spi-s3c64xx.c | 10 ++++------ + drivers/spi/spi.c | 5 ++++- + 3 files changed, 14 insertions(+), 17 deletions(-) +Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast) +$ git merge gpio-current/gpio/merge +Already up-to-date. +Merging arm/for-next (197cd10 Merge branches 'audit', 'delay', 'dmaengine', 'fixes', 'misc' and 'sta2x11' into for-next) +$ git merge arm/for-next +Resolved 'drivers/dma/Kconfig' using previous resolution. +Resolved 'drivers/dma/Makefile' using previous resolution. +Auto-merging drivers/spi/spi-omap2-mcspi.c +Auto-merging drivers/mmc/host/omap_hsmmc.c +Auto-merging drivers/dma/Makefile +CONFLICT (content): Merge conflict in drivers/dma/Makefile +Auto-merging drivers/dma/Kconfig +CONFLICT (content): Merge conflict in drivers/dma/Kconfig +Auto-merging arch/arm/mach-omap1/board-nokia770.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging Documentation/feature-removal-schedule.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 65963f6] Merge remote-tracking branch 'arm/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 11 + + arch/arm/configs/omap2plus_defconfig | 2 + + arch/arm/kernel/entry-common.S | 24 +- + arch/arm/kernel/ptrace.c | 1 + + arch/arm/kernel/signal.c | 114 ++-- + arch/arm/kernel/signal.h | 2 - + arch/arm/kernel/traps.c | 2 - + arch/arm/mach-omap1/board-h2-mmc.c | 1 - + arch/arm/mach-omap1/board-h3-mmc.c | 1 - + arch/arm/mach-omap1/board-nokia770.c | 1 - + arch/arm/mach-omap2/board-n8x0.c | 1 - + arch/arm/mach-omap2/hsmmc.c | 1 - + arch/arm/mach-spear3xx/spear300.c | 26 - + arch/arm/mach-spear3xx/spear310.c | 26 - + arch/arm/mach-spear3xx/spear320.c | 26 - + arch/arm/mach-spear3xx/spear3xx.c | 3 +- + arch/arm/mach-spear6xx/spear6xx.c | 51 +- + arch/arm/plat-omap/include/plat/mmc.h | 2 - + arch/arm/plat-spear/include/plat/pl080.h | 6 +- + arch/arm/plat-spear/pl080.c | 10 +- + drivers/dma/Kconfig | 11 + + drivers/dma/Makefile | 2 + + drivers/dma/amba-pl08x.c | 941 ++++++++++++++-------------- + drivers/dma/omap-dma.c | 669 ++++++++++++++++++++ + drivers/dma/sa11x0-dma.c | 388 ++++++------ + drivers/dma/virt-dma.c | 123 ++++ + drivers/dma/virt-dma.h | 152 +++++ + drivers/mmc/host/omap.c | 368 +++++------ + drivers/mmc/host/omap_hsmmc.c | 204 +++--- + drivers/mtd/nand/omap2.c | 106 ++-- + drivers/spi/spi-omap2-mcspi.c | 229 ++++--- + include/linux/amba/pl08x.h | 156 +---- + include/linux/omap-dma.h | 24 + + 33 files changed, 2184 insertions(+), 1500 deletions(-) + create mode 100644 drivers/dma/omap-dma.c + create mode 100644 drivers/dma/virt-dma.c + create mode 100644 drivers/dma/virt-dma.h + create mode 100644 include/linux/omap-dma.h +Merging arm-perf/for-next/perf (dee8c1b ARM: perf: remove arm_perf_pmu_ids global enumeration) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +Already up-to-date. +Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) +$ git merge samsung/next-samsung +Already up-to-date. +Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) +$ git merge xilinx/arm-next +Already up-to-date. +Merging blackfin/for-linus (719154c bf60x: fix build warning) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (b9b8722 C6X: clean up compiler warning) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code) +$ git merge cris/for-next +Removing arch/cris/arch-v32/mach-fs/vcs_hook.h +Removing arch/cris/arch-v32/mach-fs/vcs_hook.c +Removing arch/cris/arch-v32/mach-a3/vcs_hook.h +Removing arch/cris/arch-v32/mach-a3/vcs_hook.c +Auto-merging arch/cris/arch-v32/drivers/pci/bios.c +Merge made by the 'recursive' strategy. + arch/cris/Kconfig | 5 - + arch/cris/arch-v32/drivers/axisflashmap.c | 29 ------ + arch/cris/arch-v32/drivers/pci/bios.c | 25 ----- + arch/cris/arch-v32/kernel/head.S | 58 +---------- + arch/cris/arch-v32/kernel/kgdb.c | 14 --- + arch/cris/arch-v32/mach-a3/Makefile | 2 - + arch/cris/arch-v32/mach-a3/vcs_hook.c | 103 -------------------- + arch/cris/arch-v32/mach-a3/vcs_hook.h | 58 ----------- + arch/cris/arch-v32/mach-fs/Makefile | 2 - + arch/cris/arch-v32/mach-fs/vcs_hook.c | 100 ------------------- + arch/cris/arch-v32/mach-fs/vcs_hook.h | 42 -------- + arch/cris/arch-v32/mm/init.c | 8 -- + arch/cris/include/arch-v32/arch/page.h | 5 - + arch/cris/include/arch-v32/arch/processor.h | 6 +- + .../cris/include/arch-v32/mach-fs/mach/startup.inc | 6 -- + arch/cris/include/asm/pci.h | 1 - + 16 files changed, 3 insertions(+), 461 deletions(-) + delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.c + delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.h + delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.c + delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.h +Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (a119365 [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (1525e06 m68k/apollo: Rename "timer" to "apollo_timer") +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (b1f7735 m68k: allow PCI bus to be enabled for ColdFire m54xx CPUs) +$ git merge m68knommu/for-next +Already up-to-date. +Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (68d8848 Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next/jz4740', 'next/lantiq', 'next/loongson1b' and 'next/netlogic' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (bba3d8c [PARISC] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts) +$ git merge parisc/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/atomic.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging powerpc/next (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ 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 (4d2f4e1 powerpc: Option FB_FSL_DIU is not really optional for mpc512x) +$ git merge mpc5xxx/next +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/512x/Kconfig | 1 + + arch/powerpc/platforms/512x/clock.c | 6 ++++-- + arch/powerpc/platforms/512x/mpc512x_shared.c | 6 ------ + 3 files changed, 5 insertions(+), 8 deletions(-) +Merging galak/next (ae33d08 powerpc/85xx: introduce support for the Freescale / iVeia P1022RDK) +$ git merge galak/next +Removing arch/powerpc/boot/dts/p2020rdb_camp_core1.dts +Removing arch/powerpc/boot/dts/p2020rdb_camp_core0.dts +Removing arch/powerpc/boot/dts/p1020rdb_camp_core1.dts +Removing arch/powerpc/boot/dts/p1020rdb_camp_core0.dts +Merge made by the 'recursive' strategy. + arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 320 +++++++++++++++++++++++++ + arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi | 111 +++++++++ + arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi | 118 +++++++++ + arch/powerpc/boot/dts/p1020rdb_camp_core0.dts | 63 ----- + arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | 141 ----------- + arch/powerpc/boot/dts/p1022rdk.dts | 188 +++++++++++++++ + arch/powerpc/boot/dts/p2020rdb-pc_32b.dts | 4 +- + arch/powerpc/boot/dts/p2020rdb-pc_36b.dts | 4 +- + arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 67 ------ + arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 125 ---------- + arch/powerpc/boot/dts/p3041ds.dts | 2 +- + arch/powerpc/boot/dts/p5040ds.dts | 203 ++++++++++++++++ + arch/powerpc/configs/corenet32_smp_defconfig | 1 + + arch/powerpc/configs/corenet64_smp_defconfig | 1 + + arch/powerpc/configs/mpc85xx_defconfig | 1 + + arch/powerpc/configs/mpc85xx_smp_defconfig | 1 + + arch/powerpc/platforms/85xx/Kconfig | 21 ++ + arch/powerpc/platforms/85xx/Makefile | 2 + + arch/powerpc/platforms/85xx/corenet_ds.c | 10 +- + arch/powerpc/platforms/85xx/p1022_ds.c | 122 ++++++++-- + arch/powerpc/platforms/85xx/p1022_rdk.c | 195 +++++++++++++++ + arch/powerpc/platforms/85xx/p5040_ds.c | 89 +++++++ + arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 4 +- + arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 49 ++-- + arch/powerpc/sysdev/fsl_pci.c | 1 + + 25 files changed, 1392 insertions(+), 451 deletions(-) + create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi + delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts + delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts + create mode 100644 arch/powerpc/boot/dts/p1022rdk.dts + delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts + delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts + create mode 100644 arch/powerpc/boot/dts/p5040ds.dts + create mode 100644 arch/powerpc/platforms/85xx/p1022_rdk.c + create mode 100644 arch/powerpc/platforms/85xx/p5040_ds.c +Merging s390/features (7d25617 s390: make use of user_mode() macro where possible) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/defconfig | 5 ++- + arch/s390/include/asm/mmu_context.h | 16 +++++++- + arch/s390/include/asm/processor.h | 2 + + arch/s390/include/asm/setup.h | 2 +- + arch/s390/kernel/debug.c | 70 ++++++++++++----------------------- + arch/s390/kernel/dis.c | 4 +- + arch/s390/kernel/early.c | 1 - + arch/s390/kernel/ipl.c | 12 +----- + arch/s390/kernel/setup.c | 12 +++--- + arch/s390/kernel/traps.c | 16 ++++---- + arch/s390/kernel/vdso.c | 9 +++-- + arch/s390/kernel/vmlinux.lds.S | 2 +- + arch/s390/mm/fault.c | 35 ++++++++++++------ + arch/s390/mm/mmap.c | 12 +++++- + arch/s390/mm/pgtable.c | 7 +--- + arch/s390/oprofile/backtrace.c | 2 +- + scripts/sortextable.c | 1 + + 18 files changed, 104 insertions(+), 105 deletions(-) +Merging sh/sh-latest (b9ccfda sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757) +$ git merge sh/sh-latest +Merge made by the 'recursive' strategy. + arch/sh/boards/Kconfig | 13 ++++ + arch/sh/boards/board-apsh4a3a.c | 10 +++ + arch/sh/boards/board-apsh4ad0a.c | 10 +++ + arch/sh/boards/board-magicpanelr2.c | 10 +++ + arch/sh/boards/board-polaris.c | 10 +++ + arch/sh/boards/board-sh2007.c | 12 ++++ + arch/sh/boards/board-sh7757lcr.c | 14 ++++ + arch/sh/boards/mach-ap325rxa/setup.c | 21 ++++++ + arch/sh/boards/mach-ecovec24/setup.c | 117 +++++++++++++++++++++++++++----- + arch/sh/boards/mach-kfr2r09/setup.c | 12 ++++ + arch/sh/boards/mach-migor/setup.c | 13 ++++ + arch/sh/boards/mach-rsk/setup.c | 10 +++ + arch/sh/boards/mach-sdk7786/setup.c | 10 +++ + arch/sh/boards/mach-se/7724/setup.c | 15 ++++ + arch/sh/include/cpu-sh4/cpu/sh7757.h | 2 + + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 14 ++++ + arch/sh/mm/fault.c | 8 ++- + drivers/sh/pfc/pinctrl.c | 2 - + 18 files changed, 282 insertions(+), 21 deletions(-) +Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler) +$ git merge unicore32/unicore32 +Auto-merging arch/unicore32/Kconfig +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 3 +++ + arch/unicore32/include/asm/bug.h | 5 ----- + arch/unicore32/include/asm/cmpxchg.h | 2 +- + arch/unicore32/kernel/setup.h | 6 ++++++ + arch/unicore32/mm/fault.c | 37 +++++++++++++++++++++++++--------- + 5 files changed, 37 insertions(+), 16 deletions(-) +Merging ceph/master (a80f7c1 rbd: drop "object_name" from rbd_req_sync_unwatch()) +$ git merge ceph/master +Recorded preimage for 'drivers/block/rbd.c' +Recorded preimage for 'net/ceph/messenger.c' +Resolved 'net/ceph/osd_client.c' using previous resolution. +Auto-merging net/ceph/osd_client.c +CONFLICT (content): Merge conflict in net/ceph/osd_client.c +Auto-merging net/ceph/mon_client.c +Auto-merging net/ceph/messenger.c +CONFLICT (content): Merge conflict in net/ceph/messenger.c +Auto-merging net/ceph/ceph_common.c +Auto-merging include/linux/ceph/messenger.h +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/super.c +Auto-merging fs/ceph/dir.c +Auto-merging drivers/block/rbd.c +CONFLICT (content): Merge conflict in drivers/block/rbd.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/block/rbd.c'. +Recorded resolution for 'net/ceph/messenger.c'. +[master 0a78910] Merge remote-tracking branch 'ceph/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-rbd | 10 +- + drivers/block/rbd.c | 616 ++++++++++++++----------- + drivers/block/rbd_types.h | 1 - + fs/ceph/dir.c | 7 +- + fs/ceph/mds_client.c | 23 +- + fs/ceph/snap.c | 18 +- + fs/ceph/super.c | 1 + + fs/ceph/super.h | 4 +- + fs/ceph/xattr.c | 1 + + include/linux/ceph/ceph_features.h | 26 ++ + include/linux/ceph/ceph_fs.h | 14 - + include/linux/ceph/decode.h | 49 +- + include/linux/ceph/libceph.h | 10 +- + include/linux/ceph/messenger.h | 60 ++- + include/linux/ceph/mon_client.h | 2 +- + include/linux/ceph/msgpool.h | 3 +- + include/linux/crush/crush.h | 8 + + net/ceph/ceph_common.c | 25 +- + net/ceph/crush/mapper.c | 13 +- + net/ceph/messenger.c | 747 +++++++++++++++++++------------ + net/ceph/mon_client.c | 72 +-- + net/ceph/msgpool.c | 7 +- + net/ceph/osd_client.c | 73 +-- + net/ceph/osdmap.c | 59 ++- + 24 files changed, 1137 insertions(+), 712 deletions(-) + create mode 100644 include/linux/ceph/ceph_features.h +Merging cifs/for-next (1a500f0 CIFS: Add SMB2 support for rmdir) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 10 ++ + fs/cifs/cifsproto.h | 11 +- + fs/cifs/cifssmb.c | 31 +++--- + fs/cifs/inode.c | 302 ++++++++++++++++++++++++++++----------------------- + fs/cifs/smb1ops.c | 24 ++++ + fs/cifs/smb2inode.c | 39 +++++++ + fs/cifs/smb2ops.c | 3 + + fs/cifs/smb2proto.h | 8 ++ + 8 files changed, 270 insertions(+), 158 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 (5f5b331 eCryptfs: check for eCryptfs cipher support at mount) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/ecryptfs_kernel.h | 24 +++----- + fs/ecryptfs/file.c | 90 ++++++++++++--------------- + fs/ecryptfs/inode.c | 65 ++++++++++---------- + fs/ecryptfs/main.c | 22 +++++++ + fs/ecryptfs/messaging.c | 136 +++++------------------------------------ + fs/ecryptfs/miscdev.c | 98 ++++++++--------------------- + fs/ecryptfs/mmap.c | 39 ++++-------- + 7 files changed, 158 insertions(+), 316 deletions(-) +Merging ext3/for_next (0143fc5 udf: avoid info leak on export) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (03179fe ext4: undo ext4_calc_metadata_amount if we fail to claim space) +$ git merge ext4/dev +Already up-to-date. +Merging fuse/for-next (f3840dc fuse: add missing INIT flag descriptions) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/file.c | 13 ++++++++----- + fs/fuse/fuse_i.h | 3 +++ + fs/fuse/inode.c | 32 ++++++++++++++++++++++++++++---- + include/linux/fuse.h | 19 ++++++++++++++++++- + 4 files changed, 57 insertions(+), 10 deletions(-) +Merging gfs2/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge gfs2/master +Already up-to-date. +Merging logfs/master (9f0bbd8 logfs: query block device for number of pages to send with bio) +$ git merge logfs/master +Auto-merging fs/logfs/readwrite.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_bdev.c | 15 +++++++-------- + fs/logfs/inode.c | 18 +++++++++++++++++- + fs/logfs/journal.c | 2 +- + fs/logfs/readwrite.c | 1 - + fs/logfs/segment.c | 2 +- + 5 files changed, 26 insertions(+), 12 deletions(-) +Merging nfs/linux-next (d72a95f Merge branch 'nfs-for-3.6' into linux-next) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/xdr.c +Auto-merging net/sunrpc/clnt.c +Merge made by the 'recursive' strategy. + fs/nfs/Kconfig | 15 +- + fs/nfs/Makefile | 24 +- + fs/nfs/blocklayout/blocklayout.c | 39 +- + fs/nfs/callback.c | 24 - + fs/nfs/callback.h | 2 +- + fs/nfs/client.c | 874 +++++---------------------------- + fs/nfs/delegation.c | 7 +- + fs/nfs/delegation.h | 21 +- + fs/nfs/dir.c | 127 ++--- + fs/nfs/direct.c | 8 +- + fs/nfs/dns_resolve.c | 4 + + fs/nfs/file.c | 201 ++------ + fs/nfs/getroot.c | 50 -- + fs/nfs/idmap.c | 29 +- + fs/nfs/inode.c | 106 ++-- + fs/nfs/internal.h | 119 ++++- + fs/nfs/namespace.c | 17 +- + fs/nfs/netns.h | 2 +- + fs/nfs/nfs.h | 29 ++ + fs/nfs/nfs2super.c | 31 ++ + fs/nfs/nfs2xdr.c | 28 +- + fs/nfs/nfs3client.c | 65 +++ + fs/nfs/nfs3proc.c | 49 ++ + fs/nfs/nfs3super.c | 31 ++ + fs/nfs/nfs3xdr.c | 43 +- + fs/nfs/nfs4_fs.h | 34 +- + fs/nfs/nfs4client.c | 656 +++++++++++++++++++++++++ + fs/nfs/nfs4file.c | 126 +++++ + fs/nfs/nfs4filelayout.c | 10 +- + fs/nfs/nfs4filelayoutdev.c | 2 +- + fs/nfs/nfs4getroot.c | 49 ++ + fs/nfs/nfs4proc.c | 312 ++++++++---- + fs/nfs/nfs4state.c | 114 +++-- + fs/nfs/nfs4super.c | 372 ++++++++++++++ + fs/nfs/nfs4sysctl.c | 68 +++ + fs/nfs/nfs4xdr.c | 90 ++-- + fs/nfs/pagelist.c | 4 + + fs/nfs/pnfs.c | 57 ++- + fs/nfs/pnfs.h | 31 +- + fs/nfs/proc.c | 41 ++ + fs/nfs/read.c | 21 +- + fs/nfs/super.c | 594 ++++++---------------- + fs/nfs/sysctl.c | 26 - + fs/nfs/unlink.c | 2 +- + fs/nfs/write.c | 55 +-- + include/linux/nfs_fs.h | 14 +- + include/linux/nfs_fs_sb.h | 10 +- + include/linux/nfs_idmap.h | 2 +- + include/linux/nfs_page.h | 2 +- + include/linux/nfs_xdr.h | 25 +- + include/linux/sunrpc/auth.h | 2 + + include/linux/sunrpc/gss_api.h | 3 +- + include/linux/sunrpc/xdr.h | 6 +- + net/sunrpc/auth.c | 54 ++ + net/sunrpc/auth_gss/auth_gss.c | 1 + + net/sunrpc/auth_gss/gss_mech_switch.c | 20 +- + net/sunrpc/clnt.c | 3 +- + net/sunrpc/rpcb_clnt.c | 4 +- + net/sunrpc/sched.c | 7 +- + net/sunrpc/xdr.c | 127 ++--- + net/sunrpc/xprtrdma/transport.c | 3 +- + net/sunrpc/xprtsock.c | 10 + + 62 files changed, 2803 insertions(+), 2099 deletions(-) + create mode 100644 fs/nfs/nfs.h + create mode 100644 fs/nfs/nfs2super.c + create mode 100644 fs/nfs/nfs3client.c + create mode 100644 fs/nfs/nfs3super.c + create mode 100644 fs/nfs/nfs4client.c + create mode 100644 fs/nfs/nfs4file.c + create mode 100644 fs/nfs/nfs4getroot.c + create mode 100644 fs/nfs/nfs4super.c + create mode 100644 fs/nfs/nfs4sysctl.c +Merging nfsd/nfsd-next (2c142ba NFSd: make boot_time variable per network namespace) +$ git merge nfsd/nfsd-next +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/lockd/grace.c | 16 ++-- + fs/lockd/host.c | 92 ++++++++++++------- + fs/lockd/netns.h | 7 ++ + fs/lockd/svc.c | 43 +++++---- + fs/lockd/svc4proc.c | 13 +-- + fs/lockd/svclock.c | 16 ++-- + fs/lockd/svcproc.c | 15 ++-- + fs/lockd/svcsubs.c | 19 ++-- + fs/locks.c | 28 +++--- + fs/nfs/callback_xdr.c | 4 +- + fs/nfsd/export.c | 10 +-- + fs/nfsd/netns.h | 4 + + fs/nfsd/nfs4callback.c | 1 - + fs/nfsd/nfs4idmap.c | 4 +- + fs/nfsd/nfs4proc.c | 18 ++-- + fs/nfsd/nfs4state.c | 201 +++++++++++++++++++++++++----------------- + fs/nfsd/nfs4xdr.c | 2 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nfsd/nfsd.h | 13 +++ + fs/nfsd/nfssvc.c | 24 ++--- + fs/nfsd/state.h | 5 +- + fs/nfsd/vfs.c | 10 ++- + include/linux/fs.h | 5 +- + include/linux/lockd/lockd.h | 6 +- + include/linux/sunrpc/cache.h | 34 +++++-- + include/linux/sunrpc/svc.h | 2 + + net/sunrpc/cache.c | 5 +- + 27 files changed, 368 insertions(+), 237 deletions(-) +Merging ocfs2/linux-next (2dfd060 aio: make kiocb->private NUll in init_sync_kiocb()) +$ git merge ocfs2/linux-next +Already up-to-date. +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 (5fcb08b 9p: BUG before corrupting memory) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (7074e5e UBIFS: remove invalid reference to list iterator variable) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (9a57fa8 xfs: wait for the write the superblock on unmount) +$ git merge xfs/for-next +Already up-to-date. +Merging vfs/for-next (f8310c5 fix O_EXCL handling for devices) +$ git merge vfs/for-next +Resolved 'drivers/staging/gdm72xx/usb_boot.c' using previous resolution. +Resolved 'drivers/usb/gadget/storage_common.c' using previous resolution. +Auto-merging net/unix/af_unix.c +Auto-merging kernel/audit.c +Auto-merging include/linux/pipe_fs_i.h +Auto-merging include/linux/fs.h +Auto-merging fs/pipe.c +Auto-merging fs/lockd/svcproc.c +Auto-merging fs/lockd/svclock.c +Auto-merging fs/lockd/svc4proc.c +Auto-merging fs/exec.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging drivers/usb/gadget/storage_common.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/storage_common.c +Auto-merging drivers/staging/gdm72xx/usb_boot.c +CONFLICT (content): Merge conflict in drivers/staging/gdm72xx/usb_boot.c +Auto-merging drivers/staging/gdm72xx/sdio_boot.c +Auto-merging drivers/staging/bcm/Misc.c +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 815f2d4] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/sysctl/fs.txt | 42 ++++ + arch/powerpc/platforms/cell/spufs/inode.c | 77 +++---- + arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +- + drivers/base/devtmpfs.c | 9 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 2 +- + drivers/staging/bcm/Misc.c | 31 +-- + drivers/staging/gdm72xx/sdio_boot.c | 7 +- + drivers/staging/gdm72xx/usb_boot.c | 22 +- + drivers/usb/gadget/storage_common.c | 12 +- + drivers/usb/gadget/u_uac1.c | 6 +- + fs/ecryptfs/inode.c | 30 +-- + fs/exec.c | 19 +- + fs/file_table.c | 2 +- + fs/lockd/clntproc.c | 14 +- + fs/lockd/svc4proc.c | 1 + + fs/lockd/svclock.c | 1 - + fs/lockd/svcproc.c | 1 + + fs/namei.c | 220 ++++++++++++++------ + fs/ocfs2/refcounttree.c | 11 +- + fs/open.c | 6 +- + fs/pipe.c | 75 +++---- + include/linux/audit.h | 4 + + include/linux/fs.h | 5 +- + include/linux/namei.h | 1 + + include/linux/pipe_fs_i.h | 2 + + kernel/audit.c | 21 ++ + kernel/sysctl.c | 18 ++ + net/unix/af_unix.c | 93 ++++----- + sound/sound_firmware.c | 8 +- + 29 files changed, 407 insertions(+), 335 deletions(-) +Merging pci/next (63b96f7 Merge branch 'pci/yinghai-pciehp-unused' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (e8ff13b Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge quilt/i2c +Already up-to-date. +Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap) +$ git merge bjdooks-i2c/next-i2c +Recorded preimage for 'drivers/i2c/busses/i2c-omap.c' +Auto-merging drivers/i2c/busses/i2c-omap.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 815f2d4 Merge remote-tracking branch 'vfs/for-next' +Merging i2c-embedded/i2c-embedded/for-next (5db20c4 Revert "i2c: tegra: convert normal suspend/resume to *_noirq") +$ git merge i2c-embedded/i2c-embedded/for-next +Already up-to-date. +Merging quilt/jdelvare-hwmon (b2c6146 hwmon: struct x86_cpu_id arrays can be __initconst) +$ git merge quilt/jdelvare-hwmon +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (829917c hwmon: (applesmc) Decode and act on read/write status codes) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (331fe70 Merge /home/v4l/v4l/patchwork) +$ git merge v4l-dvb/master +Recorded preimage for 'Documentation/feature-removal-schedule.txt' +Auto-merging include/linux/i2c.h +Auto-merging include/linux/Kbuild +Auto-merging drivers/media/video/v4l2-dev.c +Removing drivers/media/video/saa7146reg.h +Removing drivers/media/video/saa7146.h +Removing drivers/media/video/saa7121.h +Removing drivers/media/video/ibmmpeg2.h +Auto-merging drivers/media/video/cx25821/cx25821.h +Removing drivers/media/video/cs8420.h +Auto-merging drivers/i2c/i2c-core.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Auto-merging MAINTAINERS +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/feature-removal-schedule.txt'. +[master a447bc3] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/media/v4l/biblio.xml | 2 +- + Documentation/DocBook/media/v4l/common.xml | 17 +- + Documentation/DocBook/media/v4l/compat.xml | 42 +- + Documentation/DocBook/media/v4l/controls.xml | 5 + + Documentation/DocBook/media/v4l/dev-subdev.xml | 36 +- + Documentation/DocBook/media/v4l/io.xml | 19 +- + Documentation/DocBook/media/v4l/selection-api.xml | 34 +- + .../DocBook/media/v4l/selections-common.xml | 164 + + Documentation/DocBook/media/v4l/v4l2.xml | 11 + + .../DocBook/media/v4l/vidioc-create-bufs.xml | 12 +- + .../DocBook/media/v4l/vidioc-dv-timings-cap.xml | 14 +- + .../DocBook/media/v4l/vidioc-enum-freq-bands.xml | 179 + + .../DocBook/media/v4l/vidioc-g-frequency.xml | 13 +- + .../DocBook/media/v4l/vidioc-g-selection.xml | 86 +- + Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 38 +- + Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 9 +- + .../DocBook/media/v4l/vidioc-querycap.xml | 13 + + .../DocBook/media/v4l/vidioc-s-hw-freq-seek.xml | 68 +- + .../media/v4l/vidioc-subdev-g-selection.xml | 79 +- + Documentation/dvb/get_dvb_firmware | 42 +- + Documentation/feature-removal-schedule.txt | 30 + + Documentation/video4linux/CARDLIST.au0828 | 2 +- + Documentation/video4linux/CARDLIST.bttv | 1 + + Documentation/video4linux/CARDLIST.cx23885 | 4 +- + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/v4l2-framework.txt | 73 +- + MAINTAINERS | 3 +- + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/i2c/i2c-core.c | 44 +- + drivers/media/Kconfig | 114 +- + drivers/media/common/tuners/Kconfig | 64 +- + drivers/media/common/tuners/tuner-xc2028.c | 249 +- + drivers/media/common/tuners/xc5000.c | 14 +- + drivers/media/dvb/ddbridge/ddbridge-core.c | 1 + + drivers/media/dvb/dvb-core/dvb_frontend.h | 1 + + drivers/media/dvb/dvb-usb/Kconfig | 3 + + drivers/media/dvb/dvb-usb/az6007.c | 6 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 + + drivers/media/dvb/dvb-usb/rtl28xxu.c | 516 ++- + drivers/media/dvb/frontends/Kconfig | 8 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/a8293.c | 37 +- + drivers/media/dvb/frontends/dib8000.c | 4 +- + drivers/media/dvb/frontends/drxk.h | 11 +- + drivers/media/dvb/frontends/drxk_hard.c | 350 +- + drivers/media/dvb/frontends/drxk_hard.h | 17 +- + drivers/media/dvb/frontends/lgs8gxx.c | 5 +- + drivers/media/dvb/frontends/rtl2832.c | 789 +++++ + drivers/media/dvb/frontends/rtl2832.h | 74 + + drivers/media/dvb/frontends/rtl2832_priv.h | 260 ++ + drivers/media/dvb/frontends/s5h1420.c | 20 - + drivers/media/dvb/frontends/stb0899_drv.c | 22 +- + drivers/media/dvb/frontends/stv0367.c | 5 +- + drivers/media/dvb/frontends/stv090x.c | 4 +- + drivers/media/dvb/frontends/tda10071.c | 351 +- + drivers/media/dvb/frontends/tda10071_priv.h | 15 +- + drivers/media/dvb/ngene/ngene-cards.c | 1 + + drivers/media/dvb/siano/smscoreapi.c | 39 +- + drivers/media/radio/Kconfig | 34 + + drivers/media/radio/Makefile | 4 + + drivers/media/radio/lm7000.h | 43 + + drivers/media/radio/radio-aimslab.c | 66 +- + drivers/media/radio/radio-cadet.c | 388 +-- + drivers/media/radio/radio-mr800.c | 5 +- + drivers/media/radio/radio-sf16fmi.c | 61 +- + drivers/media/radio/radio-shark.c | 376 +++ + drivers/media/radio/radio-shark2.c | 348 ++ + drivers/media/radio/radio-tea5777.c | 489 +++ + drivers/media/radio/radio-tea5777.h | 87 + + drivers/media/radio/radio-wl1273.c | 3 +- + drivers/media/radio/si470x/radio-si470x-common.c | 289 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 6 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 47 +- + drivers/media/radio/si470x/radio-si470x.h | 7 +- + drivers/media/radio/wl128x/fmdrv_rx.c | 2 +- + drivers/media/radio/wl128x/fmdrv_v4l2.c | 4 +- + drivers/media/rc/Kconfig | 60 +- + drivers/media/rc/Makefile | 1 + + drivers/media/rc/ati_remote.c | 133 +- + drivers/media/rc/ene_ir.c | 3 +- + drivers/media/rc/fintek-cir.c | 32 +- + drivers/media/rc/gpio-ir-recv.c | 26 +- + drivers/media/rc/iguanair.c | 639 ++++ + drivers/media/rc/ir-raw.c | 4 +- + drivers/media/rc/mceusb.c | 20 +- + drivers/media/rc/nuvoton-cir.c | 145 +- + drivers/media/rc/rc-main.c | 5 +- + drivers/media/video/Kconfig | 85 +- + drivers/media/video/Makefile | 1 + + drivers/media/video/adv7180.c | 235 +- + drivers/media/video/adv7393.c | 487 +++ + drivers/media/video/adv7393_regs.h | 188 ++ + drivers/media/video/bt8xx/bttv-cards.c | 11 +- + drivers/media/video/bt8xx/bttv-driver.c | 6 - + drivers/media/video/bt8xx/bttv.h | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 2 +- + drivers/media/video/cs8420.h | 50 - + drivers/media/video/cx18/cx18-ioctl.c | 18 - + drivers/media/video/cx18/cx18-ioctl.h | 2 - + drivers/media/video/cx18/cx18-streams.c | 4 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 56 +- + drivers/media/video/cx231xx/cx231xx-cards.c | 17 +- + drivers/media/video/cx231xx/cx231xx-i2c.c | 8 +- + drivers/media/video/cx231xx/cx231xx.h | 2 - + drivers/media/video/cx23885/cx23885-i2c.c | 10 +- + drivers/media/video/cx23885/cx23885.h | 2 - + drivers/media/video/cx25821/cx25821-i2c.c | 10 +- + drivers/media/video/cx25821/cx25821-medusa-video.c | 2 +- + drivers/media/video/cx25821/cx25821.h | 2 - + drivers/media/video/cx88/cx88-alsa.c | 31 +- + drivers/media/video/cx88/cx88-blackbird.c | 234 +- + drivers/media/video/cx88/cx88-cards.c | 20 + + drivers/media/video/cx88/cx88-core.c | 7 +- + drivers/media/video/cx88/cx88-video.c | 901 +++-- + drivers/media/video/cx88/cx88.h | 68 +- + drivers/media/video/davinci/Kconfig | 30 +- + drivers/media/video/davinci/Makefile | 8 +- + drivers/media/video/davinci/vpbe_display.c | 4 +- + drivers/media/video/davinci/vpif.c | 45 +- + drivers/media/video/davinci/vpif.h | 45 + + drivers/media/video/davinci/vpif_capture.c | 694 ++-- + drivers/media/video/davinci/vpif_capture.h | 16 +- + drivers/media/video/davinci/vpif_display.c | 684 ++-- + drivers/media/video/davinci/vpif_display.h | 23 +- + drivers/media/video/em28xx/em28xx-audio.c | 27 +- + drivers/media/video/em28xx/em28xx-cards.c | 7 +- + drivers/media/video/em28xx/em28xx-core.c | 33 +- + drivers/media/video/em28xx/em28xx-dvb.c | 95 +- + drivers/media/video/em28xx/em28xx-i2c.c | 1 + + drivers/media/video/em28xx/em28xx-input.c | 2 +- + drivers/media/video/em28xx/em28xx-reg.h | 51 +- + drivers/media/video/gspca/benq.c | 7 +- + drivers/media/video/gspca/conex.c | 208 +- + drivers/media/video/gspca/cpia1.c | 486 +-- + drivers/media/video/gspca/etoms.c | 221 +- + drivers/media/video/gspca/finepix.c | 1 + + drivers/media/video/gspca/gl860/gl860.c | 1 + + drivers/media/video/gspca/gspca.c | 50 +- + drivers/media/video/gspca/jeilinj.c | 219 +- + drivers/media/video/gspca/jl2005bcd.c | 3 +- + drivers/media/video/gspca/kinect.c | 10 +- + drivers/media/video/gspca/konica.c | 289 +- + drivers/media/video/gspca/m5602/m5602_core.c | 1 + + drivers/media/video/gspca/mars.c | 48 +- + drivers/media/video/gspca/mr97310a.c | 439 +-- + drivers/media/video/gspca/nw80x.c | 203 +- + drivers/media/video/gspca/ov519.c | 600 ++-- + drivers/media/video/gspca/ov534.c | 570 ++-- + drivers/media/video/gspca/ov534_9.c | 294 +- + drivers/media/video/gspca/pac207.c | 1 + + drivers/media/video/gspca/pac7302.c | 372 +- + drivers/media/video/gspca/pac7311.c | 1 + + drivers/media/video/gspca/se401.c | 184 +- + drivers/media/video/gspca/sn9c2028.c | 7 +- + drivers/media/video/gspca/sonixb.c | 622 ++-- + drivers/media/video/gspca/sonixj.c | 1 + + drivers/media/video/gspca/spca1528.c | 271 +- + drivers/media/video/gspca/spca500.c | 201 +- + drivers/media/video/gspca/spca501.c | 257 +- + drivers/media/video/gspca/spca505.c | 77 +- + drivers/media/video/gspca/spca506.c | 209 +- + drivers/media/video/gspca/spca508.c | 71 +- + drivers/media/video/gspca/spca561.c | 393 +-- + drivers/media/video/gspca/sq905.c | 1 + + drivers/media/video/gspca/sq905c.c | 1 + + drivers/media/video/gspca/sq930x.c | 110 +- + drivers/media/video/gspca/stk014.c | 188 +- + drivers/media/video/gspca/stv0680.c | 7 +- + drivers/media/video/gspca/sunplus.c | 237 +- + drivers/media/video/gspca/t613.c | 824 ++--- + drivers/media/video/gspca/topro.c | 459 ++- + drivers/media/video/gspca/tv8532.c | 125 +- + drivers/media/video/gspca/vc032x.c | 694 +--- + drivers/media/video/gspca/vicam.c | 68 +- + drivers/media/video/gspca/w996Xcf.c | 15 +- + drivers/media/video/gspca/xirlink_cit.c | 473 +-- + drivers/media/video/ibmmpeg2.h | 94 - + drivers/media/video/ivtv/ivtv-ioctl.c | 12 - + drivers/media/video/ivtv/ivtv-ioctl.h | 1 - + drivers/media/video/ivtv/ivtv-streams.c | 4 +- + drivers/media/video/m5mols/Kconfig | 1 + + drivers/media/video/m5mols/m5mols_controls.c | 4 +- + drivers/media/video/mem2mem_testdev.c | 332 +- + drivers/media/video/mt9m001.c | 2 +- + drivers/media/video/mt9m032.c | 13 +- + drivers/media/video/mt9m111.c | 1 - + drivers/media/video/mt9p031.c | 5 +- + drivers/media/video/mt9t001.c | 13 +- + drivers/media/video/mt9v022.c | 2 +- + drivers/media/video/mx2_emmaprp.c | 10 +- + drivers/media/video/omap3isp/ispccdc.c | 8 +- + drivers/media/video/omap3isp/isppreview.c | 8 +- + drivers/media/video/omap3isp/ispresizer.c | 6 +- + drivers/media/video/ov2640.c | 6 +- + drivers/media/video/ov772x.c | 8 +- + drivers/media/video/ov9640.c | 1 + + drivers/media/video/pms.c | 1 - + drivers/media/video/pvrusb2/Kconfig | 1 - + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 12 +- + drivers/media/video/pwc/pwc-if.c | 171 +- + drivers/media/video/pwc/pwc-v4l.c | 165 +- + drivers/media/video/pwc/pwc.h | 3 - + drivers/media/video/s2255drv.c | 1 + + drivers/media/video/s5p-fimc/fimc-capture.c | 112 +- + drivers/media/video/s5p-fimc/fimc-core.c | 2 +- + drivers/media/video/s5p-fimc/fimc-core.h | 3 - + drivers/media/video/s5p-fimc/fimc-lite-reg.c | 2 +- + drivers/media/video/s5p-fimc/fimc-lite.c | 15 +- + drivers/media/video/s5p-fimc/fimc-m2m.c | 52 +- + drivers/media/video/s5p-fimc/fimc-mdevice.c | 7 +- + drivers/media/video/s5p-fimc/fimc-reg.c | 20 +- + drivers/media/video/s5p-g2d/g2d.c | 9 +- + drivers/media/video/s5p-jpeg/jpeg-core.c | 38 +- + drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 10 +- + drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 11 +- + drivers/media/video/s5p-tv/mixer_video.c | 8 +- + drivers/media/video/s5p-tv/sii9234_drv.c | 12 +- + drivers/media/video/saa7121.h | 132 - + drivers/media/video/saa7134/saa7134-dvb.c | 82 +- + drivers/media/video/saa7146.h | 112 - + drivers/media/video/saa7146reg.h | 283 -- + drivers/media/video/saa7164/saa7164-api.c | 14 - + drivers/media/video/saa7164/saa7164-i2c.c | 20 +- + drivers/media/video/saa7164/saa7164.h | 2 - + drivers/media/video/smiapp/Kconfig | 1 + + drivers/media/video/smiapp/smiapp-core.c | 41 +- + drivers/media/video/sn9c102/sn9c102.h | 2 +- + drivers/media/video/soc_camera.c | 9 +- + drivers/media/video/tlg2300/pd-main.c | 4 +- + drivers/media/video/tuner-core.c | 15 +- + drivers/media/video/tvaudio.c | 291 +- + drivers/media/video/tvp5150.c | 97 +- + drivers/media/video/tw9910.c | 8 +- + drivers/media/video/uvc/Kconfig | 1 + + drivers/media/video/uvc/uvc_v4l2.c | 2 +- + drivers/media/video/uvc/uvc_video.c | 8 +- + drivers/media/video/v4l2-compat-ioctl32.c | 10 +- + drivers/media/video/v4l2-ctrls.c | 3 +- + drivers/media/video/v4l2-dev.c | 70 +- + drivers/media/video/v4l2-ioctl.c | 3535 ++++++++++---------- + drivers/media/video/v4l2-mem2mem.c | 18 +- + drivers/media/video/v4l2-subdev.c | 4 +- + drivers/media/video/via-camera.c | 2 +- + drivers/media/video/videobuf-core.c | 16 - + drivers/media/video/videobuf-dma-contig.c | 57 +- + drivers/media/video/videobuf2-core.c | 417 ++- + drivers/media/video/vivi.c | 220 +- + drivers/media/video/zr364xx.c | 484 ++- + drivers/staging/media/dt3155v4l/dt3155v4l.c | 15 +- + drivers/staging/media/easycap/easycap_main.c | 1 + + drivers/staging/media/lirc/lirc_bt829.c | 2 +- + drivers/staging/media/lirc/lirc_sir.c | 60 +- + drivers/staging/media/solo6x10/TODO | 2 +- + drivers/staging/media/solo6x10/core.c | 13 +- + drivers/staging/media/solo6x10/i2c.c | 2 +- + include/linux/Kbuild | 1 + + include/linux/i2c.h | 3 + + include/linux/uvcvideo.h | 3 +- + include/linux/v4l2-common.h | 71 + + include/linux/v4l2-subdev.h | 20 +- + include/linux/videodev2.h | 79 +- + include/media/adv7393.h | 28 + + include/media/davinci/vpif_types.h | 2 + + include/media/gpio-ir-recv.h | 6 +- + include/media/mt9t001.h | 1 + + include/media/v4l2-chip-ident.h | 3 + + include/media/v4l2-dev.h | 3 + + include/media/v4l2-ioctl.h | 27 +- + include/media/videobuf-core.h | 2 - + include/media/videobuf2-core.h | 54 + + include/media/videobuf2-dma-contig.h | 6 +- + include/sound/tea575x-tuner.h | 5 + + sound/i2c/other/tea575x-tuner.c | 45 +- + 274 files changed, 15065 insertions(+), 13634 deletions(-) + create mode 100644 Documentation/DocBook/media/v4l/selections-common.xml + create mode 100644 Documentation/DocBook/media/v4l/vidioc-enum-freq-bands.xml + create mode 100644 drivers/media/dvb/frontends/rtl2832.c + create mode 100644 drivers/media/dvb/frontends/rtl2832.h + create mode 100644 drivers/media/dvb/frontends/rtl2832_priv.h + create mode 100644 drivers/media/radio/lm7000.h + create mode 100644 drivers/media/radio/radio-shark.c + create mode 100644 drivers/media/radio/radio-shark2.c + create mode 100644 drivers/media/radio/radio-tea5777.c + create mode 100644 drivers/media/radio/radio-tea5777.h + create mode 100644 drivers/media/rc/iguanair.c + create mode 100644 drivers/media/video/adv7393.c + create mode 100644 drivers/media/video/adv7393_regs.h + delete mode 100644 drivers/media/video/cs8420.h + delete mode 100644 drivers/media/video/ibmmpeg2.h + delete mode 100644 drivers/media/video/saa7121.h + delete mode 100644 drivers/media/video/saa7146.h + delete mode 100644 drivers/media/video/saa7146reg.h + create mode 100644 include/linux/v4l2-common.h + create mode 100644 include/media/adv7393.h +Merging kbuild/for-next (85b170e Merge branches 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (4503379 localmodconfig: Add debug environment variable LOCALMODCONFIG_DEBUG) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/NEXT (354b2ea libata-acpi: fix up for acpi_pm_device_sleep_state API) +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next (1da9b6b Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next) +$ git merge infiniband/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma.c | 5 +- + drivers/infiniband/core/ucma.c | 19 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- + drivers/infiniband/hw/qib/qib.h | 10 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 56 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 16 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 646 ++++++++++++++++++------ + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 57 +-- + 8 files changed, 555 insertions(+), 258 deletions(-) +Merging acpi/next (ec033d0 Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupled', 'cpuidle-tweaks', 'intel_idle-ivb', 'ost', 'red-hat-bz-772730', 'thermal', 'thermal-spear' and 'turbostat-v2' into release) +$ git merge acpi/next +Already up-to-date. +Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules) +$ git merge cpuidle/cpuidle-next +Resolved 'drivers/cpuidle/coupled.c' using previous resolution. +Auto-merging drivers/cpuidle/coupled.c +CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6935a70] Merge remote-tracking branch 'cpuidle/cpuidle-next' +$ git diff -M --stat --summary HEAD^.. +Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs attribute) +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (87e773c UBI: harmonize the update of ubi->beb_rsvd_pebs) +$ git merge ubi/linux-next +Already up-to-date. +Merging dlm/next (c572b7f dlm: fix deadlock between dlm_send and dlm_controld) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 79 ++++----------------- + fs/dlm/config.h | 2 - + fs/dlm/lowcomms.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++------- + fs/dlm/lowcomms.h | 2 + + fs/dlm/main.c | 2 + + 5 files changed, 200 insertions(+), 90 deletions(-) +Merging scsi/for-next (641aa03 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Resolved 'drivers/ata/libata-core.c' using previous resolution. +Auto-merging include/linux/libata.h +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ata/libata-core.c +CONFLICT (content): Merge conflict in drivers/ata/libata-core.c +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9141c2f] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 3 + + Documentation/scsi/ChangeLog.megaraid_sas | 10 ++ + drivers/ata/libata-core.c | 69 +++++++++---- + drivers/ata/libata-eh.c | 2 + + drivers/scsi/ipr.c | 149 +++++++++++++++++++-------- + drivers/scsi/ipr.h | 5 +- + drivers/scsi/isci/host.c | 4 +- + drivers/scsi/isci/host.h | 2 +- + drivers/scsi/isci/init.c | 59 ++++++++++- + drivers/scsi/isci/phy.c | 4 +- + drivers/scsi/isci/probe_roms.c | 1 - + drivers/scsi/isci/remote_node_context.h | 2 +- + drivers/scsi/libsas/sas_ata.c | 91 +++++++++++++++- + drivers/scsi/libsas/sas_discover.c | 69 +++++++++++-- + drivers/scsi/libsas/sas_dump.c | 1 + + drivers/scsi/libsas/sas_event.c | 4 +- + drivers/scsi/libsas/sas_init.c | 90 +++++++++++++++- + drivers/scsi/libsas/sas_internal.h | 1 + + drivers/scsi/libsas/sas_phy.c | 21 ++++ + drivers/scsi/libsas/sas_port.c | 52 +++++++++- + drivers/scsi/megaraid/megaraid_sas.h | 8 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 42 ++++++-- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 5 +- + drivers/scsi/mpt2sas/Kconfig | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2.h | 14 ++- + drivers/scsi/mpt2sas/mpi/mpi2_init.h | 9 +- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 8 +- + drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 7 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 19 ++-- + drivers/scsi/mpt2sas/mpt2sas_base.h | 14 +-- + drivers/scsi/mpt2sas/mpt2sas_config.c | 38 ++++++- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 72 ++++++++++++- + drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 30 +++++- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 2 +- + drivers/scsi/scsi_lib.c | 5 +- + include/linux/libata.h | 15 ++- + include/scsi/libsas.h | 20 +++- + include/scsi/sas_ata.h | 10 ++ + 40 files changed, 819 insertions(+), 144 deletions(-) +Merging target-updates/for-next (bf6932f iscsi-target: Drop bogus struct file usage for iSCSI/SCTP) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (1247c37 tcm_vhost: Initial merge for vhost level target fabric driver) +$ git merge target-merge/for-next-merge +Merge made by the 'recursive' strategy. + drivers/vhost/Kconfig | 3 + + drivers/vhost/Kconfig.tcm | 6 + + drivers/vhost/Makefile | 2 + + drivers/vhost/tcm_vhost.c | 1628 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/vhost/tcm_vhost.h | 101 +++ + 5 files changed, 1740 insertions(+) + create mode 100644 drivers/vhost/Kconfig.tcm + create mode 100644 drivers/vhost/tcm_vhost.c + create mode 100644 drivers/vhost/tcm_vhost.h +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 (6343325 dmaengine: Cleanup logging messages) +$ git merge slave-dma/next +Already up-to-date. +Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (173f865 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge net-next/master +Already up-to-date. +Merging wireless-next/master (36eb22e libertas: firmware.c: remove duplicated include) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (8bd38a6 Bluetooth: Added /proc/net/sco via bt_procfs_init()) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + include/net/bluetooth/bluetooth.h | 10 +++ + include/net/bluetooth/hci.h | 9 +++ + include/net/bluetooth/hci_core.h | 22 ++---- + include/net/bluetooth/l2cap.h | 17 +---- + include/net/bluetooth/smp.h | 8 +-- + net/bluetooth/a2mp.c | 16 +++-- + net/bluetooth/af_bluetooth.c | 141 +++++++++++++++++++++++++++++++++++++ + net/bluetooth/bnep/sock.c | 22 +++++- + net/bluetooth/cmtp/sock.c | 23 +++++- + net/bluetooth/hci_core.c | 6 +- + net/bluetooth/hci_event.c | 20 +++--- + net/bluetooth/hci_sock.c | 13 +++- + net/bluetooth/hidp/sock.c | 22 +++++- + net/bluetooth/l2cap_core.c | 32 +++++++-- + net/bluetooth/l2cap_sock.c | 22 +++++- + net/bluetooth/mgmt.c | 34 ++++++--- + net/bluetooth/rfcomm/sock.c | 14 +++- + net/bluetooth/sco.c | 16 +++-- + 18 files changed, 361 insertions(+), 86 deletions(-) +Merging mtd/master (4800399 mtd: m25p80: Add support for serial flash STM/Micron N25Q032) +$ git merge mtd/master +Auto-merging drivers/mtd/mtdoops.c +Removing drivers/mtd/maps/wr_sbc82xx_flash.c +Auto-merging arch/arm/mach-imx/clk-imx51-imx53.c +Auto-merging arch/arm/boot/dts/imx53.dtsi +Auto-merging arch/arm/boot/dts/imx51.dtsi +Merge made by the 'recursive' strategy. + Documentation/DocBook/mtdnand.tmpl | 2 - + .../devicetree/bindings/mtd/atmel-nand.txt | 40 +- + .../devicetree/bindings/mtd/gpmi-nand.txt | 4 + + .../devicetree/bindings/mtd/lpc32xx-mlc.txt | 50 + + .../devicetree/bindings/mtd/lpc32xx-slc.txt | 52 + + arch/arm/boot/dts/imx51.dtsi | 7 + + arch/arm/boot/dts/imx53.dtsi | 7 + + arch/arm/mach-imx/clk-imx51-imx53.c | 2 + + arch/arm/plat-mxc/devices/platform-mxc_nand.c | 11 +- + drivers/mtd/chips/Kconfig | 11 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 67 ++ + drivers/mtd/devices/Kconfig | 2 +- + drivers/mtd/devices/m25p80.c | 6 + + drivers/mtd/devices/spear_smi.c | 54 +- + drivers/mtd/maps/Kconfig | 12 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/wr_sbc82xx_flash.c | 174 ---- + drivers/mtd/mtdcore.c | 9 + + drivers/mtd/mtdoops.c | 14 +- + drivers/mtd/nand/Kconfig | 62 +- + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/atmel_nand.c | 934 +++++++++++++++-- + drivers/mtd/nand/atmel_nand_ecc.h | 114 ++- + drivers/mtd/nand/bcm_umi_bch.c | 6 +- + drivers/mtd/nand/bf5xx_nand.c | 6 +- + drivers/mtd/nand/cafe_nand.c | 13 +- + drivers/mtd/nand/denali.c | 12 +- + drivers/mtd/nand/docg4.c | 8 +- + drivers/mtd/nand/fsl_elbc_nand.c | 15 +- + drivers/mtd/nand/fsl_ifc_nand.c | 5 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 13 +- + drivers/mtd/nand/lpc32xx_mlc.c | 925 +++++++++++++++++ + drivers/mtd/nand/lpc32xx_slc.c | 1059 ++++++++++++++++++++ + drivers/mtd/nand/mxc_nand.c | 141 +-- + drivers/mtd/nand/nand_base.c | 50 +- + drivers/mtd/nand/nand_bbt.c | 21 +- + drivers/mtd/nand/nand_ids.c | 7 +- + drivers/mtd/nand/pxa3xx_nand.c | 5 +- + drivers/mtd/nand/sh_flctl.c | 302 +++--- + drivers/mtd/tests/mtd_speedtest.c | 16 +- + drivers/mtd/tests/mtd_stresstest.c | 39 +- + include/linux/mtd/bbm.h | 7 +- + include/linux/mtd/mtd.h | 9 +- + include/linux/mtd/nand.h | 11 +- + include/linux/mtd/sh_flctl.h | 23 +- + 45 files changed, 3653 insertions(+), 677 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt + create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt + delete mode 100644 drivers/mtd/maps/wr_sbc82xx_flash.c + create mode 100644 drivers/mtd/nand/lpc32xx_mlc.c + create mode 100644 drivers/mtd/nand/lpc32xx_slc.c +Merging l2-mtd/master (cd0a30d mtd: m25p80: Fix the Spansion chip detection) +$ git merge l2-mtd/master +Resolved 'arch/arm/mach-imx/clk-imx6q.c' using previous resolution. +Auto-merging arch/arm/mach-imx/clk-imx6q.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/clk-imx6q.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6e3a135] Merge remote-tracking branch 'l2-mtd/master' +$ git diff -M --stat --summary HEAD^.. + drivers/mtd/devices/m25p80.c | 11 +++-- + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 45 ++++++++++++++---- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 82 ++++++++++++++++++++++++++++---- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 3 +- + drivers/mtd/nand/sh_flctl.c | 30 +++++++----- + include/linux/mtd/sh_flctl.h | 2 +- + 6 files changed, 137 insertions(+), 36 deletions(-) +Merging crypto/master (d37c042 powerpc/crypto: add 842 crypto driver) +$ git merge crypto/master +Auto-merging crypto/cast6_generic.c +Auto-merging crypto/cast5_generic.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + arch/powerpc/kernel/prom_init.c | 4 +- + arch/s390/crypto/aes_s390.c | 5 - + arch/s390/crypto/des_s390.c | 10 - + arch/s390/crypto/ghash_s390.c | 1 - + arch/x86/crypto/Makefile | 4 + + arch/x86/crypto/aes_glue.c | 1 - + arch/x86/crypto/aesni-intel_glue.c | 5 +- + arch/x86/crypto/blowfish_glue.c | 4 - + arch/x86/crypto/camellia_glue.c | 6 - + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 322 ++++ + arch/x86/crypto/cast5_avx_glue.c | 530 ++++++ + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 335 ++++ + arch/x86/crypto/cast6_avx_glue.c | 648 +++++++ + arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 - + arch/x86/crypto/salsa20_glue.c | 1 - + arch/x86/crypto/serpent_avx_glue.c | 10 - + arch/x86/crypto/serpent_sse2_glue.c | 10 - + arch/x86/crypto/twofish_avx_glue.c | 10 - + arch/x86/crypto/twofish_glue.c | 1 - + arch/x86/crypto/twofish_glue_3way.c | 5 - + crypto/842.c | 183 ++ + crypto/Kconfig | 40 + + crypto/Makefile | 5 +- + crypto/aes_generic.c | 1 - + crypto/ansi_cprng.c | 63 +- + crypto/anubis.c | 1 - + crypto/blowfish_generic.c | 1 - + crypto/camellia_generic.c | 1 - + crypto/{cast5.c => cast5_generic.c} | 80 +- + crypto/{cast6.c => cast6_generic.c} | 67 +- + crypto/crypto_null.c | 57 +- + crypto/deflate.c | 1 - + crypto/des_generic.c | 25 +- + crypto/fcrypt.c | 1 - + crypto/ghash-generic.c | 1 - + crypto/khazad.c | 1 - + crypto/krng.c | 1 - + crypto/lzo.c | 1 - + crypto/salsa20_generic.c | 1 - + crypto/seed.c | 1 - + crypto/serpent_generic.c | 53 +- + crypto/sha256_generic.c | 25 +- + crypto/sha512_generic.c | 20 +- + crypto/shash.c | 36 + + crypto/tcrypt.c | 82 + + crypto/tcrypt.h | 1 + + crypto/tea.c | 41 +- + crypto/testmgr.c | 210 +++ + crypto/testmgr.h | 2538 ++++++++++++++++++++++++++-- + crypto/tgr192.c | 38 +- + crypto/twofish_generic.c | 1 - + crypto/wp512.c | 39 +- + drivers/crypto/Kconfig | 20 +- + drivers/crypto/atmel-aes.c | 2 - + drivers/crypto/atmel-tdes.c | 1 - + drivers/crypto/caam/caamalg.c | 8 +- + drivers/crypto/caam/caamhash.c | 18 +- + drivers/crypto/caam/caamrng.c | 9 +- + drivers/crypto/caam/jr.c | 10 +- + drivers/crypto/geode-aes.c | 3 - + drivers/crypto/nx/Kconfig | 26 + + drivers/crypto/nx/Makefile | 5 +- + drivers/crypto/nx/nx-842.c | 1615 ++++++++++++++++++ + drivers/crypto/nx/nx-aes-cbc.c | 1 - + drivers/crypto/nx/nx-aes-ccm.c | 2 - + drivers/crypto/nx/nx-aes-ctr.c | 2 - + drivers/crypto/nx/nx-aes-ecb.c | 1 - + drivers/crypto/nx/nx-aes-gcm.c | 2 - + drivers/crypto/omap-aes.c | 1 - + drivers/crypto/padlock-aes.c | 3 - + drivers/crypto/s5p-sss.c | 1 - + drivers/crypto/tegra-aes.c | 2 - + include/crypto/cast5.h | 22 + + include/crypto/cast6.h | 23 + + include/crypto/internal/hash.h | 2 + + include/linux/nx842.h | 11 + + 77 files changed, 6698 insertions(+), 628 deletions(-) + create mode 100644 arch/x86/crypto/cast5-avx-x86_64-asm_64.S + create mode 100644 arch/x86/crypto/cast5_avx_glue.c + create mode 100644 arch/x86/crypto/cast6-avx-x86_64-asm_64.S + create mode 100644 arch/x86/crypto/cast6_avx_glue.c + create mode 100644 crypto/842.c + rename crypto/{cast5.c => cast5_generic.c} (95%) + rename crypto/{cast6.c => cast6_generic.c} (94%) + create mode 100644 drivers/crypto/nx/Kconfig + create mode 100644 drivers/crypto/nx/nx-842.c + create mode 100644 include/crypto/cast5.h + create mode 100644 include/crypto/cast6.h + create mode 100644 include/linux/nx842.h +Merging drm/drm-next (e2f895f Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next) +$ git merge drm/drm-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (e5b3542 ALSA: es1688 - freeup resources on init failure) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (e13ab2a ASoC: mc13783: Provide codec->control_data) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/soc/codecs/mc13783.c | 2 ++ + sound/soc/codecs/sgtl5000.c | 2 -- + sound/soc/codecs/wm8994.c | 15 ++++++++++++++- + sound/soc/mxs/mxs-saif.c | 24 ++++++++++++++++++++++++ + sound/soc/ux500/ux500_msp_dai.c | 2 +- + sound/soc/ux500/ux500_msp_i2s.c | 2 +- + sound/soc/ux500/ux500_msp_i2s.h | 2 +- + 7 files changed, 43 insertions(+), 6 deletions(-) +Merging quilt/rr (a5839a8 Make most arch asm/module.h files use asm-generic/module.h) +$ git merge quilt/rr +Auto-merging arch/unicore32/Kconfig +Removing arch/sparc/include/asm/module.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/mips/include/asm/module.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/Kconfig +Removing arch/m32r/include/asm/module.h +Auto-merging arch/ia64/Kconfig +Removing arch/h8300/include/asm/module.h +Removing arch/cris/include/asm/module.h +Auto-merging arch/cris/Kconfig +Auto-merging arch/blackfin/Kconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/Kconfig | 19 +++++++++++++++++ + arch/alpha/Kconfig | 2 ++ + arch/alpha/include/asm/module.h | 10 ++------- + arch/arm/Kconfig | 2 ++ + arch/arm/include/asm/module.h | 8 ++------ + arch/avr32/Kconfig | 2 ++ + arch/avr32/include/asm/module.h | 6 ++---- + arch/blackfin/Kconfig | 2 ++ + arch/blackfin/include/asm/module.h | 4 +--- + arch/c6x/Kconfig | 1 + + arch/c6x/include/asm/module.h | 12 +---------- + arch/cris/Kconfig | 1 + + arch/cris/include/asm/Kbuild | 2 ++ + arch/cris/include/asm/module.h | 9 -------- + arch/frv/include/asm/module.h | 8 +------- + arch/h8300/Kconfig | 1 + + arch/h8300/include/asm/Kbuild | 2 ++ + arch/h8300/include/asm/module.h | 11 ---------- + arch/hexagon/Kconfig | 1 + + arch/ia64/Kconfig | 2 ++ + arch/ia64/include/asm/module.h | 6 ++---- + arch/m32r/Kconfig | 1 + + arch/m32r/include/asm/Kbuild | 2 ++ + arch/m32r/include/asm/module.h | 10 --------- + arch/m32r/kernel/module.c | 15 -------------- + arch/m68k/Kconfig | 3 +++ + arch/m68k/include/asm/module.h | 6 ++---- + arch/microblaze/Kconfig | 1 + + arch/mips/Kconfig | 3 +++ + arch/mips/include/asm/module.h | 10 +++++++-- + arch/mips/kernel/module.c | 2 ++ + arch/mn10300/Kconfig | 1 + + arch/mn10300/include/asm/module.h | 7 +------ + arch/openrisc/Kconfig | 1 + + arch/parisc/Kconfig | 2 ++ + arch/parisc/include/asm/module.h | 16 +++------------ + arch/powerpc/Kconfig | 2 ++ + arch/powerpc/include/asm/module.h | 7 +------ + arch/s390/Kconfig | 2 ++ + arch/s390/include/asm/module.h | 18 +++------------- + arch/score/Kconfig | 2 ++ + arch/score/include/asm/module.h | 6 +----- + arch/score/kernel/module.c | 10 --------- + arch/sh/Kconfig | 2 ++ + arch/sh/include/asm/module.h | 14 +++---------- + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/module.h | 24 ---------------------- + arch/tile/Kconfig | 1 + + arch/unicore32/Kconfig | 1 + + arch/x86/Kconfig | 2 ++ + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/module.h | 9 +------- + include/asm-generic/module.h | 40 +++++++++++++++++++++++++++++------- + include/linux/moduleloader.h | 36 ++++++++++++++++++++++++++++---- + kernel/module.c | 24 ++++------------------ + 56 files changed, 171 insertions(+), 223 deletions(-) + delete mode 100644 arch/cris/include/asm/module.h + delete mode 100644 arch/h8300/include/asm/module.h + delete mode 100644 arch/m32r/include/asm/module.h + delete mode 100644 arch/sparc/include/asm/module.h +Merging input/next (2b94e25 Input: random formatting fixes) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/apm-power.c | 2 +- + drivers/input/ff-core.c | 4 +- + drivers/input/ff-memless.c | 14 +-- + drivers/input/joydev.c | 2 +- + drivers/input/keyboard/gpio_keys.c | 168 ++++++++++++++++---------------- + drivers/input/misc/twl4030-pwrbutton.c | 1 + + drivers/input/mousedev.c | 9 +- + drivers/input/sparse-keymap.c | 4 +- + 8 files changed, 105 insertions(+), 99 deletions(-) +Merging input-mt/for-next (c45361a Revert "Input: atmel_mxt_ts - warn if sysfs could not be created") +$ git merge input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (4b2ebf0 Merge branch 'for-3.6' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging block/for-next (f45d342 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging quilt/device-mapper (8d5ab5c Commit outstanding metadata before returning the status for a dm thin pool so that the numbers reported are as up-to-date as possible.) +$ git merge quilt/device-mapper +Merge made by the 'recursive' strategy. +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 (30b87c6 mmc: sdhci-dove: Prepare for common clock framework) +$ git merge mmc/mmc-next +Already up-to-date. +Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()) +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next (73a1180 mm: Fix build warning in kmem_cache_create()) +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (cd853a6 md: avoid taking the mutex on some ioctls.) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + block/blk-core.c | 44 +++++-- + drivers/block/umem.c | 37 ++---- + drivers/md/bitmap.c | 2 +- + drivers/md/md.c | 144 ++++++++++------------ + drivers/md/md.h | 11 +- + drivers/md/raid1.c | 212 ++++++++++++++++++++++++-------- + drivers/md/raid1.h | 30 ++--- + drivers/md/raid10.c | 95 +++++++++------ + drivers/md/raid10.h | 23 +--- + drivers/md/raid5.c | 317 +++++++++++++++++++++++++++++++----------------- + drivers/md/raid5.h | 3 + + include/linux/blkdev.h | 8 +- + 12 files changed, 563 insertions(+), 363 deletions(-) +Merging mfd/for-next (3c1534c mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core) +$ git merge mfd/for-next +Already up-to-date. +Merging battery/master (ecc2edd olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries) +$ git merge battery/master +Auto-merging include/linux/i2c/twl.h +Auto-merging drivers/power/twl4030_charger.c +Auto-merging drivers/power/pda_power.c +Auto-merging drivers/power/ds2781_battery.c +Auto-merging drivers/power/Kconfig +Auto-merging drivers/mfd/twl-core.c +Merge made by the 'recursive' strategy. + Documentation/power/power_supply_class.txt | 10 ++ + drivers/mfd/twl-core.c | 9 +- + drivers/power/Kconfig | 1 + + drivers/power/bq27x00_battery.c | 155 +++++++++++++++++++++++++--- + drivers/power/charger-manager.c | 152 ++++++++++++++++++++++++--- + drivers/power/ds2781_battery.c | 2 +- + drivers/power/gpio-charger.c | 2 +- + drivers/power/lp8727_charger.c | 2 +- + drivers/power/max17042_battery.c | 8 ++ + drivers/power/olpc_battery.c | 62 ++++++++++- + drivers/power/pda_power.c | 4 +- + drivers/power/power_supply_core.c | 65 ++++++++++++ + drivers/power/power_supply_sysfs.c | 8 ++ + drivers/power/sbs-battery.c | 2 +- + drivers/power/smb347-charger.c | 123 ++++++++++++++++++++-- + drivers/power/test_power.c | 75 ++++++++++++++ + drivers/power/twl4030_charger.c | 80 +++++++++++++- + include/linux/i2c/twl.h | 2 + + include/linux/{ => platform_data}/lp8727.h | 0 + include/linux/power/charger-manager.h | 67 +++++++++++- + include/linux/power_supply.h | 13 +++ + 21 files changed, 787 insertions(+), 55 deletions(-) + rename include/linux/{ => platform_data}/lp8727.h (100%) +$ git am -3 ../patches/0001-ACPI-Thermal-fix-for-an-API-change.patch +Applying: ACPI-Thermal: fix for an API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/power/power_supply_core.c +$ git add . +$ git commit -v -a --amend +[master 547a001] Merge remote-tracking branch 'battery/master' +Merging fbdev/fbdev-next (a023907 da8xx-fb: fix compile issue due to missing include) +$ git merge fbdev/fbdev-next +Auto-merging drivers/video/smscufx.c +Removing drivers/video/exynos/s6e8ax0.h +Auto-merging drivers/video/exynos/exynos_mipi_dsi.c +Auto-merging drivers/video/exynos/exynos_dp_reg.c +Merge made by the 'recursive' strategy. + .../sysfs-devices-platform-sh_mobile_lcdc_fb | 44 + + arch/arm/mach-davinci/devices-da8xx.c | 1 + + arch/arm/mach-omap2/display.c | 25 +- + drivers/video/aty/aty128fb.c | 180 ++-- + drivers/video/da8xx-fb.c | 78 +- + drivers/video/epson1355fb.c | 8 +- + drivers/video/exynos/exynos_dp_core.c | 23 +- + drivers/video/exynos/exynos_dp_core.h | 4 - + drivers/video/exynos/exynos_dp_reg.c | 4 +- + drivers/video/exynos/exynos_mipi_dsi.c | 2 +- + drivers/video/exynos/s6e8ax0.h | 21 - + drivers/video/fb_draw.h | 7 +- + drivers/video/grvga.c | 47 +- + drivers/video/mx3fb.c | 55 +- + drivers/video/omap2/displays/panel-acx565akm.c | 10 +- + drivers/video/omap2/displays/panel-generic-dpi.c | 179 ++-- + .../omap2/displays/panel-lgphilips-lb035q02.c | 8 +- + drivers/video/omap2/displays/panel-n8x0.c | 1 - + .../omap2/displays/panel-nec-nl8048hl11-01b.c | 9 +- + drivers/video/omap2/displays/panel-picodlp.c | 9 +- + .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 9 +- + drivers/video/omap2/displays/panel-taal.c | 1 - + drivers/video/omap2/displays/panel-tfp410.c | 7 +- + .../video/omap2/displays/panel-tpo-td043mtea1.c | 8 +- + drivers/video/omap2/dss/Kconfig | 4 +- + drivers/video/omap2/dss/apply.c | 91 +- + drivers/video/omap2/dss/dispc.c | 494 ++++----- + drivers/video/omap2/dss/dispc.h | 28 + + drivers/video/omap2/dss/display.c | 40 +- + drivers/video/omap2/dss/dpi.c | 64 +- + drivers/video/omap2/dss/dsi.c | 152 +-- + drivers/video/omap2/dss/dss.c | 19 +- + drivers/video/omap2/dss/dss.h | 54 +- + drivers/video/omap2/dss/dss_features.h | 5 +- + drivers/video/omap2/dss/hdmi.c | 246 ++++- + drivers/video/omap2/dss/hdmi_panel.c | 9 +- + drivers/video/omap2/dss/manager.c | 51 +- + drivers/video/omap2/dss/overlay.c | 33 +- + drivers/video/omap2/dss/rfbi.c | 40 +- + drivers/video/omap2/dss/sdi.c | 42 +- + drivers/video/omap2/dss/ti_hdmi.h | 21 +- + drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 26 +- + drivers/video/omap2/dss/venc.c | 8 +- + drivers/video/omap2/omapfb/omapfb-main.c | 51 +- + drivers/video/s3fb.c | 31 +- + drivers/video/sh_mipi_dsi.c | 7 +- + drivers/video/sh_mobile_lcdcfb.c | 1117 +++++++++++++++++--- + drivers/video/sh_mobile_lcdcfb.h | 5 +- + drivers/video/sh_mobile_meram.c | 235 ++-- + drivers/video/smscufx.c | 2 +- + drivers/video/w100fb.c | 12 + + include/video/da8xx-fb.h | 3 + + include/video/omapdss.h | 51 +- + include/video/sh_mobile_lcdc.h | 7 + + include/video/sh_mobile_meram.h | 71 +- + 55 files changed, 2621 insertions(+), 1138 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-sh_mobile_lcdc_fb + delete mode 100644 drivers/video/exynos/s6e8ax0.h +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 (974a658 Merge "Apply LCD manager related parameters" from Archit) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (3384fb9 Merge branch 'regulator-drivers' into regulator-next) +$ git merge regulator/for-next +Already up-to-date. +Merging security/next (6637284 Smack: Maintainer Record) +$ 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 (06a3fa7 watchdog: fix watchdog-test.c build warning) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + Documentation/watchdog/src/watchdog-test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (395e51f Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next) +$ git merge iommu/next +Already up-to-date. +Merging vfio/next (59b9426 vfio: Add PCI device driver) +$ git merge vfio/next +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/vfio.txt | 314 +++++++ + MAINTAINERS | 8 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/vfio/Kconfig | 16 + + drivers/vfio/Makefile | 3 + + drivers/vfio/pci/Kconfig | 8 + + drivers/vfio/pci/Makefile | 4 + + drivers/vfio/pci/vfio_pci.c | 579 +++++++++++++ + drivers/vfio/pci/vfio_pci_config.c | 1540 ++++++++++++++++++++++++++++++++++ + drivers/vfio/pci/vfio_pci_intrs.c | 740 ++++++++++++++++ + drivers/vfio/pci/vfio_pci_private.h | 91 ++ + drivers/vfio/pci/vfio_pci_rdwr.c | 269 ++++++ + drivers/vfio/vfio.c | 1420 +++++++++++++++++++++++++++++++ + drivers/vfio/vfio_iommu_type1.c | 753 +++++++++++++++++ + include/linux/vfio.h | 445 ++++++++++ + 17 files changed, 6194 insertions(+) + create mode 100644 Documentation/vfio.txt + create mode 100644 drivers/vfio/Kconfig + create mode 100644 drivers/vfio/Makefile + create mode 100644 drivers/vfio/pci/Kconfig + create mode 100644 drivers/vfio/pci/Makefile + create mode 100644 drivers/vfio/pci/vfio_pci.c + create mode 100644 drivers/vfio/pci/vfio_pci_config.c + create mode 100644 drivers/vfio/pci/vfio_pci_intrs.c + create mode 100644 drivers/vfio/pci/vfio_pci_private.h + create mode 100644 drivers/vfio/pci/vfio_pci_rdwr.c + create mode 100644 drivers/vfio/vfio.c + create mode 100644 drivers/vfio/vfio_iommu_type1.c + create mode 100644 include/linux/vfio.h +Merging osd/linux-next (a7fdf6a exofs: stop using s_dirt) +$ git merge osd/linux-next +Auto-merging include/linux/nfs_xdr.h +Auto-merging include/linux/nfs_page.h +Auto-merging fs/nfs/pagelist.c +Merge made by the 'recursive' strategy. + fs/exofs/inode.c | 2 ++ + fs/exofs/super.c | 11 --------- + fs/nfs/objlayout/objio_osd.c | 55 +++++++++++++++++++++++++++++++++++++++--- + fs/nfs/pagelist.c | 2 ++ + include/linux/nfs_page.h | 1 + + include/linux/nfs_xdr.h | 1 + + 6 files changed, 58 insertions(+), 14 deletions(-) +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 (e1c9ac4 Revert "backlight: fix memory leak on obscure error path") +$ git merge trivial/for-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/88pm860x_bl.c | 1 - + 1 file changed, 1 deletion(-) +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge audit/for-next +Already up-to-date. +Merging pm/linux-next (26ba678 Merge branch 'master' into linux-next) +$ git merge pm/linux-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl) +$ git merge apm/for-next +Already up-to-date. +Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Auto-merging kernel/audit_watch.c +Auto-merging kernel/audit_tree.c +Auto-merging include/linux/fsnotify_backend.h +Auto-merging fs/notify/notification.c +Auto-merging fs/notify/fanotify/fanotify_user.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(-) +Merging edac/linux_next (a92cdec Merge branch 'devel' into next) +$ git merge edac/linux_next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next) +$ git merge edac-amd/for-next +Resolved 'Documentation/edac.txt' using previous resolution. +Resolved 'drivers/edac/amd64_edac.c' using previous resolution. +Auto-merging drivers/edac/amd64_edac.c +CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c +Auto-merging Documentation/edac.txt +CONFLICT (content): Merge conflict in Documentation/edac.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2eab1bb] Merge remote-tracking branch 'edac-amd/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name) +$ git merge devicetree/devicetree/next +Merge made by the 'recursive' strategy. +Merging dt-rh/for-next (e95d8aa of: mtd: nuke useless const qualifier) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices) +$ git merge spi/spi/next +Already up-to-date. +Merging spi-mb/spi-next (8ceffa7 spi/orion: remove uneeded spi_info) +$ git merge spi-mb/spi-next +Already up-to-date. +Merging tip/auto-latest (adf18da Merge branch 'perf/core') +$ git merge tip/auto-latest +Auto-merging scripts/kconfig/Makefile +Auto-merging kernel/irq/manage.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 + + arch/x86/Kconfig | 33 +- + arch/x86/include/asm/mce.h | 8 + + arch/x86/include/asm/perf_event.h | 2 +- + arch/x86/kernel/alternative.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 4 +- + arch/x86/kernel/cpu/mcheck/mce-severity.c | 7 - + arch/x86/kernel/cpu/mcheck/mce.c | 43 +- + arch/x86/kernel/cpu/perf_event.h | 2 +- + arch/x86/kernel/cpu/perf_event_intel.c | 92 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 1522 ++++++++++++++++++++---- + arch/x86/kernel/cpu/perf_event_intel_uncore.h | 207 +++- + arch/x86/kernel/irq.c | 1 + + arch/x86/kernel/kdebugfs.c | 6 +- + include/linux/hardirq.h | 2 +- + include/linux/irq.h | 1 + + include/linux/topology.h | 1 + + kernel/events/uprobes.c | 213 ++-- + kernel/futex.c | 17 +- + kernel/irq/manage.c | 15 +- + kernel/sched/core.c | 6 +- + kernel/sched/cpupri.c | 10 +- + kernel/time/timekeeping.c | 4 +- + mm/mmap.c | 6 - + 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 | 427 +++++++ + tools/kvm/README | 112 ++ + tools/kvm/builtin-balloon.c | 80 ++ + tools/kvm/builtin-debug.c | 103 ++ + 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 | 1382 ++++++++++++++++++++++ + tools/kvm/builtin-sandbox.c | 9 + + tools/kvm/builtin-setup.c | 232 ++++ + 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/disk/blk.c | 76 ++ + tools/kvm/disk/core.c | 266 +++++ + tools/kvm/disk/qcow.c | 1529 +++++++++++++++++++++++++ + tools/kvm/disk/raw.c | 141 +++ + tools/kvm/framebuffer.c | 75 ++ + tools/kvm/guest/init.c | 38 + + tools/kvm/guest/init_stage2.c | 55 + + tools/kvm/guest/passwd | 1 + + tools/kvm/guest_compat.c | 99 ++ + tools/kvm/hw/i8042.c | 348 ++++++ + tools/kvm/hw/pci-shmem.c | 268 +++++ + tools/kvm/hw/rtc.c | 137 +++ + tools/kvm/hw/serial.c | 447 ++++++++ + tools/kvm/hw/vesa.c | 85 ++ + 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 | 18 + + 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/disk-image.h | 86 ++ + tools/kvm/include/kvm/e820.h | 13 + + tools/kvm/include/kvm/framebuffer.h | 35 + + 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 | 69 ++ + tools/kvm/include/kvm/irq.h | 33 + + tools/kvm/include/kvm/kvm-cmd.h | 17 + + tools/kvm/include/kvm/kvm-cpu.h | 24 + + tools/kvm/include/kvm/kvm-ipc.h | 24 + + tools/kvm/include/kvm/kvm.h | 93 ++ + tools/kvm/include/kvm/msi.h | 10 + + tools/kvm/include/kvm/mutex.h | 33 + + tools/kvm/include/kvm/parse-options.h | 214 ++++ + tools/kvm/include/kvm/pci-shmem.h | 28 + + tools/kvm/include/kvm/pci.h | 95 ++ + tools/kvm/include/kvm/qcow.h | 133 +++ + tools/kvm/include/kvm/rbtree-interval.h | 28 + + 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 | 22 + + 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 | 20 + + tools/kvm/include/kvm/threadpool.h | 37 + + tools/kvm/include/kvm/types.h | 7 + + tools/kvm/include/kvm/uip.h | 358 ++++++ + tools/kvm/include/kvm/util.h | 97 ++ + tools/kvm/include/kvm/vesa.h | 18 + + tools/kvm/include/kvm/virtio-9p.h | 73 ++ + tools/kvm/include/kvm/virtio-balloon.h | 8 + + tools/kvm/include/kvm/virtio-blk.h | 12 + + tools/kvm/include/kvm/virtio-console.h | 9 + + tools/kvm/include/kvm/virtio-mmio.h | 58 + + tools/kvm/include/kvm/virtio-net.h | 26 + + tools/kvm/include/kvm/virtio-pci-dev.h | 37 + + tools/kvm/include/kvm/virtio-pci.h | 46 + + tools/kvm/include/kvm/virtio-rng.h | 9 + + tools/kvm/include/kvm/virtio.h | 103 ++ + tools/kvm/include/kvm/vnc.h | 20 + + tools/kvm/include/linux/bitops.h | 33 + + tools/kvm/include/linux/byteorder.h | 7 + + tools/kvm/include/linux/compiler.h | 19 + + tools/kvm/include/linux/kernel.h | 39 + + tools/kvm/include/linux/module.h | 6 + + tools/kvm/include/linux/prefetch.h | 6 + + tools/kvm/include/linux/stddef.h | 16 + + tools/kvm/include/linux/types.h | 51 + + tools/kvm/ioeventfd.c | 215 ++++ + tools/kvm/ioport.c | 195 ++++ + tools/kvm/kvm-cmd.c | 91 ++ + tools/kvm/kvm-cpu.c | 175 +++ + tools/kvm/kvm-ipc.c | 231 ++++ + tools/kvm/kvm.c | 593 ++++++++++ + tools/kvm/main.c | 19 + + tools/kvm/mmio.c | 140 +++ + 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 | 203 ++++ + tools/kvm/net/uip/icmp.c | 29 + + tools/kvm/net/uip/ipv4.c | 29 + + tools/kvm/net/uip/tcp.c | 317 +++++ + tools/kvm/net/uip/udp.c | 236 ++++ + tools/kvm/pci.c | 213 ++++ + 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 | 90 ++ + tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 ++ + tools/kvm/powerpc/ioport.c | 18 + + tools/kvm/powerpc/irq.c | 75 ++ + tools/kvm/powerpc/kvm-cpu.c | 293 +++++ + 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 | 102 ++ + tools/kvm/powerpc/spapr_hvcons.h | 19 + + tools/kvm/powerpc/spapr_pci.c | 423 +++++++ + tools/kvm/powerpc/spapr_pci.h | 57 + + tools/kvm/powerpc/spapr_rtas.c | 229 ++++ + tools/kvm/powerpc/xics.c | 514 +++++++++ + tools/kvm/powerpc/xics.h | 23 + + tools/kvm/symbol.c | 131 +++ + tools/kvm/term.c | 166 +++ + 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 | 109 ++ + tools/kvm/ui/sdl.c | 303 +++++ + tools/kvm/ui/vnc.c | 230 ++++ + tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 + + tools/kvm/util/generate-cmdlist.sh | 23 + + tools/kvm/util/kvm-ifup-vbr0 | 6 + + tools/kvm/util/parse-options.c | 577 ++++++++++ + tools/kvm/util/rbtree-interval.c | 89 ++ + 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 | 145 +++ + tools/kvm/util/util.c | 133 +++ + tools/kvm/virtio/9p-pdu.c | 287 +++++ + tools/kvm/virtio/9p.c | 1338 ++++++++++++++++++++++ + tools/kvm/virtio/balloon.c | 267 +++++ + tools/kvm/virtio/blk.c | 314 +++++ + tools/kvm/virtio/console.c | 193 ++++ + tools/kvm/virtio/core.c | 233 ++++ + tools/kvm/virtio/mmio.c | 264 +++++ + tools/kvm/virtio/net.c | 555 +++++++++ + tools/kvm/virtio/pci.c | 377 ++++++ + tools/kvm/virtio/rng.c | 194 ++++ + 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 | 67 ++ + 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 | 77 ++ + tools/kvm/x86/irq.c | 222 ++++ + tools/kvm/x86/kvm-cpu.c | 425 +++++++ + tools/kvm/x86/kvm.c | 372 ++++++ + tools/kvm/x86/mptable.c | 287 +++++ + tools/lib/traceevent/.gitignore | 1 + + tools/lib/traceevent/Makefile | 14 +- + tools/perf/Makefile | 4 + + tools/perf/builtin-test.c | 4 + + tools/perf/builtin-top.c | 2 +- + tools/perf/ui/browsers/hists.c | 4 +- + tools/perf/util/annotate.c | 15 +- + tools/perf/util/dso-test-data.c | 153 +++ + tools/perf/util/evlist.c | 2 +- + tools/perf/util/header.c | 6 + + tools/perf/util/hist.c | 7 +- + tools/perf/util/map.c | 41 +- + tools/perf/util/map.h | 1 + + tools/perf/util/parse-events.c | 2 + + tools/perf/util/session.c | 5 +- + tools/perf/util/symbol.c | 447 ++++++-- + tools/perf/util/symbol.h | 54 +- + tools/perf/util/target.c | 11 +- + 261 files changed, 27250 insertions(+), 524 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/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/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/init_stage2.c + create mode 100644 tools/kvm/guest/passwd + 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/disk-image.h + create mode 100644 tools/kvm/include/kvm/e820.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-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.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.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-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 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/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-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/lib/traceevent/.gitignore + create mode 100644 tools/perf/util/dso-test-data.c +Merging rcu/rcu/next (5cf05ad rcu: Fix broken strings in RCU's source code.) +$ 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 kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error) +$ git merge kmemleak/kmemleak +Merge made by the 'recursive' strategy. + mm/kmemleak.c | 1 + + 1 file changed, 1 insertion(+) +Merging kvm/linux-next (ade38c3 KVM: s390: Add implementation-specific trace events) +$ git merge kvm/linux-next +Auto-merging arch/s390/kernel/dis.c +Auto-merging arch/s390/include/asm/processor.h +Merge made by the 'recursive' strategy. + arch/ia64/kvm/kvm-ia64.c | 33 +--- + arch/powerpc/include/asm/kvm_host.h | 2 + + arch/powerpc/kvm/book3s_64_mmu_hv.c | 47 ++++- + arch/powerpc/kvm/e500_tlb.c | 2 +- + arch/s390/include/asm/processor.h | 1 + + arch/s390/kernel/dis.c | 27 +++ + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/diag.c | 4 + + arch/s390/kvm/intercept.c | 11 ++ + arch/s390/kvm/interrupt.c | 23 +++ + arch/s390/kvm/kvm-s390.c | 10 + + arch/s390/kvm/priv.c | 9 +- + arch/s390/kvm/sigp.c | 2 + + arch/s390/kvm/trace-s390.h | 210 +++++++++++++++++++++ + arch/s390/kvm/trace.h | 341 +++++++++++++++++++++++++++++++++++ + arch/x86/include/asm/kvm_host.h | 3 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/emulate.c | 48 +++-- + arch/x86/kvm/irq.h | 2 +- + arch/x86/kvm/lapic.c | 4 +- + arch/x86/kvm/mmu.c | 119 ++++++++---- + arch/x86/kvm/pmu.c | 2 +- + arch/x86/kvm/svm.c | 4 +- + arch/x86/kvm/vmx.c | 6 +- + arch/x86/kvm/x86.c | 59 +++--- + include/linux/kvm_host.h | 66 +++++-- + virt/kvm/Kconfig | 3 + + virt/kvm/async_pf.c | 7 +- + virt/kvm/iommu.c | 10 +- + virt/kvm/irq_comm.c | 4 +- + virt/kvm/kvm_main.c | 212 +++++++++++++--------- + 32 files changed, 1021 insertions(+), 254 deletions(-) + create mode 100644 arch/s390/kvm/trace-s390.h + create mode 100644 arch/s390/kvm/trace.h +Merging kvm-ppc/kvm-ppc-next (6d2d826 PPC: Don't use hardcoded opcode for ePAPR hcall invocation) +$ git merge kvm-ppc/kvm-ppc-next +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 7 ++++-- + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/epapr_hcalls.h | 36 ++++++++++++++++--------------- + arch/powerpc/include/asm/fsl_hcalls.h | 36 +++++++++++++++---------------- + arch/powerpc/include/asm/kvm_para.h | 21 +++++++++--------- + arch/powerpc/kernel/epapr_hcalls.S | 28 ++++++++++++++++++++++++ + arch/powerpc/kernel/epapr_paravirt.c | 11 +++++++++- + arch/powerpc/kernel/kvm.c | 2 +- + arch/powerpc/kvm/powerpc.c | 30 +++++++++++++++++++------- + arch/powerpc/platforms/Kconfig | 1 + + arch/powerpc/sysdev/fsl_msi.c | 9 ++++++-- + arch/powerpc/sysdev/fsl_soc.c | 2 ++ + drivers/tty/Kconfig | 1 + + drivers/virt/Kconfig | 1 + + include/linux/kvm.h | 2 ++ + 15 files changed, 129 insertions(+), 59 deletions(-) +Merging oprofile/for-next (c16fa4f Linux 3.3) +$ git merge oprofile/for-next +Already up-to-date. +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 (64b0a47 Merge commit 'v3.5-rc7' into linux-next) +$ git merge xen-two/linux-next +Auto-merging arch/x86/xen/enlighten.c +Merge made by the 'recursive' strategy. + arch/x86/xen/enlighten.c | 8 -------- + drivers/xen/events.c | 2 -- + 2 files changed, 10 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 (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (6fec10a workqueue: fix spurious CPU locality WARN from process_one_work()) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/linux-next (00d3959 thinkpad_acpi: Free hotkey_keycode_map after unregistering tpacpi_inputdev) +$ git merge drivers-x86/linux-next +Already up-to-date. +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 (38e2319 Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' 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 (d45bb11 leds-lp8788: forgotten unlock at lp8788_led_work) +$ git merge leds/for-next +Already up-to-date. +Merging driver-core/driver-core-next (6791457 printk: Export struct log size and member offsets through vmcoreinfo) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (d155255 tty: Fix race in tty release) +$ git merge tty/tty-next +Auto-merging net/bluetooth/rfcomm/tty.c +Removing include/linux/stallion.h +Removing include/linux/serial167.h +Removing include/linux/sc26198.h +Removing include/linux/istallion.h +Removing include/linux/generic_serial.h +Removing include/linux/comstats.h +Removing include/linux/cdk.h +Removing include/linux/cd1400.h +Auto-merging include/linux/Kbuild +Auto-merging drivers/usb/serial/sierra.c +Auto-merging drivers/usb/serial/quatech2.c +Auto-merging drivers/usb/serial/keyspan.c +Auto-merging drivers/usb/class/cdc-acm.c +Auto-merging drivers/tty/tty_ldisc.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/tty/serial/samsung.c +Auto-merging drivers/tty/serial/of_serial.c +Auto-merging drivers/tty/serial/imx.c +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/tty/serial/8250/8250.c +Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c +Auto-merging Documentation/devicetree/bindings/tty/serial/of-serial.txt +Merge made by the 'recursive' strategy. + .../bindings/tty/serial/nxp-lpc32xx-hsuart.txt | 14 + + .../devicetree/bindings/tty/serial/of-serial.txt | 2 + + arch/ia64/hp/sim/simserial.c | 2 +- + arch/um/drivers/chan_kern.c | 4 +- + arch/um/drivers/line.c | 32 +- + arch/um/drivers/line.h | 3 +- + drivers/bluetooth/hci_ath.c | 2 +- + drivers/char/mwave/mwavedd.c | 16 +- + drivers/char/pcmcia/synclink_cs.c | 24 +- + drivers/isdn/gigaset/interface.c | 4 +- + drivers/isdn/i4l/isdn_tty.c | 16 +- + drivers/misc/ibmasm/uart.c | 16 +- + drivers/mmc/card/sdio_uart.c | 20 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 22 +- + drivers/net/irda/irtty-sir.c | 10 +- + drivers/net/usb/hso.c | 12 +- + drivers/tty/amiserial.c | 20 +- + drivers/tty/cyclades.c | 82 +- + drivers/tty/hvc/hvsi_lib.c | 2 +- + drivers/tty/isicom.c | 8 +- + drivers/tty/moxa.c | 10 +- + drivers/tty/mxser.c | 20 +- + drivers/tty/n_gsm.c | 8 +- + drivers/tty/n_tty.c | 8 +- + drivers/tty/pty.c | 169 ++-- + drivers/tty/rocket.c | 18 +- + drivers/tty/serial/8250/8250.c | 80 +- + drivers/tty/serial/8250/8250.h | 31 +- + drivers/tty/serial/8250/8250_acorn.c | 22 +- + drivers/tty/serial/8250/8250_dw.c | 38 +- + drivers/tty/serial/8250/8250_gsc.c | 26 +- + drivers/tty/serial/8250/8250_hp300.c | 26 +- + drivers/tty/serial/8250/8250_pci.c | 126 +-- + drivers/tty/serial/8250/8250_pnp.c | 28 +- + drivers/tty/serial/8250/serial_cs.c | 30 +- + drivers/tty/serial/Kconfig | 19 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/amba-pl011.c | 34 +- + drivers/tty/serial/bfin_uart.c | 2 +- + drivers/tty/serial/crisv10.c | 26 +- + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/ioc4_serial.c | 2 +- + drivers/tty/serial/jsm/jsm_tty.c | 8 +- + drivers/tty/serial/lpc32xx_hs.c | 823 ++++++++++++++++++++ + drivers/tty/serial/of_serial.c | 13 +- + drivers/tty/serial/pxa.c | 14 + + drivers/tty/serial/samsung.c | 26 +- + drivers/tty/serial/serial_core.c | 28 +- + drivers/tty/synclink.c | 36 +- + drivers/tty/synclink_gt.c | 24 +- + drivers/tty/synclinkmp.c | 24 +- + drivers/tty/tty_io.c | 122 +-- + drivers/tty/tty_ioctl.c | 100 +-- + drivers/tty/tty_ldisc.c | 13 +- + drivers/tty/tty_port.c | 23 +- + drivers/tty/vt/keyboard.c | 50 +- + drivers/tty/vt/vt.c | 63 +- + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/serial/ark3116.c | 4 +- + drivers/usb/serial/belkin_sa.c | 2 +- + drivers/usb/serial/cp210x.c | 8 +- + drivers/usb/serial/cypress_m8.c | 40 +- + drivers/usb/serial/digi_acceleport.c | 14 +- + drivers/usb/serial/empeg.c | 2 +- + drivers/usb/serial/f81232.c | 3 +- + drivers/usb/serial/ftdi_sio.c | 2 +- + drivers/usb/serial/io_edgeport.c | 12 +- + drivers/usb/serial/io_ti.c | 12 +- + drivers/usb/serial/ir-usb.c | 2 +- + drivers/usb/serial/iuu_phoenix.c | 28 +- + drivers/usb/serial/keyspan.c | 6 +- + drivers/usb/serial/keyspan_pda.c | 4 +- + drivers/usb/serial/kl5kusb105.c | 18 +- + drivers/usb/serial/kobil_sct.c | 14 +- + drivers/usb/serial/mct_u232.c | 4 +- + drivers/usb/serial/metro-usb.c | 8 +- + drivers/usb/serial/mos7720.c | 14 +- + drivers/usb/serial/mos7840.c | 12 +- + drivers/usb/serial/oti6858.c | 10 +- + drivers/usb/serial/pl2303.c | 6 +- + drivers/usb/serial/quatech2.c | 4 +- + drivers/usb/serial/sierra.c | 2 +- + drivers/usb/serial/spcp8x5.c | 12 +- + drivers/usb/serial/ssu100.c | 4 +- + drivers/usb/serial/ti_usb_3410_5052.c | 10 +- + drivers/usb/serial/usb-serial.c | 7 +- + drivers/usb/serial/usb_wwan.c | 2 +- + drivers/usb/serial/whiteheat.c | 2 +- + include/linux/Kbuild | 3 - + include/linux/cd1400.h | 292 ------- + include/linux/cdk.h | 486 ------------ + include/linux/comstats.h | 119 --- + include/linux/generic_serial.h | 35 - + include/linux/istallion.h | 123 --- + include/linux/kbd_kern.h | 13 - + include/linux/sc26198.h | 533 ------------- + include/linux/serial167.h | 157 ---- + include/linux/serial_8250.h | 33 +- + include/linux/stallion.h | 147 ---- + include/linux/tty.h | 52 +- + include/linux/tty_driver.h | 12 +- + include/net/irda/ircomm_tty.h | 17 +- + net/bluetooth/rfcomm/tty.c | 2 +- + net/irda/ircomm/ircomm_param.c | 5 - + net/irda/ircomm/ircomm_tty.c | 281 ++++--- + net/irda/ircomm/ircomm_tty_attach.c | 40 +- + net/irda/ircomm/ircomm_tty_ioctl.c | 33 +- + 107 files changed, 2024 insertions(+), 3033 deletions(-) + create mode 100644 Documentation/devicetree/bindings/tty/serial/nxp-lpc32xx-hsuart.txt + create mode 100644 drivers/tty/serial/lpc32xx_hs.c + delete mode 100644 include/linux/cd1400.h + delete mode 100644 include/linux/cdk.h + delete mode 100644 include/linux/comstats.h + delete mode 100644 include/linux/generic_serial.h + delete mode 100644 include/linux/istallion.h + delete mode 100644 include/linux/sc26198.h + delete mode 100644 include/linux/serial167.h + delete mode 100644 include/linux/stallion.h +$ git am -3 ../patches/0001-disable-SERIAL_IPOCTAL-broken-by-tty-updates.patch +Applying: disable SERIAL_IPOCTAL broken by tty updates +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/ipack/devices/Kconfig +$ git add . +$ git commit -v -a --amend +[master a143d26] Merge remote-tracking branch 'tty/tty-next' +$ git am -3 ../patches/0001-disable-USB_SERIAL_QUATECH2-broken-by-tty-update.patch +Applying: disable USB_SERIAL_QUATECH2 broken by tty update +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/serqt_usb2/Kconfig +$ git add . +$ git commit -v -a --amend +[master 286e2a1] Merge remote-tracking branch 'tty/tty-next' +$ git am -3 ../patches/0001-tty-fix-up-usb-serial-console-for-termios-change.patch +Applying: tty: fix up usb serial console for termios change. +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/serial/console.c +$ git add . +$ git commit -v -a --amend +[master d5dfc56] Merge remote-tracking branch 'tty/tty-next' +Merging usb/usb-next (e387ef5 usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams) +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next (419e926 staging: csr: delete a bunch of unused library functions) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (6078188 mei: use module_pci_driver) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging tmem/linux-next (78821b2 Merge branch 'stable/for-linus-3.6' into linux-next) +$ git merge tmem/linux-next +Merge made by the 'recursive' strategy. +Merging writeback/writeback-for-next (331cbde writeback: Fix some comment errors) +$ git merge writeback/writeback-for-next +Resolved 'fs/sync.c' using previous resolution. +Auto-merging lib/Makefile +Auto-merging fs/sync.c +CONFLICT (content): Merge conflict in fs/sync.c +Auto-merging fs/super.c +Auto-merging fs/fs-writeback.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fe390ae] Merge remote-tracking branch 'writeback/writeback-for-next' +$ git diff -M --stat --summary HEAD^.. + fs/fs-writeback.c | 4 +- + fs/super.c | 2 +- + include/linux/backing-dev.h | 4 +- + include/linux/flex_proportions.h | 101 ++++++++++++++ + lib/Makefile | 2 +- + lib/flex_proportions.c | 272 ++++++++++++++++++++++++++++++++++++++ + mm/backing-dev.c | 6 +- + mm/page-writeback.c | 107 +++++++++------ + 8 files changed, 448 insertions(+), 50 deletions(-) + create mode 100644 include/linux/flex_proportions.h + create mode 100644 lib/flex_proportions.c +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 (c9eebe7 pinctrl/pinctrl-u300: remove unneeded devm_kfree call) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/pinctrl-imx23.c | 2 +- + drivers/pinctrl/pinctrl-imx28.c | 2 +- + drivers/pinctrl/pinctrl-u300.c | 8 ++------ + 3 files changed, 4 insertions(+), 8 deletions(-) +Merging moduleh/for-sfr (6b16351 Linux 3.5-rc4) +$ git merge moduleh/for-sfr +Already up-to-date. +Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support) +$ git merge vhost/linux-next +Resolved 'drivers/net/tun.c' using previous resolution. +Auto-merging drivers/net/tun.c +CONFLICT (content): Merge conflict in drivers/net/tun.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 17a58a0] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging kmap_atomic/kmap_atomic (2164d33 pipe: remove KM_USER0 from comments) +$ git merge kmap_atomic/kmap_atomic +Already up-to-date. +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 (6bb697b MAINTAINERS: add remoteproc's git) +$ git merge remoteproc/for-next +Already up-to-date. +Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails) +$ git merge irqdomain/irqdomain/next +Auto-merging include/linux/of.h +Merge made by the 'recursive' strategy. + Documentation/IRQ-domain.txt | 5 + + arch/powerpc/sysdev/xics/icp-hv.c | 2 +- + arch/powerpc/sysdev/xics/icp-native.c | 2 +- + arch/powerpc/sysdev/xics/xics-common.c | 3 - + include/linux/irqdomain.h | 28 ++- + include/linux/of.h | 15 +- + kernel/irq/irqdomain.c | 362 ++++++++++++++++++-------------- + 7 files changed, 248 insertions(+), 169 deletions(-) +Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio shadow variables properly) +$ git merge gpio/gpio/next +Already up-to-date. +Merging gpio-lw/for-next (4fbb002 gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available) +$ git merge gpio-lw/for-next +Already up-to-date. +Merging arm-soc/for-next (deac1d4 ARM: arm-soc: add arm-soc-for-next-contents.txt) +$ git merge arm-soc/for-next +Resolved 'drivers/watchdog/orion_wdt.c' using previous resolution. +Auto-merging drivers/watchdog/orion_wdt.c +CONFLICT (content): Merge conflict in drivers/watchdog/orion_wdt.c +Auto-merging arch/arm/mm/mmu.c +Auto-merging arch/arm/mm/ioremap.c +Removing arch/arm/mach-versatile/include/mach/io.h +Auto-merging arch/arm/mach-tegra/pcie.c +Removing arch/arm/mach-tegra/include/mach/io.h +Removing arch/arm/mach-shark/include/mach/io.h +Removing arch/arm/mach-orion5x/include/mach/io.h +Auto-merging arch/arm/mach-omap2/timer.c +Auto-merging arch/arm/mach-omap2/cpuidle44xx.c +Auto-merging arch/arm/mach-omap2/Kconfig +Removing arch/arm/mach-mv78xx0/include/mach/io.h +Removing arch/arm/mach-kirkwood/include/mach/io.h +Removing arch/arm/mach-iop33x/include/mach/io.h +Removing arch/arm/mach-iop32x/include/mach/io.h +Removing arch/arm/mach-iop13xx/include/mach/io.h +Auto-merging arch/arm/mach-integrator/integrator_ap.c +Removing arch/arm/mach-integrator/include/mach/io.h +Removing arch/arm/mach-dove/include/mach/io.h +Auto-merging arch/arm/kernel/bios32.c +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 32b79f5] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/memory.txt | 3 + + .../devicetree/bindings/arm/mrvl/intc.txt | 20 ++ + Documentation/devicetree/bindings/ata/marvell.txt | 16 ++ + .../devicetree/bindings/gpio/mrvl-gpio.txt | 23 ++ + .../devicetree/bindings/watchdog/marvel.txt | 14 + + arch/arm/Kconfig | 14 +- + arch/arm/arm-soc-for-next-contents.txt | 294 ++++++++++++++++++++ + arch/arm/boot/dts/kirkwood-dns320.dts | 62 ++--- + arch/arm/boot/dts/kirkwood-dns325.dts | 68 +++-- + arch/arm/boot/dts/kirkwood-dnskw.dtsi | 69 +++++ + arch/arm/boot/dts/kirkwood-dreamplug.dts | 50 ++++ + arch/arm/boot/dts/kirkwood-goflexnet.dts | 99 +++++++ + arch/arm/boot/dts/kirkwood-ib62x0.dts | 38 +++ + arch/arm/boot/dts/kirkwood-iconnect.dts | 42 +++ + arch/arm/boot/dts/kirkwood-lschlv2.dts | 20 ++ + arch/arm/boot/dts/kirkwood-lsxhl.dts | 20 ++ + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 95 +++++++ + arch/arm/boot/dts/kirkwood-ts219-6281.dts | 21 ++ + arch/arm/boot/dts/kirkwood-ts219-6282.dts | 21 ++ + arch/arm/boot/dts/kirkwood-ts219.dtsi | 78 ++++++ + arch/arm/boot/dts/kirkwood.dtsi | 60 ++++ + arch/arm/include/asm/hardware/iop3xx.h | 12 +- + arch/arm/include/asm/io.h | 8 + + arch/arm/include/asm/mach/map.h | 8 + + arch/arm/include/asm/mach/pci.h | 13 + + arch/arm/kernel/bios32.c | 54 +++- + arch/arm/mach-dove/common.c | 10 - + arch/arm/mach-dove/include/mach/dove.h | 8 +- + arch/arm/mach-dove/include/mach/io.h | 19 -- + arch/arm/mach-dove/irq.c | 58 ++-- + arch/arm/mach-dove/pcie.c | 43 +-- + arch/arm/mach-footbridge/common.c | 12 +- + arch/arm/mach-footbridge/dc21285.c | 16 +- + .../arm/mach-footbridge/include/mach/debug-macro.S | 3 +- + arch/arm/mach-footbridge/include/mach/io.h | 12 +- + arch/arm/mach-integrator/include/mach/io.h | 33 --- + arch/arm/mach-integrator/include/mach/platform.h | 4 + + arch/arm/mach-integrator/integrator_ap.c | 9 +- + arch/arm/mach-integrator/pci_v3.c | 50 ++-- + arch/arm/mach-iop13xx/include/mach/io.h | 28 -- + arch/arm/mach-iop13xx/include/mach/iop13xx.h | 28 +- + arch/arm/mach-iop13xx/io.c | 27 -- + arch/arm/mach-iop13xx/pci.c | 37 +-- + arch/arm/mach-iop13xx/setup.c | 10 - + arch/arm/mach-iop32x/include/mach/io.h | 19 -- + arch/arm/mach-iop33x/include/mach/io.h | 19 -- + arch/arm/mach-kirkwood/Kconfig | 29 ++ + arch/arm/mach-kirkwood/Makefile | 3 + + arch/arm/mach-kirkwood/Makefile.boot | 4 + + arch/arm/mach-kirkwood/board-dnskw.c | 143 ---------- + arch/arm/mach-kirkwood/board-dreamplug.c | 80 ------ + arch/arm/mach-kirkwood/board-dt.c | 29 +- + arch/arm/mach-kirkwood/board-goflexnet.c | 71 +++++ + arch/arm/mach-kirkwood/board-ib62x0.c | 72 ----- + arch/arm/mach-kirkwood/board-iconnect.c | 56 ---- + arch/arm/mach-kirkwood/board-lsxl.c | 135 +++++++++ + arch/arm/mach-kirkwood/board-ts219.c | 82 ++++++ + arch/arm/mach-kirkwood/common.c | 12 +- + arch/arm/mach-kirkwood/common.h | 17 ++ + arch/arm/mach-kirkwood/include/mach/io.h | 24 -- + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 8 +- + arch/arm/mach-kirkwood/irq.c | 38 ++- + arch/arm/mach-kirkwood/pcie.c | 44 +-- + arch/arm/mach-mv78xx0/addr-map.c | 3 +- + arch/arm/mach-mv78xx0/common.c | 5 - + arch/arm/mach-mv78xx0/include/mach/io.h | 24 -- + arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 21 +- + arch/arm/mach-mv78xx0/irq.c | 22 +- + arch/arm/mach-mv78xx0/pcie.c | 110 +++----- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/cpuidle44xx.c | 145 +++++++--- + arch/arm/mach-omap2/timer.c | 4 +- + arch/arm/mach-orion5x/common.c | 10 - + arch/arm/mach-orion5x/include/mach/io.h | 22 -- + arch/arm/mach-orion5x/include/mach/orion5x.h | 20 +- + arch/arm/mach-orion5x/irq.c | 22 +- + arch/arm/mach-orion5x/pci.c | 56 ++-- + arch/arm/mach-shark/core.c | 18 -- + arch/arm/mach-shark/include/mach/debug-macro.S | 7 +- + arch/arm/mach-shark/include/mach/entry-macro.S | 3 +- + arch/arm/mach-shark/include/mach/io.h | 18 -- + arch/arm/mach-shark/pci.c | 5 + + arch/arm/mach-tegra/include/mach/io.h | 46 --- + arch/arm/mach-tegra/include/mach/iomap.h | 3 + + arch/arm/mach-tegra/pcie.c | 95 ++----- + arch/arm/mach-versatile/core.c | 5 - + arch/arm/mach-versatile/include/mach/hardware.h | 1 - + arch/arm/mach-versatile/include/mach/io.h | 27 -- + arch/arm/mach-versatile/pci.c | 22 +- + arch/arm/mm/ioremap.c | 14 + + arch/arm/mm/mmu.c | 54 +++- + arch/arm/plat-iop/pci.c | 25 +- + arch/arm/plat-iop/setup.c | 5 - + arch/arm/plat-orion/common.c | 1 + + arch/arm/plat-orion/gpio.c | 166 ++++++++--- + arch/arm/plat-orion/include/plat/gpio.h | 16 +- + arch/arm/plat-orion/include/plat/irq.h | 3 +- + arch/arm/plat-orion/irq.c | 40 +++ + drivers/ata/sata_mv.c | 42 ++- + drivers/i2c/busses/i2c-iop3xx.c | 121 ++++---- + drivers/watchdog/orion_wdt.c | 8 + + 101 files changed, 2198 insertions(+), 1526 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/marvell.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/marvel.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/kirkwood-dnskw.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-goflexnet.dts + create mode 100644 arch/arm/boot/dts/kirkwood-lschlv2.dts + create mode 100644 arch/arm/boot/dts/kirkwood-lsxhl.dts + create mode 100644 arch/arm/boot/dts/kirkwood-lsxl.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-ts219-6281.dts + create mode 100644 arch/arm/boot/dts/kirkwood-ts219-6282.dts + create mode 100644 arch/arm/boot/dts/kirkwood-ts219.dtsi + delete mode 100644 arch/arm/mach-dove/include/mach/io.h + delete mode 100644 arch/arm/mach-integrator/include/mach/io.h + delete mode 100644 arch/arm/mach-iop13xx/include/mach/io.h + delete mode 100644 arch/arm/mach-iop32x/include/mach/io.h + delete mode 100644 arch/arm/mach-iop33x/include/mach/io.h + create mode 100644 arch/arm/mach-kirkwood/board-goflexnet.c + create mode 100644 arch/arm/mach-kirkwood/board-lsxl.c + create mode 100644 arch/arm/mach-kirkwood/board-ts219.c + delete mode 100644 arch/arm/mach-kirkwood/include/mach/io.h + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/io.h + delete mode 100644 arch/arm/mach-orion5x/include/mach/io.h + delete mode 100644 arch/arm/mach-shark/include/mach/io.h + delete mode 100644 arch/arm/mach-tegra/include/mach/io.h + delete mode 100644 arch/arm/mach-versatile/include/mach/io.h +Merging ep93xx/ep93xx-for-next (9b6a359 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 renesas/next (45c7a01 Merge branch 'renesas-marzen' into renesas-board) +$ git merge renesas/next +Already up-to-date. +Merging s5p/for-next (6701bca Merge branch 'next/board-samsung-3' into for-next) +$ git merge s5p/for-next +Merge made by the 'recursive' strategy. +Merging tegra/for-next (a04ef1f Merge branch 'for-3.6/defconfig' into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. +Merging kvmtool/master (8598de5 kvm tools, powerpc: Use MMU info for ibm,slb-size) +$ git merge kvmtool/master +Already up-to-date. +Merging dma-mapping/dma-mapping-next (97ef952 ARM: dma-mapping: add support for DMA_ATTR_SKIP_CPU_SYNC attribute) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (19891b2 pwm: pwm-tiehrpwm: PWM driver support for EHRPWM) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (ca24a14 Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (491fa9e userns: Allow the usernamespace support to build after the removal of usbfs) +$ git merge userns/for-next +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + init/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/from-sfr (2e117f2 Revert "arm: pull all work_pending logics into C function") +$ git merge signal/from-sfr +Resolved 'arch/arm/include/asm/thread_info.h' using previous resolution. +Resolved 'arch/powerpc/kernel/entry_64.S' using previous resolution. +Auto-merging kernel/timer.c +Auto-merging kernel/sched/core.c +Auto-merging arch/xtensa/kernel/signal.c +Auto-merging arch/x86/kernel/vm86_32.c +Auto-merging arch/x86/kernel/signal.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/sh/kernel/cpu/sh5/entry.S +Auto-merging arch/s390/include/asm/thread_info.h +Auto-merging arch/powerpc/kernel/entry_64.S +CONFLICT (content): Merge conflict in arch/powerpc/kernel/entry_64.S +Auto-merging arch/powerpc/include/asm/thread_info.h +Auto-merging arch/mn10300/kernel/signal.c +Auto-merging arch/mn10300/include/asm/thread_info.h +Auto-merging arch/mips/include/asm/thread_info.h +Auto-merging arch/m32r/kernel/signal.c +Auto-merging arch/h8300/kernel/signal.c +Auto-merging arch/frv/kernel/signal.c +Auto-merging arch/avr32/kernel/signal.c +Auto-merging arch/arm/kernel/signal.c +Auto-merging arch/arm/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 32d6dde] Merge branch 'signal/from-sfr' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/ptrace.h | 5 +- + arch/alpha/include/asm/thread_info.h | 3 +- + arch/alpha/kernel/alpha_ksyms.c | 1 - + arch/alpha/kernel/entry.S | 161 ----------------------------- + arch/alpha/kernel/osf_sys.c | 49 +++++++++ + arch/alpha/kernel/process.c | 29 ++++++ + arch/alpha/kernel/systbls.S | 2 +- + arch/arm/include/asm/thread_info.h | 2 - + arch/arm/kernel/signal.c | 1 - + arch/avr32/include/asm/thread_info.h | 17 +-- + arch/avr32/kernel/signal.c | 1 - + arch/blackfin/include/asm/thread_info.h | 4 - + arch/blackfin/kernel/signal.c | 1 - + arch/c6x/include/asm/thread_info.h | 1 - + arch/c6x/kernel/asm-offsets.c | 1 - + arch/cris/include/asm/thread_info.h | 3 - + arch/frv/include/asm/thread_info.h | 3 - + arch/frv/kernel/signal.c | 9 -- + arch/h8300/include/asm/thread_info.h | 7 +- + arch/h8300/kernel/signal.c | 1 - + arch/hexagon/include/asm/thread_info.h | 5 - + arch/hexagon/kernel/signal.c | 1 - + arch/ia64/include/asm/thread_info.h | 2 - + arch/ia64/kernel/signal.c | 8 -- + arch/m32r/include/asm/thread_info.h | 9 +- + arch/m32r/kernel/signal.c | 3 - + arch/microblaze/include/asm/thread_info.h | 3 +- + arch/microblaze/kernel/entry-nommu.S | 21 +++- + arch/microblaze/kernel/entry.S | 62 ++++++----- + arch/microblaze/kernel/signal.c | 16 +-- + arch/mips/include/asm/thread_info.h | 9 +- + arch/mips/kernel/entry.S | 15 ++- + arch/mips/kernel/scall32-o32.S | 13 +-- + arch/mips/kernel/scall64-64.S | 13 +-- + arch/mips/kernel/scall64-n32.S | 13 +-- + arch/mips/kernel/scall64-o32.S | 13 +-- + arch/mips/kernel/signal.c | 8 -- + arch/mn10300/include/asm/thread_info.h | 3 +- + arch/mn10300/kernel/entry.S | 4 + + arch/mn10300/kernel/signal.c | 9 -- + arch/openrisc/include/asm/thread_info.h | 3 +- + arch/parisc/hpux/gate.S | 2 +- + arch/parisc/include/asm/thread_info.h | 5 +- + arch/parisc/kernel/signal.c | 45 +++----- + arch/parisc/kernel/syscall.S | 9 +- + arch/powerpc/include/asm/thread_info.h | 2 + + arch/powerpc/kernel/signal_32.c | 1 - + arch/s390/include/asm/thread_info.h | 4 - + arch/score/include/asm/thread_info.h | 4 - + arch/score/kernel/signal.c | 1 + + arch/sh/include/asm/thread_info.h | 3 + + arch/sh/kernel/cpu/sh5/entry.S | 2 +- + arch/sh/kernel/entry-common.S | 2 +- + arch/sh/kernel/signal_32.c | 1 - + arch/sh/kernel/signal_64.c | 1 - + arch/sparc/include/asm/thread_info_32.h | 3 +- + arch/sparc/include/asm/thread_info_64.h | 3 + + arch/tile/kernel/compat_signal.c | 9 -- + arch/tile/kernel/signal.c | 12 +-- + arch/um/include/asm/thread_info.h | 3 - + arch/unicore32/include/asm/thread_info.h | 4 +- + arch/unicore32/kernel/entry.S | 2 - + arch/unicore32/kernel/signal.c | 1 - + arch/x86/include/asm/thread_info.h | 2 - + arch/x86/kernel/entry_32.S | 17 ++- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/signal.c | 4 - + arch/x86/kernel/vm86_32.c | 2 +- + arch/xtensa/include/asm/thread_info.h | 5 - + arch/xtensa/kernel/signal.c | 4 - + kernel/sched/core.c | 2 +- + kernel/timer.c | 9 -- + 72 files changed, 227 insertions(+), 473 deletions(-) +Merging clk/clk-next (137f8a7 clk: fix compile for OF && !COMMON_CLK) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf()) +$ git merge random/dev +Resolved 'drivers/mfd/ab3100-core.c' using previous resolution. +Resolved 'drivers/usb/gadget/omap_udc.c' using previous resolution. +Auto-merging net/core/rtnetlink.c +Auto-merging net/core/dev.c +Auto-merging kernel/irq/manage.c +Auto-merging drivers/usb/otg/isp1301_omap.c +Auto-merging drivers/usb/gadget/pxa25x_udc.c +Auto-merging drivers/usb/gadget/omap_udc.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/omap_udc.c +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/power/pda_power.c +Auto-merging drivers/mfd/ab3100-core.c +CONFLICT (content): Merge conflict in drivers/mfd/ab3100-core.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging arch/um/drivers/mconsole_kern.c +Auto-merging arch/um/drivers/line.c +Auto-merging arch/arm/mach-omap1/board-palmz71.c +Auto-merging MAINTAINERS +Auto-merging Documentation/feature-removal-schedule.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3098185] Merge remote-tracking branch 'random/dev' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 14 -- + MAINTAINERS | 2 +- + arch/arm/mach-omap1/board-palmz71.c | 3 +- + arch/arm/mach-pxa/lubbock.c | 2 +- + arch/arm/mach-pxa/magician.c | 5 +- + arch/arm/mach-pxa/trizeps4.c | 4 +- + arch/ia64/kernel/irq_ia64.c | 1 - + arch/sparc/kernel/ldc.c | 6 +- + arch/um/drivers/line.c | 13 +- + arch/um/drivers/mconsole_kern.c | 3 +- + arch/um/drivers/port_kern.c | 6 +- + arch/um/drivers/random.c | 3 +- + arch/um/drivers/xterm_kern.c | 3 +- + arch/um/kernel/sigio.c | 3 +- + drivers/block/xen-blkfront.c | 5 +- + drivers/char/random.c | 355 ++++++++++++++++++---------- + drivers/crypto/n2_core.c | 3 +- + drivers/firmware/dmi_scan.c | 3 + + drivers/hv/vmbus_drv.c | 3 +- + drivers/i2c/busses/i2c-pmcmsp.c | 3 +- + drivers/input/serio/hp_sdc.c | 2 +- + drivers/mfd/ab3100-core.c | 4 - + drivers/mfd/tps65010.c | 3 +- + drivers/mfd/wm831x-otp.c | 8 + + drivers/power/pda_power.c | 6 +- + drivers/rtc/rtc-wm831x.c | 24 +- + drivers/tty/serial/uartlite.c | 3 +- + drivers/usb/core/hub.c | 9 + + drivers/usb/gadget/goku_udc.c | 2 +- + drivers/usb/gadget/omap_udc.c | 4 +- + drivers/usb/gadget/pxa25x_udc.c | 12 +- + drivers/usb/otg/isp1301_omap.c | 1 - + include/linux/interrupt.h | 2 - + include/linux/irqdesc.h | 1 - + include/linux/random.h | 6 +- + include/trace/events/random.h | 134 +++++++++++ + kernel/irq/handle.c | 7 +- + kernel/irq/manage.c | 17 -- + net/core/dev.c | 3 + + net/core/rtnetlink.c | 1 + + 40 files changed, 454 insertions(+), 235 deletions(-) + create mode 100644 include/trace/events/random.h +Merging scsi-post-merge/merge-base:master () +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm +From ../next + * [new branch] quilt/akpm -> akpm +$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base +From ../next + * [new branch] quilt/akpm-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: mm: fix wrong argument of migrate_huge_pages() in soft_offline_huge_page() +Applying: pcdp: use early_ioremap/early_iounmap to access pcdp table +Applying: cciss: fix incorrect scsi status reporting +Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug +Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed +Applying: acpi_memhotplug.c: remove memory info from list before freeing it +Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used +Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded +Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded +Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver +Applying: arch/x86/include/asm/spinlock.h: fix comment +Applying: arch/x86/kernel/cpu/perf_event_intel_uncore.h: make UNCORE_PMU_HRTIMER_INTERVAL 64-bit +Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it +Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message +Applying: prctl: remove redunant assignment of "error" to zero +Applying: timeconst.pl: remove deprecated defined(@array) +Applying: time: don't inline EXPORT_SYMBOL functions +Applying: thermal: fix potential out-of-bounds memory access +Applying: thermal: add Renesas R-Car thermal sensor support +Applying: thermal: add generic cpufreq cooling implementation +Applying: hwmon: exynos4: move thermal sensor driver to driver/thermal directory +Applying: thermal: exynos5: add exynos5 thermal sensor driver support +Applying: thermal: exynos: register the tmu sensor with the kernel thermal layer +Applying: ARM: exynos: add thermal sensor driver platform data support +Applying: ocfs2: use find_last_bit() +Applying: ocfs2: use bitmap_weight() +Applying: drivers/scsi/atp870u.c: fix bad use of udelay +Applying: vfs: increment iversion when a file is truncated +Applying: fs: push rcu_barrier() from deactivate_locked_super() to filesystems +Applying: fs/xattr.c:getxattr(): improve handling of allocation failures +Applying: fs: make dumpable=2 require fully qualified path +Applying: coredump: warn about unsafe suid_dumpable / core_pattern combo +Applying: xtensa/mm/fault.c: port OOM changes to do_page_fault +Applying: mm/slab: remove duplicate check +Applying: slab: do not call compound_head() in page_get_cache() +Applying: vmalloc: walk vmap_areas by sorted list instead of rb_next() +Applying: mm: make vb_alloc() more foolproof +Applying: mm-make-vb_alloc-more-foolproof-fix +Applying: memcg: rename MEM_CGROUP_STAT_SWAPOUT as MEM_CGROUP_STAT_SWAP +Applying: memcg: rename MEM_CGROUP_CHARGE_TYPE_MAPPED as MEM_CGROUP_CHARGE_TYPE_ANON +Applying: memcg: remove MEM_CGROUP_CHARGE_TYPE_FORCE +Applying: swap: allow swap readahead to be merged +Applying: documentation: update how page-cluster affects swap I/O +Applying: mm: account the total_vm in the vm_stat_account() +Applying: mm/buddy: cleanup on should_fail_alloc_page +Applying: mm: prepare for removal of obsolete /proc/sys/vm/nr_pdflush_threads +Applying: hugetlb: rename max_hstate to hugetlb_max_hstate +Applying: hugetlb: don't use ERR_PTR with VM_FAULT* values +Applying: hugetlb: add an inline helper for finding hstate index +Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages +Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb +Applying: hugetlb: simplify migrate_huge_page() +Applying: hugetlb: add a list for tracking in-use HugeTLB pages +Applying: hugetlb: make some static variables global +Applying: hugeltb: mark hugelb_max_hstate __read_mostly +Applying: mm/hugetlb: add new HugeTLB cgroup +Applying: mm-hugetlb-add-new-hugetlb-cgroup-fix +Applying: mm-hugetlb-add-new-hugetlb-cgroup-fix-fix +Applying: hugetlb/cgroup: remove unnecessary NULL checks +Applying: hugetlb/cgroup: Mark root_h_cgroup static +Applying: hugetlb/cgroup: add the cgroup pointer to page lru +Applying: hugetlb/cgroup: add charge/uncharge routines for hugetlb cgroup +Applying: hugetlb/cgroup: Remove unnecessary NULL checks +Applying: mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge +Applying: hugetlb/cgroup: add support for cgroup removal +Applying: hugetlb/cgroup: add hugetlb cgroup control files +Applying: hugetlb-cgroup-add-hugetlb-cgroup-control-files-fix +Applying: hugetlb-cgroup-add-hugetlb-cgroup-control-files-fix-fix +Applying: hugetlb/cgroup: migrate hugetlb cgroup info from oldpage to new page during migration +Applying: hugetlb/cgroup: add HugeTLB controller documentation +Applying: hugetlb: move all the in use pages to active list +Applying: hugetlb/cgroup: assign the page hugetlb cgroup when we move the page to active list. +Applying: hugetlb/cgroup: remove exclude and wakeup rmdir calls from migrate +Applying: mm, oom: do not schedule if current has been killed +Applying: mm/memblock.c:memblock_double_array(): cosmetic cleanups +Applying: memcg: remove check for signal_pending() during rmdir() +Applying: memcg: clean up force_empty_list() return value check +Applying: memcg: mem_cgroup_move_parent() doesn't need gfp_mask +Applying: memcg: make mem_cgroup_force_empty_list() return bool +Applying: memcg-make-mem_cgroup_force_empty_list-return-bool-fix +Applying: mm/compaction: cleanup on compaction_deferred +Applying: mm, fadvise: don't return -EINVAL when filesystem cannot implement fadvise() +Applying: mm-fadvise-dont-return-einval-when-filesystem-cannot-implement-fadvise-checkpatch-fixes +Applying: mm: clear pages_scanned only if draining a pcp adds pages to the buddy allocator again +Applying: mm, oom: fix potential killing of thread that is disabled from oom killing +Applying: mm, oom: replace some information in tasklist dump +Applying: mm: do not use page_count() without a page pin +Applying: mm: clean up __count_immobile_pages() +Applying: memcg: rename config variables +Applying: memcg-rename-config-variables-fix +Applying: memcg-rename-config-variables-fix-fix +Applying: mm: remove unused LRU_ALL_EVICTABLE +Applying: memcg: fix bad behavior in use_hierarchy file +Applying: memcg: rename mem_control_xxx to memcg_xxx +Applying: mm: have order > 0 compaction start off where it left +Applying: mm-have-order-0-compaction-start-off-where-it-left-checkpatch-fixes +Applying: mm: have order > 0 compaction start off where it left +Applying: mm-have-order-0-compaction-start-off-where-it-left-v3-typo +Applying: mm: CONFIG_HAVE_MEMBLOCK_NODE -> CONFIG_HAVE_MEMBLOCK_NODE_MAP +Applying: vmscan: remove obsolete shrink_control comment +Applying: mm/memory.c:print_vma_addr(): call up_read(&mm->mmap_sem) directly +Applying: mm: setup pageblock_order before it's used by sparsemem +Applying: mm/memcg: complete documentation for tcp memcg files +Applying: mm/memcg: mem_cgroup_relize_xxx_limit can guarantee memcg->res.limit <= memcg->memsw.limit +Applying: mm/memcg: replace inexistence move_lock_page_cgroup() by move_lock_mem_cgroup() in comment +Applying: mm/hotplug: correctly setup fallback zonelists when creating new pgdat +Applying: mm/hotplug: correctly add new zone to all other nodes' zone lists +Applying: mm/hotplug: free zone->pageset when a zone becomes empty +Applying: mm/hotplug: mark memory hotplug code in page_alloc.c as __meminit +Applying: mm, oom: move declaration for mem_cgroup_out_of_memory to oom.h +Applying: mm, oom: introduce helper function to process threads during scan +Applying: mm, memcg: introduce own oom handler to iterate only over its own threads +Applying: mm, oom: reduce dependency on tasklist_lock +Applying: mm, oom: reduce dependency on tasklist_lock: fix +Applying: mm, memcg: move all oom handling to memcontrol.c +Applying: mm: factor out memory isolate functions +Applying: mm: fix free page check in zone_watermark_ok() +Applying: memory-hotplug: fix kswapd looping forever problem +Applying: memory-hotplug-fix-kswapd-looping-forever-problem-fix +Applying: memory-hotplug-fix-kswapd-looping-forever-problem-fix-fix +Applying: mm: sl[au]b: add knowledge of PFMEMALLOC reserve pages +Applying: mm: slub: optimise the SLUB fast path to avoid pfmemalloc checks +Applying: mm: introduce __GFP_MEMALLOC to allow access to emergency reserves +Applying: mm: allow PF_MEMALLOC from softirq context +Applying: mm: only set page->pfmemalloc when ALLOC_NO_WATERMARKS was used +Applying: mm: ignore mempolicies when using ALLOC_NO_WATERMARK +Applying: net: introduce sk_gfp_atomic() to allow addition of GFP flags depending on the individual socket +Applying: netvm: allow the use of __GFP_MEMALLOC by specific sockets +Applying: netvm: allow skb allocation to use PFMEMALLOC reserves +Applying: netvm: propagate page->pfmemalloc to skb +Applying: netvm: propagate page->pfmemalloc from skb_alloc_page to skb +Applying: netvm-propagate-page-pfmemalloc-from-skb_alloc_page-to-skb-fix +Applying: netvm: set PF_MEMALLOC as appropriate during SKB processing +Applying: mm: micro-optimise slab to avoid a function call +Applying: nbd: set SOCK_MEMALLOC for access to PFMEMALLOC reserves +Applying: mm: throttle direct reclaimers if PF_MEMALLOC reserves are low and swap is backed by network storage +Applying: mm: account for the number of times direct reclaimers get throttled +Applying: netvm: prevent a stream-specific deadlock +Applying: selinux: tag avc cache alloc as non-critical +Applying: mm: methods for teaching filesystems about PG_swapcache pages +Applying: mm: add support for a filesystem to activate swap files and use direct_IO for writing swap pages +Applying: mm: swap: implement generic handler for swap_activate +Applying: mm: add get_kernel_page[s] for pinning of kernel addresses for I/O +Applying: mm: add support for direct_IO to highmem pages +Applying: nfs: teach the NFS client how to treat PG_swapcache pages +Applying: nfs: disable data cache revalidation for swapfiles +Applying: nfs: enable swap on NFS +Using index info to reconstruct a base tree... +M fs/nfs/Kconfig +M fs/nfs/direct.c +M fs/nfs/file.c +M include/linux/nfs_fs.h +M net/sunrpc/clnt.c +M net/sunrpc/sched.c +M net/sunrpc/xprtsock.c +Falling back to patching base and 3-way merge... +Auto-merging net/sunrpc/xprtsock.c +CONFLICT (content): Merge conflict in net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/sched.c +Auto-merging net/sunrpc/clnt.c +Auto-merging include/linux/nfs_fs.h +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/direct.c +Auto-merging fs/nfs/Kconfig +Failed to merge in the changes. +Patch failed at 0147 nfs: enable swap on NFS + +When you have resolved this problem run "git rebase --continue". +If you would prefer to skip this patch, instead run "git rebase --skip". +To check out the original branch and stop rebasing run "git rebase --abort". + +$ git rebase --continue +Applying: nfs: prevent page allocator recursions with swap over NFS. +Applying: swapfile: avoid dereferencing bd_disk during swap_entry_free for network storage +Applying: mm: memcg: fix compaction/migration failing due to memcg limits +Applying: mm: swapfile: clean up unuse_pte race handling +Applying: mm: memcg: push down PageSwapCache check into uncharge entry functions +Applying: mm: memcg: only check for PageSwapCache when uncharging anon +Applying: mm: memcg: move swapin charge functions above callsites +Applying: mm: memcg: remove unneeded shmem charge type +Applying: mm: memcg: remove needless !mm fixup to init_mm when charging +Applying: mm: memcg: split swapin charge function into private and public part +Applying: mm: memcg: only check swap cache pages for repeated charging +Applying: mm: memcg: only check anon swapin page charges for swap cache +Applying: mm: mmu_notifier: fix freed page still mapped in secondary MMU +Applying: memcg: prevent OOM with too many dirty pages +Applying: memcg: further prevent OOM with too many dirty pages +Applying: memcg: add mem_cgroup_from_css() helper +Applying: memcg-add-mem_cgroup_from_css-helper-fix +Applying: shmem: provide vm_ops when also providing a mem policy +Applying: tmpfs: interleave the starting node of /dev/shmem +Applying: frv: kill used but uninitialized variable +Applying: alpha: remove mysterious if zero-ed out includes +Applying: avr32/mm/fault.c: port OOM changes to do_page_fault +Applying: avr32-mm-faultc-port-oom-changes-to-do_page_fault-fix +Applying: clk: add non CONFIG_HAVE_CLK routines +Applying: clk: remove redundant depends on from drivers/Kconfig +Applying: i2c/i2c-pxa: remove conditional compilation of clk code +Applying: usb/marvell: remove conditional compilation of clk code +Applying: usb/musb: remove conditional compilation of clk code +Applying: ata/pata_arasan: remove conditional compilation of clk code +Applying: net/c_can: remove conditional compilation of clk code +Applying: net/stmmac: remove conditional compilation of clk code +Applying: gadget/m66592: remove conditional compilation of clk code +Applying: gadget/r8a66597: remove conditional compilation of clk code +Applying: usb/host/r8a66597: remove conditional compilation of clk code +Applying: arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n +Applying: clk: validate pointer in __clk_disable() +Applying: panic: fix a possible deadlock in panic() +Applying: NMI watchdog: fix for lockup detector breakage on resume +Applying: kernel/sys.c: avoid argv_free(NULL) +Applying: kmsg: /dev/kmsg - properly return possible copy_from_user() failure +Applying: printk: add generic functions to find KERN_ headers +Applying: printk-add-generic-functions-to-find-kern_level-headers-fix +Applying: printk: add kern_levels.h to make KERN_ available for asm use +Applying: arch: remove direct definitions of KERN_ uses +Applying: btrfs: use printk_get_level and printk_skip_level, add __printf, fix fallout +Applying: btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-fix +Applying: btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-checkpatch-fixes +Applying: sound: use printk_get_level and printk_skip_level +Applying: printk: convert the format for KERN_ to a 2 byte pattern +Applying: printk: only look for prefix levels in kernel messages +Applying: printk: remove the now unnecessary "C" annotation for KERN_CONT +Applying: vsprintf: add %pMR for Bluetooth MAC address +Applying: Documentation/printk-formats.txt: add description for %pMR +Applying: lib/vsprintf.c: remind people to update Documentation/printk-formats.txt when adding printk formats +Applying: lib/vsprintf.c: kptr_restrict: fix pK-error in SysRq show-all-timers(Q) +Applying: MAINTAINERS: update EXYNOS DP DRIVER F: patterns +Applying: drivers/video/backlight/atmel-pwm-bl.c: use devm_ functions +Applying: drivers/video/backlight/ot200_bl.c: use devm_ functions +Applying: drivers/video/backlight/lm3533_bl.c: use devm_ functions +Applying: backlight: atmel-pwm-bl: use devm_gpio_request() +Applying: backlight: ot200_bl: use devm_gpio_request() +Applying: backlight: tosa_lcd: use devm_gpio_request() +Applying: backlight: tosa_bl: use devm_gpio_request() +Applying: backlight: lms283gf05: use devm_gpio_request() +Applying: backlight: corgi_lcd: use devm_gpio_request() +Applying: backlight: l4f00242t03: export and use devm_gpio_request_one() +Applying: backlight: move register definitions from header to source +Applying: backlight: move lp855x header into platform_data directory +Applying: string: introduce memweight() +Applying: string-introduce-memweight-fix +Applying: string: fix build error caused by memweight() introduction +Applying: qnx4fs: use memweight() +Applying: dm: use memweight() +Applying: affs: use memweight() +Applying: video/uvc: use memweight() +Applying: ocfs2: use memweight() +Applying: ext2: use memweight() +Applying: ext3: use memweight() +Applying: ext4: use memweight() +Applying: ipc/mqueue: remove unnecessary rb_init_node() calls +Applying: rbtree: reference Documentation/rbtree.txt for usage instructions +Applying: rbtree: empty nodes have no color +Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c +Applying: rbtree: move some implementation details from rbtree.h to rbtree.c +Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field +Applying: rbtree: performance and correctness test +Applying: rbtree: break out of rb_insert_color loop after tree rotation +Applying: rbtree: adjust root color in rb_insert_color() only when necessary +Applying: rbtree: low level optimizations in rb_insert_color() +Applying: rbtree: adjust node color in __rb_erase_color() only when necessary +Applying: rbtree: optimize case selection logic in __rb_erase_color() +Applying: rbtree: low level optimizations in __rb_erase_color() +Applying: rbtree: coding style adjustments +Applying: rbtree: rb_erase updates and comments +Applying: rbtree: optimize fetching of sibling node +Applying: atomic64_test: simplify the #ifdef for atomic64_dec_if_positive() test +Applying: checkpatch: Update alignment check +Applying: checkpatch: test for non-standard signatures +Applying: checkpatch: check usleep_range() arguments +Applying: checkpatch: Add acheck for use of sizeof without parenthesis +Applying: checkpatch-add-check-for-use-of-sizeof-without-parenthesis-v2 +Applying: checkpatch: add checks for do {} while (0) macro misuses +Applying: nsproxy: move free_nsproxy() out of do_exit() path +Applying: drivers/message/i2o/i2o_proc.c: the pointer returned from chtostr() points to an array which is no longer valid +Applying: drivers/rtc/rtc-coh901331.c: use clk_prepare/unprepare +Applying: drivers/rtc/rtc-coh901331.c: use devm allocation +Applying: rtc: pl031: encapsulate per-vendor ops +Applying: rtc: pl031: use per-vendor variables for special init +Applying: rtc: pl031: fix up IRQ flags +Applying: drivers/rtc/rtc-ab8500.c: use UIE emulation +Applying: drivers-rtc-rtc-ab8500c-use-uie-emulation-checkpatch-fixes +Applying: drivers/rtc/rtc-ab8500.c: remove fix for AB8500 ED version +Applying: drivers/rtc/rtc-r9701.c: avoid second call to rtc_valid_tm() +Applying: drivers/rtc/rtc-r9701.c: check that r9701_set_datetime() succeeded +Applying: drivers/rtc/rtc-s3c.c: replace #include header files from asm/* to linux/* +Applying: rtc/mc13xxx: use MODULE_DEVICE_TABLE instead of MODULE_ALIAS +Applying: rtc/mc13xxx: add support for the rtc in the mc34708 pmic +Applying: rtc/rtc-88pm80x: assign ret only when rtc_register_driver fails +Applying: rtc/rtc-88pm80x: remove unneed devm_kfree +Applying: rtc/rtc-da9052: remove unneed devm_kfree call +Applying: nilfs2: add omitted comment for ns_mount_state field of the_nilfs structure +Applying: nilfs2: remove references to long gone super operations +Applying: nilfs2: fix timing issue between rmcp and chcp ioctls +Applying: nilfs2: fix deadlock issue between chcp and thaw ioctls +Applying: nilfs2: add omitted comments for structures in nilfs2_fs.h +Applying: nilfs2: add omitted comments for different structures in driver implementation +Applying: hfsplus: use -ENOMEM when kzalloc() fails +Applying: fat: accessors for msdos_dir_entry 'start' fields +Applying: fat: Refactor shortname parsing +Applying: fat (exportfs): move NFS support code +Applying: fat (exportfs): fix dentry reconnection +Applying: kernel/kmod.c: document call_usermodehelper_fns() a bit +Applying: kmod: avoid deadlock from recursive kmod call +Applying: coredump: fix wrong comments on core limits of pipe coredump case +Applying: fork: use vma_pages() to simplify the code +Applying: fork-use-vma_pages-to-simplify-the-code-fix +Applying: revert "sched: Fix fork() error path to not crash" +Applying: fork: fix error handling in dup_task() +Applying: kdump: append newline to the last lien of vmcoreinfo note +Applying: ipc: add COMPAT_SHMLBA support +Applying: ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC +Applying: ipc: compat: use signed size_t types for msgsnd and msgrcv +Applying: ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: sysctl: suppress kmemleak messages +Applying: pps: return PTR_ERR on error in device_create +Applying: fs: cachefiles: add support for large files in filesystem caching +Applying: include/linux/aio.h: cpp->C conversions +Applying: resource: make sure requested range is included in the root range +Applying: c/r: fcntl: add F_GETOWNER_UIDS option +Applying: fault-injection: notifier error injection +Applying: notifier error injection documentation +Applying: cpu: rewrite cpu-notifier-error-inject module +Applying: PM: PM notifier error injection module +Applying: memory: memory notifier error injection module +Applying: notifier error injection: fix copy-and-paste error in Kconfig help +Applying: powerpc: pSeries reconfig notifier error injection module +Applying: fault-injection: add selftests for cpu and memory hotplug +Applying: fault-injection: add tool to run command with failslab or fail_page_alloc +Applying: fault-injection: mention failcmd.sh tool in document +Applying: lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table() +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:quilt/akpm +From ../rebase-tmp + + 3000089...6e81859 akpm -> quilt/akpm (forced update) +$ rm -rf ../rebase-tmp +Merging quilt/akpm (6e81859 lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table()) +$ git merge --no-ff quilt/akpm +Auto-merging include/linux/platform_data/lp855x.h +Auto-merging include/linux/platform_data/exynos_thermal.h +Removing drivers/hwmon/exynos4_tmu.c +Auto-merging Documentation/thermal/exynos_thermal +Merge made by the 'recursive' strategy. + .../ABI/obsolete/proc-sys-vm-nr_pdflush_threads | 5 + + Documentation/cgroups/hugetlb.txt | 45 + + Documentation/cgroups/memory.txt | 12 +- + Documentation/fault-injection/fault-injection.txt | 27 + + .../fault-injection/notifier-error-inject.txt | 99 ++ + Documentation/feature-removal-schedule.txt | 8 + + Documentation/filesystems/Locking | 13 + + Documentation/filesystems/vfs.txt | 12 + + Documentation/printk-formats.txt | 5 + + Documentation/sysctl/fs.txt | 18 +- + Documentation/sysctl/vm.txt | 30 +- + Documentation/thermal/cpu-cooling-api.txt | 60 ++ + .../{hwmon/exynos4_tmu => thermal/exynos_thermal} | 35 +- + MAINTAINERS | 1 + + arch/Kconfig | 7 + + arch/alpha/Kconfig | 1 + + arch/alpha/include/asm/unistd.h | 1 - + arch/alpha/kernel/smc37c669.c | 12 - + arch/arm/Kconfig | 2 + + arch/arm/include/asm/unistd.h | 1 - + arch/arm/lib/io-acorn.S | 3 +- + arch/arm/mach-netx/fb.c | 23 - + arch/arm/vfp/vfphw.S | 7 +- + arch/avr32/Kconfig | 1 + + arch/avr32/include/asm/unistd.h | 1 - + arch/avr32/mm/fault.c | 33 +- + arch/blackfin/Kconfig | 1 + + arch/blackfin/include/asm/unistd.h | 1 - + arch/cris/Kconfig | 1 + + arch/cris/include/asm/unistd.h | 1 - + arch/frv/Kconfig | 1 + + arch/frv/include/asm/unistd.h | 1 - + arch/frv/kernel/kernel_thread.S | 2 +- + arch/frv/kernel/pm.c | 19 +- + arch/h8300/Kconfig | 1 + + arch/h8300/include/asm/unistd.h | 1 - + arch/ia64/kernel/perfmon.c | 1 - + arch/m32r/Kconfig | 1 + + arch/m32r/include/asm/unistd.h | 1 - + arch/m68k/Kconfig | 1 + + arch/m68k/include/asm/unistd.h | 1 - + arch/microblaze/Kconfig | 1 + + arch/microblaze/include/asm/unistd.h | 1 - + arch/mips/Kconfig | 2 + + arch/mips/include/asm/unistd.h | 1 - + arch/mn10300/Kconfig | 1 + + arch/mn10300/Makefile | 2 +- + arch/mn10300/include/asm/unistd.h | 1 - + arch/powerpc/Kconfig | 2 + + arch/powerpc/configs/chroma_defconfig | 4 +- + arch/powerpc/include/asm/unistd.h | 1 - + arch/s390/Kconfig | 2 + + arch/s390/defconfig | 2 +- + arch/s390/include/asm/unistd.h | 1 - + arch/sh/Kconfig | 1 + + arch/sh/configs/apsh4ad0a_defconfig | 2 +- + arch/sh/configs/sdk7786_defconfig | 4 +- + arch/sh/configs/se7206_defconfig | 2 +- + arch/sh/configs/shx3_defconfig | 2 +- + arch/sh/configs/urquell_defconfig | 4 +- + arch/sh/include/asm/unistd.h | 1 - + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/unistd.h | 1 - + arch/sparc/kernel/sys_sparc_64.c | 2 +- + arch/tile/configs/tilegx_defconfig | 4 +- + arch/tile/configs/tilepro_defconfig | 4 +- + arch/um/defconfig | 8 +- + arch/x86/Kconfig | 2 + + arch/x86/include/asm/spinlock.h | 3 +- + arch/x86/include/asm/unistd.h | 1 - + arch/x86/kernel/cpu/perf_event_intel_uncore.h | 2 +- + arch/x86/platform/iris/iris.c | 67 +- + arch/xtensa/kernel/syscall.c | 2 +- + arch/xtensa/mm/fault.c | 29 +- + drivers/acpi/acpi_memhotplug.c | 123 ++- + drivers/ata/pata_arasan_cf.c | 14 +- + drivers/base/Kconfig | 1 + + drivers/block/cciss_scsi.c | 11 +- + drivers/block/nbd.c | 6 +- + drivers/clk/Kconfig | 1 - + drivers/clk/clk.c | 3 + + drivers/dma/dmaengine.c | 2 +- + drivers/firmware/pcdp.c | 4 +- + drivers/hwmon/Kconfig | 10 - + drivers/hwmon/Makefile | 1 - + drivers/hwmon/exynos4_tmu.c | 518 ----------- + drivers/i2c/busses/i2c-pxa.c | 7 - + drivers/md/dm-log.c | 13 +- + drivers/media/video/uvc/uvc_ctrl.c | 5 +- + drivers/message/i2o/i2o_proc.c | 37 +- + drivers/net/can/c_can/c_can_platform.c | 8 - + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 - + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 42 - + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 33 +- + drivers/net/usb/cdc-phonet.c | 2 +- + drivers/pps/pps.c | 4 +- + drivers/rtc/Kconfig | 1 + + drivers/rtc/rtc-88pm80x.c | 4 +- + drivers/rtc/rtc-ab8500.c | 42 +- + drivers/rtc/rtc-coh901331.c | 61 +- + drivers/rtc/rtc-da9052.c | 5 +- + drivers/rtc/rtc-mc13xxx.c | 6 +- + drivers/rtc/rtc-pl031.c | 95 +- + drivers/rtc/rtc-r9701.c | 6 +- + drivers/rtc/rtc-s3c.c | 4 +- + drivers/scsi/atp870u.c | 11 +- + drivers/thermal/Kconfig | 28 + + drivers/thermal/Makefile | 5 +- + drivers/thermal/cpu_cooling.c | 483 ++++++++++ + drivers/thermal/exynos_thermal.c | 960 ++++++++++++++++++++ + drivers/thermal/rcar_thermal.c | 260 ++++++ + drivers/thermal/thermal_sys.c | 5 +- + drivers/usb/gadget/f_phonet.c | 2 +- + drivers/usb/gadget/m66592-udc.c | 9 +- + drivers/usb/gadget/m66592-udc.h | 5 - + drivers/usb/gadget/r8a66597-udc.c | 11 +- + drivers/usb/gadget/r8a66597-udc.h | 5 - + drivers/usb/host/r8a66597-hcd.c | 12 - + drivers/usb/host/r8a66597.h | 5 - + drivers/usb/musb/musb_core.h | 8 - + drivers/video/backlight/atmel-pwm-bl.c | 19 +- + drivers/video/backlight/corgi_lcd.c | 19 +- + drivers/video/backlight/l4f00242t03.c | 29 +- + drivers/video/backlight/lm3533_bl.c | 8 +- + drivers/video/backlight/lms283gf05.c | 24 +- + drivers/video/backlight/lp855x_bl.c | 10 +- + drivers/video/backlight/ot200_bl.c | 21 +- + drivers/video/backlight/tosa_bl.c | 8 +- + drivers/video/backlight/tosa_lcd.c | 7 +- + fs/9p/v9fs.c | 5 + + fs/adfs/super.c | 5 + + fs/affs/bitmap.c | 28 +- + fs/affs/super.c | 5 + + fs/afs/super.c | 5 + + fs/attr.c | 5 + + fs/befs/linuxvfs.c | 5 + + fs/bfs/inode.c | 5 + + fs/btrfs/ctree.h | 13 + + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/extent_io.c | 6 + + fs/btrfs/inode.c | 5 + + fs/btrfs/relocation.c | 2 +- + fs/btrfs/super.c | 41 +- + fs/cachefiles/rdwr.c | 2 +- + fs/ceph/super.c | 5 + + fs/cifs/cifsfs.c | 5 + + fs/coda/inode.c | 5 + + fs/ecryptfs/main.c | 6 + + fs/efs/super.c | 5 + + fs/exec.c | 42 +- + fs/exofs/super.c | 5 + + fs/ext2/balloc.c | 14 +- + fs/ext2/ialloc.c | 1 + + fs/ext2/super.c | 5 + + fs/ext3/balloc.c | 2 +- + fs/ext3/bitmap.c | 12 +- + fs/ext3/super.c | 5 + + fs/ext4/bitmap.c | 9 +- + fs/ext4/super.c | 5 + + fs/fat/Makefile | 2 +- + fs/fat/dir.c | 275 +++--- + fs/fat/fat.h | 38 +- + fs/fat/inode.c | 190 ++-- + fs/fat/namei_msdos.c | 16 +- + fs/fat/namei_vfat.c | 16 +- + fs/fat/nfs.c | 101 ++ + fs/fcntl.c | 29 + + fs/freevxfs/vxfs_super.c | 5 + + fs/fs-writeback.c | 5 - + fs/fuse/inode.c | 6 + + fs/hfs/super.c | 6 + + fs/hfsplus/super.c | 8 +- + fs/hpfs/super.c | 5 + + fs/hugetlbfs/inode.c | 9 +- + fs/isofs/inode.c | 5 + + fs/jffs2/readinode.c | 13 +- + fs/jffs2/super.c | 6 + + fs/jfs/super.c | 6 + + fs/logfs/inode.c | 5 + + fs/minix/inode.c | 5 + + fs/ncpfs/inode.c | 5 + + fs/nfs/Kconfig | 8 + + fs/nfs/direct.c | 82 +- + fs/nfs/file.c | 28 +- + fs/nfs/inode.c | 9 + + fs/nfs/internal.h | 7 +- + fs/nfs/pagelist.c | 4 +- + fs/nfs/read.c | 6 +- + fs/nfs/write.c | 89 +- + fs/nilfs2/alloc.h | 14 +- + fs/nilfs2/bmap.h | 7 + + fs/nilfs2/btnode.h | 8 +- + fs/nilfs2/cpfile.c | 10 +- + fs/nilfs2/dat.c | 6 + + fs/nilfs2/export.h | 8 + + fs/nilfs2/ifile.c | 6 +- + fs/nilfs2/inode.c | 7 + + fs/nilfs2/ioctl.c | 4 +- + fs/nilfs2/mdt.h | 7 + + fs/nilfs2/nilfs.h | 17 +- + fs/nilfs2/sufile.c | 8 +- + fs/nilfs2/super.c | 12 +- + fs/nilfs2/the_nilfs.c | 1 + + fs/nilfs2/the_nilfs.h | 6 +- + fs/ntfs/super.c | 6 + + fs/ocfs2/cluster/heartbeat.c | 40 +- + fs/ocfs2/dlmfs/dlmfs.c | 5 + + fs/ocfs2/localalloc.c | 8 +- + fs/ocfs2/super.c | 5 + + fs/openpromfs/inode.c | 5 + + fs/proc/proc_sysctl.c | 5 +- + fs/qnx4/bitmap.c | 24 +- + fs/qnx4/inode.c | 5 + + fs/qnx6/inode.c | 5 + + fs/reiserfs/super.c | 5 + + fs/romfs/super.c | 5 + + fs/squashfs/super.c | 5 + + fs/super.c | 8 +- + fs/sysv/inode.c | 5 + + fs/ubifs/super.c | 6 + + fs/udf/super.c | 5 + + fs/ufs/super.c | 5 + + fs/xattr.c | 16 +- + fs/xfs/xfs_super.c | 5 + + include/asm-generic/fcntl.h | 4 + + include/linux/aio.h | 38 +- + include/linux/backing-dev.h | 3 + + include/linux/blk_types.h | 2 + + include/linux/cgroup_subsys.h | 8 +- + include/linux/clk.h | 168 ++-- + include/linux/compaction.h | 4 +- + include/linux/compat.h | 4 +- + include/linux/cpu_cooling.h | 99 ++ + include/linux/fs.h | 8 + + include/linux/gfp.h | 13 +- + include/linux/highmem.h | 7 + + include/linux/hugetlb.h | 39 +- + include/linux/hugetlb_cgroup.h | 126 +++ + include/linux/kern_levels.h | 25 + + include/linux/memcontrol.h | 34 +- + include/linux/migrate.h | 4 +- + include/linux/mm.h | 38 + + include/linux/mm_types.h | 9 + + include/linux/mmzone.h | 26 +- + include/linux/nfs_fs.h | 4 +- + include/linux/nilfs2_fs.h | 63 +- + include/linux/nsproxy.h | 1 + + include/linux/oom.h | 21 + + include/linux/page-flags.h | 28 + + include/linux/page-isolation.h | 13 +- + include/linux/page_cgroup.h | 10 +- + include/linux/pagemap.h | 5 + + .../{exynos4_tmu.h => exynos_thermal.h} | 31 +- + include/linux/{ => platform_data}/lp855x.h | 6 - + include/linux/platform_data/mv_usb.h | 9 - + include/linux/printk.h | 41 +- + include/linux/rbtree.h | 112 +-- + include/linux/sched.h | 22 +- + include/linux/shm.h | 6 +- + include/linux/shmem_fs.h | 3 + + include/linux/shrinker.h | 1 - + include/linux/skbuff.h | 80 +- + include/linux/string.h | 3 + + include/linux/sunrpc/xprt.h | 3 + + include/linux/swap.h | 14 +- + include/linux/timerqueue.h | 2 +- + include/linux/vm_event_item.h | 1 + + include/linux/writeback.h | 5 - + include/net/sock.h | 40 +- + include/trace/events/gfpflags.h | 1 + + init/Kconfig | 29 +- + init/main.c | 2 +- + ipc/compat.c | 18 +- + ipc/mqueue.c | 3 - + ipc/sem.c | 250 +++-- + ipc/shm.c | 9 +- + ipc/syscall.c | 2 +- + ipc/util.c | 4 +- + ipc/util.h | 2 +- + kernel/cpu.c | 2 +- + kernel/fork.c | 46 +- + kernel/kexec.c | 2 +- + kernel/kmod.c | 37 +- + kernel/nsproxy.c | 34 +- + kernel/panic.c | 8 + + kernel/power/suspend.c | 3 + + kernel/printk.c | 36 +- + kernel/resource.c | 24 +- + kernel/softirq.c | 9 + + kernel/sys.c | 57 +- + kernel/sysctl.c | 51 +- + kernel/sysctl_binary.c | 2 +- + kernel/time.c | 4 +- + kernel/timeconst.pl | 2 +- + kernel/watchdog.c | 21 +- + lib/Kconfig | 3 + + lib/Kconfig.debug | 98 +- + lib/Makefile | 9 +- + lib/atomic64_test.c | 5 +- + lib/cpu-notifier-error-inject.c | 63 +- + lib/memory-notifier-error-inject.c | 48 + + lib/memweight.c | 38 + + lib/notifier-error-inject.c | 112 +++ + lib/notifier-error-inject.h | 24 + + lib/pSeries-reconfig-notifier-error-inject.c | 51 ++ + lib/pm-notifier-error-inject.c | 49 + + lib/rbtree.c | 597 +++++++----- + lib/rbtree_test.c | 135 +++ + lib/scatterlist.c | 8 - + lib/vsprintf.c | 28 +- + mm/Kconfig | 5 + + mm/Makefile | 8 +- + mm/backing-dev.c | 20 + + mm/compaction.c | 63 +- + mm/fadvise.c | 18 +- + mm/highmem.c | 12 + + mm/hugetlb.c | 167 ++-- + mm/hugetlb_cgroup.c | 418 +++++++++ + mm/hwpoison-inject.c | 2 +- + mm/internal.h | 8 + + mm/memblock.c | 35 +- + mm/memcontrol.c | 390 ++++---- + mm/memory-failure.c | 21 +- + mm/memory.c | 56 +- + mm/memory_hotplug.c | 20 +- + mm/mempolicy.c | 4 + + mm/migrate.c | 81 +- + mm/mmap.c | 5 +- + mm/mmu_notifier.c | 45 +- + mm/mmzone.c | 2 +- + mm/mremap.c | 2 - + mm/oom_kill.c | 222 ++--- + mm/page_alloc.c | 315 ++++--- + mm/page_cgroup.c | 2 +- + mm/page_io.c | 145 +++ + mm/page_isolation.c | 93 ++ + mm/shmem.c | 35 +- + mm/slab.c | 217 ++++- + mm/slub.c | 30 +- + mm/sparse.c | 3 + + mm/swap_state.c | 7 +- + mm/swapfile.c | 145 ++- + mm/vmalloc.c | 16 +- + mm/vmscan.c | 173 +++- + mm/vmstat.c | 1 + + net/caif/caif_socket.c | 2 +- + net/core/dev.c | 53 +- + net/core/filter.c | 8 + + net/core/skbuff.c | 124 ++- + net/core/sock.c | 59 +- + net/ipv4/Makefile | 2 +- + net/ipv4/sysctl_net_ipv4.c | 4 +- + net/ipv4/tcp_input.c | 21 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/tcp_output.c | 12 +- + net/ipv6/tcp_ipv6.c | 10 +- + net/sctp/ulpevent.c | 3 +- + net/sunrpc/Kconfig | 5 + + net/sunrpc/clnt.c | 2 + + net/sunrpc/sched.c | 7 +- + net/sunrpc/xprtsock.c | 52 ++ + scripts/checkpatch.pl | 71 +- + security/selinux/avc.c | 2 +- + security/selinux/hooks.c | 1 + + sound/core/misc.c | 13 +- + tools/testing/fault-injection/failcmd.sh | 219 +++++ + tools/testing/selftests/Makefile | 2 +- + tools/testing/selftests/cpu-hotplug/Makefile | 6 + + tools/testing/selftests/cpu-hotplug/on-off-test.sh | 221 +++++ + tools/testing/selftests/memory-hotplug/Makefile | 6 + + .../selftests/memory-hotplug/on-off-test.sh | 230 +++++ + 375 files changed, 8997 insertions(+), 3271 deletions(-) + create mode 100644 Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads + create mode 100644 Documentation/cgroups/hugetlb.txt + create mode 100644 Documentation/fault-injection/notifier-error-inject.txt + create mode 100644 Documentation/thermal/cpu-cooling-api.txt + rename Documentation/{hwmon/exynos4_tmu => thermal/exynos_thermal} (71%) + delete mode 100644 drivers/hwmon/exynos4_tmu.c + create mode 100644 drivers/thermal/cpu_cooling.c + create mode 100644 drivers/thermal/exynos_thermal.c + create mode 100644 drivers/thermal/rcar_thermal.c + create mode 100644 fs/fat/nfs.c + create mode 100644 include/linux/cpu_cooling.h + create mode 100644 include/linux/hugetlb_cgroup.h + create mode 100644 include/linux/kern_levels.h + rename include/linux/platform_data/{exynos4_tmu.h => exynos_thermal.h} (74%) + rename include/linux/{ => platform_data}/lp855x.h (96%) + create mode 100644 lib/memory-notifier-error-inject.c + create mode 100644 lib/memweight.c + create mode 100644 lib/notifier-error-inject.c + create mode 100644 lib/notifier-error-inject.h + create mode 100644 lib/pSeries-reconfig-notifier-error-inject.c + create mode 100644 lib/pm-notifier-error-inject.c + create mode 100644 lib/rbtree_test.c + create mode 100644 mm/hugetlb_cgroup.c + create mode 100644 tools/testing/fault-injection/failcmd.sh + create mode 100644 tools/testing/selftests/cpu-hotplug/Makefile + create mode 100644 tools/testing/selftests/cpu-hotplug/on-off-test.sh + create mode 100644 tools/testing/selftests/memory-hotplug/Makefile + create mode 100644 tools/testing/selftests/memory-hotplug/on-off-test.sh +$ git am -3 ../patches/0001-libceph-remove-rb_node-initialisation.patch +Applying: libceph: remove rb_node initialisation +$ git reset HEAD^ +Unstaged changes after reset: +M net/ceph/osd_client.c +$ git add . +$ git commit -v -a --amend +[master 73585cc] Merge branch 'quilt/akpm' +$ git cherry-pick 938e05bf1313 +[master d50f6f3] regulator: Fix an s5m8767 build failure + Author: Samuel Ortiz + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..1983ab138d14 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,47 @@ +Importing i2c based on bdc0077af574800d24318b6945cf2344e8dbb050 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on f7da9cdf45cbbad5029d4858dcbc0134e06084ed +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard f7da9cdf45cbbad5029d4858dcbc0134e06084ed +HEAD is now at f7da9cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net +$ git am ../quilt/jdelvare-hwmon/hwmon-struct-x86_cpu_id-arrays-can-be-__initconst.patch +Applying: hwmon: struct x86_cpu_id arrays can be __initconst +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 73e15f6...b2c6146 master -> quilt/jdelvare-hwmon (forced update) +Importing rr based on v3.5-7078-gf7da9cd +$ cd ../quilt-tmp +$ git reset --hard f7da9cdf45cbbad5029d4858dcbc0134e06084ed +HEAD is now at f7da9cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net +$ git am ../quilt/rr/virtio:ids_fix_comment_for_rng.patch +Applying: virtio ids: fix comment for virtio-rng +$ git am ../quilt/rr/virtio:rng_allow_tasks_to_be_killed_that_are_waiting_for_rng_input.patch +Applying: virtio: rng: allow tasks to be killed that are waiting for rng input +$ git am ../quilt/rr/virtio:rng_don_t_wait_on_host_when_module_is_going_away.patch +Applying: virtio: rng: don't wait on host when module is going away +$ git am ../quilt/rr/virtio:rng_split_out_common_code_in_probe_remove_for_s3_s4_ops.patch +Applying: virtio: rng: split out common code in probe / remove for s3/s4 ops +$ git am ../quilt/rr/virtio:rng_s3_s4_support.patch +Applying: virtio: rng: s3/s4 support +$ git am ../quilt/rr/virtio:blk_call_del_gendisk_before_disable_guest_kick.patch +Applying: virtio-blk: Call del_gendisk() before disable guest kick +$ git am ../quilt/rr/virtio:blk_reset_device_after_blk_cleanup_queue.patch +Applying: virtio-blk: Reset device after blk_cleanup_queue() +$ git am ../quilt/rr/virtio:blk_use_block_layer_provided_spinlock.patch +Applying: virtio-blk: Use block layer provided spinlock +$ git am ../quilt/rr/virtio:blk_allow_toggling_host_cache_between_writeback_and_writethrough.patch +Applying: virtio-blk: allow toggling host cache between writeback and writethrough +$ git am ../quilt/rr/virtio_blk-expose-old-VIRTIO_BLK_F_FLUSH.patch +Applying: virtio-blk: return VIRTIO_BLK_F_FLUSH to header. +$ git am ../quilt/rr/module:taint_kernel_when_lve_is_loaded.patch +Applying: Taint kernel when lve module is loaded +$ git am ../quilt/rr/module:make_most_arch_asm_h_files_use_asm_generic_h.patch +Applying: Make most arch asm/module.h files use asm-generic/module.h +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/rr +From ../quilt-tmp + + 3804700...a5839a8 master -> quilt/rr (forced update) +Importing device-mapper based on v3.5-4773-gbdc0077 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..1538a8e4188e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20120731 -- 2.39.2