From 5281d400be701f966b565cb2c68adfe6b91a8209 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 16 Oct 2012 14:51:18 +1100 Subject: [PATCH] Add linux-next specific files for 20121016 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 206 ++++ Next/Trees | 208 ++++ Next/merge.log | 2704 +++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 19 + localversion-next | 1 + 5 files changed, 3138 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..47c5189bdb8a --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,206 @@ +Name SHA1 +---- ---- +origin dd8e8c4a2c902d8350b702e7bc7c2799e5e7e331 +fixes 12250d843e8489ee00b5b7726da855e51694e792 +kbuild-current b1e0d8b70fa31821ebca3965f2ef8619d7c5e316 +arm-current 3d6ee36dfb2d40c72071f68173f67c728a0e19f3 +m68k-current 92f79db1af9ff8d525dc24fa43116bd2c70ef45b +powerpc-merge fd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db +sparc ddffeb8c4d0331609ef2581d84de4d763607bd37 +net 29bb4cc5e0547a7589556f8629e39016c5d203c0 +sound-current ddffeb8c4d0331609ef2581d84de4d763607bd37 +pci-current 0ff9514b579b4f2f3e6038cd961ce64c224c3c73 +wireless bf11315eeda510ea4fc1a2bf972d8155d31d89b4 +driver-core.current ddffeb8c4d0331609ef2581d84de4d763607bd37 +tty.current 3e5bde8ef4cc9e719b492726dd82a43d29468cd0 +usb.current 8282da478966975a5efff3eeb650a49fe67fa14e +staging.current ddffeb8c4d0331609ef2581d84de4d763607bd37 +char-misc.current ddffeb8c4d0331609ef2581d84de4d763607bd37 +input-current 0cc8d6a9d23d6662da91eeb6bb8e7d1c559850f0 +md-current 72f36d5972a166197036c1281963f6863c429bf2 +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current c9f97a27ceee84998999bf3341e6d5d207b05539 +ide 9974e43d900af7979e0a571b8e0c9674c7399b79 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +irqdomain-current 15e06bf64f686befd2030da867a3dad965b96cc0 +devicetree-current 4e8383b6b06b275999f51337adf7064b2c135a04 +spi-current d1c185bcb15184ebcbc1b2e003e9a6c4658985c4 +gpio-current 96b70641b937e99c1579cb6ebbcdb7b0af98cdd0 +asm-generic c37d6154c0b9163c27e53cc1d0be3867b4abd760 +arm 3d6ee36dfb2d40c72071f68173f67c728a0e19f3 +arm-perf 5d64edbf5a96110135c56c24e101f03a0815b7c4 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +arm64 48b3b3215f6bc33986f275a0cff508bd9b23fd86 +blackfin 9f5715182c289aa547de1353c99a318d8f9eef2d +c6x fbdd63d76c5ad6ae56a7bd1acebabefafc6aadf0 +cris 620614d003e0d674993b1b536460301abe353be5 +hexagon 5042ab91c4272e158748180ae70a2e097f9e90e3 +ia64 d536e0db2433686238ec97c517e4fc691000ee6f +m68k f82735d55056b200eab19749398457a2f534306b +m68knommu ddffeb8c4d0331609ef2581d84de4d763607bd37 +microblaze 1883baaa2ea07d83228d5a83a3133cd02bab7fc6 +mips 6fd0bca25c09d74ee26e4c2893f8d4c06ecabe7e +openrisc 6257c5740e9f876f4097f6c67ec69576c23abb82 +parisc 07abad0579de44f8250dfee5ddc253062d050dc0 +powerpc d900bd7366463fd96a907b2c212242e2b68b27d8 +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx f3ac71271ef8149f7799ec3852ff17fd93a03bae +galak 10bfa766efa19c23f72f50727952a26cb1512256 +s390 86d7c60b8c69d829e64ae2edf57bbbf7c24188d9 +sh 0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb +sparc-next 7fe0b14b725d6d09a1d9e1409bd465cb88b587f9 +tile c19c6c954b9b264abdc21e0c855118e3daf019b0 +unicore32 935ce97028a200a57f0abc5e221eb9abd3d014ec +xtensa 70cefe765433529fc894fd1995a1d5883cb33e05 +btrfs f46dbe3dee853f8a860f889cb2b7ff4c624f2a7a +ceph 6285bc231277419255f3498d3eb5ddc9f8e7fe79 +cifs 72bd481f860f0125c810bb43d878ce5f9c060c58 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee +ext3 6c29c50fda25c2ac2ce45a9b042ff7e424aa8eac +ext4 c278531d39f3158bfee93dc67da0b77e09776de2 +fuse c7a3f5e3e7a1e4938a41f0196d4b4ee632b30b38 +gfs2 5d8550fef3eef5092d356c99497575ec06bc612a +jfs 84f4141ee3ea11035f741d4298cb6bbad1850fcf +logfs ab2ec19f42dc084880ba9b77e1c153adc1e9c439 +nfs 1813badd98ce02e4b96d8997b68ddef4d4ad4ec5 +nfsd a9ca4043d074509b9d15003fbcb068d3cdae85a4 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs 552aad02a283ee88406b102b4d6455eef7127196 +ubifs a74b6e459d4017e97a626c2bdd8d88ee290f943c +xfs 2ea0392983a82f7dc3055568ae0f2558724d119b +vfs f81700bd831efcd12eb7f0e66b24b16c2ad00a32 +pci 78c8f84302ce007aedcfa11912fd4aacf22727ab +hid 0b824113b796e11d99f575429b089afc953ad1d5 +i2c a17e9c1710abadf037559fb64d30300483935a02 +i2c-embedded 62885f59a26195d9f6a3f8c795225dfbab62a110 +jdelvare-hwmon 12250d843e8489ee00b5b7726da855e51694e792 +hwmon-staging 17875ef69f5baaa314846abe227152a771922527 +v4l-dvb c3c0b61133a02c50109f09563677fd9bfb314cbb +kbuild b974d36fd9d3ecfc9c4f643e658a1fda50b6def7 +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata 13b74085d92feda78bad1045516d332a1e9a3407 +infiniband 56040f07b26bb32f4b70ec2192ecddeb6cef3754 +pstore 80c9d03c22f13a17df67b4b99a83ed5e9acf6093 +acpi d1d4a81b842db21b144ffd2334ca5eee3eb740f3 +cpuidle 3cf7997a389de59498c966c529456696ce8bc1a7 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal f5a246eab9a268f51ba8189ea5b098a1bfff200e +ieee1394 790198f74c9d1b46b6a89504361b1a844670d050 +ubi ddffeb8c4d0331609ef2581d84de4d763607bd37 +dlm 2b75bc9121e54e22537207b47b71373bcb0be41c +scsi 5c1b10ab7f93d24f29b5630286e323d1c5802d5c +target-updates cf0eb28d3ba60098865bf7dbcbfdd6b1cc483e3b +target-merge d9875690d9b89a866022ff49e3fcea892345ad92 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +slave-dma ddffeb8c4d0331609ef2581d84de4d763607bd37 +dmaengine a2bd1140a264b561e38d99e656cd843c2d840e86 +net-next 7fe0b14b725d6d09a1d9e1409bd465cb88b587f9 +wireless-next ddffeb8c4d0331609ef2581d84de4d763607bd37 +bluetooth 56f6098441adb9487f6e0439429fc536afcf9e71 +mtd 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc +l2-mtd a7c19936c14286d7b69bdbbe65c5bbc3f19c6f03 +crypto ba1ee070909fae01248b8117da1706f3cf2bfd1b +drm 1f31c69dac71bebc0f00bc8534a6345782045501 +sound ede8d1b42473967c40c006bfc6dbec23ea541ad3 +sound-asoc 1937aafc25620b758190d0fb2da8fb36bbda010d +modules dbadc17683e6c673a69b236c0f041b931cc55c42 +virtio d43b7167d4c74137f9a6c61fdcead127d60357f9 +input ad5396ee32afbdabb6188ffba67778080ea795b8 +input-mt 51c80b74002f86477d691ed7c8ac479dcfa6271c +cgroup c0a93e2857b16ef01659e056eb276a55d7718134 +block 454832b8eeb292d0efea792d4620912ab0e114ef +device-mapper ddffeb8c4d0331609ef2581d84de4d763607bd37 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc b35a5c58b318add02395e6078996e8c122f18186 +kgdb 58bcdf6847831913b41e9dfee1cbc579f939ef8b +slab e2087be35a8ed101c1e748ef688c889419c69829 +uclinux ddffeb8c4d0331609ef2581d84de4d763607bd37 +md 635a2a0f0d9b4ed9c50e124d8d094d7fc0672322 +mfd 74d8378159de16a0a1d1975d4778120d263d6000 +battery 18766f0936d444fd7ff2e0064bd6e69a89d5c6fc +fbdev cd9d6f10d07f26dd8a70e519c22b6b4f8a9e3e7a +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 13b1ba7de8d0ecc42e4f9c002d5b0c1a48f05e58 +regulator d42ca376e49bc665cdc329931332832c75e130fb +security bf5308344527d015ac9a6d2bda4ad4d40fd7d943 +selinux c2d7b247f0c028d325a5da5b9611b60ba160f237 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 58ddfed79a60ba5d5eb4dce2767aa592947e1586 +dwmw2-iommu c3b92c8787367a8bb53d57d9789b558f1295cc96 +iommu 009487258399cb4f431992919fa0f386d1b74ceb +vfio 12250d843e8489ee00b5b7726da855e51694e792 +osd 7f8d145d43ebfe4526e12021324ffd9f24e1ee81 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 5d0c3d4f3d48681c2ba51e9f9ed6ae5dc4a34a47 +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +pm df5a2a1fbca44bebeebb78530ac93c734f289707 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +fsnotify 1aec9c0d718693553543349e92138033b0bcea4c +edac cfe503149482bf0bb76ff453b44dedd5e801870f +edac-amd 305f1c3cfd7eef63bef2128b6934a9054d902976 +devicetree efd68e7254503f3207805f674a1ea1d743f5dfe2 +dt-rh 36165f55055781a0e4bf32d775241796414504b0 +spi d8e328b3bd65fdefc9c49a27ee80c28e0a44b653 +spi-mb 43e37b00f9e2ae9919eae7d13e8eec5454d935dc +tip 4b84058f3c1277735fc6c5b3396c2f648e2dd024 +rcu d677124b1fc3b2706a13e92f1b329f1ac77e5f20 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 03604b31142058362db13e7881385806977893f5 +kvm-ppc f37f4441bbaf69e38d98678b757adbc7199eb1f2 +oprofile 44009105081b51417f311f4c3be0061870b6b8ed +xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495 +xen-two 79fef7a91640c86065651774c718fb413228591c +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu 6101167727932a929e37fb8a6eeb68bdbf54d58e +workqueues 2b0f620dfe3e869e4665030d2599ede49c662d83 +drivers-x86 455f38ccba672b33cda0a96cf9089be312ba95de +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap cc63199887a0dbdb59ec641563a142c8d35903cc +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 2f73c3927318abe3d7fcaecadfbad89e2d12f881 +driver-core ddffeb8c4d0331609ef2581d84de4d763607bd37 +tty ddffeb8c4d0331609ef2581d84de4d763607bd37 +usb ddffeb8c4d0331609ef2581d84de4d763607bd37 +staging ddffeb8c4d0331609ef2581d84de4d763607bd37 +char-misc ddffeb8c4d0331609ef2581d84de4d763607bd37 +tmem a728d5ea1c20adbc4997287d8f17c528bda7ce8c +writeback 2f60d628ffd042e65e0b1d3431fb3e38d6f7c1be +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 4cf8f8161c1d4834adc3a3e27bd83f1ed4d5c86c +vhost e0953c8b85baaa38d77ebd5dc4051bc3837c1191 +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc ed26d190a3e7718a6b8a4f844e963b408f54ce32 +irqdomain f5a1ad057e6da5d0fc9c5677ff44797d193d3e62 +gpio ddf343f635fe4440cad528e12f96f28bd50aa099 +gpio-lw 3fa851ee43268bf5043a2dd5f651e607ab142ad2 +arm-soc ab3ee8467d2c9098dbb18f10dc6d332fb6cff73a +cortex 2f3e7d3436cba0bfe01367e1463458239ed220fe +ep93xx 70f0f7c302ed9bdbc626b380a16bdbac62513adb +ixp4xx b94740b3b38fd8e37fcd3bb06a18ec2796061c7d +msm a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 +renesas 3d6071a9be7001270f8aa0b4c48ee48ed91e3695 +samsung 59e65fdb514b774cb4838ac86f07b9d7b7241f11 +tegra 5c6387b2a08e7844c3a2408a6fbf0dda5cf08125 +kvmtool 5fd2a45e96670408462e8791415953d9019d1030 +dma-mapping ddffeb8c4d0331609ef2581d84de4d763607bd37 +pwm 85f8879ca4f3d26a7f473522101fb74a79bda3f2 +dma-buf ba4205121f8199c32658b03c2660b1a9f9ff217c +userns e9069f470803eeb5e243a05bc717452c6218bd71 +ktest 95f57838418358e93212e9dddd60d3502c7f8e2e +signal 75dd1485d87156f7468bdaab31e96325184b2cc3 +clk 494bfec99922d54054d2d0873f1017680cfc3f13 +random d2e7c96af1e54b507ae2a6a7dd2baf588417a7e5 +lzo-update 2135668f9e106313b153fd451c18f7542df11cd8 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm 194ff2be8db60fd40f1251af87e2e00f1e7a8bfd diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..7fee9355ab4a --- /dev/null +++ b/Next/Trees @@ -0,0 +1,208 @@ +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 +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git#upstream +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://github.com/pmundt/linux-sh.git#sh-latest +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs.git#for-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-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 +pstore git git://git.infradead.org/users/cbou/linux-pstore.git#master +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +cpuidle git git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git#linux-next +isci git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git#all +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://github.com/rydberg/linux.git#for-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper quilt http://people.redhat.com/agk/patches/linux/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://github.com/schandinat/linux-2.6.git#fbdev-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://sources.calxeda.com/kernel/linux.git#for-next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +spi-mb git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git#spi-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +cputime git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#cputime +uprobes git git://github.com/srikard/linux.git#for-next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://cavan.codon.org.uk/platform-drivers-x86.git#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +tmem git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +irqdomain git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next +gpio-lw git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +cortex git git://git.pengutronix.de/git/ukl/linux-2.6.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next +kvmtool git git://github.com/penberg/linux-kvm.git#master +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://gitorious.org/linux-pwm/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update +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..70e2197a04a9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2704 @@ +$ date +Tuesday 16 October 10:21:05 EST 2012 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ddffeb8 Linux 3.7-rc1 +Merging origin/master (dd8e8c4 thermal, cpufreq: Fix build when CPU_FREQ_TABLE isn't configured) +$ git merge origin/master +Updating ddffeb8..dd8e8c4 +Fast-forward + Documentation/DocBook/networking.tmpl | 4 ++-- + arch/arm/kernel/entry-common.S | 4 ++-- + arch/x86/Makefile | 2 +- + drivers/thermal/Kconfig | 2 ++ + mm/huge_memory.c | 1 + + scripts/Makefile.fwinst | 4 ++-- + 6 files changed, 10 insertions(+), 7 deletions(-) +Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (b1e0d8b kbuild: Fix gcc -x syntax) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/fixes (3d6ee36 Merge branch 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (92f79db m68k: Remove empty #ifdef/#else/#endif block) +$ git merge m68k-current/for-linus +Merge made by the 'recursive' strategy. + arch/m68k/include/asm/Kbuild | 2 - + arch/m68k/include/asm/ptrace.h | 75 +---- + arch/m68k/include/asm/setup.h | 82 +----- + arch/m68k/include/asm/signal.h | 118 +------- + arch/m68k/include/asm/termios.h | 44 +-- + arch/m68k/include/asm/unistd.h | 354 +---------------------- + arch/m68k/include/uapi/asm/Kbuild | 23 ++ + arch/m68k/include/{ => uapi}/asm/a.out.h | 0 + arch/m68k/include/{ => uapi}/asm/auxvec.h | 0 + arch/m68k/include/{ => uapi}/asm/byteorder.h | 0 + arch/m68k/include/{ => uapi}/asm/cachectl.h | 0 + arch/m68k/include/{ => uapi}/asm/fcntl.h | 0 + arch/m68k/include/{ => uapi}/asm/ioctls.h | 0 + arch/m68k/include/{ => uapi}/asm/msgbuf.h | 0 + arch/m68k/include/{ => uapi}/asm/param.h | 0 + arch/m68k/include/{ => uapi}/asm/poll.h | 0 + arch/m68k/include/{ => uapi}/asm/posix_types.h | 0 + arch/m68k/include/uapi/asm/ptrace.h | 79 ++++++ + arch/m68k/include/{ => uapi}/asm/sembuf.h | 0 + arch/m68k/include/uapi/asm/setup.h | 103 +++++++ + arch/m68k/include/{ => uapi}/asm/shmbuf.h | 0 + arch/m68k/include/{ => uapi}/asm/sigcontext.h | 0 + arch/m68k/include/uapi/asm/signal.h | 118 ++++++++ + arch/m68k/include/{ => uapi}/asm/socket.h | 0 + arch/m68k/include/{ => uapi}/asm/sockios.h | 0 + arch/m68k/include/{ => uapi}/asm/stat.h | 0 + arch/m68k/include/{ => uapi}/asm/swab.h | 0 + arch/m68k/include/{ => uapi}/asm/termbits.h | 0 + arch/m68k/include/uapi/asm/termios.h | 44 +++ + arch/m68k/include/uapi/asm/unistd.h | 356 ++++++++++++++++++++++++ + 30 files changed, 728 insertions(+), 670 deletions(-) + rename arch/m68k/include/{ => uapi}/asm/a.out.h (100%) + rename arch/m68k/include/{ => uapi}/asm/auxvec.h (100%) + rename arch/m68k/include/{ => uapi}/asm/byteorder.h (100%) + rename arch/m68k/include/{ => uapi}/asm/cachectl.h (100%) + rename arch/m68k/include/{ => uapi}/asm/fcntl.h (100%) + rename arch/m68k/include/{ => uapi}/asm/ioctls.h (100%) + rename arch/m68k/include/{ => uapi}/asm/msgbuf.h (100%) + rename arch/m68k/include/{ => uapi}/asm/param.h (100%) + rename arch/m68k/include/{ => uapi}/asm/poll.h (100%) + rename arch/m68k/include/{ => uapi}/asm/posix_types.h (100%) + create mode 100644 arch/m68k/include/uapi/asm/ptrace.h + rename arch/m68k/include/{ => uapi}/asm/sembuf.h (100%) + create mode 100644 arch/m68k/include/uapi/asm/setup.h + rename arch/m68k/include/{ => uapi}/asm/shmbuf.h (100%) + rename arch/m68k/include/{ => uapi}/asm/sigcontext.h (100%) + create mode 100644 arch/m68k/include/uapi/asm/signal.h + rename arch/m68k/include/{ => uapi}/asm/socket.h (100%) + rename arch/m68k/include/{ => uapi}/asm/sockios.h (100%) + rename arch/m68k/include/{ => uapi}/asm/stat.h (100%) + rename arch/m68k/include/{ => uapi}/asm/swab.h (100%) + rename arch/m68k/include/{ => uapi}/asm/termbits.h (100%) + create mode 100644 arch/m68k/include/uapi/asm/termios.h + create mode 100644 arch/m68k/include/uapi/asm/unistd.h +Merging powerpc-merge/merge (fd3bc66 Merge tag 'disintegrate-powerpc-20121009' into merge) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (ddffeb8 Linux 3.7-rc1) +$ git merge sparc/master +Already up-to-date. +Merging net/master (29bb4cc docbook: networking: fix file paths for uapi headers) +$ git merge net/master +Already up-to-date. +Merging sound-current/for-linus (ddffeb8 Linux 3.7-rc1) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (bf11315 net/wireless: ipw2200: Fix panic occurring in ipw_handle_promiscuous_tx()) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/bcma/main.c | 5 +- + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 68 +++++++------------- + drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- + net/bluetooth/smp.c | 6 +- + net/mac80211/iface.c | 2 +- + net/mac80211/sta_info.c | 4 +- + net/mac80211/util.c | 4 +- + net/mac80211/wpa.c | 3 +- + 9 files changed, 40 insertions(+), 56 deletions(-) +Merging driver-core.current/driver-core-linus (ddffeb8 Linux 3.7-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (3e5bde8 serial/8250_hp300: Missing 8250 register interface conversion bits) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/staging/dgrp/dgrp_mon_ops.c | 1 + + drivers/staging/dgrp/dgrp_specproc.c | 1 + + drivers/staging/dgrp/dgrp_tty.c | 1 + + drivers/tty/serial/8250/8250_hp300.c | 20 ++++++++++---------- + drivers/tty/serial/Kconfig | 4 ++-- + drivers/tty/serial/sccnxp.c | 1 + + include/linux/ratelimit.h | 27 +++++++++------------------ + net/irda/ircomm/ircomm_tty.c | 2 ++ + 8 files changed, 27 insertions(+), 30 deletions(-) +Merging usb.current/usb-linus (8282da4 MAINTAINERS: Add maintainer entry for the USB webcam gadget) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + drivers/usb/core/driver.c | 4 + + drivers/usb/core/hub.c | 36 +- + drivers/usb/gadget/Kconfig | 1 + + include/linux/usb/Kbuild | 10 - + include/linux/usb/audio.h | 524 +--------------- + include/linux/usb/ch9.h | 960 +---------------------------- + include/linux/usb/functionfs.h | 167 +---- + include/uapi/linux/usb/Kbuild | 10 + + include/uapi/linux/usb/audio.h | 545 ++++++++++++++++ + include/{ => uapi}/linux/usb/cdc.h | 0 + include/{ => uapi}/linux/usb/ch11.h | 0 + include/uapi/linux/usb/ch9.h | 993 ++++++++++++++++++++++++++++++ + include/uapi/linux/usb/functionfs.h | 169 +++++ + include/{ => uapi}/linux/usb/g_printer.h | 0 + include/{ => uapi}/linux/usb/gadgetfs.h | 0 + include/{ => uapi}/linux/usb/midi.h | 0 + include/{ => uapi}/linux/usb/tmc.h | 0 + include/{ => uapi}/linux/usb/video.h | 0 + 19 files changed, 1755 insertions(+), 1671 deletions(-) + create mode 100644 include/uapi/linux/usb/audio.h + rename include/{ => uapi}/linux/usb/cdc.h (100%) + rename include/{ => uapi}/linux/usb/ch11.h (100%) + create mode 100644 include/uapi/linux/usb/ch9.h + create mode 100644 include/uapi/linux/usb/functionfs.h + rename include/{ => uapi}/linux/usb/g_printer.h (100%) + rename include/{ => uapi}/linux/usb/gadgetfs.h (100%) + rename include/{ => uapi}/linux/usb/midi.h (100%) + rename include/{ => uapi}/linux/usb/tmc.h (100%) + rename include/{ => uapi}/linux/usb/video.h (100%) +Merging staging.current/staging-linus (ddffeb8 Linux 3.7-rc1) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (ddffeb8 Linux 3.7-rc1) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (0cc8d6a Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (72f36d5 md: refine reporting of resync/reshape delays.) +$ 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 (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (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 asm-generic/master (c37d615 Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic) +$ git merge asm-generic/master +Already up-to-date. +Merging arm/for-next (3d6ee36 Merge branch 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (5d64edb Merge branch 'hw-breakpoint' into for-next/perf) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + arch/arm/include/asm/hw_breakpoint.h | 8 +- + arch/arm/include/asm/perf_event.h | 5 + + arch/arm/include/asm/pmu.h | 28 ++-- + arch/arm/kernel/hw_breakpoint.c | 146 ++++++++++---------- + arch/arm/kernel/perf_event.c | 88 ++++++++---- + arch/arm/kernel/perf_event_cpu.c | 74 ++++++---- + arch/arm/kernel/perf_event_v6.c | 126 ++++++++--------- + arch/arm/kernel/perf_event_v7.c | 246 ++++++++++++++++------------------ + arch/arm/kernel/perf_event_xscale.c | 157 +++++++++++----------- + 9 files changed, 470 insertions(+), 408 deletions(-) +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +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 arm64/upstream (48b3b32 Merge tag 'disintegrate-arm64-20121011' of git://git.infradead.org/users/dhowells/linux-headers into uapi) +$ git merge arm64/upstream +Already up-to-date. +Merging blackfin/for-linus (9f57151 Merge tag 'disintegrate-blackfin-20121009' into for-linus) +$ git merge blackfin/for-linus +Merge made by the 'recursive' strategy. + arch/blackfin/include/asm/Kbuild | 5 - + arch/blackfin/include/asm/bfin_sport.h | 128 +----- + arch/blackfin/include/asm/fixed_code.h | 30 +- + arch/blackfin/include/asm/ptrace.h | 161 +------- + arch/blackfin/include/asm/unistd.h | 430 +------------------ + arch/blackfin/include/uapi/asm/Kbuild | 16 + + arch/blackfin/include/uapi/asm/bfin_sport.h | 136 ++++++ + arch/blackfin/include/{ => uapi}/asm/byteorder.h | 0 + arch/blackfin/include/{ => uapi}/asm/cachectl.h | 0 + arch/blackfin/include/{ => uapi}/asm/fcntl.h | 0 + arch/blackfin/include/uapi/asm/fixed_code.h | 38 ++ + arch/blackfin/include/{ => uapi}/asm/ioctls.h | 0 + arch/blackfin/include/{ => uapi}/asm/kvm_para.h | 0 + arch/blackfin/include/{ => uapi}/asm/poll.h | 0 + arch/blackfin/include/{ => uapi}/asm/posix_types.h | 0 + arch/blackfin/include/uapi/asm/ptrace.h | 170 ++++++++ + arch/blackfin/include/{ => uapi}/asm/sigcontext.h | 0 + arch/blackfin/include/{ => uapi}/asm/siginfo.h | 0 + arch/blackfin/include/{ => uapi}/asm/signal.h | 0 + arch/blackfin/include/{ => uapi}/asm/stat.h | 0 + arch/blackfin/include/{ => uapi}/asm/swab.h | 0 + arch/blackfin/include/uapi/asm/unistd.h | 437 ++++++++++++++++++++ + 22 files changed, 802 insertions(+), 749 deletions(-) + create mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h + rename arch/blackfin/include/{ => uapi}/asm/byteorder.h (100%) + rename arch/blackfin/include/{ => uapi}/asm/cachectl.h (100%) + rename arch/blackfin/include/{ => uapi}/asm/fcntl.h (100%) + create mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h + rename arch/blackfin/include/{ => uapi}/asm/ioctls.h (100%) + rename arch/blackfin/include/{ => uapi}/asm/kvm_para.h (100%) + rename arch/blackfin/include/{ => uapi}/asm/poll.h (100%) + rename arch/blackfin/include/{ => uapi}/asm/posix_types.h (100%) + create mode 100644 arch/blackfin/include/uapi/asm/ptrace.h + rename arch/blackfin/include/{ => uapi}/asm/sigcontext.h (100%) + rename arch/blackfin/include/{ => uapi}/asm/siginfo.h (100%) + rename arch/blackfin/include/{ => uapi}/asm/signal.h (100%) + rename arch/blackfin/include/{ => uapi}/asm/stat.h (100%) + rename arch/blackfin/include/{ => uapi}/asm/swab.h (100%) + create mode 100644 arch/blackfin/include/uapi/asm/unistd.h +Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (620614d Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers into for-linus) +$ git merge cris/for-next +Auto-merging arch/cris/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/cris/include/arch-v10/arch/Kbuild | 4 - + arch/cris/include/arch-v32/arch/Kbuild | 2 - + arch/cris/include/arch-v32/arch/cryptocop.h | 116 +------ + arch/cris/include/asm/Kbuild | 5 - + arch/cris/include/asm/ptrace.h | 5 +- + arch/cris/include/asm/signal.h | 122 +------ + arch/cris/include/asm/swab.h | 3 +- + arch/cris/include/asm/termios.h | 43 +-- + arch/cris/include/asm/types.h | 5 +- + arch/cris/include/asm/unistd.h | 342 +------------------ + arch/cris/include/uapi/arch-v10/arch/Kbuild | 4 + + .../include/{ => uapi}/arch-v10/arch/sv_addr.agh | 0 + .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h | 0 + .../cris/include/{ => uapi}/arch-v10/arch/svinto.h | 0 + arch/cris/include/{ => uapi}/arch-v10/arch/user.h | 0 + arch/cris/include/uapi/arch-v32/arch/Kbuild | 2 + + arch/cris/include/uapi/arch-v32/arch/cryptocop.h | 122 +++++++ + arch/cris/include/{ => uapi}/arch-v32/arch/user.h | 0 + arch/cris/include/uapi/asm/Kbuild | 34 ++ + arch/cris/include/{ => uapi}/asm/auxvec.h | 0 + arch/cris/include/{ => uapi}/asm/bitsperlong.h | 0 + arch/cris/include/{ => uapi}/asm/byteorder.h | 0 + arch/cris/include/{ => uapi}/asm/errno.h | 0 + arch/cris/include/{ => uapi}/asm/ethernet.h | 0 + arch/cris/include/{ => uapi}/asm/etraxgpio.h | 0 + arch/cris/include/{ => uapi}/asm/fcntl.h | 0 + arch/cris/include/{ => uapi}/asm/ioctl.h | 0 + arch/cris/include/{ => uapi}/asm/ioctls.h | 0 + arch/cris/include/{ => uapi}/asm/ipcbuf.h | 0 + arch/cris/include/{ => uapi}/asm/mman.h | 0 + arch/cris/include/{ => uapi}/asm/msgbuf.h | 0 + arch/cris/include/{ => uapi}/asm/param.h | 0 + arch/cris/include/{ => uapi}/asm/poll.h | 0 + arch/cris/include/{ => uapi}/asm/posix_types.h | 0 + arch/cris/include/uapi/asm/ptrace.h | 1 + + arch/cris/include/{ => uapi}/asm/resource.h | 0 + arch/cris/include/{ => uapi}/asm/rs485.h | 0 + arch/cris/include/{ => uapi}/asm/sembuf.h | 0 + arch/cris/include/{ => uapi}/asm/setup.h | 0 + arch/cris/include/{ => uapi}/asm/shmbuf.h | 0 + arch/cris/include/{ => uapi}/asm/sigcontext.h | 0 + arch/cris/include/{ => uapi}/asm/siginfo.h | 0 + arch/cris/include/uapi/asm/signal.h | 122 +++++++ + arch/cris/include/{ => uapi}/asm/socket.h | 0 + arch/cris/include/{ => uapi}/asm/sockios.h | 0 + arch/cris/include/{ => uapi}/asm/stat.h | 0 + arch/cris/include/{ => uapi}/asm/statfs.h | 0 + arch/cris/include/{ => uapi}/asm/sync_serial.h | 0 + arch/cris/include/{ => uapi}/asm/termbits.h | 0 + arch/cris/include/uapi/asm/termios.h | 45 +++ + arch/cris/include/uapi/asm/types.h | 1 + + arch/cris/include/uapi/asm/unistd.h | 344 ++++++++++++++++++++ + arch/cris/kernel/asm-offsets.c | 6 +- + 53 files changed, 683 insertions(+), 645 deletions(-) + rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr.agh (100%) + rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr_ag.h (100%) + rename arch/cris/include/{ => uapi}/arch-v10/arch/svinto.h (100%) + rename arch/cris/include/{ => uapi}/arch-v10/arch/user.h (100%) + create mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h + rename arch/cris/include/{ => uapi}/arch-v32/arch/user.h (100%) + rename arch/cris/include/{ => uapi}/asm/auxvec.h (100%) + rename arch/cris/include/{ => uapi}/asm/bitsperlong.h (100%) + rename arch/cris/include/{ => uapi}/asm/byteorder.h (100%) + rename arch/cris/include/{ => uapi}/asm/errno.h (100%) + rename arch/cris/include/{ => uapi}/asm/ethernet.h (100%) + rename arch/cris/include/{ => uapi}/asm/etraxgpio.h (100%) + rename arch/cris/include/{ => uapi}/asm/fcntl.h (100%) + rename arch/cris/include/{ => uapi}/asm/ioctl.h (100%) + rename arch/cris/include/{ => uapi}/asm/ioctls.h (100%) + rename arch/cris/include/{ => uapi}/asm/ipcbuf.h (100%) + rename arch/cris/include/{ => uapi}/asm/mman.h (100%) + rename arch/cris/include/{ => uapi}/asm/msgbuf.h (100%) + rename arch/cris/include/{ => uapi}/asm/param.h (100%) + rename arch/cris/include/{ => uapi}/asm/poll.h (100%) + rename arch/cris/include/{ => uapi}/asm/posix_types.h (100%) + create mode 100644 arch/cris/include/uapi/asm/ptrace.h + rename arch/cris/include/{ => uapi}/asm/resource.h (100%) + rename arch/cris/include/{ => uapi}/asm/rs485.h (100%) + rename arch/cris/include/{ => uapi}/asm/sembuf.h (100%) + rename arch/cris/include/{ => uapi}/asm/setup.h (100%) + rename arch/cris/include/{ => uapi}/asm/shmbuf.h (100%) + rename arch/cris/include/{ => uapi}/asm/sigcontext.h (100%) + rename arch/cris/include/{ => uapi}/asm/siginfo.h (100%) + create mode 100644 arch/cris/include/uapi/asm/signal.h + rename arch/cris/include/{ => uapi}/asm/socket.h (100%) + rename arch/cris/include/{ => uapi}/asm/sockios.h (100%) + rename arch/cris/include/{ => uapi}/asm/stat.h (100%) + rename arch/cris/include/{ => uapi}/asm/statfs.h (100%) + create mode 100644 arch/cris/include/uapi/asm/swab.h + rename arch/cris/include/{ => uapi}/asm/sync_serial.h (100%) + rename arch/cris/include/{ => uapi}/asm/termbits.h (100%) + create mode 100644 arch/cris/include/uapi/asm/termios.h + create mode 100644 arch/cris/include/uapi/asm/types.h + create mode 100644 arch/cris/include/uapi/asm/unistd.h +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 (d536e0d Merge tag 'disintegrate-ia64-20121009' of git://git.infradead.org/users/dhowells/linux-headers into next) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (ddffeb8 Linux 3.7-rc1) +$ git merge m68knommu/for-next +Already up-to-date. +Merging microblaze/next (1883baa UAPI: (Scripted) Disintegrate arch/microblaze/include/asm) +$ git merge microblaze/next +Auto-merging arch/microblaze/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/Kbuild | 2 - + arch/microblaze/include/asm/elf.h | 97 +---- + arch/microblaze/include/asm/ptrace.h | 62 +-- + arch/microblaze/include/asm/setup.h | 6 +- + arch/microblaze/include/asm/unistd.h | 390 +------------------ + arch/microblaze/include/uapi/asm/Kbuild | 32 ++ + arch/microblaze/include/{ => uapi}/asm/auxvec.h | 0 + .../include/{ => uapi}/asm/bitsperlong.h | 0 + arch/microblaze/include/{ => uapi}/asm/byteorder.h | 0 + arch/microblaze/include/uapi/asm/elf.h | 121 ++++++ + arch/microblaze/include/{ => uapi}/asm/errno.h | 0 + arch/microblaze/include/{ => uapi}/asm/fcntl.h | 0 + arch/microblaze/include/{ => uapi}/asm/ioctl.h | 0 + arch/microblaze/include/{ => uapi}/asm/ioctls.h | 0 + arch/microblaze/include/{ => uapi}/asm/ipcbuf.h | 0 + arch/microblaze/include/{ => uapi}/asm/kvm_para.h | 0 + arch/microblaze/include/{ => uapi}/asm/mman.h | 0 + arch/microblaze/include/{ => uapi}/asm/msgbuf.h | 0 + arch/microblaze/include/{ => uapi}/asm/param.h | 0 + arch/microblaze/include/{ => uapi}/asm/poll.h | 0 + .../include/{ => uapi}/asm/posix_types.h | 0 + arch/microblaze/include/uapi/asm/ptrace.h | 72 ++++ + arch/microblaze/include/{ => uapi}/asm/resource.h | 0 + arch/microblaze/include/{ => uapi}/asm/sembuf.h | 0 + arch/microblaze/include/uapi/asm/setup.h | 19 + + arch/microblaze/include/{ => uapi}/asm/shmbuf.h | 0 + .../microblaze/include/{ => uapi}/asm/sigcontext.h | 0 + arch/microblaze/include/{ => uapi}/asm/siginfo.h | 0 + arch/microblaze/include/{ => uapi}/asm/signal.h | 0 + arch/microblaze/include/{ => uapi}/asm/socket.h | 0 + arch/microblaze/include/{ => uapi}/asm/sockios.h | 0 + arch/microblaze/include/{ => uapi}/asm/stat.h | 0 + arch/microblaze/include/{ => uapi}/asm/statfs.h | 0 + arch/microblaze/include/{ => uapi}/asm/swab.h | 0 + arch/microblaze/include/{ => uapi}/asm/termbits.h | 0 + arch/microblaze/include/{ => uapi}/asm/termios.h | 0 + arch/microblaze/include/{ => uapi}/asm/types.h | 0 + arch/microblaze/include/uapi/asm/unistd.h | 400 ++++++++++++++++++++ + 38 files changed, 649 insertions(+), 552 deletions(-) + rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%) + create mode 100644 arch/microblaze/include/uapi/asm/elf.h + rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/param.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%) + create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h + rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%) + create mode 100644 arch/microblaze/include/uapi/asm/setup.h + rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%) + rename arch/microblaze/include/{ => uapi}/asm/types.h (100%) + create mode 100644 arch/microblaze/include/uapi/asm/unistd.h +Merging mips/mips-for-linux-next (6fd0bca MIPS: Make __{,n,u}delay declarations match definitions and generic delay.h) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/include/asm/delay.h | 6 +++--- + arch/mips/lib/delay.c | 6 +++++- + 2 files changed, 8 insertions(+), 4 deletions(-) +Merging openrisc/for-upstream (6257c57 Merge tag 'disintegrate-openrisc-20121009' of git://git.infradead.org/users/dhowells/linux-headers) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (07abad0 [PARISC] asm: redo generic includes) +$ git merge parisc/for-next +Removing arch/parisc/include/asm/xor.h +Removing arch/parisc/include/asm/vga.h +Removing arch/parisc/include/asm/user.h +Removing arch/parisc/include/asm/topology.h +Removing arch/parisc/include/asm/segment.h +Removing arch/parisc/include/asm/real.h +Removing arch/parisc/include/asm/poll.h +Removing arch/parisc/include/asm/percpu.h +Removing arch/parisc/include/asm/param.h +Removing arch/parisc/include/asm/mutex.h +Removing arch/parisc/include/asm/local64.h +Removing arch/parisc/include/asm/local.h +Removing arch/parisc/include/asm/kvm_para.h +Removing arch/parisc/include/asm/kdebug.h +Removing arch/parisc/include/asm/irq_regs.h +Removing arch/parisc/include/asm/hw_irq.h +Removing arch/parisc/include/asm/emergency-restart.h +Removing arch/parisc/include/asm/div64.h +Removing arch/parisc/include/asm/device.h +Removing arch/parisc/include/asm/cputime.h +Removing arch/parisc/include/asm/compat_signal.h +Removing arch/parisc/include/asm/auxvec.h +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/Kbuild | 7 ++++--- + arch/parisc/include/asm/auxvec.h | 4 ---- + arch/parisc/include/asm/compat_signal.h | 2 -- + arch/parisc/include/asm/cputime.h | 6 ------ + arch/parisc/include/asm/device.h | 7 ------- + arch/parisc/include/asm/div64.h | 1 - + arch/parisc/include/asm/emergency-restart.h | 6 ------ + arch/parisc/include/asm/hw_irq.h | 8 -------- + arch/parisc/include/asm/irq_regs.h | 1 - + arch/parisc/include/asm/kdebug.h | 1 - + arch/parisc/include/asm/kvm_para.h | 1 - + arch/parisc/include/asm/local.h | 1 - + arch/parisc/include/asm/local64.h | 1 - + arch/parisc/include/asm/mutex.h | 9 --------- + arch/parisc/include/asm/param.h | 1 - + arch/parisc/include/asm/percpu.h | 7 ------- + arch/parisc/include/asm/poll.h | 1 - + arch/parisc/include/asm/real.h | 5 ----- + arch/parisc/include/asm/segment.h | 6 ------ + arch/parisc/include/asm/topology.h | 6 ------ + arch/parisc/include/asm/user.h | 5 ----- + arch/parisc/include/asm/vga.h | 6 ------ + arch/parisc/include/asm/xor.h | 1 - + 23 files changed, 4 insertions(+), 89 deletions(-) + delete mode 100644 arch/parisc/include/asm/auxvec.h + delete mode 100644 arch/parisc/include/asm/compat_signal.h + delete mode 100644 arch/parisc/include/asm/cputime.h + delete mode 100644 arch/parisc/include/asm/device.h + delete mode 100644 arch/parisc/include/asm/div64.h + delete mode 100644 arch/parisc/include/asm/emergency-restart.h + delete mode 100644 arch/parisc/include/asm/hw_irq.h + delete mode 100644 arch/parisc/include/asm/irq_regs.h + delete mode 100644 arch/parisc/include/asm/kdebug.h + delete mode 100644 arch/parisc/include/asm/kvm_para.h + delete mode 100644 arch/parisc/include/asm/local.h + delete mode 100644 arch/parisc/include/asm/local64.h + delete mode 100644 arch/parisc/include/asm/mutex.h + delete mode 100644 arch/parisc/include/asm/param.h + delete mode 100644 arch/parisc/include/asm/percpu.h + delete mode 100644 arch/parisc/include/asm/poll.h + delete mode 100644 arch/parisc/include/asm/real.h + delete mode 100644 arch/parisc/include/asm/segment.h + delete mode 100644 arch/parisc/include/asm/topology.h + delete mode 100644 arch/parisc/include/asm/user.h + delete mode 100644 arch/parisc/include/asm/vga.h + delete mode 100644 arch/parisc/include/asm/xor.h +Merging powerpc/next (d900bd7 powerpc/iommu: Fix multiple issues with IOMMU pools code) +$ 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 (f3ac712 powerpc/pcm030: add pcm030-audio-fabric to dts) +$ git merge mpc5xxx/next +Merge made by the 'recursive' strategy. + arch/powerpc/boot/dts/pcm030.dts | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write) +$ git merge galak/next +Already up-to-date. +Merging s390/features (86d7c60 s390/chpid: make headers usable (again)) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/uapi/asm/chpid.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.) +$ git merge sh/sh-latest +Auto-merging arch/sh/include/uapi/asm/unistd_64.h +Auto-merging arch/sh/include/uapi/asm/unistd_32.h +Merge made by the 'recursive' strategy. + arch/sh/include/asm/Kbuild | 11 ---- + arch/sh/include/asm/hw_breakpoint.h | 4 +- + arch/sh/include/asm/posix_types.h | 8 --- + arch/sh/include/asm/ptrace.h | 34 +--------- + arch/sh/include/asm/ptrace_32.h | 75 +--------------------- + arch/sh/include/asm/ptrace_64.h | 12 +--- + arch/sh/include/asm/setup.h | 5 +- + arch/sh/include/asm/types.h | 5 +- + arch/sh/include/asm/unistd.h | 9 +-- + arch/sh/include/uapi/asm/Kbuild | 22 +++++++ + arch/sh/include/{ => uapi}/asm/auxvec.h | 0 + arch/sh/include/{ => uapi}/asm/byteorder.h | 0 + arch/sh/include/{ => uapi}/asm/cachectl.h | 0 + arch/sh/include/{ => uapi}/asm/cpu-features.h | 0 + arch/sh/include/{ => uapi}/asm/ioctls.h | 0 + arch/sh/include/uapi/asm/posix_types.h | 7 +++ + arch/sh/include/{ => uapi}/asm/posix_types_32.h | 0 + arch/sh/include/{ => uapi}/asm/posix_types_64.h | 0 + arch/sh/include/uapi/asm/ptrace.h | 34 ++++++++++ + arch/sh/include/uapi/asm/ptrace_32.h | 77 +++++++++++++++++++++++ + arch/sh/include/uapi/asm/ptrace_64.h | 14 +++++ + arch/sh/include/uapi/asm/setup.h | 1 + + arch/sh/include/{ => uapi}/asm/sigcontext.h | 0 + arch/sh/include/{ => uapi}/asm/signal.h | 0 + arch/sh/include/{ => uapi}/asm/sockios.h | 0 + arch/sh/include/{ => uapi}/asm/stat.h | 0 + arch/sh/include/{ => uapi}/asm/swab.h | 0 + arch/sh/include/uapi/asm/types.h | 1 + + arch/sh/include/uapi/asm/unistd.h | 7 +++ + arch/sh/include/{ => uapi}/asm/unistd_32.h | 3 +- + arch/sh/include/{ => uapi}/asm/unistd_64.h | 3 +- + arch/sh/kernel/syscalls_32.S | 1 + + arch/sh/kernel/syscalls_64.S | 1 + + drivers/sh/intc/access.c | 45 +++++++------ + drivers/sh/intc/chip.c | 4 +- + drivers/tty/serial/sh-sci.c | 3 +- + 36 files changed, 210 insertions(+), 176 deletions(-) + rename arch/sh/include/{ => uapi}/asm/auxvec.h (100%) + rename arch/sh/include/{ => uapi}/asm/byteorder.h (100%) + rename arch/sh/include/{ => uapi}/asm/cachectl.h (100%) + rename arch/sh/include/{ => uapi}/asm/cpu-features.h (100%) + create mode 100644 arch/sh/include/uapi/asm/hw_breakpoint.h + rename arch/sh/include/{ => uapi}/asm/ioctls.h (100%) + create mode 100644 arch/sh/include/uapi/asm/posix_types.h + rename arch/sh/include/{ => uapi}/asm/posix_types_32.h (100%) + rename arch/sh/include/{ => uapi}/asm/posix_types_64.h (100%) + create mode 100644 arch/sh/include/uapi/asm/ptrace.h + create mode 100644 arch/sh/include/uapi/asm/ptrace_32.h + create mode 100644 arch/sh/include/uapi/asm/ptrace_64.h + create mode 100644 arch/sh/include/uapi/asm/setup.h + rename arch/sh/include/{ => uapi}/asm/sigcontext.h (100%) + rename arch/sh/include/{ => uapi}/asm/signal.h (100%) + rename arch/sh/include/{ => uapi}/asm/sockios.h (100%) + rename arch/sh/include/{ => uapi}/asm/stat.h (100%) + rename arch/sh/include/{ => uapi}/asm/swab.h (100%) + create mode 100644 arch/sh/include/uapi/asm/types.h + create mode 100644 arch/sh/include/uapi/asm/unistd.h + rename arch/sh/include/{ => uapi}/asm/unistd_32.h (99%) + rename arch/sh/include/{ => uapi}/asm/unistd_64.h (99%) +Merging sparc-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (c19c6c9 arch/tile: enable interrupts in do_work_pending()) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (935ce97 UAPI: (Scripted) Disintegrate arch/unicore32/include/asm) +$ git merge unicore32/unicore32 +Auto-merging arch/unicore32/Kconfig +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 3 + + arch/unicore32/include/asm/Kbuild | 1 - + arch/unicore32/include/asm/bug.h | 5 -- + arch/unicore32/include/asm/cmpxchg.h | 2 +- + arch/unicore32/include/asm/ptrace.h | 76 +---------------- + arch/unicore32/include/uapi/asm/Kbuild | 5 ++ + arch/unicore32/include/{ => uapi}/asm/byteorder.h | 0 + arch/unicore32/include/{ => uapi}/asm/kvm_para.h | 0 + arch/unicore32/include/uapi/asm/ptrace.h | 90 ++++++++++++++++++++ + arch/unicore32/include/{ => uapi}/asm/sigcontext.h | 0 + arch/unicore32/include/{ => uapi}/asm/unistd.h | 0 + arch/unicore32/kernel/setup.h | 6 ++ + arch/unicore32/mm/fault.c | 37 +++++--- + 13 files changed, 133 insertions(+), 92 deletions(-) + rename arch/unicore32/include/{ => uapi}/asm/byteorder.h (100%) + rename arch/unicore32/include/{ => uapi}/asm/kvm_para.h (100%) + create mode 100644 arch/unicore32/include/uapi/asm/ptrace.h + rename arch/unicore32/include/{ => uapi}/asm/sigcontext.h (100%) + rename arch/unicore32/include/{ => uapi}/asm/unistd.h (100%) +Merging xtensa/for_next (70cefe7 xtensa: Setup CROSS_COMPILE at the top) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (f46dbe3 btrfs: init ref_index to zero in add_inode_ref) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (6285bc2 ceph: avoid 32-bit page index overflow) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (72bd481 cifs: reinstate the forcegid option) +$ git merge cifs/for-next +Already up-to-date. +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 (0d7614f Linux 3.6-rc1) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning()) +$ git merge ext3/for_next +Auto-merging fs/ext3/super.c +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 4 ++-- + fs/ext3/namei.c | 40 +++++++++++++++++++++------------------- + fs/ext3/namei.h | 19 +++++++++++++++++++ + fs/ext3/super.c | 4 ++-- + fs/quota/dquot.c | 2 ++ + 5 files changed, 46 insertions(+), 23 deletions(-) +Merging ext4/dev (c278531 ext4: fix ext4_flush_completed_IO wait semantics) +$ git merge ext4/dev +Already up-to-date. +Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig) +$ git merge fuse/for-next +Auto-merging include/uapi/linux/fuse.h +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/dev.c +Merge made by the 'recursive' strategy. + fs/Kconfig | 10 --- + fs/fuse/Kconfig | 16 ++++- + fs/fuse/dev.c | 19 ++++++ + fs/fuse/dir.c | 160 +++++++++++++++++++++++++++++++++++++++++++-- + fs/fuse/fuse_i.h | 6 ++ + fs/fuse/inode.c | 5 +- + include/uapi/linux/fuse.h | 12 ++++ + 7 files changed, 211 insertions(+), 17 deletions(-) +Merging gfs2/master (5d8550f GFS2: Clean up some unused assignments) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 2 -- + fs/gfs2/glock.c | 10 ++++------ + fs/gfs2/glock.h | 54 +++++++++++++++++++++++++++--------------------------- + fs/gfs2/glops.c | 10 +++++----- + fs/gfs2/lops.c | 2 -- + fs/gfs2/quota.c | 7 +++++-- + fs/gfs2/rgrp.c | 5 ++--- + 7 files changed, 43 insertions(+), 47 deletions(-) +Merging jfs/jfs-next (84f4141 jfs: Fix do_div precision in commit b40c2e66) +$ git merge jfs/jfs-next +Already up-to-date. +Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf()) +$ git merge logfs/master +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (1813bad NFSv4.1: Use kcalloc() to allocate zeroed arrays instead of kzalloc()) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4filelayout.c | 21 ++++++++++++++++----- + fs/nfs/nfs4filelayout.h | 1 - + fs/nfs/nfs4filelayoutdev.c | 22 ---------------------- + fs/nfs/pnfs.h | 1 + + 4 files changed, 17 insertions(+), 28 deletions(-) +Merging nfsd/nfsd-next (a9ca404 Merge Trond's bugfixes) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/cluster/heartbeat.c +Merge made by the 'recursive' strategy. + fs/ocfs2/cluster/heartbeat.c | 40 +++++++++------------------------------- + fs/ocfs2/cluster/masklog.h | 3 ++- + fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++-- + fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ + fs/ocfs2/symlink.c | 2 +- + 5 files changed, 27 insertions(+), 35 deletions(-) +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request()) +$ git merge v9fs/for-next +Merge made by the 'recursive' strategy. +Merging ubifs/linux-next (a74b6e4 UBIFS: fix mounting problems after power cuts) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + fs/ubifs/find.c | 5 +++-- + fs/ubifs/lprops.c | 6 ++++++ + fs/ubifs/ubifs.h | 3 +++ + 3 files changed, 12 insertions(+), 2 deletions(-) +Merging xfs/for-next (2ea0392 xfs: Make inode32 a remountable option) +$ git merge xfs/for-next +Already up-to-date. +Merging vfs/for-next (f81700b procfs: don't need a PATH_MAX allocation to hold a string representation of an int) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (0b82411 Merge branch 'hidraw' into for-next) +$ git merge hid/for-next +Resolved 'drivers/hid/hid-multitouch.c' using previous resolution. +Auto-merging drivers/hid/hid-multitouch.c +CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b53b00c] Merge remote-tracking branch 'hid/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/i2c (a17e9c1 i2c-stub: Move to drivers/i2c) +$ git merge quilt/i2c +Auto-merging drivers/i2c/i2c-stub.c +Merge made by the 'recursive' strategy. + drivers/i2c/Makefile | 1 + + drivers/i2c/busses/Makefile | 1 - + drivers/i2c/{busses => }/i2c-stub.c | 65 +++++++++++++++++------------------ + 3 files changed, 33 insertions(+), 34 deletions(-) + rename drivers/i2c/{busses => }/i2c-stub.c (75%) +Merging i2c-embedded/i2c-embedded/for-next (62885f5 MXS: Implement DMA support into mxs-i2c) +$ git merge i2c-embedded/i2c-embedded/for-next +Already up-to-date. +Merging quilt/jdelvare-hwmon (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux) +$ git merge quilt/jdelvare-hwmon +Already up-to-date. +Merging hwmon-staging/hwmon-next (17875ef hwmon: DA9055 HWMON driver) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/ads7828 | 46 +++-- + Documentation/hwmon/coretemp | 3 + + Documentation/hwmon/da9055 | 47 +++++ + Documentation/hwmon/submitting-patches | 3 +- + drivers/hwmon/Kconfig | 19 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/ads7828.c | 247 ++++++++++------------- + drivers/hwmon/coretemp.c | 67 +++---- + drivers/hwmon/da9052-hwmon.c | 27 +-- + drivers/hwmon/da9055-hwmon.c | 336 ++++++++++++++++++++++++++++++++ + drivers/hwmon/ina2xx.c | 13 +- + drivers/hwmon/pmbus/Kconfig | 2 +- + include/linux/platform_data/ads7828.h | 29 +++ + 13 files changed, 611 insertions(+), 229 deletions(-) + create mode 100644 Documentation/hwmon/da9055 + create mode 100644 drivers/hwmon/da9055-hwmon.c + create mode 100644 include/linux/platform_data/ads7828.h +Merging v4l-dvb/master (c3c0b61 Merge /home/v4l/v4l/patchwork) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (b974d36 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI) +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next (56040f0 Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case) +$ git merge pstore/master +Already up-to-date. +Merging acpi/next (d1d4a81 Merge branches 'fixes-for-37', 'ec' and 'thermal' 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. +Resolved 'include/linux/cpuidle.h' using previous resolution. +Auto-merging include/linux/cpuidle.h +CONFLICT (content): Merge conflict in include/linux/cpuidle.h +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 8e8402f] 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 thermal/next (f5a246e Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ git merge thermal/next +Already up-to-date. +Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)) +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (ddffeb8 Linux 3.7-rc1) +$ git merge ubi/linux-next +Already up-to-date. +Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user) +$ git merge dlm/next +Already up-to-date. +Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (cf0eb28 iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) +$ git merge ibft/linux-next +Already up-to-date. +Merging isci/all (6734092 isci: add a couple __iomem annotations) +$ git merge isci/all +Already up-to-date. +Merging slave-dma/next (ddffeb8 Linux 3.7-rc1) +$ git merge slave-dma/next +Already up-to-date. +$ git am -3 ../patches/DMA__PL330__Fix_build_error_on_linux-next-20120924.patch +Applying: DMA: PL330: Fix build error (on linux-next-20120924) +Using index info to reconstruct a base tree... +M drivers/dma/pl330.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc) +$ git merge net-next/master +Already up-to-date. +Merging wireless-next/master (ddffeb8 Linux 3.7-rc1) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (56f6098 Bluetooth: Zero bredr pointer when chan is deleted) +$ git merge bluetooth/master +Auto-merging net/bluetooth/smp.c +Auto-merging net/bluetooth/rfcomm/tty.c +Auto-merging net/bluetooth/rfcomm/sock.c +Auto-merging net/bluetooth/mgmt.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/af_bluetooth.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_sdio.c | 28 ++- + include/net/bluetooth/a2mp.h | 22 ++ + include/net/bluetooth/amp.h | 50 ++++ + include/net/bluetooth/bluetooth.h | 1 - + include/net/bluetooth/hci.h | 40 ++- + include/net/bluetooth/hci_core.h | 48 +++- + include/net/bluetooth/l2cap.h | 14 +- + net/bluetooth/Kconfig | 1 + + net/bluetooth/Makefile | 2 +- + net/bluetooth/a2mp.c | 455 ++++++++++++++++++++++++++++++--- + net/bluetooth/af_bluetooth.c | 10 +- + net/bluetooth/amp.c | 374 +++++++++++++++++++++++++++ + net/bluetooth/bnep/core.c | 3 +- + net/bluetooth/cmtp/core.c | 2 +- + net/bluetooth/hci_conn.c | 70 +++++- + net/bluetooth/hci_core.c | 65 +++-- + net/bluetooth/hci_event.c | 167 +++++++++++- + net/bluetooth/hci_sysfs.c | 10 +- + net/bluetooth/hidp/core.c | 8 +- + net/bluetooth/l2cap_core.c | 503 +++++++++++++++++++++---------------- + net/bluetooth/l2cap_sock.c | 89 ++++--- + net/bluetooth/lib.c | 14 -- + net/bluetooth/mgmt.c | 5 +- + net/bluetooth/rfcomm/core.c | 19 +- + net/bluetooth/rfcomm/sock.c | 9 +- + net/bluetooth/rfcomm/tty.c | 6 +- + net/bluetooth/sco.c | 12 +- + net/bluetooth/smp.c | 2 +- + 28 files changed, 1637 insertions(+), 392 deletions(-) + create mode 100644 include/net/bluetooth/amp.h + create mode 100644 net/bluetooth/amp.c +Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/nand_base.c | 9 +++++---- + drivers/mtd/ofpart.c | 2 +- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging l2-mtd/master (ef15412 ARM: nomadik: fixup some FSMC merge problems) +$ git merge l2-mtd/master +Removing include/linux/platform_data/mtd-nomadik-nand.h +Removing drivers/mtd/nand/nomadik_nand.c +Removing arch/arm/mach-nomadik/include/mach/fsmc.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/denali-nand.txt | 23 ++ + .../devicetree/bindings/mtd/fsmc-nand.txt | 12 +- + Documentation/devicetree/bindings/mtd/m25p80.txt | 29 +++ + arch/arm/boot/dts/spear13xx.dtsi | 10 +- + arch/arm/boot/dts/spear300.dtsi | 8 +- + arch/arm/boot/dts/spear310.dtsi | 8 +- + arch/arm/boot/dts/spear320.dtsi | 8 +- + arch/arm/boot/dts/spear600.dtsi | 8 +- + arch/arm/configs/nhk8815_defconfig | 2 +- + arch/arm/mach-nomadik/board-nhk8815.c | 73 +++--- + arch/arm/mach-nomadik/include/mach/fsmc.h | 29 --- + arch/arm/mach-u300/core.c | 14 +- + drivers/clk/clk-nomadik.c | 1 + + drivers/mtd/cmdlinepart.c | 80 +++---- + drivers/mtd/devices/m25p80.c | 36 +-- + drivers/mtd/devices/slram.c | 2 +- + drivers/mtd/nand/Kconfig | 26 ++- + drivers/mtd/nand/Makefile | 3 +- + drivers/mtd/nand/denali.c | 160 +++---------- + drivers/mtd/nand/denali.h | 5 + + drivers/mtd/nand/denali_dt.c | 167 ++++++++++++++ + drivers/mtd/nand/denali_pci.c | 144 ++++++++++++ + drivers/mtd/nand/fsl_elbc_nand.c | 15 -- + drivers/mtd/nand/fsmc_nand.c | 44 +--- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 +- + drivers/mtd/nand/nomadik_nand.c | 235 -------------------- + drivers/mtd/onenand/onenand_base.c | 2 +- + include/linux/mtd/fsmc.h | 3 - + include/linux/platform_data/mtd-nomadik-nand.h | 16 -- + 29 files changed, 580 insertions(+), 597 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/m25p80.txt + delete mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h + create mode 100644 drivers/mtd/nand/denali_dt.c + create mode 100644 drivers/mtd/nand/denali_pci.c + delete mode 100644 drivers/mtd/nand/nomadik_nand.c + delete mode 100644 include/linux/platform_data/mtd-nomadik-nand.h +$ git reset --hard HEAD^ +HEAD is now at 259cfb6 Merge remote-tracking branch 'mtd/master' +Merging refs/next/20121011/l2-mtd +$ git merge refs/next/20121011/l2-mtd +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mtd/m25p80.txt | 29 ++++++++ + drivers/mtd/cmdlinepart.c | 80 ++++++++++++---------- + drivers/mtd/devices/m25p80.c | 36 ++++++---- + drivers/mtd/devices/slram.c | 2 +- + drivers/mtd/nand/fsl_elbc_nand.c | 15 ---- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 ++-- + drivers/mtd/onenand/onenand_base.c | 2 +- + 7 files changed, 104 insertions(+), 74 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/m25p80.txt +Merging crypto/master (ba1ee07 crypto: vmac - Make VMAC work when blocks aren't aligned) +$ git merge crypto/master +Auto-merging arch/x86/crypto/crc32c-intel_glue.c +Merge made by the 'recursive' strategy. + arch/x86/crypto/Makefile | 2 + + .../crypto/{crc32c-intel.c => crc32c-intel_glue.c} | 81 ++++ + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 460 ++++++++++++++++++++ + crypto/Kconfig | 10 + + crypto/tcrypt.c | 4 + + crypto/testmgr.h | 33 +- + crypto/vmac.c | 47 +- + drivers/crypto/talitos.c | 3 +- + include/crypto/vmac.h | 2 + + 9 files changed, 635 insertions(+), 7 deletions(-) + rename arch/x86/crypto/{crc32c-intel.c => crc32c-intel_glue.c} (69%) + create mode 100644 arch/x86/crypto/crc32c-pcl-intel-asm_64.S +Merging drm/drm-next (1f31c69 Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging sound/for-next (ede8d1b Merge tag 'disintegrate-sound-20121009' of git://git.infradead.org/users/dhowells/linux-headers into for-next-next) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/Kbuild | 10 - + include/sound/asequencer.h | 594 +---------------- + include/sound/asound.h | 935 +------------------------- + include/sound/emu10k1.h | 355 +--------- + include/sound/sb16_csp.h | 104 +-- + include/uapi/sound/Kbuild | 10 + + include/uapi/sound/asequencer.h | 614 +++++++++++++++++ + include/uapi/sound/asound.h | 957 +++++++++++++++++++++++++++ + include/{ => uapi}/sound/asound_fm.h | 0 + include/{ => uapi}/sound/compress_offload.h | 0 + include/{ => uapi}/sound/compress_params.h | 0 + include/uapi/sound/emu10k1.h | 373 +++++++++++ + include/{ => uapi}/sound/hdsp.h | 0 + include/{ => uapi}/sound/hdspm.h | 0 + include/uapi/sound/sb16_csp.h | 122 ++++ + include/{ => uapi}/sound/sfnt_info.h | 0 + sound/pci/ac97/ac97_codec.c | 2 + + sound/pci/hda/hda_codec.c | 32 +- + sound/pci/hda/hda_codec.h | 2 + + sound/pci/hda/hda_intel.c | 53 +- + sound/pci/hda/hda_jack.c | 22 + + sound/pci/hda/hda_jack.h | 2 + + sound/pci/hda/patch_conexant.c | 44 ++ + 23 files changed, 2224 insertions(+), 2007 deletions(-) + create mode 100644 include/uapi/sound/asequencer.h + create mode 100644 include/uapi/sound/asound.h + rename include/{ => uapi}/sound/asound_fm.h (100%) + rename include/{ => uapi}/sound/compress_offload.h (100%) + rename include/{ => uapi}/sound/compress_params.h (100%) + create mode 100644 include/uapi/sound/emu10k1.h + rename include/{ => uapi}/sound/hdsp.h (100%) + rename include/{ => uapi}/sound/hdspm.h (100%) + create mode 100644 include/uapi/sound/sb16_csp.h + rename include/{ => uapi}/sound/sfnt_info.h (100%) +Merging sound-asoc/for-next (1937aafc Merge branches 'for-3.7', 'asoc-ak4104', 'asoc-cs4271', 'asoc-da9055', 'asoc-davinci', 'asoc-fsi', 'asoc-samsung', 'asoc-si476x', 'asoc-wm2200', 'asoc-wm8750', 'asoc-wm8770', 'asoc-wm8971' and 'asoc-wm8994' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4104.txt | 17 + + Documentation/devicetree/bindings/sound/cs4271.txt | 2 + + arch/arm/mach-omap1/board-ams-delta.c | 12 + + drivers/base/regmap/internal.h | 2 + + drivers/base/regmap/regmap-debugfs.c | 50 +- + drivers/base/regmap/regmap.c | 154 +++-- + include/linux/mfd/wm8994/pdata.h | 5 + + include/linux/regmap.h | 6 +- + include/sound/cs4271.h | 1 + + sound/soc/Makefile | 5 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4104.c | 29 +- + sound/soc/codecs/cs4271.c | 21 +- + sound/soc/codecs/da9055.c | 26 +- + sound/soc/codecs/si476x.c | 255 ++++++++ + sound/soc/codecs/twl6040.c | 8 +- + sound/soc/codecs/wm2200.c | 631 ++++++++++++++++++-- + sound/soc/codecs/wm8750.c | 86 ++- + sound/soc/codecs/wm8770.c | 217 ++++--- + sound/soc/codecs/wm8958-dsp2.c | 31 +- + sound/soc/codecs/wm8971.c | 80 ++- + sound/soc/codecs/wm8994.c | 100 ++-- + sound/soc/codecs/wmfw.h | 99 +++ + sound/soc/davinci/davinci-evm.c | 5 + + sound/soc/davinci/davinci-mcasp.c | 91 ++- + sound/soc/davinci/davinci-mcasp.h | 2 +- + sound/soc/davinci/davinci-pcm.c | 16 +- + sound/soc/omap/ams-delta.c | 63 +- + sound/soc/omap/omap-abe-twl6040.c | 2 +- + sound/soc/omap/omap-mcpdm.c | 9 +- + sound/soc/pxa/mmp-pcm.c | 2 +- + sound/soc/samsung/ac97.c | 6 +- + sound/soc/samsung/bells.c | 224 +++++-- + sound/soc/samsung/i2s.c | 8 +- + sound/soc/samsung/pcm.c | 12 +- + sound/soc/samsung/spdif.c | 12 +- + sound/soc/sh/fsi.c | 40 +- + sound/soc/soc-jack.c | 7 +- + 39 files changed, 1868 insertions(+), 474 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ak4104.txt + create mode 100644 sound/soc/codecs/si476x.c + create mode 100644 sound/soc/codecs/wmfw.h +Merging modules/modules-next (dbadc17 X.509: Fix indefinite length element skip error handling) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (d43b716 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (ad5396e Input: mms114 - add device tree bindings) +$ git merge input/next +Auto-merging drivers/input/touchscreen/wm831x-ts.c +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/mms114.txt | 34 +++++++++++ + drivers/input/joystick/as5011.c | 19 +++++- + drivers/input/misc/wm831x-on.c | 5 +- + drivers/input/touchscreen/cy8ctmg110_ts.c | 13 +++- + drivers/input/touchscreen/mms114.c | 62 +++++++++++++++++++- + drivers/input/touchscreen/wm831x-ts.c | 6 +- + 6 files changed, 125 insertions(+), 14 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt +Merging input-mt/for-next (51c80b7 Input: bcm5974 - Convert to MT-B) +$ git merge input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (c0a93e2 Merge branch 'for-3.7-hierarchy' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next) +$ git merge block/for-next +Resolved 'init/Kconfig' using previous resolution. +Auto-merging init/Kconfig +CONFLICT (content): Merge conflict in init/Kconfig +Auto-merging drivers/block/mtip32xx/mtip32xx.h +Auto-merging drivers/block/mtip32xx/mtip32xx.c +Auto-merging drivers/block/loop.c +Auto-merging drivers/block/floppy.c +Auto-merging drivers/block/Kconfig +Auto-merging block/genhd.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3b90d29] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 7 +- + block/genhd.c | 6 +- + drivers/block/Kconfig | 1 + + drivers/block/cciss.c | 1 - + drivers/block/floppy.c | 97 +- + drivers/block/loop.c | 17 +- + drivers/block/mtip32xx/mtip32xx.c | 19 +- + drivers/block/mtip32xx/mtip32xx.h | 3 + + drivers/block/xen-blkback/common.h | 4 +- + drivers/block/xen-blkback/xenbus.c | 9 +- + drivers/memstick/core/Kconfig | 12 + + drivers/memstick/core/Makefile | 2 +- + drivers/memstick/core/ms_block.c | 2395 ++++++++++++++++++++++++++++++++++++ + drivers/memstick/core/ms_block.h | 293 +++++ + 14 files changed, 2797 insertions(+), 69 deletions(-) + create mode 100644 drivers/memstick/core/ms_block.c + create mode 100644 drivers/memstick/core/ms_block.h +Merging quilt/device-mapper (ddffeb8 Linux 3.7-rc1) +$ git merge quilt/device-mapper +Already up-to-date. +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 (b35a5c5 mmc: rtsx_pci_sdmmc: Add realtek pcie sdmmc host driver) +$ git merge mmc/mmc-next +Merge made by the 'recursive' strategy. + drivers/mmc/host/Kconfig | 7 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/rtsx_pci_sdmmc.c | 1332 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 1340 insertions(+) + create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c +Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (e2087be Merge branch 'slab/tracing' into slab/for-linus) +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (635a2a0 md/raid5: add blktrace calls) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + block/blk-core.c | 1 + + drivers/md/md.c | 8 +- + drivers/md/md.h | 8 + + drivers/md/raid5.c | 446 ++++++++++++++++++++++++++++++++-- + drivers/md/raid5.h | 19 ++ + include/linux/raid/Kbuild | 2 - + include/linux/raid/md_u.h | 141 +---------- + include/uapi/linux/raid/Kbuild | 2 + + include/{ => uapi}/linux/raid/md_p.h | 0 + include/uapi/linux/raid/md_u.h | 155 ++++++++++++ + 10 files changed, 613 insertions(+), 169 deletions(-) + rename include/{ => uapi}/linux/raid/md_p.h (100%) + create mode 100644 include/uapi/linux/raid/md_u.h +Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic) +$ git merge mfd/for-next +Already up-to-date. +Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes) +$ git merge battery/master +Already up-to-date. +Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error) +$ git merge fbdev/fbdev-next +Already up-to-date. +Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (d42ca37 Merge branches 'regulator-lp8788', 'regulator-tps51632' and 'regulator-vexpress' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/vexpress.txt | 32 ++ + drivers/regulator/Kconfig | 18 ++ + drivers/regulator/Makefile | 2 + + drivers/regulator/core.c | 5 + + drivers/regulator/lp8788-ldo.c | 2 +- + drivers/regulator/tps51632-regulator.c | 332 ++++++++++++++++++++ + drivers/regulator/vexpress.c | 146 +++++++++ + include/linux/regulator/driver.h | 3 + + include/linux/regulator/tps51632-regulator.h | 47 +++ + 9 files changed, 586 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/regulator/vexpress.txt + create mode 100644 drivers/regulator/tps51632-regulator.c + create mode 100644 drivers/regulator/vexpress.c + create mode 100644 include/linux/regulator/tps51632-regulator.h +Merging security/next (bf53083 Merge tag 'v3.6-rc7' into next) +$ 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 (58ddfed Merge branch 'master' of ../linux-watchdog) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/davinci_wdt.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (0094872 Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next) +$ git merge iommu/next +Already up-to-date. +Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (7f8d145 pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (5d0c3d4 parport: dead code in pp_write) +$ git merge trivial/for-next +Auto-merging mm/util.c +Auto-merging drivers/char/ppdev.c +Merge made by the 'recursive' strategy. + drivers/char/ppdev.c | 6 +----- + mm/util.c | 2 +- + 2 files changed, 2 insertions(+), 6 deletions(-) +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge audit/for-next +Already up-to-date. +Merging pm/linux-next (df5a2a1 Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394) +$ git merge pm/linux-next +Already up-to-date. +Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) +$ git merge apm/for-next +Already up-to-date. +Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Resolved 'kernel/audit_tree.c' using previous resolution. +Auto-merging kernel/audit_watch.c +Auto-merging kernel/audit_tree.c +CONFLICT (content): Merge conflict in kernel/audit_tree.c +Auto-merging include/linux/fsnotify_backend.h +Auto-merging fs/notify/notification.c +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d78d7b2] Merge remote-tracking branch 'fsnotify/for-next' +$ git diff -M --stat --summary HEAD^.. + 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 (cfe5031 edac: edac_mc no longer deals with kobjects directly) +$ git merge edac/linux_next +Auto-merging drivers/edac/edac_mc.c +Merge made by the 'recursive' strategy. + drivers/edac/edac_mc.c | 7 ------- + include/linux/edac.h | 1 - + 2 files changed, 8 deletions(-) +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 2d5c0a7] 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 +Already up-to-date. +Merging dt-rh/for-next (36165f5 MAINTAINERS: add scripts/dtc under Devicetree maintainers) +$ 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 (43e37b0 spi: tsc2005: delete soon-obsolete e-mail address) +$ git merge spi-mb/spi-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-rspi.c | 56 ++++++++++++++++++++++++++----------------- + include/linux/spi/tsc2005.h | 2 -- + 2 files changed, 34 insertions(+), 24 deletions(-) +Merging tip/auto-latest (4b84058 Merge branch 'sched/numa') +$ git merge tip/auto-latest +Recorded preimage for 'mm/huge_memory.c' +Resolved 'include/linux/mempolicy.h' using previous resolution. +Resolved 'mm/mempolicy.c' using previous resolution. +Auto-merging tools/perf/Makefile +Auto-merging scripts/kconfig/Makefile +Auto-merging mm/vmstat.c +Auto-merging mm/pgtable-generic.c +Auto-merging mm/mempolicy.c +CONFLICT (content): Merge conflict in mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/huge_memory.c +CONFLICT (content): Merge conflict in mm/huge_memory.c +Auto-merging lib/Makefile +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mempolicy.h +CONFLICT (content): Merge conflict in include/linux/mempolicy.h +Auto-merging include/linux/init_task.h +Auto-merging include/linux/huge_mm.h +Auto-merging include/linux/acpi.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'mm/huge_memory.c'. +[master ac3b853] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/acpi/initrd_table_override.txt | 94 ++ + Documentation/scheduler/numa-problem.txt | 230 +++ + MAINTAINERS | 8 + + arch/sh/mm/Kconfig | 1 + + arch/x86/Kconfig | 31 + + arch/x86/include/asm/pgtable.h | 7 + + arch/x86/kernel/acpi/boot.c | 6 + + arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- + arch/x86/kernel/reboot.c | 8 - + arch/x86/kernel/setup.c | 4 + + arch/x86/mm/pgtable.c | 17 +- + arch/x86/realmode/rm/wakeup_asm.S | 15 +- + drivers/acpi/Kconfig | 9 + + drivers/acpi/osl.c | 202 ++- + drivers/base/node.c | 2 +- + fs/proc/stat.c | 14 +- + include/asm-generic/pgtable.h | 4 + + include/linux/acpi.h | 16 + + include/linux/earlycpio.h | 17 + + include/linux/huge_mm.h | 19 + + include/linux/init_task.h | 8 + + include/linux/mempolicy.h | 13 +- + include/linux/migrate.h | 7 + + include/linux/migrate_mode.h | 3 + + include/linux/mm.h | 115 +- + include/linux/mm_types.h | 9 + + include/linux/mmzone.h | 15 +- + include/linux/page-flags-layout.h | 83 ++ + include/linux/sched.h | 52 +- + init/Kconfig | 14 + + kernel/sched/core.c | 71 +- + kernel/sched/debug.c | 3 + + kernel/sched/fair.c | 500 ++++++- + kernel/sched/features.h | 11 + + kernel/sched/sched.h | 45 + + kernel/sysctl.c | 20 +- + lib/Makefile | 2 +- + lib/earlycpio.c | 145 ++ + mm/huge_memory.c | 172 ++- + mm/memory.c | 105 +- + mm/mempolicy.c | 297 +++- + mm/migrate.c | 85 +- + mm/mprotect.c | 31 +- + mm/pgtable-generic.c | 3 +- + mm/vmstat.c | 1 - + 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 | 457 ++++++ + tools/kvm/README | 112 ++ + tools/kvm/builtin-balloon.c | 80 + + tools/kvm/builtin-debug.c | 110 ++ + tools/kvm/builtin-help.c | 63 + + tools/kvm/builtin-list.c | 149 ++ + tools/kvm/builtin-pause.c | 88 ++ + tools/kvm/builtin-resume.c | 88 ++ + tools/kvm/builtin-run.c | 697 +++++++++ + tools/kvm/builtin-sandbox.c | 9 + + tools/kvm/builtin-setup.c | 262 ++++ + 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 | 354 +++++ + tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++ + tools/kvm/disk/raw.c | 141 ++ + tools/kvm/framebuffer.c | 80 + + tools/kvm/guest/init.c | 72 + + tools/kvm/guest_compat.c | 99 ++ + tools/kvm/hw/i8042.c | 355 +++++ + tools/kvm/hw/pci-shmem.c | 405 ++++++ + tools/kvm/hw/rtc.c | 139 ++ + tools/kvm/hw/serial.c | 452 ++++++ + tools/kvm/hw/vesa.c | 89 ++ + tools/kvm/include/asm/hweight.h | 8 + + tools/kvm/include/bios/memcpy.h | 9 + + tools/kvm/include/kvm/8250-serial.h | 11 + + tools/kvm/include/kvm/apic.h | 17 + + tools/kvm/include/kvm/brlock.h | 41 + + tools/kvm/include/kvm/builtin-balloon.h | 9 + + tools/kvm/include/kvm/builtin-debug.h | 20 + + tools/kvm/include/kvm/builtin-help.h | 6 + + tools/kvm/include/kvm/builtin-list.h | 10 + + tools/kvm/include/kvm/builtin-pause.h | 9 + + tools/kvm/include/kvm/builtin-resume.h | 9 + + tools/kvm/include/kvm/builtin-run.h | 11 + + tools/kvm/include/kvm/builtin-sandbox.h | 6 + + tools/kvm/include/kvm/builtin-setup.h | 11 + + tools/kvm/include/kvm/builtin-stat.h | 9 + + tools/kvm/include/kvm/builtin-stop.h | 9 + + tools/kvm/include/kvm/builtin-version.h | 6 + + tools/kvm/include/kvm/compiler.h | 10 + + tools/kvm/include/kvm/disk-image.h | 96 ++ + tools/kvm/include/kvm/e820.h | 13 + + tools/kvm/include/kvm/framebuffer.h | 36 + + tools/kvm/include/kvm/guest_compat.h | 9 + + tools/kvm/include/kvm/i8042.h | 12 + + tools/kvm/include/kvm/ioeventfd.h | 28 + + tools/kvm/include/kvm/ioport.h | 70 + + tools/kvm/include/kvm/irq.h | 33 + + tools/kvm/include/kvm/kvm-cmd.h | 17 + + tools/kvm/include/kvm/kvm-config.h | 60 + + tools/kvm/include/kvm/kvm-cpu.h | 26 + + tools/kvm/include/kvm/kvm-ipc.h | 26 + + tools/kvm/include/kvm/kvm.h | 121 ++ + tools/kvm/include/kvm/msi.h | 10 + + tools/kvm/include/kvm/mutex.h | 33 + + tools/kvm/include/kvm/parse-options.h | 218 +++ + tools/kvm/include/kvm/pci-shmem.h | 32 + + 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 | 28 + + tools/kvm/include/kvm/segment.h | 21 + + tools/kvm/include/kvm/strbuf.h | 20 + + tools/kvm/include/kvm/symbol.h | 30 + + tools/kvm/include/kvm/term.h | 24 + + tools/kvm/include/kvm/threadpool.h | 38 + + tools/kvm/include/kvm/types.h | 7 + + tools/kvm/include/kvm/uip.h | 360 +++++ + tools/kvm/include/kvm/util-init.h | 51 + + tools/kvm/include/kvm/util.h | 97 ++ + tools/kvm/include/kvm/vesa.h | 18 + + tools/kvm/include/kvm/virtio-9p.h | 76 + + tools/kvm/include/kvm/virtio-balloon.h | 9 + + tools/kvm/include/kvm/virtio-blk.h | 12 + + tools/kvm/include/kvm/virtio-console.h | 10 + + tools/kvm/include/kvm/virtio-mmio.h | 58 + + tools/kvm/include/kvm/virtio-net.h | 30 + + tools/kvm/include/kvm/virtio-pci-dev.h | 38 + + tools/kvm/include/kvm/virtio-pci.h | 49 + + tools/kvm/include/kvm/virtio-rng.h | 9 + + tools/kvm/include/kvm/virtio-scsi.h | 26 + + tools/kvm/include/kvm/virtio.h | 102 ++ + tools/kvm/include/kvm/vnc.h | 22 + + tools/kvm/include/linux/bitops.h | 33 + + tools/kvm/include/linux/byteorder.h | 7 + + tools/kvm/include/linux/compiler.h | 20 + + tools/kvm/include/linux/kernel.h | 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 | 216 +++ + tools/kvm/ioport.c | 198 +++ + tools/kvm/kvm-cmd.c | 91 ++ + tools/kvm/kvm-cpu.c | 242 ++++ + tools/kvm/kvm-ipc.c | 498 +++++++ + tools/kvm/kvm.c | 458 ++++++ + tools/kvm/main.c | 19 + + tools/kvm/mmio.c | 139 ++ + tools/kvm/net/uip/arp.c | 30 + + tools/kvm/net/uip/buf.c | 114 ++ + tools/kvm/net/uip/core.c | 190 +++ + tools/kvm/net/uip/csum.c | 92 ++ + tools/kvm/net/uip/dhcp.c | 202 +++ + tools/kvm/net/uip/icmp.c | 29 + + tools/kvm/net/uip/ipv4.c | 29 + + tools/kvm/net/uip/tcp.c | 345 +++++ + tools/kvm/net/uip/udp.c | 236 +++ + tools/kvm/pci.c | 215 +++ + 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 | 68 + + 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 | 108 ++ + 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 | 133 ++ + tools/kvm/term.c | 171 +++ + tools/kvm/tests/Makefile | 19 + + tools/kvm/tests/boot/Makefile | 13 + + tools/kvm/tests/boot/init.c | 11 + + tools/kvm/tests/kernel/.gitignore | 2 + + tools/kvm/tests/kernel/Makefile | 20 + + tools/kvm/tests/kernel/README | 16 + + tools/kvm/tests/kernel/kernel.S | 8 + + tools/kvm/tests/pit/.gitignore | 2 + + tools/kvm/tests/pit/Makefile | 20 + + tools/kvm/tests/pit/README | 16 + + tools/kvm/tests/pit/tick.S | 101 ++ + tools/kvm/ui/sdl.c | 321 ++++ + tools/kvm/ui/vnc.c | 248 ++++ + tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 + + tools/kvm/util/generate-cmdlist.sh | 23 + + tools/kvm/util/init.c | 69 + + tools/kvm/util/kvm-ifup-vbr0 | 6 + + tools/kvm/util/parse-options.c | 577 ++++++++ + tools/kvm/util/rbtree-interval.c | 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 | 173 +++ + tools/kvm/util/util.c | 133 ++ + tools/kvm/virtio/9p-pdu.c | 287 ++++ + tools/kvm/virtio/9p.c | 1448 ++++++++++++++++++ + tools/kvm/virtio/balloon.c | 270 ++++ + tools/kvm/virtio/blk.c | 315 ++++ + tools/kvm/virtio/console.c | 203 +++ + tools/kvm/virtio/core.c | 233 +++ + tools/kvm/virtio/mmio.c | 264 ++++ + tools/kvm/virtio/net.c | 670 +++++++++ + tools/kvm/virtio/pci.c | 398 +++++ + tools/kvm/virtio/rng.c | 193 +++ + tools/kvm/virtio/scsi.c | 309 ++++ + 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 | 43 + + 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 | 224 +++ + tools/kvm/x86/kvm-cpu.c | 425 ++++++ + tools/kvm/x86/kvm.c | 362 +++++ + tools/kvm/x86/mptable.c | 289 ++++ + tools/perf/Documentation/android.txt | 75 + + tools/perf/Documentation/perf-diff.txt | 60 + + tools/perf/Makefile | 33 +- + tools/perf/builtin-annotate.c | 3 +- + tools/perf/builtin-diff.c | 405 +++++- + tools/perf/builtin-inject.c | 6 +- + tools/perf/builtin-kvm.c | 35 +- + tools/perf/builtin-record.c | 32 + + tools/perf/builtin-report.c | 4 +- + tools/perf/builtin-sched.c | 3 +- + tools/perf/builtin-script.c | 4 +- + tools/perf/builtin-test.c | 2 - + tools/perf/builtin-top.c | 3 +- + tools/perf/builtin-trace.c | 53 +- + tools/perf/config/feature-tests.mak | 20 +- + tools/perf/perf.c | 2 + + tools/perf/ui/hist.c | 134 +- + tools/perf/ui/stdio/hist.c | 2 +- + tools/perf/util/build-id.c | 2 +- + tools/perf/util/event.c | 215 +-- + tools/perf/util/event.h | 6 +- + tools/perf/util/evlist.c | 3 - + tools/perf/util/hist.h | 8 + + tools/perf/util/machine.c | 277 ++++ + tools/perf/util/machine.h | 19 + + .../util/scripting-engines/trace-event-python.c | 1 - + tools/perf/util/session.c | 4 +- + tools/perf/util/sort.h | 18 + + tools/perf/util/thread.c | 41 +- + tools/perf/util/thread.h | 2 + + tools/perf/util/trace-event-read.c | 2 - + tools/perf/util/util.c | 2 + + tools/perf/util/util.h | 2 + + 300 files changed, 28900 insertions(+), 595 deletions(-) + create mode 100644 Documentation/acpi/initrd_table_override.txt + create mode 100644 Documentation/scheduler/numa-problem.txt + create mode 100644 include/linux/earlycpio.h + create mode 100644 include/linux/page-flags-layout.h + create mode 100644 lib/earlycpio.c + 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_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-config.h + create mode 100644 tools/kvm/include/kvm/kvm-cpu.h + create mode 100644 tools/kvm/include/kvm/kvm-ipc.h + create mode 100644 tools/kvm/include/kvm/kvm.h + create mode 100644 tools/kvm/include/kvm/msi.h + create mode 100644 tools/kvm/include/kvm/mutex.h + create mode 100644 tools/kvm/include/kvm/parse-options.h + create mode 100644 tools/kvm/include/kvm/pci-shmem.h + create mode 100644 tools/kvm/include/kvm/pci.h + create mode 100644 tools/kvm/include/kvm/qcow.h + create mode 100644 tools/kvm/include/kvm/rbtree-interval.h + create mode 100644 tools/kvm/include/kvm/read-write.h + create mode 100644 tools/kvm/include/kvm/rtc.h + create mode 100644 tools/kvm/include/kvm/rwsem.h + create mode 100644 tools/kvm/include/kvm/sdl.h + create mode 100644 tools/kvm/include/kvm/segment.h + create mode 100644 tools/kvm/include/kvm/strbuf.h + create mode 100644 tools/kvm/include/kvm/symbol.h + create mode 100644 tools/kvm/include/kvm/term.h + create mode 100644 tools/kvm/include/kvm/threadpool.h + create mode 100644 tools/kvm/include/kvm/types.h + create mode 100644 tools/kvm/include/kvm/uip.h + create mode 100644 tools/kvm/include/kvm/util-init.h + create mode 100644 tools/kvm/include/kvm/util.h + create mode 100644 tools/kvm/include/kvm/vesa.h + create mode 100644 tools/kvm/include/kvm/virtio-9p.h + create mode 100644 tools/kvm/include/kvm/virtio-balloon.h + create mode 100644 tools/kvm/include/kvm/virtio-blk.h + create mode 100644 tools/kvm/include/kvm/virtio-console.h + create mode 100644 tools/kvm/include/kvm/virtio-mmio.h + create mode 100644 tools/kvm/include/kvm/virtio-net.h + create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h + create mode 100644 tools/kvm/include/kvm/virtio-pci.h + create mode 100644 tools/kvm/include/kvm/virtio-rng.h + create mode 100644 tools/kvm/include/kvm/virtio-scsi.h + create mode 100644 tools/kvm/include/kvm/virtio.h + create mode 100644 tools/kvm/include/kvm/vnc.h + create mode 100644 tools/kvm/include/linux/bitops.h + create mode 100644 tools/kvm/include/linux/byteorder.h + create mode 100644 tools/kvm/include/linux/compiler.h + create mode 100644 tools/kvm/include/linux/kernel.h + create mode 100644 tools/kvm/include/linux/module.h + create mode 100644 tools/kvm/include/linux/prefetch.h + create mode 100644 tools/kvm/include/linux/stddef.h + create mode 100644 tools/kvm/include/linux/types.h + create mode 100644 tools/kvm/ioeventfd.c + create mode 100644 tools/kvm/ioport.c + create mode 100644 tools/kvm/kvm-cmd.c + create mode 100644 tools/kvm/kvm-cpu.c + create mode 100644 tools/kvm/kvm-ipc.c + create mode 100644 tools/kvm/kvm.c + create mode 100644 tools/kvm/main.c + create mode 100644 tools/kvm/mmio.c + create mode 100644 tools/kvm/net/uip/arp.c + create mode 100644 tools/kvm/net/uip/buf.c + create mode 100644 tools/kvm/net/uip/core.c + create mode 100644 tools/kvm/net/uip/csum.c + create mode 100644 tools/kvm/net/uip/dhcp.c + create mode 100644 tools/kvm/net/uip/icmp.c + create mode 100644 tools/kvm/net/uip/ipv4.c + create mode 100644 tools/kvm/net/uip/tcp.c + create mode 100644 tools/kvm/net/uip/udp.c + create mode 100644 tools/kvm/pci.c + create mode 100644 tools/kvm/powerpc/boot.c + create mode 100644 tools/kvm/powerpc/cpu_info.c + create mode 100644 tools/kvm/powerpc/cpu_info.h + create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h + create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h + create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h + create mode 100644 tools/kvm/powerpc/ioport.c + create mode 100644 tools/kvm/powerpc/irq.c + create mode 100644 tools/kvm/powerpc/kvm-cpu.c + create mode 100644 tools/kvm/powerpc/kvm.c + create mode 100644 tools/kvm/powerpc/spapr.h + create mode 100644 tools/kvm/powerpc/spapr_hcall.c + create mode 100644 tools/kvm/powerpc/spapr_hvcons.c + create mode 100644 tools/kvm/powerpc/spapr_hvcons.h + create mode 100644 tools/kvm/powerpc/spapr_pci.c + create mode 100644 tools/kvm/powerpc/spapr_pci.h + create mode 100644 tools/kvm/powerpc/spapr_rtas.c + create mode 100644 tools/kvm/powerpc/xics.c + create mode 100644 tools/kvm/powerpc/xics.h + create mode 100644 tools/kvm/symbol.c + create mode 100644 tools/kvm/term.c + create mode 100644 tools/kvm/tests/Makefile + create mode 100644 tools/kvm/tests/boot/Makefile + create mode 100644 tools/kvm/tests/boot/init.c + create mode 100644 tools/kvm/tests/kernel/.gitignore + create mode 100644 tools/kvm/tests/kernel/Makefile + create mode 100644 tools/kvm/tests/kernel/README + create mode 100644 tools/kvm/tests/kernel/kernel.S + create mode 100644 tools/kvm/tests/pit/.gitignore + create mode 100644 tools/kvm/tests/pit/Makefile + create mode 100644 tools/kvm/tests/pit/README + create mode 100644 tools/kvm/tests/pit/tick.S + create mode 100644 tools/kvm/ui/sdl.c + create mode 100644 tools/kvm/ui/vnc.c + create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN + create mode 100755 tools/kvm/util/generate-cmdlist.sh + create mode 100644 tools/kvm/util/init.c + create mode 100755 tools/kvm/util/kvm-ifup-vbr0 + create mode 100644 tools/kvm/util/parse-options.c + create mode 100644 tools/kvm/util/rbtree-interval.c + create mode 100644 tools/kvm/util/read-write.c + create mode 100755 tools/kvm/util/set_private_br.sh + create mode 100644 tools/kvm/util/strbuf.c + create mode 100644 tools/kvm/util/threadpool.c + create mode 100644 tools/kvm/util/util.c + create mode 100644 tools/kvm/virtio/9p-pdu.c + create mode 100644 tools/kvm/virtio/9p.c + create mode 100644 tools/kvm/virtio/balloon.c + create mode 100644 tools/kvm/virtio/blk.c + create mode 100644 tools/kvm/virtio/console.c + create mode 100644 tools/kvm/virtio/core.c + create mode 100644 tools/kvm/virtio/mmio.c + create mode 100644 tools/kvm/virtio/net.c + create mode 100644 tools/kvm/virtio/pci.c + create mode 100644 tools/kvm/virtio/rng.c + create mode 100644 tools/kvm/virtio/scsi.c + create mode 100644 tools/kvm/x86/bios.c + create mode 100644 tools/kvm/x86/bios/.gitignore + create mode 100644 tools/kvm/x86/bios/bios-rom.S + create mode 100644 tools/kvm/x86/bios/e820.c + create mode 100644 tools/kvm/x86/bios/entry.S + create mode 100644 tools/kvm/x86/bios/gen-offsets.sh + create mode 100644 tools/kvm/x86/bios/int10.c + create mode 100644 tools/kvm/x86/bios/int15.c + create mode 100644 tools/kvm/x86/bios/local.S + create mode 100644 tools/kvm/x86/bios/macro.S + create mode 100644 tools/kvm/x86/bios/memcpy.c + create mode 100644 tools/kvm/x86/bios/rom.ld.S + create mode 100644 tools/kvm/x86/boot.c + create mode 100644 tools/kvm/x86/cpuid.c + create mode 100644 tools/kvm/x86/include/kvm/assembly.h + create mode 100644 tools/kvm/x86/include/kvm/barrier.h + create mode 100644 tools/kvm/x86/include/kvm/bios-export.h + create mode 100644 tools/kvm/x86/include/kvm/bios.h + create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h + create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h + create mode 100644 tools/kvm/x86/include/kvm/interrupt.h + create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h + create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h + create mode 100644 tools/kvm/x86/include/kvm/mptable.h + create mode 100644 tools/kvm/x86/interrupt.c + create mode 100644 tools/kvm/x86/ioport.c + create mode 100644 tools/kvm/x86/irq.c + create mode 100644 tools/kvm/x86/kvm-cpu.c + create mode 100644 tools/kvm/x86/kvm.c + create mode 100644 tools/kvm/x86/mptable.c + create mode 100644 tools/perf/Documentation/android.txt + create mode 100644 tools/perf/util/machine.c + create mode 100644 tools/perf/util/machine.h +$ git am -3 ../patches/0001-mm-pol-fixups-for-UAPI-include-files-split.patch +Applying: mm/pol: fixups for UAPI include files split +$ git reset HEAD^ +Unstaged changes after reset: +M include/uapi/linux/mempolicy.h +$ git add . +$ git commit -v -a --amend +[master 8f7f1c1] Merge remote-tracking branch 'tip/auto-latest' +Merging rcu/rcu/next (d677124 rcu: Advise most users not to enable RCU user mode) +$ git merge rcu/rcu/next +Already up-to-date. +Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) +$ git merge cputime/cputime +Already up-to-date. +Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (03604b3 Merge branch 'for-upstream' of http://github.com/agraf/linux-2.6 into queue) +$ git merge kvm/linux-next +Resolved 'arch/powerpc/include/asm/Kbuild' using previous resolution. +Resolved 'arch/powerpc/include/asm/kvm_para.h' using previous resolution. +Auto-merging include/uapi/linux/kvm.h +Auto-merging arch/powerpc/kvm/trace.h +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c +Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c +Auto-merging arch/powerpc/kernel/ppc_ksyms.c +Auto-merging arch/powerpc/include/uapi/asm/kvm.h +Auto-merging arch/powerpc/include/asm/kvm_para.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/kvm_para.h +Auto-merging arch/powerpc/include/asm/kvm_book3s.h +Auto-merging arch/powerpc/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e539b23] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 82 ++++++- + arch/powerpc/include/asm/epapr_hcalls.h | 36 +-- + arch/powerpc/include/asm/fsl_hcalls.h | 36 +-- + arch/powerpc/include/asm/kvm_book3s.h | 2 +- + arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 +- + arch/powerpc/include/asm/kvm_host.h | 38 ++- + arch/powerpc/include/asm/kvm_para.h | 15 +- + arch/powerpc/include/asm/kvm_ppc.h | 64 ++++- + arch/powerpc/include/asm/reg_booke.h | 7 + + arch/powerpc/include/uapi/asm/kvm.h | 59 +++++ + arch/powerpc/kernel/epapr_hcalls.S | 28 +++ + arch/powerpc/kernel/epapr_paravirt.c | 11 +- + arch/powerpc/kernel/kvm.c | 2 +- + arch/powerpc/kernel/ppc_ksyms.c | 5 + + arch/powerpc/kvm/44x.c | 1 + + arch/powerpc/kvm/44x_emulate.c | 110 +++++---- + arch/powerpc/kvm/Kconfig | 3 + + arch/powerpc/kvm/book3s.c | 125 ++++++++++ + arch/powerpc/kvm/book3s_32_mmu_host.c | 1 + + arch/powerpc/kvm/book3s_64_mmu_host.c | 1 + + arch/powerpc/kvm/book3s_64_mmu_hv.c | 65 ++++-- + arch/powerpc/kvm/book3s_hv.c | 337 +++++++++++++++++++++------ + arch/powerpc/kvm/book3s_hv_builtin.c | 4 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 +- + arch/powerpc/kvm/book3s_mmu_hpte.c | 5 - + arch/powerpc/kvm/book3s_pr.c | 180 ++++++++++---- + arch/powerpc/kvm/book3s_rmhandlers.S | 15 +- + arch/powerpc/kvm/booke.c | 310 ++++++++++++++++++++---- + arch/powerpc/kvm/booke_emulate.c | 22 +- + arch/powerpc/kvm/e500.h | 3 +- + arch/powerpc/kvm/e500_tlb.c | 92 ++++++-- + arch/powerpc/kvm/powerpc.c | 150 ++++++++++-- + arch/powerpc/kvm/trace.h | 200 +++++++++++++--- + arch/powerpc/platforms/Kconfig | 1 + + arch/powerpc/sysdev/fsl_msi.c | 9 +- + arch/powerpc/sysdev/fsl_soc.c | 2 + + arch/s390/kvm/interrupt.c | 19 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/x86/kvm/x86.c | 12 +- + drivers/tty/Kconfig | 1 + + drivers/virt/Kconfig | 1 + + include/linux/kvm_host.h | 2 +- + include/uapi/linux/kvm.h | 10 +- + virt/kvm/iommu.c | 6 +- + 44 files changed, 1690 insertions(+), 392 deletions(-) +$ git am -3 ../patches/0001-KVM-PPC-fix-fallout-from-UAPI-changes.patch +Applying: KVM: PPC: fix fallout from UAPI changes +$ git reset HEAD^ +Unstaged changes after reset: +D arch/powerpc/include/asm/epapr_hcalls.h +M arch/powerpc/include/uapi/asm/Kbuild +M arch/powerpc/include/uapi/asm/kvm_para.h +$ git add . +$ git commit -v -a --amend +[master c2e4441] Merge remote-tracking branch 'kvm/linux-next' +Merging kvm-ppc/kvm-ppc-next (f37f444 KVM: PPC: Move mtspr/mfspr emulation into own functions) +$ git merge kvm-ppc/kvm-ppc-next +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 3 +- + arch/powerpc/kvm/44x_emulate.c | 2 + + arch/powerpc/kvm/emulate.c | 221 ++++++++++++++++++++----------------- + 3 files changed, 125 insertions(+), 101 deletions(-) +Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()) +$ git merge oprofile/for-next +Merge made by the 'recursive' strategy. + arch/x86/oprofile/nmi_int.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (79fef7a Merge branch 'stable/for-linus-3.7' into linux-next) +$ git merge xen-two/linux-next +Auto-merging drivers/net/xen-netback/netback.c +Merge made by the 'recursive' strategy. + drivers/net/xen-netback/netback.c | 11 ++++++-- + drivers/xen/grant-table.c | 53 ------------------------------------ + drivers/xen/xenbus/xenbus_client.c | 6 ++-- + include/xen/grant_table.h | 12 -------- + 4 files changed, 12 insertions(+), 70 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 (2b0f620 Merge branch 'for-3.7' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug()) +$ git merge drivers-x86/linux-next +Auto-merging drivers/platform/x86/asus-wmi.c +Merge made by the 'recursive' strategy. + drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 76 insertions(+) +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (cc63199 Merge remote-tracking branches 'regmap/topic/range' and 'regmap/topic/type', tag 'topic/domain' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 19 +++++++++++++++++++ + drivers/base/regmap/regmap.c | 2 +- + include/linux/regmap.h | 2 ++ + 3 files changed, 22 insertions(+), 1 deletion(-) +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 (2f73c39 leds: add output driver configuration for pca9633 led driver) +$ git merge leds/for-next +Already up-to-date. +Merging driver-core/driver-core-next (ddffeb8 Linux 3.7-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (ddffeb8 Linux 3.7-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (ddffeb8 Linux 3.7-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next (ddffeb8 Linux 3.7-rc1) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (ddffeb8 Linux 3.7-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next) +$ git merge tmem/linux-next +Auto-merging include/xen/xen.h +Auto-merging include/xen/interface/xen.h +Auto-merging arch/x86/xen/smp.c +Auto-merging arch/x86/xen/setup.c +Auto-merging arch/x86/include/asm/xen/page.h +Auto-merging arch/x86/include/asm/xen/interface.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/xen/interface.h | 3 ++- + arch/x86/include/asm/xen/page.h | 3 +++ + arch/x86/xen/setup.c | 13 +++++++++--- + arch/x86/xen/smp.c | 39 ++++++++++++++++++---------------- + drivers/xen/cpu_hotplug.c | 3 ++- + include/xen/interface/xen.h | 1 + + include/xen/xen.h | 4 ++++ + 7 files changed, 43 insertions(+), 23 deletions(-) +Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) +$ git merge arm-dt/devicetree/arm-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (4cf8f81 Merge branch 'at91' into for-next) +$ git merge pinctrl/for-next +Auto-merging include/linux/platform_data/pinctrl-nomadik.h +Removing arch/arm/plat-nomadik/include/plat/gpio-nomadik.h +Removing arch/arm/mach-prima2/include/mach/gpio.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio_atmel.txt | 5 + + .../bindings/pinctrl/atmel,at91-pinctrl.txt | 136 ++ + .../bindings/pinctrl/samsung-pinctrl.txt | 118 +- + arch/arm/Kconfig | 2 + + arch/arm/boot/dts/Makefile | 44 +- + arch/arm/boot/dts/at91sam9260.dtsi | 187 ++- + arch/arm/boot/dts/at91sam9263.dtsi | 173 ++- + arch/arm/boot/dts/at91sam9263ek.dts | 1 + + arch/arm/boot/dts/at91sam9g15.dtsi | 28 + + arch/arm/boot/dts/at91sam9g15ek.dts | 16 + + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 + + arch/arm/boot/dts/at91sam9g25.dtsi | 28 + + arch/arm/boot/dts/at91sam9g25ek.dts | 49 +- + arch/arm/boot/dts/at91sam9g35.dtsi | 28 + + arch/arm/boot/dts/at91sam9g35ek.dts | 16 + + arch/arm/boot/dts/at91sam9g45.dtsi | 189 ++- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 1 + + arch/arm/boot/dts/at91sam9n12.dtsi | 180 ++- + arch/arm/boot/dts/at91sam9x25.dtsi | 28 + + arch/arm/boot/dts/at91sam9x25ek.dts | 16 + + arch/arm/boot/dts/at91sam9x35.dtsi | 28 + + arch/arm/boot/dts/at91sam9x35ek.dts | 16 + + arch/arm/boot/dts/at91sam9x5.dtsi | 178 ++- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 59 + + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 278 ++++ + arch/arm/boot/dts/exynos4210.dtsi | 241 +--- + arch/arm/configs/at91_dt_defconfig | 1 + + arch/arm/mach-at91/at91rm9200.c | 4 +- + arch/arm/mach-at91/at91sam9260.c | 7 +- + arch/arm/mach-at91/at91sam9261.c | 4 +- + arch/arm/mach-at91/at91sam9263.c | 9 +- + arch/arm/mach-at91/at91sam9g45.c | 10 +- + arch/arm/mach-at91/at91sam9n12.c | 15 +- + arch/arm/mach-at91/at91sam9rl.c | 4 +- + arch/arm/mach-at91/at91sam9x5.c | 19 +- + arch/arm/mach-at91/board-dt.c | 2 - + arch/arm/mach-at91/gpio.c | 190 +-- + arch/arm/mach-at91/setup.c | 6 +- + arch/arm/mach-at91/soc.h | 12 +- + arch/arm/mach-nomadik/board-nhk8815.c | 3 +- + arch/arm/mach-nomadik/cpu-8815.c | 2 +- + arch/arm/mach-nomadik/i2c-8815nhk.c | 3 +- + arch/arm/mach-prima2/include/mach/gpio.h | 13 - + arch/arm/mach-ux500/board-mop500-audio.c | 3 +- + arch/arm/mach-ux500/board-mop500-pins.c | 3 +- + arch/arm/mach-ux500/board-mop500.c | 2 +- + arch/arm/mach-ux500/cpu-db8500.c | 4 +- + arch/arm/mach-ux500/devices-common.c | 3 +- + arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 102 -- + drivers/mtd/nand/atmel_nand.c | 9 + + drivers/pinctrl/Kconfig | 9 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-at91.c | 1490 ++++++++++++++++++++ + drivers/pinctrl/pinctrl-bcm2835.c | 5 +- + drivers/pinctrl/pinctrl-exynos.c | 367 +++-- + drivers/pinctrl/pinctrl-exynos.h | 170 +-- + drivers/pinctrl/pinctrl-nomadik-db8500.c | 101 +- + drivers/pinctrl/pinctrl-nomadik.c | 38 +- + drivers/pinctrl/pinctrl-nomadik.h | 2 +- + drivers/pinctrl/pinctrl-samsung.c | 213 ++- + drivers/pinctrl/pinctrl-samsung.h | 29 +- + drivers/pinctrl/pinctrl-sirf.c | 35 - + drivers/pinctrl/pinctrl-xway.c | 2 - + drivers/tty/serial/atmel_serial.c | 8 + + .../linux/platform_data/pinctrl-nomadik.h | 111 +- + 65 files changed, 3744 insertions(+), 1318 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt + create mode 100644 arch/arm/boot/dts/at91sam9g15.dtsi + create mode 100644 arch/arm/boot/dts/at91sam9g15ek.dts + create mode 100644 arch/arm/boot/dts/at91sam9g25.dtsi + create mode 100644 arch/arm/boot/dts/at91sam9g35.dtsi + create mode 100644 arch/arm/boot/dts/at91sam9g35ek.dts + create mode 100644 arch/arm/boot/dts/at91sam9x25.dtsi + create mode 100644 arch/arm/boot/dts/at91sam9x25ek.dts + create mode 100644 arch/arm/boot/dts/at91sam9x35.dtsi + create mode 100644 arch/arm/boot/dts/at91sam9x35ek.dts + create mode 100644 arch/arm/boot/dts/at91sam9x5ek.dtsi + delete mode 100644 arch/arm/mach-prima2/include/mach/gpio.h + delete mode 100644 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h + create mode 100644 drivers/pinctrl/pinctrl-at91.c + rename arch/arm/plat-nomadik/include/plat/pincfg.h => include/linux/platform_data/pinctrl-nomadik.h (66%) +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 dfd8466] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. +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 (ed26d19 remoteproc: fix (again) the virtio-related build breakage) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails) +$ git merge irqdomain/irqdomain/next +Already up-to-date. +Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge gpio/gpio/next +Already up-to-date. +Merging gpio-lw/for-next (3fa851e Merge branch 'devel' into for-next) +$ git merge gpio-lw/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-omap.c | 2 +- + drivers/gpio/gpio-pl061.c | 59 +++++++++++++++------------------------- + drivers/gpio/gpio-timberdale.c | 4 +-- + 3 files changed, 25 insertions(+), 40 deletions(-) +Merging arm-soc/for-next (ab3ee84 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex/for-next (2f3e7d3 Cortex-M3: Add support for exception handling) +$ git merge cortex/for-next +Recorded preimage for 'arch/arm/include/asm/ptrace.h' +Recorded preimage for 'arch/arm/kernel/process.c' +Auto-merging arch/arm/mm/mmu.c +Auto-merging arch/arm/mm/alignment.c +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/ptrace.c +Auto-merging arch/arm/kernel/process.c +CONFLICT (content): Merge conflict in arch/arm/kernel/process.c +Auto-merging arch/arm/kernel/entry-common.S +Auto-merging arch/arm/kernel/asm-offsets.c +Auto-merging arch/arm/include/asm/ptrace.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/ptrace.h +Auto-merging arch/arm/include/asm/processor.h +Auto-merging arch/arm/include/asm/glue-cache.h +Auto-merging arch/arm/include/asm/assembler.h +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +$ git commit -v -a +# On branch master +nothing to commit (working directory clean) +$ git diff -M --stat --summary HEAD^.. +Merging ep93xx/ep93xx-for-next (70f0f7c Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO) +$ git merge ixp4xx/next +Merge made by the 'recursive' strategy. + arch/arm/mach-ixp4xx/common-pci.c | 1 + + arch/arm/mach-ixp4xx/common.c | 13 +++---- + arch/arm/mach-ixp4xx/goramo_mlr.c | 3 +- + arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 +- + arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 ++++++++++------------- + arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 +++--- + arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++- + arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 12 +----- + drivers/char/hw_random/Kconfig | 6 +-- + drivers/char/hw_random/ixp4xx-rng.c | 5 ++- + drivers/crypto/Kconfig | 2 +- + drivers/crypto/ixp4xx_crypto.c | 12 +++--- + drivers/net/wan/ixp4xx_hss.c | 2 +- + 13 files changed, 59 insertions(+), 68 deletions(-) +Merging msm/for-next (a0d271c Linux 3.6) +$ git merge msm/for-next +Already up-to-date. +Merging renesas/next (3d6071a Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/boards' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/configs/armadillo800eva_defconfig | 3 +- + arch/arm/configs/kzm9g_defconfig | 4 ++ + arch/arm/configs/mackerel_defconfig | 18 +++++- + arch/arm/configs/marzen_defconfig | 4 ++ + arch/arm/mach-shmobile/board-armadillo800eva.c | 10 ++- + arch/arm/mach-shmobile/board-kzm9g.c | 14 ++++- + arch/arm/mach-shmobile/board-marzen.c | 25 ++++++++ + arch/arm/mach-shmobile/clock-r8a7779.c | 16 ++++- + arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++ + arch/arm/mach-shmobile/setup-r8a7740.c | 16 +++++ + arch/arm/mach-shmobile/setup-r8a7779.c | 77 ++++++++++++++++++++++++ + arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++ + 12 files changed, 205 insertions(+), 6 deletions(-) +Merging samsung/for-next (59e65fd Merge branch 'next/dt-samsung-new' into for-next) +$ git merge samsung/for-next +Resolved 'arch/arm/mach-exynos/clock-exynos5.c' using previous resolution. +Auto-merging arch/arm/mach-exynos/clock-exynos5.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/clock-exynos5.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3051ae9] Merge remote-tracking branch 'samsung/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging tegra/for-next (5c6387b Merge branch 'for-3.8/defconfig' into for-next) +$ git merge tegra/for-next +Auto-merging include/linux/tegra-ahb.h +Removing arch/arm/mach-tegra/include/mach/irqs.h +Removing arch/arm/mach-tegra/include/mach/dma.h +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/nvidia,tegra20-rtc.txt | 19 ++ + .../bindings/timer/nvidia,tegra20-timer.txt | 21 +++ + .../bindings/timer/nvidia,tegra30-timer.txt | 23 +++ + arch/arm/Kconfig | 1 + + arch/arm/boot/dts/tegra20-harmony.dts | 63 ++----- + arch/arm/boot/dts/tegra20-paz00.dts | 59 ++----- + arch/arm/boot/dts/tegra20-seaboard.dts | 65 +++---- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 63 ++----- + arch/arm/boot/dts/tegra20-ventana.dts | 75 ++++---- + arch/arm/boot/dts/tegra20-whistler.dts | 119 ++++--------- + arch/arm/boot/dts/tegra20.dtsi | 21 +++ + arch/arm/boot/dts/tegra30-cardhu-a02.dts | 6 + + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 6 + + arch/arm/boot/dts/tegra30-cardhu.dtsi | 74 ++++---- + arch/arm/boot/dts/tegra30.dtsi | 23 +++ + arch/arm/configs/tegra_defconfig | 1 + + arch/arm/mach-tegra/apbio.c | 3 - + arch/arm/mach-tegra/board-dt-tegra20.c | 5 +- + arch/arm/mach-tegra/board-dt-tegra30.c | 4 + + arch/arm/mach-tegra/clock.c | 2 - + arch/arm/mach-tegra/cpu-tegra.c | 3 - + arch/arm/mach-tegra/cpuidle.c | 2 - + arch/arm/mach-tegra/include/mach/dma.h | 54 ------ + arch/arm/mach-tegra/include/mach/irqs.h | 182 -------------------- + arch/arm/mach-tegra/include/mach/powergate.h | 2 + + arch/arm/mach-tegra/pcie.c | 3 + + arch/arm/mach-tegra/platsmp.c | 1 - + arch/arm/mach-tegra/sleep-t20.S | 2 - + arch/arm/mach-tegra/sleep-t30.S | 2 - + arch/arm/mach-tegra/tegra20_clocks_data.c | 2 - + arch/arm/mach-tegra/tegra2_emc.c | 2 - + arch/arm/mach-tegra/timer.c | 40 +++-- + drivers/amba/tegra-ahb.c | 1 + + drivers/crypto/tegra-aes.c | 2 - + drivers/iommu/tegra-smmu.c | 4 +- + drivers/staging/nvec/nvec.c | 1 - + .../include/mach => include/linux}/tegra-ahb.h | 6 +- + sound/soc/tegra/tegra30_ahub.c | 1 - + sound/soc/tegra/tegra_pcm.h | 2 - + 39 files changed, 323 insertions(+), 642 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt + create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt + delete mode 100644 arch/arm/mach-tegra/include/mach/dma.h + delete mode 100644 arch/arm/mach-tegra/include/mach/irqs.h + rename {arch/arm/mach-tegra/include/mach => include/linux}/tegra-ahb.h (86%) +Merging kvmtool/master (5fd2a45 kvm tools: Drop lchown() calls from 9p) +$ git merge kvmtool/master +Merge made by the 'recursive' strategy. + tools/kvm/powerpc/ioport.c | 2 +- + tools/kvm/powerpc/irq.c | 19 ------------------- + tools/kvm/powerpc/kvm-cpu.c | 3 --- + tools/kvm/powerpc/kvm.c | 8 ++++---- + tools/kvm/powerpc/spapr_hvcons.c | 6 +++--- + tools/kvm/powerpc/spapr_rtas.c | 14 +++++++++----- + tools/kvm/powerpc/xics.c | 38 +++++++++++++++++++++++--------------- + tools/kvm/powerpc/xics.h | 5 ----- + tools/kvm/virtio/9p.c | 16 ---------------- + 9 files changed, 40 insertions(+), 71 deletions(-) +Merging dma-mapping/dma-mapping-next (ddffeb8 Linux 3.7-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (85f8879 pwm: dt: Fix description of second PWM cell) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment()) +$ git merge dma-buf/for-next +Auto-merging drivers/base/dma-buf.c +Merge made by the 'recursive' strategy. + drivers/base/dma-buf.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging userns/for-next (e9069f4 btrfs: Fix compilation with user namespace support enabled) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (75dd1485 Merge branches 'arch-arm', 'arch-c6x', 'arch-mips', 'arch-m68k', 'arch-parisc', 'arch-sparc', 'arch-arm64', 'arch-frv', 'arch-powerpc' and 'arch-s390' into for-next) +$ git merge signal/for-next +Auto-merging include/linux/sched.h +Auto-merging arch/m68k/include/asm/unistd.h +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 2 + + arch/arm64/include/asm/processor.h | 5 - + arch/arm64/include/asm/syscalls.h | 3 - + arch/arm64/include/asm/unistd.h | 1 + + arch/arm64/include/asm/unistd32.h | 2 +- + arch/arm64/kernel/entry.S | 10 +- + arch/arm64/kernel/process.c | 77 ++++------- + arch/arm64/kernel/sys.c | 65 --------- + arch/arm64/kernel/sys32.S | 5 - + arch/arm64/kernel/sys_compat.c | 18 --- + arch/c6x/Kconfig | 1 + + arch/c6x/include/uapi/asm/unistd.h | 1 - + arch/c6x/kernel/entry.S | 12 +- + arch/frv/Kconfig | 1 + + arch/frv/include/asm/unistd.h | 1 - + arch/frv/kernel/entry.S | 9 +- + arch/frv/kernel/process.c | 2 +- + arch/m68k/Kconfig | 1 + + arch/m68k/include/asm/unistd.h | 1 - + arch/m68k/kernel/entry.S | 7 - + arch/mips/Kconfig | 2 + + arch/mips/include/asm/processor.h | 2 - + arch/mips/include/asm/ptrace.h | 6 + + arch/mips/include/asm/unistd.h | 1 + + arch/mips/kernel/entry.S | 6 + + arch/mips/kernel/linux32.c | 21 --- + arch/mips/kernel/mips_ksyms.c | 2 - + arch/mips/kernel/process.c | 62 ++++----- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/syscall.c | 53 -------- + arch/parisc/Kconfig | 2 + + arch/parisc/include/asm/unistd.h | 1 + + arch/parisc/kernel/entry.S | 217 +++---------------------------- + arch/parisc/kernel/process.c | 96 +++----------- + arch/parisc/kernel/sys_parisc32.c | 22 ---- + arch/parisc/kernel/syscall_table.S | 2 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/unistd.h | 1 - + arch/powerpc/kernel/entry_32.S | 5 - + arch/powerpc/kernel/entry_64.S | 7 - + arch/powerpc/kernel/process.c | 15 +-- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/unistd.h | 1 - + arch/s390/kernel/entry.S | 32 +---- + arch/s390/kernel/entry64.S | 26 +--- + arch/sparc/Kconfig | 2 + + arch/sparc/include/asm/processor_32.h | 1 - + arch/sparc/include/asm/processor_64.h | 11 +- + arch/sparc/include/asm/ptrace.h | 10 +- + arch/sparc/include/asm/switch_to_64.h | 2 +- + arch/sparc/include/asm/syscalls.h | 2 - + arch/sparc/include/asm/thread_info_64.h | 25 ++-- + arch/sparc/include/asm/uaccess_64.h | 4 +- + arch/sparc/include/asm/unistd.h | 1 + + arch/sparc/kernel/entry.S | 51 ++++---- + arch/sparc/kernel/etrap_64.S | 8 +- + arch/sparc/kernel/process_32.c | 152 +++++++--------------- + arch/sparc/kernel/process_64.c | 143 +++++--------------- + arch/sparc/kernel/sys_sparc32.c | 36 ----- + arch/sparc/kernel/sys_sparc_32.c | 24 ---- + arch/sparc/kernel/sys_sparc_64.c | 22 ---- + arch/sparc/kernel/syscalls.S | 28 ++-- + arch/sparc/kernel/systbls_64.S | 2 +- + arch/sparc/kernel/traps_64.c | 4 +- + arch/sparc/mm/init_64.c | 2 +- + drivers/staging/gdm72xx/gdm_usb.c | 4 +- + fs/file.c | 6 - + fs/fs_struct.c | 24 ---- + include/linux/fdtable.h | 1 - + include/linux/fs_struct.h | 1 - + include/linux/sched.h | 1 - + kernel/exit.c | 92 ------------- + 73 files changed, 287 insertions(+), 1184 deletions(-) +Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support) +$ 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 +Already up-to-date. +Merging lzo-update/lzo-update (2135668 lib/decompress_unlzo.c: fix a trivial compilation error) +$ git merge lzo-update/lzo-update +Removing lib/lzo/lzo1x_decompress.c +Auto-merging crypto/testmgr.h +Merge made by the 'recursive' strategy. + crypto/testmgr.h | 53 ++++--- + include/linux/lzo.h | 15 +- + lib/decompress_unlzo.c | 2 +- + lib/lzo/Makefile | 2 +- + lib/lzo/lzo1x_compress.c | 309 +++++++++++++++++++++------------------ + lib/lzo/lzo1x_decompress.c | 255 -------------------------------- + lib/lzo/lzo1x_decompress_safe.c | 237 ++++++++++++++++++++++++++++++ + lib/lzo/lzodefs.h | 34 ++++- + 8 files changed, 472 insertions(+), 435 deletions(-) + delete mode 100644 lib/lzo/lzo1x_decompress.c + create mode 100644 lib/lzo/lzo1x_decompress_safe.c +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/akpm/master:akpm +From ../next + * [new branch] akpm/master -> akpm +$ git fetch --no-tags ../next refs/heads/akpm/base:akpm-base +From ../next + * [new branch] 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: linux/coredump.h needs asm/siginfo.h +Applying: memstick: remove unused field from state struct +Applying: memstick: ms_block: fix compile issue +Applying: memstick: use after free in msb_disk_release() +Applying: memstick: memory leak on error in msb_ftl_scan() +Applying: kernel/sys.c: fix stack memory content leak via UNAME26 +Applying: drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bled_mode_store() error paths +Applying: pidns: remove recursion from free_pid_ns() +Applying: pidns-remove-recursion-from-free_pid_ns-v5-fix +Applying: CRIS: Fix I/O macros +Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference +Applying: vfs: d_obtain_alias() needs to use "/" as default name. +Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved +Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix +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: x86 numa: don't check if node is NUMA_NO_NODE +Applying: arch/x86/tools/insn_sanity.c: identify source of messages +Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue +Applying: olpc: fix olpc-xo1-sci.c build errors +Applying: fs/debugsfs: remove unnecessary inode->i_private initialization +Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete +Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call +Applying: drm: fix radeon printk format warnings +Applying: timeconst.pl: remove deprecated defined(@array) +Applying: time: don't inline EXPORT_SYMBOL functions +Applying: h8300: select generic atomic64_t support +Applying: cciss: cleanup bitops usage +Applying: cciss: use check_signature() +Applying: block: store partition_meta_info.uuid as a string +Applying: init: reduce PARTUUID min length to 1 from 36 +Applying: block: partition: msdos: provide UUIDs for partitions +Applying: drbd: use copy_highpage +Applying: vfs: increment iversion when a file is truncated +Applying: fs: change return values from -EACCES to -EPERM +Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget() +Applying: mm/page_alloc.c: remove duplicate check +Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr() +Applying: mm: show migration types in show_mem +Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning +Applying: memory hotplug: suppress "Device nodeX does not have a release() function" warning +Applying: mm, memcg: make mem_cgroup_out_of_memory() static +Applying: swap: add a simple detector for inappropriate swapin readahead +Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix +Applying: mm/memblock: reduce overhead in binary search +Applying: compat: generic compat_sys_sched_rr_get_interval implementation +Using index info to reconstruct a base tree... +M arch/arm64/include/asm/unistd.h +M arch/arm64/kernel/sys_compat.c +M arch/powerpc/include/asm/unistd.h +M arch/sparc/include/asm/unistd.h +M arch/sparc/kernel/sys_sparc32.c +Falling back to patching base and 3-way merge... +Auto-merging arch/sparc/kernel/sys_sparc32.c +Auto-merging arch/sparc/include/asm/unistd.h +Auto-merging arch/powerpc/include/asm/unistd.h +Auto-merging arch/arm64/kernel/sys_compat.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/sys_compat.c +Auto-merging arch/arm64/include/asm/unistd.h +Failed to merge in the changes. +Patch failed at 0051 compat: generic compat_sys_sched_rr_get_interval implementation + +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: drivers/firmware/dmi_scan.c: check dmi version when get system uuid +Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix +Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists +Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes +Applying: hfsplus: add on-disk layout declarations related to attributes tree +Applying: hfsplus: add functionality of manipulating by records in attributes tree +Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes +Applying: hfsplus: add support of manipulation by attributes file +Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes +Applying: hfsplus: code style fixes - reworked support of extended attributes +Applying: fat: modify nfs mount option +Applying: fat (exportfs): rebuild inode if ilookup() fails +Applying: fat-exportfs-rebuild-inode-if-ilookup-fails-fix +Applying: fat (exportfs): rebuild directory-inode if fat_dget() fails +Applying: Documentation: update nfs option in filesystem/vfat.txt +Applying: kstrto*: add documentation +Applying: simple_strto*: annotate function as obsolete +Applying: proc: don't show nonexistent capabilities +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: dma-debug: new interfaces to debug dma mapping errors +Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + a2d7564...194ff2b akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (194ff2b linux/compiler.h: add __must_hold macro for functions called with a lock held) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/DMA-API.txt | 12 + + Documentation/DocBook/kernel-api.tmpl | 3 + + Documentation/filesystems/vfat.txt | 23 +- + arch/arm64/include/asm/unistd.h | 1 + + arch/arm64/kernel/sys_compat.c | 15 - + arch/cris/include/asm/io.h | 39 +- + arch/h8300/Kconfig | 1 + + arch/powerpc/include/asm/systbl.h | 2 +- + arch/powerpc/include/asm/unistd.h | 1 + + arch/powerpc/kernel/sys_ppc32.c | 17 +- + arch/sparc/include/asm/unistd.h | 1 + + arch/sparc/kernel/sys_sparc32.c | 14 - + arch/tile/include/asm/compat.h | 2 - + arch/tile/include/asm/unistd.h | 1 + + arch/tile/kernel/compat.c | 18 - + arch/x86/Kconfig | 1 + + arch/x86/include/asm/dma-mapping.h | 1 + + arch/x86/include/asm/uv/uv.h | 2 +- + arch/x86/kernel/acpi/boot.c | 7 +- + arch/x86/mm/numa.c | 3 +- + arch/x86/platform/iris/iris.c | 67 +++- + arch/x86/platform/uv/tlb_uv.c | 10 +- + arch/x86/tools/insn_sanity.c | 10 +- + block/genhd.c | 8 +- + block/partitions/efi.c | 7 +- + block/partitions/msdos.c | 21 +- + drivers/acpi/acpi_memhotplug.c | 123 ++++-- + drivers/base/memory.c | 9 +- + drivers/base/node.c | 11 + + drivers/block/cciss.c | 21 +- + drivers/block/drbd/drbd_bitmap.c | 7 +- + drivers/firmware/dmi_scan.c | 78 +++- + drivers/gpu/drm/i915/intel_pm.c | 3 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 4 +- + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 2 +- + drivers/memstick/core/ms_block.c | 8 +- + drivers/memstick/core/ms_block.h | 5 +- + drivers/pcmcia/cs.c | 37 +- + drivers/video/backlight/lm3639_bl.c | 4 +- + fs/attr.c | 5 + + fs/autofs4/root.c | 2 +- + fs/block_dev.c | 8 +- + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/file.c | 3 +- + fs/btrfs/ioctl.c | 2 +- + fs/dcache.c | 2 +- + fs/debugfs/inode.c | 1 - + fs/dlm/config.c | 2 +- + fs/fat/fat.h | 17 +- + fs/fat/file.c | 4 + + fs/fat/inode.c | 36 +- + fs/fat/nfs.c | 233 ++++++++++- + fs/gfs2/sys.c | 18 +- + fs/hfsplus/Makefile | 3 +- + fs/hfsplus/attributes.c | 399 +++++++++++++++++++ + fs/hfsplus/bfind.c | 79 +++- + fs/hfsplus/bnode.c | 6 +- + fs/hfsplus/brec.c | 23 +- + fs/hfsplus/btree.c | 8 + + fs/hfsplus/catalog.c | 36 +- + fs/hfsplus/dir.c | 6 +- + fs/hfsplus/extents.c | 4 +- + fs/hfsplus/hfsplus_fs.h | 41 +- + fs/hfsplus/hfsplus_raw.h | 68 +++- + fs/hfsplus/inode.c | 13 + + fs/hfsplus/ioctl.c | 542 ++++++++++++++++++++++---- + fs/hfsplus/super.c | 33 +- + fs/hfsplus/unicode.c | 7 +- + fs/ncpfs/ioctl.c | 2 +- + fs/ocfs2/file.c | 5 +- + fs/proc/array.c | 9 + + fs/proc/base.c | 6 +- + fs/splice.c | 5 +- + fs/udf/file.c | 2 +- + include/linux/compat.h | 3 + + include/linux/compiler.h | 2 + + include/linux/coredump.h | 1 + + include/linux/dma-debug.h | 7 + + include/linux/genhd.h | 8 +- + include/linux/kernel.h | 33 ++ + include/linux/oom.h | 2 - + include/linux/pid_namespace.h | 8 +- + include/linux/rmap.h | 3 + + include/linux/writeback.h | 9 +- + init/do_mounts.c | 61 ++- + ipc/sem.c | 250 ++++++++---- + kernel/compat.c | 17 + + kernel/pid_namespace.c | 21 +- + kernel/sys.c | 12 +- + kernel/time.c | 4 +- + kernel/timeconst.pl | 2 +- + lib/dma-debug.c | 71 +++- + lib/kstrtox.c | 64 +++ + lib/vsprintf.c | 8 + + mm/internal.h | 48 +++ + mm/memblock.c | 5 + + mm/memcontrol.c | 4 +- + mm/memory.c | 3 +- + mm/page-writeback.c | 11 +- + mm/page_alloc.c | 45 ++- + mm/rmap.c | 3 + + mm/shmem.c | 1 + + mm/swap_state.c | 6 + + security/selinux/netnode.c | 3 +- + 104 files changed, 2419 insertions(+), 533 deletions(-) + create mode 100644 fs/hfsplus/attributes.c +$ git am -3 ../patches/0001-sparc-fixup-for-conversion-to-generic-execve.patch +Applying: sparc: fixup for conversion to generic execve diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..8bbc13d31751 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,19 @@ +Importing i2c based on 3.7-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard ddffeb8c4d0331609ef2581d84de4d763607bd37 +HEAD is now at ddffeb8 Linux 3.7-rc1 +$ git am ../quilt/i2c/i2c-move-i2c-stub.patch +Applying: i2c-stub: Move to drivers/i2c +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:456: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + e4b1076...a17e9c1 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 12250d843e8489ee00b5b7726da855e51694e792 +Unchanged quilt series jdelvare-hwmon +Importing device-mapper based on v3.7-rc1 + quilt series is empty +$ git branch -f quilt/device-mapper ddffeb8c4d0331609ef2581d84de4d763607bd37 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..297502dc4662 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20121016 -- 2.39.5