From d1298f5278d699e0094d5c6171cdea0925547b1f Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 24 Oct 2012 14:53:04 +1100 Subject: [PATCH] Add linux-next specific files for 20121024 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 207 ++ Next/Trees | 209 ++ Next/merge.log | 4332 +++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 6 + localversion-next | 1 + 5 files changed, 4755 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..7521ac35f217 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,207 @@ +Name SHA1 +---- ---- +origin 2d1f4c8e097dc1f5d71fa7f2e250a674adfbbc71 +fixes 12250d843e8489ee00b5b7726da855e51694e792 +kbuild-current b1e0d8b70fa31821ebca3965f2ef8619d7c5e316 +arm-current b43b1ffa82aa0d4d13b5ebedcc743dfaa4c2a19f +m68k-current 8a745ee13fbbbead62fd7d3a3c15a270b1901d63 +powerpc-merge 83dac59409387789b88bed40b1be86a8abc572be +sparc 43c422eda99b894f18d1cca17bcd2401efaf7bd0 +net 37561f68bd527ec39076e32effdc7b1dcdfb17ea +sound-current 21b3de881b38a84002c07b1b4bfb91892644e83f +pci-current 0ff9514b579b4f2f3e6038cd961ce64c224c3c73 +wireless 290eddc4b3661dc4dfa95d199e0be5788928b3b1 +driver-core.current d28d3882bd1fdb88ae4e02f11b091a92b0e5068b +tty.current 6f0c0580b70c89094b3422ba81118c7b959c7556 +usb.current 3b6054da68f9b0d5ed6a7ed0f42a79e61904352c +staging.current b3ca610a22c6f4708783b918ddbc22f4cb74589f +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 4a83d2edad794e74033cd521cc69fa099eb3c00f +arm-perf eab8fc89686a7b4ec8438500a8c31f5709dcbf9b +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +arm64 e3978cded41dc7b364e74037f56d6bc558c11fd7 +blackfin cdc05847f6fa383ec777b671389844c0226a8285 +c6x fbdd63d76c5ad6ae56a7bd1acebabefafc6aadf0 +cris 21a16be2b5edd6b5197f5d975eda972e081da38a +hexagon e1858b2a21cd84a855945a4747fb2db41b250c22 +ia64 d536e0db2433686238ec97c517e4fc691000ee6f +m68k f82735d55056b200eab19749398457a2f534306b +m68knommu 4dbfd6dc5d9253516db17967c378c86b8bc5f6d3 +microblaze 1883baaa2ea07d83228d5a83a3133cd02bab7fc6 +mips c0aa62e45f54dd25ef2324a482ebb473eadf3ee8 +openrisc 6257c5740e9f876f4097f6c67ec69576c23abb82 +parisc 559fd144d53e8e999b87c91f23b64691a7da01d9 +powerpc 83dac59409387789b88bed40b1be86a8abc572be +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx fa9b24afc4698d7541cf1c13b4b4473eca877383 +galak 10bfa766efa19c23f72f50727952a26cb1512256 +s390 3862369fedc2e4b6b70506e27b34f8a3b8282bd7 +sh 0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb +sparc-next 43c422eda99b894f18d1cca17bcd2401efaf7bd0 +tile ddffeb8c4d0331609ef2581d84de4d763607bd37 +unicore32 5d05622a16a943a0aab3ccc1fc0d85785d254827 +xtensa 7216cabfff5149670445cd65d415ed5db21314b4 +btrfs f46dbe3dee853f8a860f889cb2b7ff4c624f2a7a +ceph 35152979e6181b1fbb4b61c3ff641c14df53ad66 +cifs f51de018cc3656b6994335cfdf2ec51d8f1cf8c0 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee +ext3 6c29c50fda25c2ac2ce45a9b042ff7e424aa8eac +ext4 5de35e8d5c02d271c20e18337e01bc20e6ef472e +fuse c7a3f5e3e7a1e4938a41f0196d4b4ee632b30b38 +gfs2 3bba80e0e764ffce4267a929a00f4fc71bb38314 +jfs 4e7a4b01222343481d8ff084dbef9b80f7089a19 +logfs ab2ec19f42dc084880ba9b77e1c153adc1e9c439 +nfs 4369d322b992339095525de16e5d2371b68a44b9 +nfsd ddffeb8c4d0331609ef2581d84de4d763607bd37 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs 552aad02a283ee88406b102b4d6455eef7127196 +ubifs a74b6e459d4017e97a626c2bdd8d88ee290f943c +xfs e04426b9202bccd4cfcbc70b2fa2aeca1c86d8f5 +vfs a736427fa1103158338839813139b20763c7b13e +pci 78c8f84302ce007aedcfa11912fd4aacf22727ab +hid 5277e97c2474a85eb0325ac6fff71910a4e6c134 +i2c 13a2e9ccd850af5868e22c8c41f2ae179183004d +i2c-embedded 62885f59a26195d9f6a3f8c795225dfbab62a110 +jdelvare-hwmon 12250d843e8489ee00b5b7726da855e51694e792 +hwmon-staging 502d5393f6bdc47b99d1020db37bb996374cd198 +v4l-dvb c3a64171f19388200758473ed578185fa4f89e0e +kbuild b974d36fd9d3ecfc9c4f643e658a1fda50b6def7 +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata 13b74085d92feda78bad1045516d332a1e9a3407 +infiniband 1e3474d1de922ea3df176a0efbef843ada2dd43b +pstore 80c9d03c22f13a17df67b4b99a83ed5e9acf6093 +acpi d1d4a81b842db21b144ffd2334ca5eee3eb740f3 +cpuidle 3cf7997a389de59498c966c529456696ce8bc1a7 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal a180acfe7e4ab7115511589f854098732093068b +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 e4e541a84863b6a41f2427f59cc9156c644491a8 +wireless-next 9b34f40c20111ba658f88e1669598db494be1fbc +bluetooth 9917c85b06c2eb9d61c0f2dadd2d5d8788f7e563 +mtd 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc +l2-mtd 9dfb5198033b6341cda1aceb958267ce12cf376b +crypto ba1ee070909fae01248b8117da1706f3cf2bfd1b +drm 1f31c69dac71bebc0f00bc8534a6345782045501 +sound c902466800d777de55faab34214ec01987fca05e +sound-asoc 85b6d05c586d1df78ca61e133ccbb86db0d28a1a +modules 7460bf44fd45b11a82a989305d4fc4e47ec7fd4f +virtio 3905d295db1da30ff8cc61d9f337ceaa20acf8cc +input e4b290094603423623d3f268e054f40f3f51afa8 +input-mt 6f0c0580b70c89094b3422ba81118c7b959c7556 +cgroup 5a9423c1c7781f2711096e1e29419d6cdf9fe8b5 +block 454832b8eeb292d0efea792d4620912ab0e114ef +device-mapper ddffeb8c4d0331609ef2581d84de4d763607bd37 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc ec8e1ca2a608717d0eec0fa32f530869c0229fd6 +kgdb 58bcdf6847831913b41e9dfee1cbc579f939ef8b +slab 837d678dc264c797c16f81cf56f615f7544891c1 +uclinux ddffeb8c4d0331609ef2581d84de4d763607bd37 +md 8814c6518229ad355e68649793675e6b6460c2c6 +mfd 74d8378159de16a0a1d1975d4778120d263d6000 +battery 18766f0936d444fd7ff2e0064bd6e69a89d5c6fc +fbdev cd9d6f10d07f26dd8a70e519c22b6b4f8a9e3e7a +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 13b1ba7de8d0ecc42e4f9c002d5b0c1a48f05e58 +regulator 229d1a22b30be0526c55e1470ee4c52c5056d976 +security 61d335dd27c67d656f114c091a46cf95cbeeb77c +selinux c2d7b247f0c028d325a5da5b9611b60ba160f237 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 58ddfed79a60ba5d5eb4dce2767aa592947e1586 +dwmw2-iommu c3b92c8787367a8bb53d57d9789b558f1295cc96 +iommu 009487258399cb4f431992919fa0f386d1b74ceb +vfio 12250d843e8489ee00b5b7726da855e51694e792 +osd b6755ffb0c03c2e763cc56f72cc2ceaba8ea2805 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial db8310183ae493d5229e9a4018bc5df59cc31d98 +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +pm 13f5e2d9a915373dd1573d8fe0214738bc69004f +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +fsnotify 1aec9c0d718693553543349e92138033b0bcea4c +edac cfe503149482bf0bb76ff453b44dedd5e801870f +edac-amd 20fe26bab48e715fd56f1f7cc2495a969913d658 +devicetree efd68e7254503f3207805f674a1ea1d743f5dfe2 +dt-rh 205a8eb7ce713c7f1722297dd97d19dcea6f266c +spi d8e328b3bd65fdefc9c49a27ee80c28e0a44b653 +spi-mb 32111abb508424d1d110fa471d940160abe251f5 +tip ec187e575a30b41d94b34c9882b1a1be469aaa9f +rcu 1a0ec9cc029e83146e4070297903757948a18bbb +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 03604b31142058362db13e7881385806977893f5 +kvm-ppc f37f4441bbaf69e38d98678b757adbc7199eb1f2 +oprofile 44009105081b51417f311f4c3be0061870b6b8ed +xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495 +xen-two ad502612c173fff239250c9fe9bdfaaef70b9901 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu 6101167727932a929e37fb8a6eeb68bdbf54d58e +workqueues cb1177164566b4f4ac4f16e804d835198ad9a7ba +drivers-x86 455f38ccba672b33cda0a96cf9089be312ba95de +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 97f99c45dacf5e351abdd6ef8d3734fbdabefefd +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 2f73c3927318abe3d7fcaecadfbad89e2d12f881 +driver-core 6f0c0580b70c89094b3422ba81118c7b959c7556 +tty ecbbfd44a08fa80e0d664814efd4c187721b85f6 +usb 068b054fde5cc0516717b4ec4d58d0659e1ca43b +staging 40991e4fa6a91363ee45e8ee774a3c178f8c4159 +char-misc ddffeb8c4d0331609ef2581d84de4d763607bd37 +tmem a728d5ea1c20adbc4997287d8f17c528bda7ce8c +writeback 2f60d628ffd042e65e0b1d3431fb3e38d6f7c1be +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl ea25bfcbaa6238e1d99bbcc0bc58f9025bb9a557 +vhost e0953c8b85baaa38d77ebd5dc4051bc3837c1191 +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc 6f0c0580b70c89094b3422ba81118c7b959c7556 +irqdomain f5a1ad057e6da5d0fc9c5677ff44797d193d3e62 +gpio ddf343f635fe4440cad528e12f96f28bd50aa099 +gpio-lw a1cdd6b3236e6cd1d0ec0313665e1c5ac62a3544 +arm-soc 357dde55c958425f6f5da2ec64a52e52e0eab31d +cortex 77a3018e38b901f565b36f16924a3f86ad3e7328 +ep93xx fab1f7446a5baac4bf2f90e151a879677c0de916 +ixp4xx b94740b3b38fd8e37fcd3bb06a18ec2796061c7d +msm a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 +renesas 480d23a139b5a4782c8ce8d37012413f131133df +samsung f1d782ff8f927b1e1650f7cdc05857e9bd94746b +tegra cc8c1c9f0312487858a18d2bb1b0d25570e03376 +kvmtool 1cdfa1909203b8991a42461367ebbb36b143c042 +dma-mapping 76e598700e8e58b1448583a3bd4aa608cf5df85c +pwm 85f8879ca4f3d26a7f473522101fb74a79bda3f2 +dma-buf ba4205121f8199c32658b03c2660b1a9f9ff217c +userns e9069f470803eeb5e243a05bc717452c6218bd71 +ktest 95f57838418358e93212e9dddd60d3502c7f8e2e +signal 8213538e4f17369b1df63b2825215b2360c30398 +clk 494bfec99922d54054d2d0873f1017680cfc3f13 +random d2e7c96af1e54b507ae2a6a7dd2baf588417a7e5 +lzo-update ba32bf9f4149eeab14bb97ca2edd2f8d1619dfd8 +drop-experimental e552f87a00689ee718fb775d9097a825ffa4b772 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm 234b148da776410dbf34388b8f529190084c9457 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4f87cdbf47ab --- /dev/null +++ b/Next/Trees @@ -0,0 +1,209 @@ +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 +drop-experimental git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#linux-next +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..026467aac4cd --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4332 @@ +$ date +Wednesday 24 October 10:46:04 EST 2012 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 0390c88 module_signing: fix printk format warning +Merging origin/master (2d1f4c8 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) +$ git merge origin/master +Updating 0390c88..2d1f4c8 +Fast-forward + drivers/base/regmap/Kconfig | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 4 +- + drivers/gpu/drm/drm_info.c | 2 - + drivers/gpu/drm/drm_platform.c | 1 - + drivers/gpu/drm/i915/i915_drv.c | 13 +++++ + drivers/gpu/drm/i915/i915_drv.h | 1 + + drivers/gpu/drm/i915/i915_gem.c | 7 ++- + drivers/gpu/drm/i915/intel_crt.c | 15 +----- + drivers/gpu/drm/i915/intel_display.c | 32 ++++++++++++ + drivers/gpu/drm/i915/intel_dp.c | 15 ++++-- + drivers/gpu/drm/i915/intel_lvds.c | 8 +++ + drivers/gpu/drm/i915/intel_sdvo.c | 14 ++++-- + drivers/gpu/drm/nouveau/core/core/gpuobj.c | 5 ++ + drivers/gpu/drm/nouveau/core/core/mm.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/bios/base.c | 30 +++++++++--- + drivers/gpu/drm/nouveau/core/subdev/bios/pll.c | 10 ++-- + drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c | 1 + + drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c | 3 +- + drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 14 ++++-- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 12 ++--- + drivers/gpu/drm/ttm/ttm_bo.c | 24 +++++---- + fs/ext4/balloc.c | 8 ++- + fs/ext4/bitmap.c | 6 ++- + fs/ext4/ext4.h | 7 ++- + fs/ext4/ext4_jbd2.c | 8 +-- + fs/ext4/extents.c | 60 ++++++++++++++++++----- + fs/ext4/ialloc.c | 4 +- + fs/ext4/mballoc.c | 14 +++--- + fs/ext4/resize.c | 3 +- + fs/ext4/super.c | 9 ++-- + fs/jfs/jfs_discard.c | 16 +++--- + fs/nfs/callback.c | 2 +- + fs/nfs/nfs4filelayout.c | 21 ++++++-- + fs/nfs/nfs4filelayout.h | 1 - + fs/nfs/nfs4filelayoutdev.c | 22 --------- + fs/nfs/nfs4getroot.c | 1 + + fs/nfs/objlayout/objio_osd.c | 6 +-- + fs/nfs/pnfs.h | 1 + + 39 files changed, 255 insertions(+), 152 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 (b43b1ff Merge tag 'fixes-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 9 +++++---- + arch/arm/Makefile | 13 +++++++------ + arch/arm/boot/Makefile | 10 +++++----- + arch/arm/include/asm/flat.h | 2 +- + arch/arm/include/asm/uaccess.h | 4 ++-- + arch/arm/kernel/irq.c | 2 ++ + arch/arm/kernel/kprobes-test-arm.c | 4 ++++ + arch/arm/kernel/machine_kexec.c | 7 +++---- + arch/arm/kernel/perf_event.c | 4 ++++ + arch/arm/kernel/smp.c | 14 ++++++++++---- + arch/arm/kernel/smp_twd.c | 4 ++-- + arch/arm/lib/delay.c | 1 + + arch/arm/mm/alignment.c | 4 +++- + arch/arm/tools/Makefile | 2 +- + drivers/xen/Kconfig | 2 ++ + drivers/xen/sys-hypervisor.c | 1 + + 16 files changed, 53 insertions(+), 30 deletions(-) +Merging m68k-current/for-linus (8a745ee m68k: Wire up kcmp) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40) +$ git merge sparc/master +Already up-to-date. +Merging net/master (37561f6 tcp: Reject invalid ack_seq to Fast Open sockets) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +- + drivers/bcma/main.c | 5 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 19 +++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 29 +--- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 + + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 99 +++-------- + drivers/net/ethernet/qlogic/qla3xxx.c | 9 +- + drivers/net/phy/Kconfig | 5 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/at803x.c | 176 ++++++++++++++++++++ + drivers/net/usb/ipheth.c | 5 + + drivers/net/usb/qmi_wwan.c | 41 +++++ + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 68 +++----- + drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/devices.c | 39 +++-- + include/linux/tcp.h | 3 +- + include/net/cfg80211.h | 1 + + include/uapi/linux/tcp.h | 1 + + net/8021q/vlan.c | 4 +- + net/batman-adv/bridge_loop_avoidance.c | 27 ++- + net/batman-adv/routing.c | 8 +- + net/batman-adv/types.h | 2 + + net/bluetooth/smp.c | 6 +- + net/core/skbuff.c | 6 +- + net/ipv4/route.c | 9 +- + net/ipv4/tcp.c | 10 +- + net/ipv4/tcp_input.c | 13 +- + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/tcp_minisocks.c | 1 + + net/ipv4/tcp_timer.c | 4 +- + net/mac80211/iface.c | 2 +- + net/mac80211/mlme.c | 35 ++-- + net/mac80211/sta_info.c | 4 +- + net/mac80211/util.c | 4 +- + net/mac80211/wpa.c | 14 +- + net/netfilter/ipvs/ip_vs_ctl.c | 3 +- + net/netfilter/xt_CT.c | 10 +- + net/netfilter/xt_TEE.c | 1 + + net/netfilter/xt_nat.c | 8 +- + net/netlink/af_netlink.c | 19 ++- + net/wireless/mlme.c | 12 +- + 42 files changed, 485 insertions(+), 234 deletions(-) + create mode 100644 drivers/net/phy/at803x.c +Merging sound-current/for-linus (21b3de8 ALSA: als3000: check for the kzalloc return value) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/isa/opti9xx/miro.c | 1 - + sound/pci/als300.c | 4 + + sound/pci/hda/patch_realtek.c | 20 +++- + sound/pci/rme9652/hdspm.c | 234 ++++++++++++++++++++++++----------------- + 4 files changed, 162 insertions(+), 97 deletions(-) +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 (290eddc Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (d28d388 firmware loader: sync firmware cache by async_synchronize_full_domain) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/firmware_class.c | 266 +++++++++++++++++++++++------------------ + 1 file changed, 151 insertions(+), 115 deletions(-) +Merging tty.current/tty-linus (6f0c058 Linux 3.7-rc2) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (3b6054d usb hub: send clear_tt_buffer_complete events when canceling TT clear work) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/hub.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging staging.current/staging-linus (b3ca610 staging: ramster: depends on NET) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/Kconfig | 1 - + drivers/iio/Makefile | 1 - + drivers/staging/android/binder.c | 30 ++++++++++- + drivers/staging/comedi/drivers/8255_pci.c | 2 + + drivers/staging/comedi/drivers/amplc_dio200.c | 2 + + drivers/staging/comedi/drivers/amplc_pc236.c | 5 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 2 + + drivers/staging/comedi/drivers/das08.c | 2 + + drivers/staging/comedi/drivers/ni_daq_700.c | 2 +- + drivers/staging/comedi/drivers/ni_labpc.c | 2 + + drivers/staging/iio/accel/adis16201_core.c | 24 +++++---- + drivers/staging/iio/accel/adis16203_core.c | 20 +++---- + drivers/staging/iio/accel/adis16204_core.c | 22 ++++---- + drivers/staging/iio/accel/adis16209_core.c | 18 ++++--- + drivers/staging/iio/accel/adis16220_core.c | 19 ++++--- + drivers/staging/iio/accel/adis16240_core.c | 23 ++++---- + drivers/staging/iio/gyro/adis16260_core.c | 29 +++++----- + drivers/staging/iio/imu/adis16400.h | 2 + + drivers/staging/iio/imu/adis16400_core.c | 70 ++++++++++++++++--------- + drivers/staging/omapdrm/omap_gem.c | 4 +- + drivers/staging/ramster/Kconfig | 1 + + drivers/staging/zram/zram_drv.c | 12 ++++- + include/linux/iio/iio.h | 16 ++++++ + 23 files changed, 203 insertions(+), 106 deletions(-) +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 (4a83d2e Merge remote-tracking branch 'wildea/asids' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/common/vic.c | 18 +- + arch/arm/include/asm/hardware/cache-l2x0.h | 5 + + arch/arm/include/asm/hardware/vic.h | 2 +- + arch/arm/include/asm/mmu.h | 11 +- + arch/arm/include/asm/mmu_context.h | 82 +------- + arch/arm/kernel/process.c | 1 + + arch/arm/mm/cache-aurora-l2.h | 55 ++++++ + arch/arm/mm/cache-l2x0.c | 277 +++++++++++++++++++++++++--- + arch/arm/mm/context.c | 207 +++++++++++---------- + arch/arm/mm/proc-v7.S | 2 +- + drivers/mmc/host/mmci.c | 40 ++-- + 11 files changed, 456 insertions(+), 244 deletions(-) + create mode 100644 arch/arm/mm/cache-aurora-l2.h +Merging arm-perf/for-next/perf (eab8fc8 Merge branch 'hw-breakpoint' into for-next/perf) +$ git merge arm-perf/for-next/perf +Auto-merging arch/arm/kernel/perf_event.c +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 | 84 ++++++++---- + 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, 466 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 (e3978cd arm64: Move PCI_IOBASE closer to MODULES_VADDR) +$ git merge arm64/upstream +Merge made by the 'recursive' strategy. + Documentation/arm64/memory.txt | 12 ++++++------ + arch/arm64/include/asm/io.h | 8 ++++---- + 2 files changed, 10 insertions(+), 10 deletions(-) +Merging blackfin/for-linus (cdc0584 Blackfin: twi: Add missing __iomem annotation) +$ git merge blackfin/for-linus +Removing arch/blackfin/include/asm/kvm_para.h +Merge made by the 'recursive' strategy. + arch/blackfin/include/asm/Kbuild | 6 +- + arch/blackfin/include/asm/bfin_sport.h | 128 +----- + arch/blackfin/include/asm/bfin_twi.h | 2 +- + arch/blackfin/include/asm/fixed_code.h | 30 +- + arch/blackfin/include/asm/kvm_para.h | 1 - + arch/blackfin/include/asm/ptrace.h | 161 +------- + arch/blackfin/include/asm/uaccess.h | 24 +- + 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/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 ++++++++++++++++++++ + 24 files changed, 816 insertions(+), 763 deletions(-) + delete mode 100644 arch/blackfin/include/asm/kvm_para.h + 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/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 (21a16be CRIS: locking: fix the return value of arch_read_trylock()) +$ 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/arch-v32/arch/spinlock.h | 2 +- + arch/cris/include/asm/Kbuild | 5 - + arch/cris/include/asm/ptrace.h | 5 +- + arch/cris/include/asm/signal.h | 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 +- + 54 files changed, 684 insertions(+), 646 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 (e1858b2 Hexagon: Copyright marking changes) +$ 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 (4dbfd6d m68k: switch to using the asm-generic socket.h) +$ git merge m68knommu/for-next +CONFLICT (rename/delete): arch/m68k/include/uapi/asm/termbits.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/termbits.h left in tree. +CONFLICT (rename/delete): arch/m68k/include/uapi/asm/sockios.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/sockios.h left in tree. +CONFLICT (rename/delete): arch/m68k/include/uapi/asm/socket.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/socket.h left in tree. +CONFLICT (rename/delete): arch/m68k/include/uapi/asm/shmbuf.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/shmbuf.h left in tree. +CONFLICT (rename/delete): arch/m68k/include/uapi/asm/sembuf.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/sembuf.h left in tree. +CONFLICT (rename/delete): arch/m68k/include/uapi/asm/msgbuf.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/msgbuf.h left in tree. +CONFLICT (rename/delete): arch/m68k/include/uapi/asm/auxvec.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/auxvec.h left in tree. +CONFLICT (modify/delete): arch/m68k/include/asm/termios.h deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68k/include/asm/termios.h left in tree. +Removing arch/m68k/include/asm/spinlock.h +Removing arch/m68k/include/asm/shmparam.h +Removing arch/m68k/include/asm/hw_irq.h +Auto-merging arch/m68k/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/m68k/include/asm/termios.h arch/m68k/include/uapi/asm/auxvec.h arch/m68k/include/uapi/asm/msgbuf.h arch/m68k/include/uapi/asm/sembuf.h arch/m68k/include/uapi/asm/shmbuf.h arch/m68k/include/uapi/asm/socket.h arch/m68k/include/uapi/asm/sockios.h arch/m68k/include/uapi/asm/termbits.h +arch/m68k/include/asm/termios.h: needs merge +arch/m68k/include/uapi/asm/auxvec.h: needs merge +arch/m68k/include/uapi/asm/msgbuf.h: needs merge +arch/m68k/include/uapi/asm/sembuf.h: needs merge +arch/m68k/include/uapi/asm/shmbuf.h: needs merge +arch/m68k/include/uapi/asm/socket.h: needs merge +arch/m68k/include/uapi/asm/sockios.h: needs merge +arch/m68k/include/uapi/asm/termbits.h: needs merge +rm 'arch/m68k/include/asm/termios.h' +rm 'arch/m68k/include/uapi/asm/auxvec.h' +rm 'arch/m68k/include/uapi/asm/msgbuf.h' +rm 'arch/m68k/include/uapi/asm/sembuf.h' +rm 'arch/m68k/include/uapi/asm/shmbuf.h' +rm 'arch/m68k/include/uapi/asm/socket.h' +rm 'arch/m68k/include/uapi/asm/sockios.h' +rm 'arch/m68k/include/uapi/asm/termbits.h' +$ git commit -v -a +[master 0df92d4] Merge remote-tracking branch 'm68knommu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/m68k/include/asm/Kbuild | 11 ++ + arch/m68k/include/asm/hw_irq.h | 6 - + arch/m68k/include/asm/shmparam.h | 6 - + arch/m68k/include/asm/spinlock.h | 6 - + arch/m68k/include/asm/termios.h | 50 -------- + arch/m68k/include/uapi/asm/auxvec.h | 4 - + arch/m68k/include/uapi/asm/msgbuf.h | 31 ----- + arch/m68k/include/uapi/asm/sembuf.h | 25 ---- + arch/m68k/include/uapi/asm/shmbuf.h | 42 ------- + arch/m68k/include/uapi/asm/socket.h | 72 ------------ + arch/m68k/include/uapi/asm/sockios.h | 13 --- + arch/m68k/include/uapi/asm/termbits.h | 201 --------------------------------- + 12 files changed, 11 insertions(+), 456 deletions(-) + delete mode 100644 arch/m68k/include/asm/hw_irq.h + delete mode 100644 arch/m68k/include/asm/shmparam.h + delete mode 100644 arch/m68k/include/asm/spinlock.h + delete mode 100644 arch/m68k/include/asm/termios.h + delete mode 100644 arch/m68k/include/uapi/asm/auxvec.h + delete mode 100644 arch/m68k/include/uapi/asm/msgbuf.h + delete mode 100644 arch/m68k/include/uapi/asm/sembuf.h + delete mode 100644 arch/m68k/include/uapi/asm/shmbuf.h + delete mode 100644 arch/m68k/include/uapi/asm/socket.h + delete mode 100644 arch/m68k/include/uapi/asm/sockios.h + delete mode 100644 arch/m68k/include/uapi/asm/termbits.h +$ git am -3 ../patches/0001-m68k-fix-up-for-UAPI-changes.patch +Applying: m68k: fix up for UAPI changes +$ git reset HEAD^ +Unstaged changes after reset: +M arch/m68k/include/uapi/asm/Kbuild +$ git add -A . +$ git commit -v -a --amend +[master 81c214c] Merge remote-tracking branch 'm68knommu/for-next' +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 (c0aa62e MIPS: Cavium: Update defconfig) +$ git merge mips/mips-for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 ++ + arch/mips/Kconfig | 17 ++- + arch/mips/cavium-octeon/setup.c | 30 +++++- + arch/mips/configs/cavium_octeon_defconfig | 98 ++++++++++++++--- + arch/mips/include/asm/cpu.h | 6 +- + arch/mips/include/asm/mipsregs.h | 2 +- + arch/mips/include/asm/page.h | 8 +- + arch/mips/include/asm/pgtable-64.h | 2 +- + arch/mips/include/asm/pgtable-bits.h | 13 ++- + arch/mips/include/asm/pgtable.h | 168 ++++++++++++++++++++++++++++- + arch/mips/include/asm/sparsemem.h | 2 +- + arch/mips/include/asm/tlbdebug.h | 1 + + arch/mips/kernel/mips_ksyms.c | 2 +- + arch/mips/kernel/scall64-n32.S | 6 -- + arch/mips/lib/dump_tlb.c | 47 ++++++++ + arch/mips/mm/c-octeon.c | 46 ++++---- + arch/mips/mm/pgtable-64.c | 31 ++++++ + arch/mips/mm/tlb-r4k.c | 22 +++- + arch/mips/mm/tlbex.c | 91 +++++++++++----- + arch/mips/pci/pci-octeon.c | 4 + + drivers/edac/Kconfig | 33 +++++- + drivers/edac/Makefile | 5 + + drivers/edac/octeon_edac-l2c.c | 118 ++++++++++++++++++++ + drivers/edac/octeon_edac-lmc.c | 150 ++++++++++++++++++++++++++ + drivers/edac/octeon_edac-lmc.h | 78 ++++++++++++++ + drivers/edac/octeon_edac-pc.c | 140 ++++++++++++++++++++++++ + drivers/edac/octeon_edac-pci.c | 135 +++++++++++++++++++++++ + 27 files changed, 1172 insertions(+), 92 deletions(-) + create mode 100644 drivers/edac/octeon_edac-l2c.c + create mode 100644 drivers/edac/octeon_edac-lmc.c + create mode 100644 drivers/edac/octeon_edac-lmc.h + create mode 100644 drivers/edac/octeon_edac-pc.c + create mode 100644 drivers/edac/octeon_edac-pci.c +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 (559fd14 Merge tag 'disintegrate-parisc-20121016' into for-next) +$ git merge parisc/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging powerpc/next (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.) +$ 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 (fa9b24a powerpc/mpc5200: move lpbfifo node and fix its interrupt property) +$ git merge mpc5xxx/next +Merge made by the 'recursive' strategy. + arch/powerpc/boot/dts/mpc5200b.dtsi | 6 ++++++ + arch/powerpc/boot/dts/o2d.dtsi | 6 ------ + arch/powerpc/boot/dts/pcm030.dts | 7 ++++++- + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 9 +++++---- + 4 files changed, 17 insertions(+), 11 deletions(-) +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 (3862369 s390/traps: preinitialize program check table) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/boot/compressed/vmlinux.lds.S | 2 +- + arch/s390/include/asm/perf_event.h | 2 +- + arch/s390/include/asm/pgtable.h | 10 ++ + arch/s390/include/uapi/asm/Kbuild | 2 - + arch/s390/include/uapi/asm/chpid.h | 10 +- + arch/s390/include/uapi/asm/kvm_para.h | 11 +++ + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/cache.c | 9 +- + arch/s390/kernel/entry.h | 21 ++++- + arch/s390/kernel/entry64.S | 4 +- + arch/s390/kernel/head_kdump.S | 10 +- + arch/s390/kernel/perf_cpum_cf.c | 6 +- + arch/s390/kernel/pgm_check.S | 152 +++++++++++++++++++++++++++++++ + arch/s390/kernel/traps.c | 52 ++--------- + arch/s390/kernel/vmlinux.lds.S | 2 +- + arch/s390/mm/dump_pagetables.c | 7 +- + arch/s390/mm/pageattr.c | 2 +- + arch/s390/mm/vmem.c | 46 +++++++++- + drivers/s390/cio/css.c | 7 +- + drivers/s390/cio/idset.c | 26 +++--- + drivers/s390/cio/idset.h | 3 +- + 22 files changed, 295 insertions(+), 92 deletions(-) + create mode 100644 arch/s390/include/uapi/asm/kvm_para.h + create mode 100644 arch/s390/kernel/pgm_check.S +Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.) +$ git merge sh/sh-latest +Already up-to-date. +Merging sparc-next/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (ddffeb8 Linux 3.7-rc1) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (5d05622 unicore32: switch to generic sys_execve()) +$ git merge unicore32/unicore32 +Auto-merging arch/unicore32/include/uapi/asm/unistd.h +Removing arch/unicore32/include/asm/kvm_para.h +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 5 ++ + arch/unicore32/include/asm/Kbuild | 1 - + arch/unicore32/include/asm/bug.h | 5 -- + arch/unicore32/include/asm/cmpxchg.h | 2 +- + arch/unicore32/include/asm/kvm_para.h | 1 - + arch/unicore32/include/asm/processor.h | 5 -- + arch/unicore32/include/asm/ptrace.h | 76 +---------------- + arch/unicore32/include/uapi/asm/Kbuild | 7 ++ + arch/unicore32/include/{ => uapi}/asm/byteorder.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 | 1 + + arch/unicore32/kernel/entry.S | 20 ++--- + arch/unicore32/kernel/process.c | 58 +++---------- + arch/unicore32/kernel/setup.h | 6 ++ + arch/unicore32/kernel/sys.c | 63 -------------- + arch/unicore32/mm/fault.c | 37 +++++--- + 17 files changed, 159 insertions(+), 218 deletions(-) + delete mode 100644 arch/unicore32/include/asm/kvm_para.h + rename arch/unicore32/include/{ => uapi}/asm/byteorder.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 (92%) +Merging xtensa/for_next (7216cab xtensa: add missing system calls to the syscall table) +$ 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 (3515297 rbd: activate v2 image support) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 100 +++++++++++++++++++++++++++++++++++++++----------- + net/ceph/messenger.c | 61 ++++++++++++++---------------- + 2 files changed, 106 insertions(+), 55 deletions(-) +Merging cifs/for-next (f51de01 cifs: extra sanity checking for cifs.idmap keys) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsacl.c | 749 +++++++++++++++------------------------------------ + fs/cifs/cifsacl.h | 53 ++-- + fs/cifs/cifsfs.c | 12 +- + fs/cifs/cifsproto.h | 1 - + fs/cifs/inode.c | 7 +- + fs/cifs/readdir.c | 10 + + 6 files changed, 258 insertions(+), 574 deletions(-) +Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (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 +Already up-to-date. +Merging ext4/dev (5de35e8 ext4: Avoid underflow in ext4_trim_fs()) +$ 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 (3bba80e GFS2: Speed up gfs2_rbm_from_block) +$ 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/incore.h | 1 + + fs/gfs2/lops.c | 2 -- + fs/gfs2/ops_fstype.c | 3 +++ + fs/gfs2/quota.c | 7 +++++-- + fs/gfs2/rgrp.c | 54 ++++++++++++++++++++++++++++++-------------------- + 9 files changed, 78 insertions(+), 65 deletions(-) +Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling) +$ 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 (4369d32 lockd: Remove BUG_ON()s from fs/lockd/clntproc.c) +$ git merge nfs/linux-next +Auto-merging fs/lockd/clntxdr.c +Merge made by the 'recursive' strategy. + fs/lockd/clnt4xdr.c | 8 -------- + fs/lockd/clntproc.c | 3 +-- + fs/lockd/clntxdr.c | 8 -------- + fs/lockd/host.c | 15 +++++---------- + fs/lockd/mon.c | 3 --- + fs/nfs/cache_lib.c | 1 - + fs/nfs/callback_proc.c | 1 - + fs/nfs/client.c | 6 +----- + fs/nfs/inode.c | 4 ++-- + fs/nfs/mount_clnt.c | 7 ++++++- + fs/nfs/nfs2xdr.c | 4 +--- + fs/nfs/nfs3xdr.c | 7 +++---- + fs/nfs/nfs4client.c | 4 ---- + fs/nfs/nfs4file.c | 1 - + fs/nfs/nfs4filelayout.c | 13 ++++--------- + fs/nfs/nfs4filelayoutdev.c | 2 -- + fs/nfs/nfs4proc.c | 18 ++++++++---------- + fs/nfs/nfs4state.c | 1 - + fs/nfs/nfs4xdr.c | 6 ++---- + fs/nfs/objlayout/objlayout.c | 11 ----------- + fs/nfs/pnfs.c | 17 ++--------------- + fs/nfs/write.c | 25 +++++++++---------------- + 22 files changed, 44 insertions(+), 121 deletions(-) +Merging nfsd/nfsd-next (ddffeb8 Linux 3.7-rc1) +$ 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 (e04426b xfs: move allocation stack switch up to xfs_bmapi_allocate) +$ git merge xfs/for-next +Removing fs/xfs/xfs_iget.c +Auto-merging fs/xfs/xfs_icache.h +Auto-merging fs/xfs/xfs_icache.c +Merge made by the 'recursive' strategy. + fs/xfs/Makefile | 3 +- + fs/xfs/xfs_alloc.c | 43 +-- + fs/xfs/xfs_alloc.h | 3 - + fs/xfs/xfs_bmap.c | 63 +++- + fs/xfs/xfs_bmap.h | 9 +- + fs/xfs/xfs_export.c | 1 + + fs/xfs/xfs_file.c | 13 +- + fs/xfs/xfs_ialloc.c | 1 + + fs/xfs/{xfs_sync.c => xfs_icache.c} | 701 ++++++++++++++++++++-------------- + fs/xfs/{xfs_sync.h => xfs_icache.h} | 14 +- + fs/xfs/xfs_iget.c | 705 ----------------------------------- + fs/xfs/xfs_inode.c | 251 +++++++++++++ + fs/xfs/xfs_inode.h | 10 +- + fs/xfs/xfs_iomap.c | 27 +- + fs/xfs/xfs_itable.c | 1 + + fs/xfs/xfs_log.c | 122 +++++- + fs/xfs/xfs_log.h | 4 + + fs/xfs/xfs_log_priv.h | 1 + + fs/xfs/xfs_log_recover.c | 1 + + fs/xfs/xfs_mount.c | 31 +- + fs/xfs/xfs_mount.h | 6 +- + fs/xfs/xfs_qm.c | 1 + + fs/xfs/xfs_qm_syscalls.c | 1 + + fs/xfs/xfs_rtalloc.c | 1 + + fs/xfs/xfs_super.c | 139 ++++--- + fs/xfs/xfs_super.h | 1 + + fs/xfs/xfs_vnodeops.c | 3 +- + 27 files changed, 987 insertions(+), 1169 deletions(-) + rename fs/xfs/{xfs_sync.c => xfs_icache.c} (64%) + rename fs/xfs/{xfs_sync.h => xfs_icache.h} (73%) + delete mode 100644 fs/xfs/xfs_iget.c +Merging vfs/for-next (a736427 missing const in alpha callers of do_mount()) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + arch/alpha/kernel/osf_sys.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (5277e97 HID: roccat: allow readout of koneplus sensor register data) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 6 +- + .../ABI/testing/sysfs-driver-hid-roccat-lua | 7 + + drivers/hid/Makefile | 4 +- + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-roccat-koneplus.c | 11 +- + drivers/hid/hid-roccat-lua.c | 227 ++++++++++++++++++++ + drivers/hid/hid-roccat-lua.h | 29 +++ + 8 files changed, 280 insertions(+), 6 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-lua + create mode 100644 drivers/hid/hid-roccat-lua.c + create mode 100644 drivers/hid/hid-roccat-lua.h +Merging quilt/i2c (13a2e9c i2c-i801: Fix comment) +$ git merge quilt/i2c +Auto-merging drivers/i2c/i2c-stub.c +Merge made by the 'recursive' strategy. + drivers/i2c/Makefile | 1 + + drivers/i2c/busses/Kconfig | 1 - + drivers/i2c/busses/Makefile | 1 - + drivers/i2c/busses/i2c-i801.c | 13 ++++--- + drivers/i2c/{busses => }/i2c-stub.c | 65 +++++++++++++++++------------------ + 5 files changed, 42 insertions(+), 39 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 (502d539 hwmon: DA9055 HWMON driver) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/ads7828 | 46 +++-- + Documentation/hwmon/coretemp | 2 + + Documentation/hwmon/da9055 | 47 +++++ + drivers/hwmon/Kconfig | 19 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/ads7828.c | 247 ++++++++++-------------- + drivers/hwmon/coretemp.c | 60 +++--- + drivers/hwmon/da9052-hwmon.c | 27 +-- + drivers/hwmon/da9055-hwmon.c | 336 +++++++++++++++++++++++++++++++++ + drivers/hwmon/ina2xx.c | 13 +- + include/linux/platform_data/ads7828.h | 29 +++ + 11 files changed, 603 insertions(+), 224 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 (c3a6417 Merge /home/v4l/v4l/for_upstream) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (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 (1e3474d Merge branches 'cxgb4' and 'mlx4' into for-next) +$ git merge infiniband/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +- + drivers/infiniband/hw/mlx4/mad.c | 85 +++++++++----------- + drivers/infiniband/hw/mlx4/mcg.c | 18 +++-- + drivers/net/ethernet/mellanox/mlx4/eq.c | 6 -- + drivers/net/ethernet/mellanox/mlx4/main.c | 5 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 6 -- + 7 files changed, 56 insertions(+), 68 deletions(-) +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 3c28ab3] 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 (a180acf ACPI video: Ignore errors after _DOD evaluation.) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + Documentation/thermal/sysfs-api.txt | 64 ++ + drivers/acpi/thermal.c | 6 +- + drivers/acpi/video.c | 11 +- + drivers/platform/x86/acerhdf.c | 2 +- + drivers/platform/x86/intel_mid_thermal.c | 2 +- + drivers/power/power_supply_core.c | 2 +- + drivers/staging/omap-thermal/omap-thermal-common.c | 2 +- + drivers/thermal/Kconfig | 49 ++ + drivers/thermal/Makefile | 3 + + drivers/thermal/exynos_thermal.c | 4 +- + drivers/thermal/fair_share.c | 133 ++++ + drivers/thermal/rcar_thermal.c | 2 +- + drivers/thermal/spear_thermal.c | 2 +- + drivers/thermal/step_wise.c | 194 ++++++ + drivers/thermal/thermal_core.h | 53 ++ + drivers/thermal/thermal_sys.c | 700 +++++++++++++------- + drivers/thermal/user_space.c | 68 ++ + include/linux/thermal.h | 128 +++- + 18 files changed, 1132 insertions(+), 293 deletions(-) + create mode 100644 drivers/thermal/fair_share.c + create mode 100644 drivers/thermal/step_wise.c + create mode 100644 drivers/thermal/thermal_core.h + create mode 100644 drivers/thermal/user_space.c +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. +Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (e4e541a sock-diag: Report shutdown for inet and unix sockets (v2)) +$ git merge net-next/master +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/ipv4/tcp.c +Auto-merging include/uapi/linux/usb/cdc.h +Removing drivers/net/ethernet/cadence/at91_ether.h +Removing arch/arm/mach-at91/include/mach/at91rm9200_emac.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + arch/arm/mach-at91/Kconfig | 4 - + arch/arm/mach-at91/board-csb337.c | 2 + + arch/arm/mach-at91/include/mach/at91rm9200_emac.h | 138 --- + arch/avr32/Kconfig | 1 - + drivers/net/ethernet/cadence/Kconfig | 8 +- + drivers/net/ethernet/cadence/at91_ether.c | 1029 +++-------------- + drivers/net/ethernet/cadence/at91_ether.h | 112 -- + drivers/net/ethernet/cadence/macb.c | 20 +- + drivers/net/ethernet/cadence/macb.h | 22 + + drivers/net/ethernet/emulex/benet/be.h | 20 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 392 ++++++- + drivers/net/ethernet/emulex/benet/be_cmds.h | 150 ++- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 80 +- + drivers/net/ethernet/emulex/benet/be_hw.h | 3 + + drivers/net/ethernet/emulex/benet/be_main.c | 535 ++++++--- + drivers/net/ethernet/intel/e1000e/netdev.c | 11 + + drivers/net/ethernet/intel/igb/e1000_82575.h | 3 + + drivers/net/ethernet/intel/igb/e1000_phy.c | 20 + + drivers/net/ethernet/intel/igb/igb.h | 70 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 53 +- + drivers/net/ethernet/intel/igb/igb_main.c | 1244 +++++++++++++-------- + drivers/net/ethernet/intel/igb/igb_ptp.c | 55 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 44 + + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 102 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 4 + + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 79 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 31 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 109 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 465 +++++--- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 + + drivers/net/ethernet/intel/ixgbevf/defines.h | 7 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 4 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 210 +++- + drivers/net/ethernet/intel/ixgbevf/mbx.h | 10 + + drivers/net/ethernet/intel/ixgbevf/vf.c | 58 + + drivers/net/ethernet/intel/ixgbevf/vf.h | 2 + + drivers/net/hyperv/rndis_filter.c | 5 - + drivers/net/usb/Kconfig | 18 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/cdc_mbim.c | 412 +++++++ + drivers/net/usb/cdc_ncm.c | 584 +++++----- + include/linux/platform_data/macb.h | 1 + + include/linux/usb/cdc_ncm.h | 134 +++ + include/net/af_unix.h | 1 - + include/net/ip6_fib.h | 10 + + include/uapi/linux/inet_diag.h | 3 +- + include/uapi/linux/unix_diag.h | 1 + + include/uapi/linux/usb/cdc.h | 23 + + net/core/dev.c | 1 - + net/core/pktgen.c | 6 +- + net/core/rtnetlink.c | 6 +- + net/core/sock.c | 3 + + net/ipv4/fib_semantics.c | 2 +- + net/ipv4/inet_diag.c | 3 + + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_input.c | 43 +- + net/ipv4/tcp_ipv4.c | 7 +- + net/ipv6/ip6_fib.c | 57 + + net/ipv6/route.c | 136 ++- + net/ipv6/tcp_ipv6.c | 4 +- + net/sched/sch_api.c | 9 +- + net/sched/sch_cbq.c | 3 +- + net/unix/diag.c | 3 + + 68 files changed, 4102 insertions(+), 2497 deletions(-) + delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200_emac.h + delete mode 100644 drivers/net/ethernet/cadence/at91_ether.h + create mode 100644 drivers/net/usb/cdc_mbim.c + create mode 100644 include/linux/usb/cdc_ncm.h +Merging wireless-next/master (9b34f40 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless) +$ git merge wireless-next/master +Merge made by the 'recursive' strategy. + arch/mips/bcm47xx/nvram.c | 4 +- + arch/mips/bcm47xx/wgt634u.c | 8 +- + drivers/bcma/driver_chipcommon.c | 23 +- + drivers/bcma/driver_chipcommon_nflash.c | 3 + + drivers/bcma/driver_chipcommon_pmu.c | 5 +- + drivers/bcma/driver_chipcommon_sflash.c | 35 +- + drivers/bcma/driver_mips.c | 48 +- + drivers/bcma/driver_pci_host.c | 14 +- + drivers/bcma/main.c | 54 +- + drivers/bcma/sprom.c | 5 +- + drivers/bluetooth/btmrvl_sdio.c | 28 +- + drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 4 +- + drivers/net/wireless/airo.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 2 + + drivers/net/wireless/ath/ath9k/gpio.c | 60 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/link.c | 12 +- + drivers/net/wireless/ath/ath9k/main.c | 3 +- + drivers/net/wireless/ath/carl9170/rx.c | 6 +- + drivers/net/wireless/ath/carl9170/usb.c | 7 + + drivers/net/wireless/ath/hw.c | 20 +- + drivers/net/wireless/b43/main.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 4 - + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 2 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 36 - + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 11 +- + drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 4 +- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +- + drivers/net/wireless/hostap/hostap_80211_rx.c | 2 +- + drivers/net/wireless/ipw2x00/libipw_rx.c | 6 +- + drivers/net/wireless/iwlwifi/dvm/main.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 95 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 3 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 8 + + drivers/net/wireless/iwlwifi/pcie/rx.c | 3 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 9 +- + drivers/net/wireless/iwlwifi/pcie/tx.c | 18 +- + drivers/net/wireless/libertas/mesh.c | 2 +- + drivers/net/wireless/mwifiex/cfg80211.c | 4 +- + drivers/net/wireless/mwifiex/cmdevt.c | 21 +- + drivers/net/wireless/mwifiex/main.h | 2 - + drivers/net/wireless/mwifiex/scan.c | 13 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +- + drivers/net/wireless/orinoco/main.h | 2 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 9 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 100 +- + drivers/net/wireless/rtlwifi/cam.c | 7 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 6 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 6 +- + drivers/ssb/driver_mipscore.c | 16 +- + include/linux/bcma/bcma.h | 2 +- + include/linux/bcma/bcma_driver_chipcommon.h | 5 + + include/linux/bcma/bcma_driver_mips.h | 3 + + include/linux/bcma/bcma_regs.h | 5 +- + include/linux/ieee80211.h | 47 +- + include/linux/ssb/ssb_driver_mips.h | 10 +- + include/net/bluetooth/a2mp.h | 24 +- + 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 +- + include/net/cfg80211.h | 14 + + include/net/mac80211.h | 101 +- + include/uapi/linux/nl80211.h | 48 + + net/bluetooth/Kconfig | 1 + + net/bluetooth/Makefile | 2 +- + net/bluetooth/a2mp.c | 459 +++- + 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 +- + net/mac80211/Kconfig | 2 +- + net/mac80211/Makefile | 1 + + net/mac80211/cfg.c | 284 +-- + net/mac80211/chan.c | 455 +++- + net/mac80211/debugfs.h | 6 +- + net/mac80211/debugfs_netdev.c | 10 +- + net/mac80211/driver-ops.h | 65 + + net/mac80211/ibss.c | 88 +- + net/mac80211/ieee80211_i.h | 171 +- + net/mac80211/iface.c | 44 +- + net/mac80211/main.c | 105 +- + net/mac80211/mesh.c | 43 +- + net/mac80211/mesh.h | 4 +- + net/mac80211/mesh_plink.c | 14 +- + net/mac80211/mesh_sync.c | 55 +- + net/mac80211/mlme.c | 219 +- + net/mac80211/offchannel.c | 9 +- + net/mac80211/pm.c | 2 + + net/mac80211/rate.h | 12 +- + net/mac80211/rx.c | 32 +- + net/mac80211/scan.c | 29 +- + net/mac80211/sta_info.c | 59 +- + net/mac80211/status.c | 15 +- + net/mac80211/trace.h | 112 + + net/mac80211/tx.c | 281 ++- + net/mac80211/util.c | 143 +- + net/mac80211/vht.c | 35 + + net/wireless/Makefile | 4 +- + net/wireless/ap.c | 3 +- + net/wireless/chan.c | 16 +- + net/wireless/core.c | 12 +- + net/wireless/core.h | 6 +- + net/wireless/ethtool.c | 15 +- + net/wireless/ibss.c | 9 +- + net/wireless/mesh.c | 11 +- + net/wireless/mlme.c | 92 +- + net/wireless/nl80211.c | 255 ++- + net/wireless/rdev-ops.h | 861 ++++++++ + net/wireless/scan.c | 138 +- + net/wireless/sme.c | 12 +- + net/wireless/sysfs.c | 5 +- + net/wireless/trace.c | 7 + + net/wireless/trace.h | 2286 ++++++++++++++++++++ + net/wireless/util.c | 14 +- + net/wireless/wext-compat.c | 48 +- + 135 files changed, 7480 insertions(+), 1613 deletions(-) + create mode 100644 include/net/bluetooth/amp.h + create mode 100644 net/bluetooth/amp.c + create mode 100644 net/mac80211/vht.c + create mode 100644 net/wireless/rdev-ops.h + create mode 100644 net/wireless/trace.c + create mode 100644 net/wireless/trace.h +Merging bluetooth/master (9917c85 brcm80211: remove some truely barftastic code) +$ git merge bluetooth/master +Already up-to-date. +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 (9dfb519 jffs2: Fix lock acquisition order bug in jffs2_write_begin) +$ 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/devices/spear_smi.c | 13 +- + drivers/mtd/nand/Kconfig | 26 ++- + drivers/mtd/nand/Makefile | 3 +- + drivers/mtd/nand/denali.c | 162 +++----------- + 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 | 102 ++++----- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 +- + drivers/mtd/nand/nomadik_nand.c | 235 -------------------- + drivers/mtd/onenand/onenand_base.c | 2 +- + drivers/mtd/tests/mtd_nandbiterrs.c | 73 +++--- + drivers/mtd/tests/mtd_nandecctest.c | 6 +- + drivers/mtd/tests/mtd_oobtest.c | 171 +++++++------- + drivers/mtd/tests/mtd_pagetest.c | 152 ++++++------- + drivers/mtd/tests/mtd_readtest.c | 42 ++-- + drivers/mtd/tests/mtd_speedtest.c | 88 ++++---- + drivers/mtd/tests/mtd_stresstest.c | 44 ++-- + drivers/mtd/tests/mtd_subpagetest.c | 124 +++++------ + drivers/mtd/tests/mtd_torturetest.c | 73 +++--- + fs/jffs2/file.c | 39 ++-- + include/linux/mtd/fsmc.h | 3 - + include/linux/mtd/mtd.h | 2 +- + include/linux/platform_data/mtd-nomadik-nand.h | 16 -- + 41 files changed, 1023 insertions(+), 1041 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 +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 (c902466 ALSA: usb-audio: Add quirk for Reloop Play) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/hda_intel.c +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/pcm.h | 3 + + include/sound/sb16_csp.h | 104 +-- + include/uapi/sound/Kbuild | 10 + + include/uapi/sound/asequencer.h | 614 +++++++++++++++++ + include/uapi/sound/asound.h | 960 +++++++++++++++++++++++++++ + 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/core/pcm_compat.c | 19 +- + sound/core/pcm_lib.c | 57 +- + sound/core/pcm_native.c | 2 + + sound/drivers/aloop.c | 36 +- + sound/drivers/dummy.c | 73 +- + sound/pci/Kconfig | 2 +- + sound/pci/hda/hda_codec.c | 92 ++- + sound/pci/hda/hda_codec.h | 3 + + sound/pci/hda/hda_intel.c | 119 +++- + sound/pci/hda/hda_jack.c | 24 + + sound/pci/hda/hda_jack.h | 2 + + sound/pci/hda/hda_local.h | 8 +- + sound/pci/hda/patch_cirrus.c | 5 +- + sound/pci/hda/patch_conexant.c | 44 ++ + sound/pci/hda/patch_hdmi.c | 7 +- + sound/pci/hda/patch_realtek.c | 7 +- + sound/pci/hda/patch_sigmatel.c | 7 +- + sound/pci/ice1712/Makefile | 2 +- + sound/pci/ice1712/amp.c | 1 - + sound/pci/ice1712/aureon.c | 4 +- + sound/pci/ice1712/delta.c | 1 - + sound/pci/ice1712/ews.c | 5 +- + sound/pci/ice1712/hoontech.c | 1 - + sound/pci/ice1712/ice1712.c | 9 +- + sound/pci/ice1712/ice1712.h | 12 +- + sound/pci/ice1712/ice1724.c | 19 +- + sound/pci/ice1712/juli.c | 4 +- + sound/pci/ice1712/maya44.c | 5 +- + sound/pci/ice1712/phase.c | 3 +- + sound/pci/ice1712/pontis.c | 1 - + sound/pci/ice1712/prodigy192.c | 5 +- + sound/pci/ice1712/prodigy_hifi.c | 1 - + sound/pci/ice1712/psc724.c | 464 +++++++++++++ + sound/pci/ice1712/psc724.h | 13 + + sound/pci/ice1712/quartet.c | 10 +- + sound/pci/ice1712/revo.c | 1 - + sound/pci/ice1712/se.c | 11 +- + sound/pci/ice1712/vt1720_mobo.c | 1 - + sound/pci/ice1712/wm8766.c | 361 ++++++++++ + sound/pci/ice1712/wm8766.h | 163 +++++ + sound/pci/ice1712/wm8776.c | 633 ++++++++++++++++++ + sound/pci/ice1712/wm8776.h | 226 +++++++ + sound/pci/ice1712/wtm.c | 1 - + sound/usb/pcm.c | 3 - + sound/usb/quirks-table.h | 75 +++ + 62 files changed, 4508 insertions(+), 2114 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%) + create mode 100644 sound/pci/ice1712/psc724.c + create mode 100644 sound/pci/ice1712/psc724.h + create mode 100644 sound/pci/ice1712/wm8766.c + create mode 100644 sound/pci/ice1712/wm8766.h + create mode 100644 sound/pci/ice1712/wm8776.c + create mode 100644 sound/pci/ice1712/wm8776.h +Merging sound-asoc/for-next (85b6d05 Merge remote-tracking branches 'asoc/topic/ak4104', 'asoc/topic/atmel', 'asoc/topic/cs4271', 'asoc/topic/da9055', 'asoc/topic/davinci', 'asoc/topic/fsi', 'asoc/topic/fsl', 'asoc/topic/jack', 'asoc/topic/samsung', 'asoc/topic/si476x', 'asoc/topic/wm2200', 'asoc/topic/wm8750', 'asoc/topic/wm8770', 'asoc/topic/wm8971' and 'asoc/topic/wm8994' into asoc-next) +$ 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-at91/at91sam9260_devices.c | 9 + + arch/arm/mach-at91/board-sam9g20ek.c | 17 + + arch/arm/mach-davinci/board-da850-evm.c | 24 +- + drivers/base/regmap/internal.h | 2 + + drivers/base/regmap/regmap-debugfs.c | 50 +- + drivers/base/regmap/regmap.c | 154 +++-- + drivers/misc/atmel-ssc.c | 65 +- + include/linux/mfd/wm8994/pdata.h | 5 + + include/linux/platform_data/davinci_asp.h | 3 + + include/linux/regmap.h | 6 +- + include/sound/cs4271.h | 1 + + sound/soc/atmel/sam9g20_wm8731.c | 51 +- + 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 | 43 +- + sound/soc/codecs/si476x.c | 255 ++++++++ + sound/soc/codecs/wm2200.c | 628 +++++++++++++++++++- + 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 | 93 ++- + sound/soc/davinci/davinci-mcasp.h | 2 +- + sound/soc/davinci/davinci-pcm.c | 53 +- + sound/soc/davinci/davinci-pcm.h | 2 + + sound/soc/fsl/Kconfig | 14 + + sound/soc/fsl/Makefile | 4 + + sound/soc/fsl/p1022_rdk.c | 392 ++++++++++++ + sound/soc/fsl/pcm030-audio-fabric.c | 4 +- + sound/soc/samsung/ac97.c | 6 +- + sound/soc/samsung/bells.c | 222 +++++-- + sound/soc/samsung/i2s.c | 8 +- + sound/soc/samsung/pcm.c | 12 +- + sound/soc/samsung/spdif.c | 12 +- + sound/soc/sh/fsi.c | 25 +- + sound/soc/soc-jack.c | 3 - + 43 files changed, 2336 insertions(+), 522 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 + create mode 100644 sound/soc/fsl/p1022_rdk.c +Merging modules/modules-next (7460bf4 powerpc: add finit_module syscall.) +$ git merge modules/modules-next +Resolved 'kernel/module.c' using previous resolution. +Auto-merging kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 682a2f6] Merge remote-tracking branch 'modules/modules-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/ima_policy | 3 +- + arch/arm/include/uapi/asm/unistd.h | 1 + + arch/arm/kernel/calls.S | 1 + + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/include/uapi/asm/unistd.h | 1 + + arch/x86/syscalls/syscall_32.tbl | 1 + + arch/x86/syscalls/syscall_64.tbl | 1 + + include/linux/ima.h | 6 + + include/linux/security.h | 13 ++ + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/unistd.h | 4 +- + kernel/module.c | 373 +++++++++++++++++++------------- + kernel/sys_ni.c | 1 + + security/capability.c | 6 + + security/integrity/ima/ima.h | 2 +- + security/integrity/ima/ima_api.c | 4 +- + security/integrity/ima/ima_main.c | 21 ++ + security/integrity/ima/ima_policy.c | 3 + + security/security.c | 10 + + 20 files changed, 304 insertions(+), 151 deletions(-) +Merging virtio/virtio-next (3905d29 virtio: tools: make it clear that virtqueue_add_buf() no longer returns > 0) +$ git merge virtio/virtio-next +Merge made by the 'recursive' strategy. + drivers/char/virtio_console.c | 10 ++--- + drivers/lguest/core.c | 2 +- + drivers/net/virtio_net.c | 46 +++++++++------------ + drivers/rpmsg/virtio_rpmsg_bus.c | 6 +-- + drivers/scsi/virtio_scsi.c | 24 ++++++----- + drivers/virtio/virtio_mmio.c | 4 +- + drivers/virtio/virtio_pci.c | 20 ++------- + drivers/virtio/virtio_ring.c | 46 +++++++++------------ + include/linux/virtio.h | 10 ++++- + include/linux/virtio_scsi.h | 28 ++++++++++++- + mm/highmem.c | 1 + + net/9p/trans_virtio.c | 3 +- + tools/lguest/lguest.c | 84 ++++++++++++++++---------------------- + tools/virtio/virtio_test.c | 4 +- + 14 files changed, 138 insertions(+), 150 deletions(-) +Merging input/next (e4b2900 Input: serio - add ARC PS/2 driver) +$ git merge input/next +Auto-merging drivers/input/touchscreen/wm831x-ts.c +Auto-merging drivers/input/touchscreen/edt-ft5x06.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/serio/Kconfig | 9 + + drivers/input/serio/Makefile | 1 + + drivers/input/serio/arc_ps2.c | 279 ++++++++++++++++++++ + drivers/input/serio/i8042-io.h | 2 +- + drivers/input/touchscreen/cy8ctmg110_ts.c | 13 +- + drivers/input/touchscreen/edt-ft5x06.c | 10 +- + drivers/input/touchscreen/mms114.c | 62 ++++- + drivers/input/touchscreen/wm831x-ts.c | 6 +- + 11 files changed, 416 insertions(+), 24 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt + create mode 100644 drivers/input/serio/arc_ps2.c +Merging input-mt/for-next (6f0c058 Linux 3.7-rc2) +$ git merge input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (5a9423c Merge branch 'for-3.8' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + include/linux/cgroup.h | 1 - + include/linux/freezer.h | 50 +++++++++-- + kernel/cgroup.c | 101 +++++++++-------------- + kernel/cgroup_freezer.c | 210 +++++++++++++++++------------------------------ + kernel/fork.c | 9 +- + 5 files changed, 156 insertions(+), 215 deletions(-) +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 a6aa338] 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 (ec8e1ca mmc: dw_mmc: use helper macro module_platform_driver()) +$ git merge mmc/mmc-next +Merge made by the 'recursive' strategy. + drivers/mmc/card/queue.c | 17 +- + drivers/mmc/host/Kconfig | 7 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/dw_mmc-pci.c | 2 +- + drivers/mmc/host/dw_mmc-pltfm.c | 16 +- + drivers/mmc/host/dw_mmc.c | 2 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 1332 +++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/sdhci-s3c.c | 28 +- + include/linux/mmc/dw_mmc.h | 2 +- + 9 files changed, 1370 insertions(+), 37 deletions(-) + 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 (837d678 slub: remove one code path and reduce lock contention in __slab_free()) +$ git merge slab/for-next +Merge made by the 'recursive' strategy. + mm/slub.c | 34 ++++++++++++++-------------------- + 1 file changed, 14 insertions(+), 20 deletions(-) +Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (8814c65 md/raid5: add blktrace calls) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + block/blk-core.c | 1 + + drivers/md/faulty.c | 5 +- + 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 ++++++++++++ + 11 files changed, 617 insertions(+), 170 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 (229d1a2 Merge remote-tracking branches 'regulator/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexpress' into regulator-next) +$ git merge regulator/for-next +Removing include/linux/regulator/tps65090-regulator.h +Merge made by the 'recursive' strategy. + .../bindings/regulator/gpio-regulator.txt | 36 +++ + .../devicetree/bindings/regulator/vexpress.txt | 32 ++ + drivers/regulator/Kconfig | 18 ++ + drivers/regulator/Makefile | 2 + + drivers/regulator/core.c | 5 + + drivers/regulator/gpio-regulator.c | 94 ++++++ + drivers/regulator/lp8788-ldo.c | 2 +- + drivers/regulator/max77686.c | 164 +++++++++- + drivers/regulator/tps51632-regulator.c | 332 ++++++++++++++++++++ + drivers/regulator/tps65090-regulator.c | 247 +++++++++++---- + drivers/regulator/vexpress.c | 147 +++++++++ + include/linux/mfd/tps65090.h | 35 +++ + include/linux/regulator/driver.h | 3 + + include/linux/regulator/tps51632-regulator.h | 47 +++ + include/linux/regulator/tps65090-regulator.h | 50 --- + 15 files changed, 1091 insertions(+), 123 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt + 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 + delete mode 100644 include/linux/regulator/tps65090-regulator.h +Merging security/next (61d335d Merge branch 'security-next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/security-keys into next-queue) +$ git merge security/next +Resolved 'fs/cifs/cifsacl.c' using previous resolution. +Resolved 'net/dns_resolver/dns_key.c' using previous resolution. +Resolved 'security/keys/keyctl.c' using previous resolution. +Resolved 'security/keys/keyring.c' using previous resolution. +Resolved 'security/keys/process_keys.c' using previous resolution. +Auto-merging security/keys/request_key.c +Auto-merging security/keys/process_keys.c +CONFLICT (content): Merge conflict in security/keys/process_keys.c +Auto-merging security/keys/keyring.c +CONFLICT (content): Merge conflict in security/keys/keyring.c +Auto-merging security/keys/keyctl.c +CONFLICT (content): Merge conflict in security/keys/keyctl.c +Auto-merging security/keys/key.c +Auto-merging net/dns_resolver/dns_key.c +CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c +Auto-merging kernel/cred.c +Auto-merging include/linux/key.h +Auto-merging fs/nfs/idmap.c +Auto-merging fs/cifs/cifsacl.c +CONFLICT (content): Merge conflict in fs/cifs/cifsacl.c +Auto-merging arch/x86/kernel/vsyscall_64.c +Auto-merging Documentation/security/keys.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dc438ad] Merge remote-tracking branch 'security/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/prctl/seccomp_filter.txt | 74 +++++++++++++++++-- + Documentation/security/keys.txt | 17 +++++ + arch/x86/kernel/vsyscall_64.c | 110 ++++++++++++++------------- + fs/cifs/cifsacl.c | 12 +-- + fs/nfs/idmap.c | 12 +-- + include/linux/cred.h | 17 +---- + include/linux/key.h | 1 + + kernel/cred.c | 127 ++++---------------------------- + kernel/seccomp.c | 13 +++- + net/dns_resolver/dns_key.c | 9 +-- + security/keys/key.c | 6 +- + security/keys/keyctl.c | 15 ++-- + security/keys/keyring.c | 10 +-- + security/keys/process_keys.c | 94 ++++++++++------------- + security/keys/request_key.c | 21 ++++-- + 15 files changed, 252 insertions(+), 286 deletions(-) +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 (b6755ff osduld: Add osdname & systemid sysfs at scsi_osd class) +$ git merge osd/linux-next +Merge made by the 'recursive' strategy. + drivers/scsi/osd/osd_uld.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) +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 (db83101 iscsi: fix check keys) +$ git merge trivial/for-next +Auto-merging mm/util.c +Auto-merging drivers/target/iscsi/iscsi_target_parameters.c +Auto-merging drivers/char/ppdev.c +Merge made by the 'recursive' strategy. + drivers/char/ppdev.c | 6 +----- + drivers/target/iscsi/iscsi_target_parameters.c | 1 + + mm/util.c | 2 +- + 3 files changed, 3 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 (13f5e2d Merge branch 'acpi-next' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 15 +- + Documentation/ABI/testing/sysfs-devices-power | 31 ++ + Documentation/power/pm_qos_interface.txt | 2 +- + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/pci/acpi.c | 10 + + drivers/acpi/acpi_pad.c | 8 +- + drivers/acpi/container.c | 17 +- + drivers/acpi/dock.c | 26 +- + drivers/acpi/ec.c | 97 ++--- + drivers/acpi/glue.c | 1 + + drivers/acpi/internal.h | 4 +- + drivers/acpi/osl.c | 7 +- + drivers/acpi/processor_driver.c | 14 + + drivers/acpi/scan.c | 11 +- + drivers/acpi/sleep.c | 91 +++-- + drivers/base/power/clock_ops.c | 6 +- + drivers/base/power/domain.c | 16 +- + drivers/base/power/opp.c | 28 +- + drivers/base/power/power.h | 6 +- + drivers/base/power/qos.c | 291 +++++++++++--- + drivers/base/power/sysfs.c | 95 ++++- + drivers/cpufreq/Makefile | 4 +- + drivers/cpufreq/cpufreq.c | 10 +- + drivers/cpufreq/cpufreq_conservative.c | 34 -- + drivers/cpufreq/cpufreq_governor.c | 52 +++ + drivers/cpufreq/cpufreq_ondemand.c | 34 -- + drivers/cpufreq/cpufreq_performance.c | 2 + + drivers/cpufreq/cpufreq_powersave.c | 2 + + drivers/cpufreq/cpufreq_stats.c | 1 + + drivers/cpufreq/cpufreq_userspace.c | 2 + + drivers/cpufreq/freq_table.c | 2 + + drivers/cpufreq/powernow-k8.c | 9 +- + drivers/cpuidle/cpuidle.c | 16 +- + drivers/cpuidle/cpuidle.h | 6 +- + drivers/cpuidle/governors/menu.c | 166 ++++++-- + drivers/cpuidle/sysfs.c | 19 +- + drivers/devfreq/devfreq.c | 513 ++++++++++++------------- + drivers/devfreq/governor.h | 13 + + drivers/devfreq/governor_performance.c | 16 +- + drivers/devfreq/governor_powersave.c | 16 +- + drivers/devfreq/governor_simpleondemand.c | 33 ++ + drivers/devfreq/governor_userspace.c | 23 +- + drivers/mtd/nand/sh_flctl.c | 4 +- + drivers/pci/pci-acpi.c | 8 +- + include/acpi/acpi_bus.h | 11 +- + include/linux/acpi.h | 6 +- + include/linux/cpufreq.h | 7 + + include/linux/devfreq.h | 49 +-- + include/linux/pm.h | 3 +- + include/linux/pm_qos.h | 77 +++- + include/linux/tick.h | 6 + + kernel/cpu.c | 8 +- + kernel/power/main.c | 2 +- + kernel/power/qos.c | 65 +++- + kernel/power/swap.c | 2 +- + kernel/time/tick-sched.c | 4 + + 56 files changed, 1344 insertions(+), 659 deletions(-) + create mode 100644 drivers/cpufreq/cpufreq_governor.c +Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) +$ git merge apm/for-next +Already up-to-date. +Merging fsnotify/for-next (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 8265867] 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 (20fe26b MCE, AMD: Dump error status) +$ git merge edac-amd/for-next +Auto-merging include/linux/edac.h +Auto-merging drivers/edac/edac_mc.c +Auto-merging drivers/edac/Kconfig +Merge made by the 'recursive' strategy. + drivers/edac/Kconfig | 8 +- + drivers/edac/amd64_edac.c | 297 ++++++++++++++++------------------------- + drivers/edac/amd64_edac.h | 59 ++++++-- + drivers/edac/amd64_edac_inj.c | 128 +++++++++--------- + drivers/edac/edac_mc.c | 57 ++++---- + drivers/edac/edac_mc_sysfs.c | 14 +- + drivers/edac/edac_module.c | 27 +++- + drivers/edac/edac_pci.c | 3 +- + drivers/edac/mce_amd.c | 254 +++++++++++++++++++---------------- + drivers/edac/mce_amd.h | 11 +- + include/linux/edac.h | 3 + + 11 files changed, 439 insertions(+), 422 deletions(-) +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 (205a8eb dtc: fix for_each_*() to skip first object if deleted) +$ 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 (32111ab Merge tag 'spi-linus' into spi-next) +$ git merge spi-mb/spi-next +Auto-merging drivers/spi/spi-s3c64xx.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/omap-spi.txt | 4 +- + drivers/spi/spi-mxs.c | 3 +- + drivers/spi/spi-omap2-mcspi.c | 25 ++++++--- + drivers/spi/spi-pl022.c | 55 ++++++++++++------- + drivers/spi/spi-rspi.c | 56 ++++++++++++-------- + drivers/spi/spi-s3c64xx.c | 32 +++++------ + include/linux/platform_data/spi-omap2-mcspi.h | 4 ++ + include/linux/spi/tsc2005.h | 2 - + 8 files changed, 113 insertions(+), 68 deletions(-) +Merging tip/auto-latest (ec187e5 Merge branch 'numa/core') +$ git merge tip/auto-latest +Auto-merging kernel/time/tick-sched.c +Auto-merging include/linux/acpi.h +Auto-merging drivers/acpi/osl.c +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 1 + + Documentation/00-INDEX | 4 +- + Documentation/acpi/initrd_table_override.txt | 94 ++ + Documentation/scheduler/numa-problem.txt | 230 +++ + MAINTAINERS | 8 + + arch/mips/include/asm/pgtable.h | 2 + + arch/s390/include/asm/pgtable.h | 13 + + 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/perf_event_intel_uncore.c | 3 + + arch/x86/kernel/setup.c | 4 + + arch/x86/kernel/signal.c | 4 +- + arch/x86/kernel/uprobes.c | 16 +- + arch/x86/mm/gup.c | 23 +- + arch/x86/mm/pgtable.c | 17 +- + arch/x86/oprofile/nmi_int.c | 2 +- + 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 | 11 +- + include/linux/migrate.h | 7 + + include/linux/migrate_mode.h | 3 + + include/linux/mm.h | 122 +- + include/linux/mm_types.h | 10 + + include/linux/mmzone.h | 15 +- + include/linux/page-flags-layout.h | 83 ++ + include/linux/sched.h | 43 +- + include/linux/uprobes.h | 11 - + include/uapi/linux/mempolicy.h | 17 +- + init/Kconfig | 14 + + kernel/events/uprobes.c | 345 +++-- + kernel/sched/core.c | 77 +- + kernel/sched/debug.c | 3 + + kernel/sched/fair.c | 568 +++++++- + kernel/sched/features.h | 19 + + kernel/sched/sched.h | 36 + + kernel/sysctl.c | 34 +- + kernel/time/tick-sched.c | 111 +- + kernel/trace/ring_buffer.c | 4 + + lib/Makefile | 2 +- + lib/earlycpio.c | 145 ++ + mm/huge_memory.c | 254 +++- + mm/memory.c | 132 +- + mm/mempolicy.c | 273 +++- + mm/migrate.c | 87 +- + 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 | 149 ++ + 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 | 41 + + 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 | 56 + + tools/kvm/powerpc/kvm-cpu.c | 290 ++++ + tools/kvm/powerpc/kvm.c | 529 +++++++ + tools/kvm/powerpc/spapr.h | 93 ++ + tools/kvm/powerpc/spapr_hcall.c | 134 ++ + tools/kvm/powerpc/spapr_hvcons.c | 108 ++ + tools/kvm/powerpc/spapr_hvcons.h | 19 + + tools/kvm/powerpc/spapr_pci.c | 423 ++++++ + tools/kvm/powerpc/spapr_pci.h | 57 + + tools/kvm/powerpc/spapr_rtas.c | 233 +++ + tools/kvm/powerpc/xics.c | 522 +++++++ + tools/kvm/powerpc/xics.h | 18 + + tools/kvm/symbol.c | 133 ++ + tools/kvm/term.c | 171 +++ + tools/kvm/tests/Makefile | 19 + + tools/kvm/tests/boot/Makefile | 13 + + tools/kvm/tests/boot/init.c | 11 + + tools/kvm/tests/kernel/.gitignore | 2 + + tools/kvm/tests/kernel/Makefile | 20 + + tools/kvm/tests/kernel/README | 16 + + tools/kvm/tests/kernel/kernel.S | 8 + + tools/kvm/tests/pit/.gitignore | 2 + + tools/kvm/tests/pit/Makefile | 20 + + tools/kvm/tests/pit/README | 16 + + tools/kvm/tests/pit/tick.S | 101 ++ + tools/kvm/ui/sdl.c | 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 | 118 ++ + 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 | 1432 ++++++++++++++++++ + 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 + + 311 files changed, 29345 insertions(+), 862 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 +Merging rcu/rcu/next (1a0ec9c Merge branch 'tracing.2012.10.23c' into dev.3.8.2012.10.23d) +$ git merge rcu/rcu/next +Auto-merging kernel/sched/core.c +Auto-merging kernel/cpu.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Merge made by the 'recursive' strategy. + Documentation/RCU/RTFP.txt | 2 +- + Documentation/RCU/checklist.txt | 17 +- + Documentation/RCU/listRCU.txt | 2 +- + Documentation/RCU/whatisRCU.txt | 17 +- + Documentation/memory-barriers.txt | 9 +- + arch/um/drivers/mconsole_kern.c | 2 +- + include/linux/rculist.h | 17 -- + include/linux/rcupdate.h | 22 +++ + include/linux/sched.h | 10 +- + include/linux/srcu.h | 34 ++++ + init/Kconfig | 15 +- + kernel/cpu.c | 9 +- + kernel/ksysfs.c | 18 +++ + kernel/rcu.h | 9 ++ + kernel/rcupdate.c | 54 +++++++ + kernel/rcutiny.c | 6 +- + kernel/rcutiny_plugin.h | 61 ++++++- + kernel/rcutorture.c | 54 +++---- + kernel/rcutree.c | 253 ++++++++++++++++++----------- + kernel/rcutree.h | 24 +-- + kernel/rcutree_plugin.h | 18 ++- + kernel/rcutree_trace.c | 322 ++++++++++++++++++------------------- + kernel/sched/core.c | 8 +- + kernel/srcu.c | 16 +- + lib/Kconfig.debug | 2 +- + 25 files changed, 632 insertions(+), 369 deletions(-) +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 bcc3bdc] 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 -A . +$ git commit -v -a --amend +[master 925e227] 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 +Already up-to-date. +Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes) +$ git merge xen/upstream/xen +Already up-to-date. +Merging xen-two/linux-next (ad50261 Merge branch 'stable/for-linus-3.7' into linux-next) +$ git merge xen-two/linux-next +Auto-merging drivers/xen/xenbus/xenbus_xs.c +Auto-merging drivers/xen/sys-hypervisor.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/xen/interface.h | 12 +++++-- + arch/arm/include/asm/xen/page.h | 13 ++++++-- + arch/arm/xen/grant-table.c | 2 +- + arch/x86/include/asm/xen/interface.h | 4 +-- + arch/x86/kernel/entry_32.S | 8 +++-- + arch/x86/kernel/entry_64.S | 2 +- + arch/x86/xen/enlighten.c | 2 -- + drivers/net/xen-netback/netback.c | 11 ++++-- + drivers/xen/balloon.c | 3 +- + drivers/xen/dbgp.c | 2 ++ + drivers/xen/events.c | 4 +++ + drivers/xen/grant-table.c | 61 +++------------------------------- + drivers/xen/sys-hypervisor.c | 3 +- + drivers/xen/xen-pciback/vpci.c | 14 +++++--- + drivers/xen/xenbus/xenbus_client.c | 6 ++-- + drivers/xen/xenbus/xenbus_xs.c | 2 ++ + include/xen/grant_table.h | 14 +------- + include/xen/interface/grant_table.h | 2 +- + include/xen/interface/memory.h | 24 ++----------- + 19 files changed, 69 insertions(+), 120 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 (cb11771 workqueue: trivial fix for return statement in work_busy()) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug()) +$ git merge drivers-x86/linux-next +Auto-merging drivers/platform/x86/asus-wmi.c +Merge made by the 'recursive' strategy. + drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 76 insertions(+) +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (97f99c4 Merge tag 'regmap-fix-mmio' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 4 +-- + drivers/base/regmap/regmap-irq.c | 19 +++++++++++ + drivers/base/regmap/regmap.c | 67 ++++++++++++++++++++++---------------- + include/linux/regmap.h | 18 +++++++++- + 4 files changed, 76 insertions(+), 32 deletions(-) +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 (6f0c058 Linux 3.7-rc2) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (ecbbfd4 TTY: move tty buffers to tty_port) +$ git merge tty/tty-next +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_ldisc.c | 7 +- + drivers/tty/n_tty.c | 752 ++++++++++++++++++++++------------------- + drivers/tty/pty.c | 30 +- + drivers/tty/tty_audit.c | 15 +- + drivers/tty/tty_buffer.c | 227 +++++++------ + drivers/tty/tty_io.c | 15 +- + drivers/tty/tty_ldisc.c | 15 +- + drivers/tty/tty_port.c | 2 + + drivers/tty/vt/selection.c | 9 +- + fs/devpts/inode.c | 61 ++-- + include/linux/devpts_fs.h | 20 +- + include/linux/tty.h | 44 +-- + include/linux/tty_flip.h | 2 +- + kernel/printk.c | 9 + + 14 files changed, 645 insertions(+), 563 deletions(-) +$ git am -3 ../patches/0001-staging-disable-dgrp-driver-since-it-is-broken-by-tt.patch +Applying: staging: disable dgrp driver since it is broken by tty changes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/dgrp/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 047fc0b] Merge remote-tracking branch 'tty/tty-next' +Merging usb/usb-next (068b054 USB: OHCI: sm501: fix build failure after ohci_finish_controller_resume removal) +$ git merge usb/usb-next +Removing drivers/usb/host/ohci-xls.c +Removing drivers/usb/host/ohci-sh.c +Removing drivers/usb/host/ohci-ppc-soc.c +Removing drivers/usb/host/ohci-pnx8550.c +Removing drivers/usb/host/ohci-cns3xxx.c +Removing drivers/usb/host/ohci-au1xxx.c +Removing drivers/usb/host/ehci-xls.c +Removing drivers/usb/host/ehci-ls1x.c +Removing drivers/usb/host/ehci-ixp4xx.c +Removing drivers/usb/host/ehci-cns3xxx.c +Removing drivers/usb/host/ehci-au1xxx.c +Merge made by the 'recursive' strategy. + Documentation/usb/error-codes.txt | 5 +- + arch/arm/mach-cns3xxx/cns3420vb.c | 54 ++++- + arch/mips/alchemy/common/Makefile | 2 +- + arch/mips/alchemy/common/platform.c | 58 ++++- + .../mips/alchemy/common/usb.c | 0 + arch/mips/configs/db1000_defconfig | 1 + + arch/mips/configs/db1235_defconfig | 2 + + arch/mips/configs/gpr_defconfig | 1 + + arch/mips/configs/ls1b_defconfig | 1 + + arch/mips/configs/mtx1_defconfig | 1 + + arch/mips/loongson1/common/platform.c | 8 +- + arch/mips/netlogic/xlr/platform.c | 17 +- + arch/mips/pnx8550/common/platform.c | 31 ++- + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 6 +- + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 6 +- + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 6 +- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 6 +- + drivers/usb/core/urb.c | 22 +- + drivers/usb/host/Kconfig | 28 +-- + drivers/usb/host/Makefile | 1 - + drivers/usb/host/ehci-au1xxx.c | 184 --------------- + drivers/usb/host/ehci-cns3xxx.c | 155 ------------- + drivers/usb/host/ehci-hcd.c | 27 +-- + drivers/usb/host/ehci-ixp4xx.c | 139 ----------- + drivers/usb/host/ehci-ls1x.c | 147 ------------ + drivers/usb/host/ehci-pci.c | 1 - + drivers/usb/host/ehci-platform.c | 24 +- + drivers/usb/host/ehci-sched.c | 109 +++++---- + drivers/usb/host/ehci-xls.c | 142 ------------ + drivers/usb/host/ehci.h | 3 +- + drivers/usb/host/ohci-at91.c | 2 +- + drivers/usb/host/ohci-au1xxx.c | 234 ------------------- + drivers/usb/host/ohci-cns3xxx.c | 166 ------------- + drivers/usb/host/ohci-ep93xx.c | 2 +- + drivers/usb/host/ohci-exynos.c | 5 +- + drivers/usb/host/ohci-hcd.c | 139 ++++++++--- + drivers/usb/host/ohci-hub.c | 42 ---- + drivers/usb/host/ohci-omap.c | 2 +- + drivers/usb/host/ohci-pci.c | 47 +--- + drivers/usb/host/ohci-platform.c | 28 +-- + drivers/usb/host/ohci-pnx8550.c | 243 -------------------- + drivers/usb/host/ohci-ppc-soc.c | 216 ----------------- + drivers/usb/host/ohci-pxa27x.c | 2 +- + drivers/usb/host/ohci-q.c | 4 +- + drivers/usb/host/ohci-s3c2410.c | 3 +- + drivers/usb/host/ohci-sh.c | 141 ------------ + drivers/usb/host/ohci-sm501.c | 2 +- + drivers/usb/host/ohci-spear.c | 2 +- + drivers/usb/host/ohci-tmio.c | 2 +- + drivers/usb/host/ohci-xls.c | 152 ------------ + drivers/usb/host/uhci-q.c | 73 +++--- + drivers/usb/wusbcore/devconnect.c | 13 -- + include/linux/usb.h | 27 ++- + include/linux/usb/ehci_pdriver.h | 3 + + include/linux/usb/ohci_pdriver.h | 2 + + 55 files changed, 474 insertions(+), 2265 deletions(-) + rename drivers/usb/host/alchemy-common.c => arch/mips/alchemy/common/usb.c (100%) + delete mode 100644 drivers/usb/host/ehci-au1xxx.c + delete mode 100644 drivers/usb/host/ehci-cns3xxx.c + delete mode 100644 drivers/usb/host/ehci-ixp4xx.c + delete mode 100644 drivers/usb/host/ehci-ls1x.c + delete mode 100644 drivers/usb/host/ehci-xls.c + delete mode 100644 drivers/usb/host/ohci-au1xxx.c + delete mode 100644 drivers/usb/host/ohci-cns3xxx.c + delete mode 100644 drivers/usb/host/ohci-pnx8550.c + delete mode 100644 drivers/usb/host/ohci-ppc-soc.c + delete mode 100644 drivers/usb/host/ohci-sh.c + delete mode 100644 drivers/usb/host/ohci-xls.c +Merging staging/staging-next (40991e4 staging: slicoss: remove ASSERT macro altogether) +$ git merge staging/staging-next +Auto-merging drivers/staging/omapdrm/omap_gem.c +Auto-merging drivers/staging/ipack/carriers/tpci200.h +Auto-merging drivers/staging/ipack/carriers/tpci200.c +Removing drivers/staging/ipack/bridges/Kconfig +Auto-merging drivers/staging/iio/imu/adis16400_core.c +Auto-merging drivers/staging/iio/gyro/adis16260_core.c +Auto-merging drivers/staging/iio/accel/adis16240_core.c +Auto-merging drivers/staging/iio/accel/adis16220_core.c +Auto-merging drivers/staging/iio/accel/adis16209_core.c +Auto-merging drivers/staging/iio/accel/adis16204_core.c +Auto-merging drivers/staging/iio/accel/adis16203_core.c +Auto-merging drivers/staging/iio/accel/adis16201_core.c +Auto-merging drivers/staging/comedi/drivers/ni_labpc.c +Removing drivers/staging/comedi/drivers/mpc8260cpm.c +Auto-merging drivers/staging/comedi/drivers/das08.c +Auto-merging drivers/staging/comedi/drivers/amplc_pc236.c +Auto-merging drivers/staging/comedi/drivers/amplc_dio200.c +Auto-merging drivers/staging/comedi/drivers/8255_pci.c +Auto-merging drivers/staging/android/binder.c +Merge made by the 'recursive' strategy. + drivers/iio/accel/Kconfig | 2 +- + drivers/iio/adc/at91_adc.c | 21 +- + drivers/iio/dac/Kconfig | 10 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad5449.c | 375 +++++++++ + drivers/iio/dac/ad5686.c | 2 +- + drivers/iio/industrialio-buffer.c | 6 +- + drivers/iio/industrialio-core.c | 5 + + drivers/iio/industrialio-event.c | 4 +- + drivers/iio/inkern.c | 5 +- + drivers/staging/android/Makefile | 2 + + drivers/staging/android/binder.c | 95 ++- + drivers/staging/android/binder_trace.h | 327 ++++++++ + drivers/staging/bcm/CmHost.c | 30 +- + drivers/staging/bcm/InterfaceMisc.c | 114 ++- + drivers/staging/bcm/Misc.c | 222 ++--- + drivers/staging/bcm/Prototypes.h | 8 +- + drivers/staging/ccg/ccg.c | 8 +- + drivers/staging/ced1401/ced_ioc.c | 2 +- + drivers/staging/ced1401/usb1401.c | 29 +- + drivers/staging/comedi/comedidev.h | 3 +- + drivers/staging/comedi/drivers.c | 1 + + drivers/staging/comedi/drivers/8255_pci.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_82x54.c | 8 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 7 + + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 4 + + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 42 + + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 5 +- + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 9 +- + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 + + .../comedi/drivers/addi-data/APCI1710_Tor.c | 5 +- + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 4 + + .../staging/comedi/drivers/addi-data/addi_common.c | 14 +- + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1 + + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 + + .../comedi/drivers/addi-data/hwdrv_apci035.c | 14 + + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 11 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 19 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 17 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 16 + + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 4 + + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 12 + + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 14 + + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 19 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 37 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 28 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 18 + + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 16 + + drivers/staging/comedi/drivers/adl_pci6208.c | 2 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 12 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 6 +- + drivers/staging/comedi/drivers/adq12b.c | 38 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 2 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 2 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 19 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 18 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 20 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 16 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 16 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 7 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 877 +++++++++++--------- + drivers/staging/comedi/drivers/cb_pcimdas.c | 94 +-- + drivers/staging/comedi/drivers/comedi_parport.c | 2 +- + drivers/staging/comedi/drivers/comedi_test.c | 2 +- + drivers/staging/comedi/drivers/daqboard2000.c | 4 +- + drivers/staging/comedi/drivers/das08.c | 12 +- + drivers/staging/comedi/drivers/das08_cs.c | 6 +- + drivers/staging/comedi/drivers/das16.c | 21 +- + drivers/staging/comedi/drivers/das16m1.c | 47 +- + drivers/staging/comedi/drivers/das1800.c | 30 +- + drivers/staging/comedi/drivers/das6402.c | 14 +- + drivers/staging/comedi/drivers/das800.c | 20 +- + drivers/staging/comedi/drivers/dmm32at.c | 27 +- + drivers/staging/comedi/drivers/dt2801.c | 12 +- + drivers/staging/comedi/drivers/dt2811.c | 11 +- + drivers/staging/comedi/drivers/dt2814.c | 10 +- + drivers/staging/comedi/drivers/dt2815.c | 11 +- + drivers/staging/comedi/drivers/dt282x.c | 31 +- + drivers/staging/comedi/drivers/dt3000.c | 23 +- + drivers/staging/comedi/drivers/dt9812.c | 29 +- + drivers/staging/comedi/drivers/fl512.c | 12 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 345 ++++---- + drivers/staging/comedi/drivers/icp_multi.c | 2 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 49 +- + drivers/staging/comedi/drivers/jr3_pci.c | 39 +- + drivers/staging/comedi/drivers/jr3_pci.h | 12 +- + drivers/staging/comedi/drivers/ke_counter.c | 44 +- + drivers/staging/comedi/drivers/me_daq.c | 41 +- + drivers/staging/comedi/drivers/mpc624.c | 12 +- + drivers/staging/comedi/drivers/mpc8260cpm.c | 164 ---- + drivers/staging/comedi/drivers/multiq3.c | 9 +- + drivers/staging/comedi/drivers/ni_6527.c | 21 +- + drivers/staging/comedi/drivers/ni_65xx.c | 120 +-- + drivers/staging/comedi/drivers/ni_660x.c | 164 ++-- + drivers/staging/comedi/drivers/ni_670x.c | 3 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 22 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 15 +- + drivers/staging/comedi/drivers/ni_atmio.c | 11 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 13 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 16 +- + drivers/staging/comedi/drivers/ni_labpc.c | 48 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 9 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 147 +++- + drivers/staging/comedi/drivers/ni_mio_cs.c | 9 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 32 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 47 +- + drivers/staging/comedi/drivers/pcl711.c | 13 +- + drivers/staging/comedi/drivers/pcl726.c | 12 +- + drivers/staging/comedi/drivers/pcl812.c | 27 +- + drivers/staging/comedi/drivers/pcl816.c | 21 +- + drivers/staging/comedi/drivers/pcl818.c | 32 +- + drivers/staging/comedi/drivers/pcm3724.c | 46 +- + drivers/staging/comedi/drivers/pcmad.c | 8 +- + drivers/staging/comedi/drivers/pcmda12.c | 36 +- + drivers/staging/comedi/drivers/pcmmio.c | 126 +-- + drivers/staging/comedi/drivers/pcmuio.c | 27 +- + drivers/staging/comedi/drivers/poc.c | 17 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 34 +- + drivers/staging/comedi/drivers/rtd520.c | 34 +- + drivers/staging/comedi/drivers/rti800.c | 11 +- + drivers/staging/comedi/drivers/rti802.c | 11 +- + drivers/staging/comedi/drivers/s626.c | 40 +- + drivers/staging/comedi/drivers/serial2002.c | 40 +- + drivers/staging/comedi/drivers/skel.c | 20 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 26 +- + drivers/staging/comedi/drivers/usbdux.c | 10 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 5 +- + drivers/staging/crystalhd/crystalhd_cmds.c | 4 +- + drivers/staging/csr/csr_framework_ext.c | 1 - + drivers/staging/csr/csr_framework_ext_types.h | 33 +- + drivers/staging/csr/csr_log_configure.h | 100 +-- + drivers/staging/csr/csr_time.c | 1 - + drivers/staging/csr/csr_time.h | 71 +- + drivers/staging/csr/csr_wifi_hip_signals.h | 8 +- + drivers/staging/csr/csr_wifi_router_ctrl_sef.c | 67 +- + .../csr/csr_wifi_router_free_upstream_contents.c | 46 +- + drivers/staging/csr/csr_wifi_sme_sef.h | 204 +++-- + drivers/staging/csr/csr_wifi_sme_serialize.h | 328 ++++---- + drivers/staging/csr/csr_wifi_sme_task.h | 8 +- + drivers/staging/csr/data_tx.c | 45 +- + drivers/staging/csr/io.c | 1 - + drivers/staging/csr/monitor.c | 1 - + drivers/staging/csr/netdev.c | 1 - + drivers/staging/csr/sdio_mmc.c | 1 - + drivers/staging/csr/sme_native.c | 1 - + drivers/staging/csr/sme_sys.c | 1 - + drivers/staging/csr/sme_userspace.h | 2 +- + drivers/staging/csr/ul_int.c | 1 - + drivers/staging/csr/unifi_pdu_processing.c | 1 - + drivers/staging/csr/unifi_priv.h | 1 - + drivers/staging/csr/unifi_wext.h | 1 - + drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +- + drivers/staging/dgrp/dgrp_net_ops.c | 3 + + drivers/staging/dgrp/dgrp_sysfs.c | 3 +- + drivers/staging/et131x/et131x.c | 257 ++---- + drivers/staging/gdm72xx/gdm_wimax.c | 5 +- + drivers/staging/gdm72xx/sdio_boot.c | 81 +- + drivers/staging/iio/accel/adis16201_core.c | 4 +- + drivers/staging/iio/accel/adis16203_core.c | 2 - + drivers/staging/iio/accel/adis16204_core.c | 4 +- + drivers/staging/iio/accel/adis16209_core.c | 6 +- + drivers/staging/iio/accel/adis16209_trigger.c | 11 +- + drivers/staging/iio/accel/adis16220_core.c | 2 - + drivers/staging/iio/accel/adis16240_core.c | 2 - + drivers/staging/iio/accel/adis16240_trigger.c | 11 +- + drivers/staging/iio/accel/kxsd9.c | 2 +- + drivers/staging/iio/accel/lis3l02dq.h | 1 + + drivers/staging/iio/accel/lis3l02dq_core.c | 10 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 4 +- + drivers/staging/iio/adc/lpc32xx_adc.c | 2 +- + drivers/staging/iio/adc/mxs-lradc.c | 2 +- + drivers/staging/iio/cdc/ad7150.c | 12 +- + drivers/staging/iio/cdc/ad7152.c | 2 +- + drivers/staging/iio/cdc/ad7746.c | 2 +- + drivers/staging/iio/gyro/adis16260_core.c | 6 +- + drivers/staging/iio/iio_dummy_evgen.c | 2 +- + drivers/staging/iio/imu/adis16400_core.c | 10 +- + drivers/staging/iio/magnetometer/hmc5843.c | 2 +- + drivers/staging/iio/meter/ade7753.h | 2 - + drivers/staging/iio/meter/ade7754.h | 2 - + drivers/staging/iio/meter/ade7758.h | 3 - + drivers/staging/iio/meter/ade7759.h | 2 - + drivers/staging/iio/meter/ade7854.h | 2 - + drivers/staging/ipack/Kconfig | 15 +- + drivers/staging/ipack/Makefile | 2 +- + drivers/staging/ipack/bridges/Kconfig | 8 - + drivers/staging/ipack/carriers/Kconfig | 7 + + .../staging/ipack/{bridges => carriers}/Makefile | 0 + .../staging/ipack/{bridges => carriers}/tpci200.c | 310 ++----- + .../staging/ipack/{bridges => carriers}/tpci200.h | 23 +- + drivers/staging/ipack/devices/Kconfig | 1 - + drivers/staging/ipack/devices/ipoctal.c | 118 +-- + drivers/staging/ipack/ipack.c | 45 +- + drivers/staging/ipack/ipack.h | 58 +- + drivers/staging/line6/audio.c | 8 +- + drivers/staging/line6/driver.c | 20 +- + drivers/staging/line6/driver.h | 2 - + drivers/staging/olpc_dcon/olpc_dcon.c | 83 +- + drivers/staging/olpc_dcon/olpc_dcon.h | 2 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 30 - + drivers/staging/omapdrm/omap_crtc.c | 2 +- + drivers/staging/omapdrm/omap_dmm_priv.h | 9 +- + drivers/staging/omapdrm/omap_dmm_tiler.c | 106 +-- + drivers/staging/omapdrm/omap_dmm_tiler.h | 7 +- + drivers/staging/omapdrm/omap_fb.c | 14 +- + drivers/staging/omapdrm/omap_gem.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 5 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +- + drivers/staging/rts5139/Makefile | 22 +- + drivers/staging/rts5139/ms.c | 96 +-- + drivers/staging/rts5139/ms.h | 18 +- + drivers/staging/rts5139/ms_mg.c | 104 +-- + drivers/staging/rts5139/ms_mg.h | 14 +- + drivers/staging/rts5139/rts51x.c | 10 +- + drivers/staging/rts5139/rts51x_card.c | 80 +- + drivers/staging/rts5139/rts51x_card.h | 30 +- + drivers/staging/rts5139/rts51x_chip.c | 24 +- + drivers/staging/rts5139/rts51x_chip.h | 16 +- + drivers/staging/rts5139/rts51x_fop.c | 6 +- + drivers/staging/rts5139/rts51x_scsi.c | 238 +++--- + drivers/staging/rts5139/rts51x_scsi.h | 6 +- + drivers/staging/rts5139/sd.c | 36 +- + drivers/staging/rts5139/sd.h | 12 +- + drivers/staging/rts5139/sd_cprm.c | 124 +-- + drivers/staging/rts5139/sd_cprm.h | 18 +- + drivers/staging/rts5139/xd.c | 58 +- + drivers/staging/rts5139/xd.h | 10 +- + drivers/staging/sbe-2t3e3/cpld.c | 2 +- + drivers/staging/sbe-2t3e3/netdev.c | 5 +- + drivers/staging/silicom/bp_mod.c | 11 +- + drivers/staging/silicom/bp_proc.c | 85 +- + drivers/staging/silicom/bypasslib/bplibk.h | 1 + + drivers/staging/silicom/bypasslib/bypass.c | 1 - + drivers/staging/slicoss/slicoss.c | 143 +--- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 24 +- + drivers/staging/usbip/stub_dev.c | 13 +- + drivers/staging/usbip/stub_rx.c | 5 +- + drivers/staging/usbip/stub_tx.c | 3 +- + drivers/staging/usbip/usbip_common.c | 40 +- + drivers/staging/usbip/usbip_common.h | 4 +- + drivers/staging/usbip/vhci.h | 1 - + drivers/staging/usbip/vhci_hcd.c | 49 +- + drivers/staging/usbip/vhci_rx.c | 2 +- + drivers/staging/usbip/vhci_sysfs.c | 6 +- + drivers/staging/usbip/vhci_tx.c | 2 +- + drivers/staging/vt6655/hostap.c | 6 +- + drivers/staging/vt6655/rxtx.c | 2 +- + drivers/staging/vt6655/wcmd.c | 1 + + drivers/staging/vt6656/device.h | 1 - + drivers/staging/vt6656/firmware.c | 22 +- + drivers/staging/vt6656/hostap.c | 6 +- + drivers/staging/vt6656/main_usb.c | 1 - + drivers/staging/vt6656/rf.c | 3 + + drivers/staging/vt6656/rxtx.c | 2 +- + drivers/staging/vt6656/usbpipe.c | 1 + + drivers/staging/xgifb/TODO | 2 +- + drivers/staging/xgifb/vb_setmode.c | 4 +- + drivers/staging/zram/zram_drv.h | 4 +- + include/linux/iio/types.h | 1 + + include/linux/platform_data/ad5449.h | 40 + + 261 files changed, 4607 insertions(+), 4127 deletions(-) + create mode 100644 drivers/iio/dac/ad5449.c + create mode 100644 drivers/staging/android/binder_trace.h + delete mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c + delete mode 100644 drivers/staging/ipack/bridges/Kconfig + create mode 100644 drivers/staging/ipack/carriers/Kconfig + rename drivers/staging/ipack/{bridges => carriers}/Makefile (100%) + rename drivers/staging/ipack/{bridges => carriers}/tpci200.c (68%) + rename drivers/staging/ipack/{bridges => carriers}/tpci200.h (89%) + create mode 100644 include/linux/platform_data/ad5449.h +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 (ea25bfc Merge branch 'u300' 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 +Auto-merging arch/arm/mach-u300/core.c +Auto-merging arch/arm/mach-nomadik/board-nhk8815.c +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio_atmel.txt | 5 + + .../bindings/pinctrl/atmel,at91-pinctrl.txt | 136 ++ + .../bindings/pinctrl/nvidia,tegra20-pinmux.txt | 2 +- + .../bindings/pinctrl/nvidia,tegra30-pinmux.txt | 2 +- + .../bindings/pinctrl/samsung-pinctrl.txt | 118 +- + Documentation/pinctrl.txt | 4 +- + 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-u300/core.c | 3 +- + arch/arm/mach-u300/include/mach/irqs.h | 126 +- + 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/core.c | 6 +- + drivers/pinctrl/core.h | 2 + + drivers/pinctrl/pinconf.c | 4 - + drivers/pinctrl/pinctrl-at91.c | 1490 ++++++++++++++++++++ + drivers/pinctrl/pinctrl-coh901.c | 122 +- + drivers/pinctrl/pinctrl-exynos.c | 367 +++-- + drivers/pinctrl/pinctrl-exynos.h | 170 +-- + drivers/pinctrl/pinctrl-nomadik-db8500.c | 101 +- + drivers/pinctrl/pinctrl-nomadik.c | 61 +- + drivers/pinctrl/pinctrl-nomadik.h | 2 +- + drivers/pinctrl/pinctrl-samsung.c | 203 ++- + drivers/pinctrl/pinctrl-samsung.h | 29 +- + drivers/pinctrl/pinctrl-tegra.c | 2 +- + drivers/pinctrl/pinctrl-tegra30.c | 24 +- + drivers/pinctrl/pinctrl-u300.c | 32 +- + drivers/pinctrl/pinmux.c | 67 +- + drivers/tty/serial/atmel_serial.c | 8 + + include/linux/platform_data/pinctrl-coh901.h | 2 - + .../linux/platform_data/pinctrl-nomadik.h | 111 +- + 75 files changed, 3939 insertions(+), 1479 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/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 567c64b] 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 (6f0c058 Linux 3.7-rc2) +$ git merge remoteproc/for-next +Already up-to-date. +Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails) +$ git merge irqdomain/irqdomain/next +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 (a1cdd6b Merge branch 'devel' into for-next) +$ git merge gpio-lw/for-next +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 + + drivers/gpio/Kconfig | 15 +++ + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-74x164.c | 2 +- + drivers/gpio/gpio-clps711x.c | 163 ++++++++++++++++++++++++++++++++ + drivers/gpio/gpio-da9055.c | 204 ++++++++++++++++++++++++++++++++++++++++ + drivers/gpio/gpio-omap.c | 2 +- + drivers/gpio/gpio-pl061.c | 59 +++++------- + drivers/gpio/gpio-timberdale.c | 4 +- + drivers/gpio/gpio-vt8500.c | 2 + + 10 files changed, 413 insertions(+), 41 deletions(-) + create mode 100644 drivers/gpio/gpio-clps711x.c + create mode 100644 drivers/gpio/gpio-da9055.c +Merging arm-soc/for-next (357dde5 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Auto-merging include/linux/dma/ipu-dma.h +Removing arch/arm/plat-mxc/include/mach/uncompress.h +Removing arch/arm/plat-mxc/include/mach/timex.h +Removing arch/arm/plat-mxc/include/mach/irqs.h +Removing arch/arm/plat-mxc/Makefile +Removing arch/arm/plat-mxc/Kconfig +Removing arch/arm/mach-vt8500/include/mach/restart.h +Removing arch/arm/mach-vt8500/include/mach/i8042.h +Removing arch/arm/mach-vt8500/include/mach/hardware.h +Auto-merging arch/arm/mach-imx/ulpi.c +Auto-merging arch/arm/mach-imx/tzic.c +Auto-merging arch/arm/mach-imx/time.c +Auto-merging arch/arm/mach-imx/system.c +Auto-merging arch/arm/mach-imx/irq-common.h +Auto-merging arch/arm/mach-imx/iram_alloc.c +Auto-merging arch/arm/mach-imx/iomux-v3.c +Auto-merging arch/arm/mach-imx/iomux-v1.c +Auto-merging arch/arm/mach-imx/iomux-mx51.h +Auto-merging arch/arm/mach-imx/iomux-mx50.h +Auto-merging arch/arm/mach-imx/iomux-mx35.h +Auto-merging arch/arm/mach-imx/iomux-mx27.h +Auto-merging arch/arm/mach-imx/iomux-mx25.h +Auto-merging arch/arm/mach-imx/iomux-mx21.h +Auto-merging arch/arm/mach-imx/iomux-mx1.h +Removing arch/arm/mach-imx/include/mach/dma-mx1-mx2.h +Auto-merging arch/arm/mach-imx/hardware.h +Auto-merging arch/arm/mach-imx/epit.c +Auto-merging arch/arm/mach-imx/devices/platform-spi_imx.c +Auto-merging arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c +Auto-merging arch/arm/mach-imx/devices/platform-pata_imx.c +Auto-merging arch/arm/mach-imx/devices/platform-mxc_w1.c +Auto-merging arch/arm/mach-imx/devices/platform-mxc_rtc.c +Auto-merging arch/arm/mach-imx/devices/platform-mxc_rnga.c +Auto-merging arch/arm/mach-imx/devices/platform-mxc_pwm.c +Auto-merging arch/arm/mach-imx/devices/platform-mxc_nand.c +Auto-merging arch/arm/mach-imx/devices/platform-mxc-mmc.c +Auto-merging arch/arm/mach-imx/devices/platform-mxc-ehci.c +Auto-merging arch/arm/mach-imx/devices/platform-mx2-camera.c +Auto-merging arch/arm/mach-imx/devices/platform-mx1-camera.c +Auto-merging arch/arm/mach-imx/devices/platform-ipu-core.c +Auto-merging arch/arm/mach-imx/devices/platform-imxdi_rtc.c +Auto-merging arch/arm/mach-imx/devices/platform-imx_udc.c +Auto-merging arch/arm/mach-imx/devices/platform-imx27-coda.c +Auto-merging arch/arm/mach-imx/devices/platform-imx21-hcd.c +Auto-merging arch/arm/mach-imx/devices/platform-imx2-wdt.c +Auto-merging arch/arm/mach-imx/devices/platform-imx-uart.c +Auto-merging arch/arm/mach-imx/devices/platform-imx-ssi.c +Auto-merging arch/arm/mach-imx/devices/platform-imx-keypad.c +Auto-merging arch/arm/mach-imx/devices/platform-imx-i2c.c +Auto-merging arch/arm/mach-imx/devices/platform-imx-fb.c +Auto-merging arch/arm/mach-imx/devices/platform-imx-dma.c +Auto-merging arch/arm/mach-imx/devices/platform-gpio_keys.c +Auto-merging arch/arm/mach-imx/devices/platform-gpio-mxc.c +Auto-merging arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c +Auto-merging arch/arm/mach-imx/devices/platform-flexcan.c +Auto-merging arch/arm/mach-imx/devices/platform-fec.c +Auto-merging arch/arm/mach-imx/devices/platform-ahci-imx.c +Auto-merging arch/arm/mach-imx/devices/devices.c +Auto-merging arch/arm/mach-imx/devices/devices-common.h +Auto-merging arch/arm/mach-imx/devices/Makefile +Auto-merging arch/arm/mach-imx/cpufreq.c +Auto-merging arch/arm/mach-imx/cpu.c +Auto-merging arch/arm/mach-imx/common.h +Auto-merging arch/arm/mach-imx/avic.c +Auto-merging arch/arm/mach-imx/3ds_debugboard.c +Auto-merging arch/arm/include/debug/imx.S +Removing arch/arm/boot/compressed/head-vt8500.S +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/fsl-imx-i2c.txt | 4 +- + MAINTAINERS | 1 - + arch/arm/Kconfig | 15 +-- + arch/arm/Kconfig.debug | 8 ++ + arch/arm/Makefile | 1 - + arch/arm/arm-soc-for-next-contents.txt | 7 + + arch/arm/boot/compressed/Makefile | 4 - + arch/arm/boot/compressed/head-vt8500.S | 46 ------- + arch/arm/boot/dts/imx27.dtsi | 4 +- + arch/arm/boot/dts/imx51.dtsi | 4 +- + arch/arm/boot/dts/imx53.dtsi | 6 +- + arch/arm/boot/dts/imx6q.dtsi | 6 +- + arch/arm/configs/imx_v4_v5_defconfig | 5 +- + arch/arm/configs/imx_v6_v7_defconfig | 3 +- + .../mach/debug-macro.S => include/debug/imx.S} | 33 +++-- + arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c | 2 +- + .../include/mach => mach-imx}/3ds_debugboard.h | 0 + arch/arm/mach-imx/Kconfig | 89 ++++++++++++- + arch/arm/mach-imx/Makefile | 22 ++++ + arch/arm/{plat-mxc => mach-imx}/avic.c | 5 +- + .../include/mach => mach-imx}/board-mx31lilly.h | 0 + .../include/mach => mach-imx}/board-mx31lite.h | 0 + .../include/mach => mach-imx}/board-mx31moboard.h | 0 + .../include/mach => mach-imx}/board-pcm038.h | 0 + arch/arm/mach-imx/clk-imx1.c | 17 +-- + arch/arm/mach-imx/clk-imx21.c | 18 +-- + arch/arm/mach-imx/clk-imx25.c | 26 ++-- + arch/arm/mach-imx/clk-imx27.c | 40 +++--- + arch/arm/mach-imx/clk-imx31.c | 21 ++- + arch/arm/mach-imx/clk-imx35.c | 13 +- + arch/arm/mach-imx/clk-imx51-imx53.c | 15 +-- + arch/arm/mach-imx/clk-imx6q.c | 3 +- + arch/arm/mach-imx/clk-pllv1.c | 4 +- + .../{plat-mxc/include/mach => mach-imx}/common.h | 1 + + arch/arm/mach-imx/cpu-imx25.c | 5 +- + arch/arm/mach-imx/cpu-imx27.c | 2 +- + arch/arm/mach-imx/cpu-imx31.c | 7 +- + arch/arm/mach-imx/cpu-imx35.c | 5 +- + arch/arm/mach-imx/cpu-imx5.c | 3 +- + arch/arm/{plat-mxc => mach-imx}/cpu.c | 3 +- + arch/arm/mach-imx/cpu_op-mx51.c | 3 +- + arch/arm/{plat-mxc => mach-imx}/cpufreq.c | 3 +- + arch/arm/{plat-mxc => mach-imx}/cpuidle.c | 0 + .../{plat-mxc/include/mach => mach-imx}/cpuidle.h | 0 + arch/arm/mach-imx/devices-imx1.h | 3 +- + arch/arm/mach-imx/devices-imx21.h | 3 +- + arch/arm/mach-imx/devices-imx25.h | 3 +- + arch/arm/mach-imx/devices-imx27.h | 3 +- + arch/arm/mach-imx/devices-imx31.h | 3 +- + arch/arm/mach-imx/devices-imx35.h | 3 +- + arch/arm/mach-imx/devices-imx50.h | 3 +- + arch/arm/mach-imx/devices-imx51.h | 3 +- + arch/arm/{plat-mxc => mach-imx}/devices/Kconfig | 0 + arch/arm/{plat-mxc => mach-imx}/devices/Makefile | 2 + + .../mach => mach-imx/devices}/devices-common.h | 9 +- + arch/arm/{plat-mxc => mach-imx/devices}/devices.c | 4 +- + .../devices/platform-ahci-imx.c | 5 +- + .../{plat-mxc => mach-imx}/devices/platform-fec.c | 5 +- + .../devices/platform-flexcan.c | 4 +- + .../devices/platform-fsl-usb2-udc.c | 5 +- + .../devices/platform-gpio-mxc.c | 2 +- + .../devices/platform-gpio_keys.c | 5 +- + .../devices/platform-imx-dma.c | 23 +++- + .../devices/platform-imx-fb.c | 16 ++- + .../devices/platform-imx-i2c.c | 32 ++--- + .../devices/platform-imx-keypad.c | 4 +- + .../devices/platform-imx-ssi.c | 4 +- + .../devices/platform-imx-uart.c | 4 +- + .../devices/platform-imx2-wdt.c | 5 +- + .../devices/platform-imx21-hcd.c | 4 +- + .../devices/platform-imx27-coda.c | 4 +- + .../devices/platform-imx_udc.c | 4 +- + .../devices/platform-imxdi_rtc.c | 5 +- + .../devices/platform-ipu-core.c | 5 +- + .../devices/platform-mx1-camera.c | 4 +- + .../devices/platform-mx2-camera.c | 16 ++- + .../devices/platform-mxc-ehci.c | 5 +- + .../devices/platform-mxc-mmc.c | 20 +-- + .../devices/platform-mxc_nand.c | 25 ++-- + .../devices/platform-mxc_pwm.c | 4 +- + .../devices/platform-mxc_rnga.c | 4 +- + .../devices/platform-mxc_rtc.c | 13 +- + .../devices/platform-mxc_w1.c | 4 +- + .../devices/platform-pata_imx.c | 4 +- + .../devices/platform-sdhci-esdhc-imx.c | 5 +- + .../devices/platform-spi_imx.c | 4 +- + arch/arm/mach-imx/ehci-imx25.c | 4 +- + arch/arm/mach-imx/ehci-imx27.c | 4 +- + arch/arm/mach-imx/ehci-imx31.c | 4 +- + arch/arm/mach-imx/ehci-imx35.c | 4 +- + arch/arm/mach-imx/ehci-imx5.c | 4 +- + arch/arm/{plat-mxc => mach-imx}/epit.c | 6 +- + .../include/mach => mach-imx}/eukrea-baseboards.h | 0 + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 7 +- + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +- + arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 7 +- + arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 7 +- + .../{plat-mxc/include/mach => mach-imx}/hardware.h | 26 ++-- + arch/arm/mach-imx/hotplug.c | 3 +- + arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h | 0 + arch/arm/mach-imx/imx27-dt.c | 11 +- + arch/arm/mach-imx/imx31-dt.c | 5 +- + arch/arm/mach-imx/imx51-dt.c | 9 +- + arch/arm/mach-imx/include/mach/dma-mx1-mx2.h | 10 -- + arch/arm/mach-imx/iomux-imx31.c | 5 +- + .../include/mach => mach-imx}/iomux-mx1.h | 2 +- + .../include/mach => mach-imx}/iomux-mx21.h | 4 +- + .../include/mach => mach-imx}/iomux-mx25.h | 2 +- + .../include/mach => mach-imx}/iomux-mx27.h | 4 +- + .../include/mach => mach-imx}/iomux-mx2x.h | 0 + .../include/mach => mach-imx}/iomux-mx3.h | 0 + .../include/mach => mach-imx}/iomux-mx35.h | 2 +- + .../include/mach => mach-imx}/iomux-mx50.h | 2 +- + .../include/mach => mach-imx}/iomux-mx51.h | 2 +- + arch/arm/{plat-mxc => mach-imx}/iomux-v1.c | 5 +- + .../{plat-mxc/include/mach => mach-imx}/iomux-v1.h | 0 + arch/arm/{plat-mxc => mach-imx}/iomux-v3.c | 5 +- + .../{plat-mxc/include/mach => mach-imx}/iomux-v3.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/iram.h | 0 + arch/arm/{plat-mxc => mach-imx}/iram_alloc.c | 3 +- + arch/arm/{plat-mxc => mach-imx}/irq-common.c | 0 + arch/arm/{plat-mxc => mach-imx}/irq-common.h | 3 + + arch/arm/mach-imx/lluart.c | 3 +- + arch/arm/mach-imx/mach-apf9328.c | 7 +- + arch/arm/mach-imx/mach-armadillo5x0.c | 9 +- + arch/arm/mach-imx/mach-bug.c | 7 +- + arch/arm/mach-imx/mach-cpuimx27.c | 11 +- + arch/arm/mach-imx/mach-cpuimx35.c | 9 +- + arch/arm/mach-imx/mach-cpuimx51sd.c | 9 +- + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 10 +- + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 +- + arch/arm/mach-imx/mach-imx27ipcam.c | 6 +- + arch/arm/mach-imx/mach-imx27lite.c | 6 +- + arch/arm/mach-imx/mach-imx53.c | 11 +- + arch/arm/mach-imx/mach-imx6q.c | 6 +- + arch/arm/mach-imx/mach-kzm_arm11_01.c | 7 +- + arch/arm/mach-imx/mach-mx1ads.c | 7 +- + arch/arm/mach-imx/mach-mx21ads.c | 6 +- + arch/arm/mach-imx/mach-mx25_3ds.c | 8 +- + arch/arm/mach-imx/mach-mx27_3ds.c | 10 +- + arch/arm/mach-imx/mach-mx27ads.c | 6 +- + arch/arm/mach-imx/mach-mx31_3ds.c | 12 +- + arch/arm/mach-imx/mach-mx31ads.c | 5 +- + arch/arm/mach-imx/mach-mx31lilly.c | 11 +- + arch/arm/mach-imx/mach-mx31lite.c | 11 +- + arch/arm/mach-imx/mach-mx31moboard.c | 14 +- + arch/arm/mach-imx/mach-mx35_3ds.c | 8 +- + arch/arm/mach-imx/mach-mx50_rdp.c | 7 +- + arch/arm/mach-imx/mach-mx51_3ds.c | 9 +- + arch/arm/mach-imx/mach-mx51_babbage.c | 7 +- + arch/arm/mach-imx/mach-mxt_td60.c | 6 +- + arch/arm/mach-imx/mach-pca100.c | 8 +- + arch/arm/mach-imx/mach-pcm037.c | 8 +- + arch/arm/mach-imx/mach-pcm037_eet.c | 5 +- + arch/arm/mach-imx/mach-pcm038.c | 13 +- + arch/arm/mach-imx/mach-pcm043.c | 9 +- + arch/arm/mach-imx/mach-qong.c | 6 +- + arch/arm/mach-imx/mach-scb9328.c | 7 +- + arch/arm/mach-imx/mach-vpr200.c | 7 +- + arch/arm/mach-imx/mm-imx1.c | 9 +- + arch/arm/mach-imx/mm-imx21.c | 14 +- + arch/arm/mach-imx/mm-imx25.c | 12 +- + arch/arm/mach-imx/mm-imx27.c | 14 +- + arch/arm/mach-imx/mm-imx3.c | 13 +- + arch/arm/mach-imx/mm-imx5.c | 12 +- + arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/mx21.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/mx25.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/mx27.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/mx2x.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/mx31.h | 0 + arch/arm/mach-imx/mx31lilly-db.c | 9 +- + arch/arm/mach-imx/mx31lite-db.c | 9 +- + arch/arm/mach-imx/mx31moboard-devboard.c | 9 +- + arch/arm/mach-imx/mx31moboard-marxbot.c | 9 +- + arch/arm/mach-imx/mx31moboard-smartbot.c | 11 +- + .../arm/{plat-mxc/include/mach => mach-imx}/mx35.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/mx3x.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/mx50.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/mx51.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/mx53.h | 0 + .../arm/{plat-mxc/include/mach => mach-imx}/mx6q.h | 0 + arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h | 0 + arch/arm/mach-imx/pcm970-baseboard.c | 7 +- + arch/arm/mach-imx/platsmp.c | 5 +- + arch/arm/mach-imx/pm-imx27.c | 3 +- + arch/arm/mach-imx/pm-imx3.c | 7 +- + arch/arm/mach-imx/pm-imx5.c | 7 +- + arch/arm/mach-imx/pm-imx6q.c | 5 +- + arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c | 0 + arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S | 0 + arch/arm/{plat-mxc => mach-imx}/system.c | 5 +- + arch/arm/{plat-mxc => mach-imx}/time.c | 5 +- + arch/arm/{plat-mxc => mach-imx}/tzic.c | 6 +- + arch/arm/{plat-mxc => mach-imx}/ulpi.c | 2 +- + .../arm/{plat-mxc/include/mach => mach-imx}/ulpi.h | 0 + arch/arm/mach-vt8500/include/mach/hardware.h | 12 -- + arch/arm/mach-vt8500/include/mach/i8042.h | 18 --- + arch/arm/mach-vt8500/include/mach/restart.h | 17 --- + arch/arm/mach-vt8500/timer.c | 2 +- + arch/arm/mach-vt8500/vt8500.c | 2 - + arch/arm/plat-mxc/Kconfig | 89 ------------- + arch/arm/plat-mxc/Makefile | 24 ---- + arch/arm/plat-mxc/include/mach/irqs.h | 21 --- + arch/arm/plat-mxc/include/mach/timex.h | 22 ---- + arch/arm/plat-mxc/include/mach/uncompress.h | 132 ------------------- + drivers/dma/imx-dma.c | 137 ++++++++++++-------- + drivers/dma/imx-sdma.c | 1 - + drivers/dma/ipu/ipu_idmac.c | 3 +- + drivers/dma/ipu/ipu_irq.c | 3 +- + drivers/i2c/busses/i2c-imx.c | 40 +++++- + drivers/media/platform/soc_camera/mx2_camera.c | 95 ++++++++++---- + drivers/media/platform/soc_camera/mx3_camera.c | 2 +- + drivers/mmc/host/mxcmmc.c | 31 ++++- + drivers/mtd/nand/mxc_nand.c | 96 +++++++++----- + drivers/rtc/rtc-mxc.c | 34 ++++- + drivers/usb/host/ehci-mxc.c | 1 - + drivers/video/imxfb.c | 38 +++++- + drivers/video/mx3fb.c | 3 +- + drivers/watchdog/imx2_wdt.c | 1 - + .../mach/ipu.h => include/linux/dma/ipu-dma.h | 6 +- + include/linux/platform_data/asoc-imx-ssi.h | 2 + + include/linux/platform_data/dma-imx.h | 4 +- + sound/soc/fsl/imx-pcm-fiq.c | 1 - + sound/soc/fsl/imx-ssi.c | 1 - + 225 files changed, 1091 insertions(+), 1112 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/boot/compressed/head-vt8500.S + rename arch/arm/{plat-mxc/include/mach/debug-macro.S => include/debug/imx.S} (59%) + rename arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c (99%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/3ds_debugboard.h (100%) + rename arch/arm/{plat-mxc => mach-imx}/avic.c (98%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lilly.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lite.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31moboard.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-pcm038.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/common.h (99%) + rename arch/arm/{plat-mxc => mach-imx}/cpu.c (97%) + rename arch/arm/{plat-mxc => mach-imx}/cpufreq.c (99%) + rename arch/arm/{plat-mxc => mach-imx}/cpuidle.c (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/cpuidle.h (100%) + rename arch/arm/{plat-mxc => mach-imx}/devices/Kconfig (100%) + rename arch/arm/{plat-mxc => mach-imx}/devices/Makefile (98%) + rename arch/arm/{plat-mxc/include/mach => mach-imx/devices}/devices-common.h (97%) + rename arch/arm/{plat-mxc => mach-imx/devices}/devices.c (92%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ahci-imx.c (98%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fec.c (97%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-flexcan.c (96%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fsl-usb2-udc.c (96%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio-mxc.c (96%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio_keys.c (94%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-dma.c (63%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-fb.c (79%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-i2c.c (76%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-keypad.c (97%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-ssi.c (98%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-uart.c (98%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx2-wdt.c (97%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx21-hcd.c (94%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx27-coda.c (93%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx_udc.c (96%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imxdi_rtc.c (94%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ipu-core.c (98%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx1-camera.c (94%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-camera.c (83%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-ehci.c (97%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-mmc.c (76%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_nand.c (74%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_pwm.c (97%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rnga.c (95%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rtc.c (77%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_w1.c (95%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-pata_imx.c (96%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-sdhci-esdhc-imx.c (98%) + rename arch/arm/{plat-mxc => mach-imx}/devices/platform-spi_imx.c (98%) + rename arch/arm/{plat-mxc => mach-imx}/epit.c (99%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/eukrea-baseboards.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/hardware.h (94%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h (100%) + delete mode 100644 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx1.h (99%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx21.h (99%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx25.h (99%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx27.h (99%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx2x.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx3.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx35.h (99%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx50.h (99%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx51.h (99%) + rename arch/arm/{plat-mxc => mach-imx}/iomux-v1.c (98%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v1.h (100%) + rename arch/arm/{plat-mxc => mach-imx}/iomux-v3.c (97%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v3.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/iram.h (100%) + rename arch/arm/{plat-mxc => mach-imx}/iram_alloc.c (98%) + rename arch/arm/{plat-mxc => mach-imx}/irq-common.c (100%) + rename arch/arm/{plat-mxc => mach-imx}/irq-common.h (94%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx21.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx25.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx27.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx2x.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx31.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx35.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx3x.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx50.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx51.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx53.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx6q.h (100%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h (100%) + rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c (100%) + rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S (100%) + rename arch/arm/{plat-mxc => mach-imx}/system.c (97%) + rename arch/arm/{plat-mxc => mach-imx}/time.c (99%) + rename arch/arm/{plat-mxc => mach-imx}/tzic.c (98%) + rename arch/arm/{plat-mxc => mach-imx}/ulpi.c (99%) + rename arch/arm/{plat-mxc/include/mach => mach-imx}/ulpi.h (100%) + delete mode 100644 arch/arm/mach-vt8500/include/mach/hardware.h + delete mode 100644 arch/arm/mach-vt8500/include/mach/i8042.h + delete mode 100644 arch/arm/mach-vt8500/include/mach/restart.h + delete mode 100644 arch/arm/plat-mxc/Kconfig + delete mode 100644 arch/arm/plat-mxc/Makefile + delete mode 100644 arch/arm/plat-mxc/include/mach/irqs.h + delete mode 100644 arch/arm/plat-mxc/include/mach/timex.h + delete mode 100644 arch/arm/plat-mxc/include/mach/uncompress.h + rename arch/arm/plat-mxc/include/mach/ipu.h => include/linux/dma/ipu-dma.h (97%) +Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling) +$ git merge cortex/for-next +Auto-merging arch/arm/mm/alignment.c +Auto-merging arch/arm/kernel/process.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/assembler.h | 13 ++- + arch/arm/include/asm/cp15.h | 11 ++- + arch/arm/include/asm/cputype.h | 3 + + arch/arm/include/asm/glue-cache.h | 25 ++++++ + arch/arm/include/asm/glue-df.h | 8 ++ + arch/arm/include/asm/glue-proc.h | 9 ++ + arch/arm/include/asm/irqflags.h | 22 +++-- + arch/arm/include/asm/processor.h | 7 ++ + arch/arm/include/asm/ptrace.h | 8 ++ + arch/arm/include/asm/system_info.h | 1 + + arch/arm/include/uapi/asm/ptrace.h | 36 ++++++-- + arch/arm/kernel/asm-offsets.c | 3 + + arch/arm/kernel/entry-common.S | 4 + + arch/arm/kernel/entry-header.S | 148 +++++++++++++++++++++++++++++++++ + arch/arm/kernel/entry-v7m.S | 134 ++++++++++++++++++++++++++++++ + arch/arm/kernel/head-common.S | 9 +- + arch/arm/kernel/head-nommu.S | 9 +- + arch/arm/kernel/process.c | 4 + + arch/arm/kernel/ptrace.c | 3 + + arch/arm/kernel/setup.c | 13 ++- + arch/arm/kernel/traps.c | 2 + + arch/arm/mm/alignment.c | 2 + + arch/arm/mm/mmu.c | 17 ++++ + arch/arm/mm/nommu.c | 2 + + arch/arm/mm/proc-v7m.S | 161 ++++++++++++++++++++++++++++++++++++ + 25 files changed, 632 insertions(+), 22 deletions(-) + create mode 100644 arch/arm/kernel/entry-v7m.S + create mode 100644 arch/arm/mm/proc-v7m.S +Merging ep93xx/ep93xx-for-next (fab1f74 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 (480d23a 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 | 8 +++ + 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 | 18 +++++- + arch/arm/mach-shmobile/setup-r8a7779.c | 79 +++++++++++++++++++++++- + arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++ + 12 files changed, 206 insertions(+), 7 deletions(-) +Merging samsung/for-next (f1d782f Merge branch 'next/board-samsung' into for-next) +$ git merge samsung/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/s5p-mfc.txt | 23 ++++ + arch/arm/boot/dts/exynos4210-origen.dts | 16 +++ + arch/arm/boot/dts/exynos4210-smdkv310.dts | 16 +++ + arch/arm/boot/dts/exynos4210-trats.dts | 6 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 5 + + arch/arm/boot/dts/exynos5250.dtsi | 6 + + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-exynos/clock-exynos4.c | 5 - + arch/arm/mach-exynos/clock-exynos5.c | 7 +- + arch/arm/mach-exynos/common.c | 5 + + arch/arm/mach-exynos/mach-exynos4-dt.c | 1 + + arch/arm/mach-exynos/mach-exynos5-dt.c | 16 +++ + arch/arm/mach-exynos/mach-nuri.c | 1 - + arch/arm/mach-exynos/mach-universal_c210.c | 1 - + arch/arm/mach-s3c24xx/s3c2416.c | 2 + + arch/arm/mach-s3c24xx/s3c2443.c | 4 + + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 141 ++++++++++++++++---- + arch/arm/mach-s3c64xx/mach-crag6410.c | 29 +++- + arch/arm/mach-s5p64x0/common.c | 3 + + arch/arm/mach-s5pc100/common.c | 3 + + arch/arm/mach-s5pv210/common.c | 3 + + arch/arm/mach-s5pv210/mach-goni.c | 1 - + arch/arm/plat-samsung/clock.c | 75 ++++++++++- + arch/arm/plat-samsung/devs.c | 1 + + arch/arm/plat-samsung/include/plat/gpio-core.h | 2 + + arch/arm/plat-samsung/include/plat/mfc.h | 11 ++ + arch/arm/plat-samsung/include/plat/spi-core.h | 30 +++++ + arch/arm/plat-samsung/s5p-dev-mfc.c | 34 +++++ + arch/arm/plat-samsung/s5p-irq-gpioint.c | 8 +- + drivers/gpio/gpio-samsung.c | 25 ++-- + 30 files changed, 427 insertions(+), 54 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt + create mode 100644 arch/arm/plat-samsung/include/plat/spi-core.h +Merging tegra/for-next (cc8c1c9 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 | 44 +---- + 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, 326 insertions(+), 681 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 (1cdfa19 tools/kvm: Fix formatting in parse-options.h) +$ git merge kvmtool/master +Merge made by the 'recursive' strategy. + tools/kvm/Makefile | 3 +++ + tools/kvm/builtin-run.c | 10 +++++++++- + tools/kvm/include/kvm/parse-options.h | 22 +++++++++++----------- + 3 files changed, 23 insertions(+), 12 deletions(-) +Merging dma-mapping/dma-mapping-next (76e5987 ARM: mm: Remove unused arm_vmregion priv field) +$ git merge dma-mapping/dma-mapping-next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/dma-mapping.h | 1 + + arch/arm/mm/vmregion.h | 1 - + drivers/base/Kconfig | 2 +- + drivers/base/dma-coherent.c | 5 ++--- + drivers/base/dma-contiguous.c | 5 +---- + mm/page_alloc.c | 2 +- + 6 files changed, 6 insertions(+), 10 deletions(-) +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 (8213538 Merge branches 'arch-frv', 'arch-powerpc', 'arch-s390' and 'no-rebases' into for-next) +$ git merge signal/for-next +Auto-merging include/linux/sched.h +Auto-merging arch/s390/kernel/entry64.S +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/include/asm/unistd.h +Auto-merging arch/parisc/include/asm/unistd.h +Auto-merging arch/mips/kernel/scall64-n32.S +Auto-merging arch/mips/kernel/mips_ksyms.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/unistd.h +Auto-merging arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/alpha/kernel/osf_sys.c +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/thread_info.h | 80 ++++++++---- + arch/alpha/kernel/entry.S | 21 +-- + arch/alpha/kernel/osf_sys.c | 25 ++-- + arch/alpha/kernel/process.c | 18 ++- + arch/alpha/kernel/signal.c | 16 +-- + arch/alpha/kernel/traps.c | 6 +- + arch/arm64/Kconfig | 2 + + arch/arm64/include/asm/processor.h | 5 - + arch/arm64/include/asm/syscalls.h | 14 +- + arch/arm64/include/asm/unistd.h | 1 + + arch/arm64/include/asm/unistd32.h | 8 +- + arch/arm64/kernel/entry.S | 17 +-- + arch/arm64/kernel/process.c | 83 +++++------- + arch/arm64/kernel/sys.c | 76 +---------- + arch/arm64/kernel/sys32.S | 19 --- + arch/arm64/kernel/sys_compat.c | 38 +----- + 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 | 28 +--- + arch/ia64/Kconfig | 2 + + arch/ia64/include/asm/processor.h | 16 --- + arch/ia64/include/asm/unistd.h | 1 + + arch/ia64/kernel/entry.S | 39 +++--- + arch/ia64/kernel/head.S | 13 -- + arch/ia64/kernel/process.c | 158 +++++++++------------- + 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/openrisc/Kconfig | 2 + + arch/openrisc/include/uapi/asm/unistd.h | 2 + + arch/openrisc/kernel/entry.S | 43 +++--- + arch/openrisc/kernel/process.c | 163 ++++++++--------------- + 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 | 8 +- + arch/powerpc/kernel/process.c | 41 ++---- + 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 | 30 ++--- + arch/sparc/kernel/systbls_64.S | 2 +- + arch/sparc/kernel/traps_64.c | 4 +- + arch/sparc/mm/init_64.c | 2 +- + arch/tile/Kconfig | 2 + + arch/tile/include/asm/compat.h | 6 - + arch/tile/include/asm/elf.h | 1 + + arch/tile/include/asm/processor.h | 4 + + arch/tile/include/asm/switch_to.h | 5 +- + arch/tile/include/asm/syscalls.h | 3 +- + arch/tile/include/asm/unistd.h | 1 + + arch/tile/kernel/compat.c | 1 - + arch/tile/kernel/entry.S | 11 -- + arch/tile/kernel/intvec_32.S | 16 ++- + arch/tile/kernel/intvec_64.S | 17 ++- + arch/tile/kernel/process.c | 148 ++++++--------------- + arch/tile/kernel/sys.c | 1 - + arch/um/kernel/process.c | 2 - + arch/um/kernel/syscall.c | 8 +- + drivers/staging/gdm72xx/gdm_usb.c | 4 +- + fs/file.c | 6 - + fs/fs_struct.c | 24 ---- + include/linux/compat.h | 2 - + include/linux/fdtable.h | 1 - + include/linux/fs_struct.h | 1 - + include/linux/sched.h | 1 - + kernel/exit.c | 92 ------------- + 104 files changed, 656 insertions(+), 1769 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 (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress()) +$ git merge lzo-update/lzo-update +Removing lib/lzo/lzo1x_decompress.c +Auto-merging crypto/testmgr.h +Merge made by the 'recursive' strategy. + crypto/testmgr.h | 38 ++--- + include/linux/lzo.h | 15 +- + lib/decompress_unlzo.c | 2 +- + lib/lzo/Makefile | 2 +- + lib/lzo/lzo1x_compress.c | 335 +++++++++++++++++++++++---------------- + lib/lzo/lzo1x_decompress.c | 255 ----------------------------- + lib/lzo/lzo1x_decompress_safe.c | 237 +++++++++++++++++++++++++++ + lib/lzo/lzodefs.h | 34 +++- + 8 files changed, 488 insertions(+), 430 deletions(-) + delete mode 100644 lib/lzo/lzo1x_decompress.c + create mode 100644 lib/lzo/lzo1x_decompress_safe.c +Merging drop-experimental/linux-next (e552f87 make CONFIG_EXPERIMENTAL invisible and default) +$ git merge drop-experimental/linux-next +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + init/Kconfig | 31 ++----------------------------- + 1 file changed, 2 insertions(+), 29 deletions(-) +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: mm: vmscan: scale number of pages reclaimed by reclaim/compaction only in direct reclaim +Applying: proc: check vma->vm_file before dereferencing +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: 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: 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: mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD +Applying: mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD +Applying: thp: clean up __collapse_huge_page_isolate +Applying: thp: introduce hugepage_get_pmd() +Applying: thp: introduce hugepage_vma_check() +Applying: thp: cleanup: introduce mk_huge_pmd() +Applying: memory-hotplug: skip HWPoisoned page when offlining pages +Using index info to reconstruct a base tree... +M mm/page_alloc.c +Falling back to patching base and 3-way merge... +Auto-merging mm/page_alloc.c +Applying: memory-hotplug: update mce_bad_pages when removing the memory +Applying: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix +Applying: memory-hotplug: auto offline page_cgroup when onlining memory block failed +Applying: memory-hotplug: fix NR_FREE_PAGES mismatch +Applying: memory-hotplug: allocate zone's pcp before onlining pages +Applying: slab: ignore internal flags in cache creation +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: include/linux/init.h: use the stringify operator for the __define_initcall macro +Applying: init-use-the-stringify-operator-for-the-__define_initcall-macro-checkpatch-fixes +Applying: printk: move to separate directory for easier modification +Using index info to reconstruct a base tree... +M kernel/printk.c +Falling back to patching base and 3-way merge... +Auto-merging kernel/printk/printk.c +Applying: printk: add console_cmdline.h +Applying: printk: move braille console support into separate braille.[ch] files +Applying: printk: use pointer for console_cmdline indexing +Applying: printk: rename struct log to struct printk_log +Applying: printk: rename log_buf and __LOG_BUF_LEN +Applying: printk: rename log_first and log_next variables +Applying: printk: rename log_ variables and functions +Applying: printk: rename enum log_flags to printk_log_flags +Applying: printk: rename log_wait to printk_log_wait +Applying: printk: rename logbuf_lock to printk_logbuf_lock +Applying: printk: rename clear_seq and clear_idx variables +Applying: printk: remove static from printk_ variables +Applying: printk: rename LOG_ALIGN to PRINTK_LOG_ALIGN +Applying: printk: add and use printk_log.h +Applying: printk: add printk_log.c +Applying: printk: make wait_queue_head_t printk_log_wait extern +Applying: printk: rename and move 2 #defines to printk_log.h +Applying: printk: move devkmsg bits to separate file +Applying: printk: prefix print_time and msg_print_text with printk_ +Applying: printk: move functions printk_print_time and printk_msg_print_text +Applying: printk: add printk_syslog.c and .h +Applying: printk: move kmsg_dump functions to separate file +Applying: backlight: da903x_bl: use dev_get_drvdata() instead of platform_get_drvdata() +Applying: backlight: 88pm860x_bl: fix checkpatch warning +Applying: backlight: atmel-pwm-bl: fix checkpatch warning +Applying: backlight: corgi_lcd: fix checkpatch error and warning +Applying: backlight: da903x_bl: fix checkpatch warning +Applying: backlight: generic_bl: fix checkpatch warning +Applying: backlight: hp680_bl: fix checkpatch error and warning +Applying: backlight: ili9320: fix checkpatch error and warning +Applying: backlight: jornada720: fix checkpatch error and warning +Applying: backlight: l4f00242t03: fix checkpatch warning +Applying: backlight: lm3630: fix checkpatch warning +Applying: backlight: locomolcd: fix checkpatch error and warning +Applying: backlight: omap1: fix checkpatch warning +Applying: backlight: pcf50633: fix checkpatch warning +Applying: backlight: platform_lcd: fix checkpatch error +Applying: backlight: tdo24m: fix checkpatch warning +Applying: backlight: tosa: fix checkpatch error and warning +Applying: backlight: vgg2432a4: fix checkpatch warning +Applying: backlight: lms283gf05: use devm_gpio_request_one +Applying: backlight: tosa: use devm_gpio_request_one +Applying: drivers/video/backlight/lp855x_bl.c: use generic PWM functions +Applying: drivers-video-backlight-lp855x_blc-use-generic-pwm-functions-fix +Applying: drivers/video/backlight/lp855x_bl.c: remove unnecessary mutex code +Applying: string: introduce helper to get base file name from given path +Applying: lib: dynamic_debug: use kbasename() +Applying: staging: rts_pstor: use kbasename() +Applying: mm: use kbasename() +Applying: procfs: use kbasename() +Applying: trace: use kbasename() +Applying: compat: generic compat_sys_sched_rr_get_interval() implementation +Using index info to reconstruct a base tree... +M arch/tile/include/asm/compat.h +M arch/tile/include/asm/unistd.h +M arch/tile/kernel/compat.c +M include/linux/compat.h +Falling back to patching base and 3-way merge... +Auto-merging include/linux/compat.h +Auto-merging arch/tile/kernel/compat.c +Auto-merging arch/tile/include/asm/unistd.h +Auto-merging arch/tile/include/asm/compat.h +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: checkpatch: improve network block comment style checking +Applying: rtc: omap: kicker mechanism support +Applying: ARM: davinci: remove rtc kicker release +Applying: rtc: omap: dt support +Applying: rtc: omap: depend on am33xx +Applying: rtc: omap: add runtime pm support +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: procfs: add VmFlags field in smaps output +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held +Applying: Documentation/sparse.txt: document context annotations for lock checking +Applying: aoe: describe the behavior of the "err" character device +Applying: aoe: print warning regarding a common reason for dropped transmits +Applying: aoe-print-warning-regarding-a-common-reason-for-dropped-transmits-v2 +Applying: aoe: update cap on outstanding commands based on config query response +Applying: aoe: support the forgetting (flushing) of a user-specified AoE target +Applying: aoe: support larger I/O requests via aoe_maxsectors module param +Applying: aoe: "payload" sysfs file exports per-AoE-command data transfer size +Applying: aoe: cleanup: remove unused ata_scnt function +Applying: aoe: whitespace cleanup +Applying: aoe: update driver-internal version number to 60 +Applying: random: make it possible to enable debugging without rebuild +Applying: random: fix debug format strings +Applying: dma-debug: new interfaces to debug dma mapping errors +Applying: tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test +Applying: Revert "init-use-the-stringify-operator-for-the-__define_initcall-macro-checkpatch-fixes" +Applying: Revert "include/linux/init.h: use the stringify operator for the __define_initcall macro" +Applying: Revert "printk: move kmsg_dump functions to separate file" +Applying: Revert "printk: add printk_syslog.c and .h" +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + a4d83f1...234b148 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (234b148 Revert "printk: add printk_syslog.c and .h") +$ git merge --no-ff akpm/master +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + Documentation/DMA-API.txt | 12 + + Documentation/DocBook/kernel-api.tmpl | 3 + + Documentation/backlight/lp855x-driver.txt | 10 +- + Documentation/devicetree/bindings/rtc/rtc-omap.txt | 17 + + Documentation/filesystems/proc.txt | 40 +- + Documentation/filesystems/vfat.txt | 23 +- + Documentation/sparse.txt | 18 + + arch/arm/mach-davinci/devices-da8xx.c | 13 +- + 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/accessibility/braille/braille_console.c | 9 +- + drivers/acpi/acpi_memhotplug.c | 123 ++- + drivers/base/memory.c | 9 +- + drivers/base/node.c | 11 + + drivers/block/aoe/aoe.h | 10 +- + drivers/block/aoe/aoeblk.c | 19 + + drivers/block/aoe/aoechr.c | 7 +- + drivers/block/aoe/aoecmd.c | 22 +- + drivers/block/aoe/aoedev.c | 44 +- + drivers/block/aoe/aoemain.c | 2 +- + drivers/block/aoe/aoenet.c | 11 +- + drivers/block/cciss.c | 21 +- + drivers/block/drbd/drbd_bitmap.c | 7 +- + drivers/char/random.c | 14 +- + drivers/firmware/dmi_scan.c | 78 +- + drivers/gpu/drm/i915/intel_pm.c | 3 +- + drivers/memstick/core/ms_block.c | 8 +- + drivers/memstick/core/ms_block.h | 5 +- + drivers/pcmcia/cs.c | 37 +- + drivers/rtc/Kconfig | 10 +- + drivers/rtc/rtc-omap.c | 80 +- + drivers/staging/rts_pstor/trace.h | 24 +- + drivers/video/backlight/88pm860x_bl.c | 4 +- + drivers/video/backlight/atmel-pwm-bl.c | 7 +- + drivers/video/backlight/corgi_lcd.c | 16 +- + drivers/video/backlight/da903x_bl.c | 15 +- + drivers/video/backlight/generic_bl.c | 4 +- + drivers/video/backlight/hp680_bl.c | 4 +- + drivers/video/backlight/ili9320.c | 12 +- + drivers/video/backlight/jornada720_bl.c | 34 +- + drivers/video/backlight/jornada720_lcd.c | 3 +- + drivers/video/backlight/l4f00242t03.c | 3 +- + drivers/video/backlight/lm3630_bl.c | 2 +- + drivers/video/backlight/lms283gf05.c | 10 +- + drivers/video/backlight/locomolcd.c | 65 +- + drivers/video/backlight/lp855x_bl.c | 51 +- + drivers/video/backlight/omap1_bl.c | 4 +- + drivers/video/backlight/pcf50633-backlight.c | 8 +- + drivers/video/backlight/platform_lcd.c | 2 +- + drivers/video/backlight/tdo24m.c | 6 +- + drivers/video/backlight/tosa_bl.c | 10 +- + drivers/video/backlight/tosa_lcd.c | 24 +- + drivers/video/backlight/vgg2432a4.c | 2 +- + 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 | 11 +- + fs/proc/kmsg.c | 4 +- + fs/proc/proc_devtree.c | 7 +- + fs/proc/task_mmu.c | 49 + + fs/splice.c | 5 +- + fs/udf/file.c | 2 +- + include/linux/compat.h | 3 + + include/linux/compiler.h | 2 + + include/linux/dma-debug.h | 7 + + include/linux/genhd.h | 8 +- + include/linux/gfp.h | 2 +- + include/linux/kernel.h | 47 +- + include/linux/oom.h | 2 - + include/linux/page-isolation.h | 10 +- + include/linux/platform_data/lp855x.h | 9 +- + include/linux/rmap.h | 3 + + include/linux/string.h | 11 + + include/linux/writeback.h | 9 +- + init/do_mounts.c | 61 +- + ipc/sem.c | 250 +++-- + kernel/Makefile | 3 +- + kernel/compat.c | 17 + + kernel/printk/Makefile | 4 + + kernel/printk/braille.c | 48 + + kernel/printk/braille.h | 48 + + kernel/printk/console_cmdline.h | 14 + + kernel/printk/devkmsg.c | 309 ++++++ + kernel/{ => printk}/printk.c | 1118 +++++--------------- + kernel/printk/printk_log.c | 263 +++++ + kernel/printk/printk_log.h | 123 +++ + kernel/time.c | 4 +- + kernel/timeconst.pl | 2 +- + kernel/trace/trace_uprobe.c | 8 +- + lib/dma-debug.c | 71 +- + lib/dynamic_debug.c | 9 +- + lib/kstrtox.c | 64 ++ + lib/vsprintf.c | 8 + + mm/huge_memory.c | 164 ++- + mm/internal.h | 48 + + mm/memblock.c | 5 + + mm/memcontrol.c | 4 +- + mm/memory-failure.c | 2 +- + mm/memory.c | 11 +- + mm/memory_hotplug.c | 15 +- + mm/page-writeback.c | 11 +- + mm/page_alloc.c | 100 +- + mm/page_cgroup.c | 3 + + mm/page_isolation.c | 27 +- + mm/rmap.c | 3 + + mm/shmem.c | 1 + + mm/slab.c | 22 - + mm/slab.h | 25 + + mm/slab_common.c | 7 + + mm/slub.c | 3 - + mm/sparse.c | 22 + + mm/swap_state.c | 6 + + mm/vmalloc.c | 4 +- + mm/vmscan.c | 18 +- + scripts/checkpatch.pl | 6 +- + security/selinux/netnode.c | 3 +- + tools/testing/selftests/kcmp/kcmp_test.c | 6 +- + 167 files changed, 4148 insertions(+), 1833 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-omap.txt + create mode 100644 fs/hfsplus/attributes.c + create mode 100644 kernel/printk/Makefile + create mode 100644 kernel/printk/braille.c + create mode 100644 kernel/printk/braille.h + create mode 100644 kernel/printk/console_cmdline.h + create mode 100644 kernel/printk/devkmsg.c + rename kernel/{ => printk}/printk.c (64%) + create mode 100644 kernel/printk/printk_log.c + create mode 100644 kernel/printk/printk_log.h +$ git am -3 ../patches/0001-cpuidle-fix-up-but-return-type-for-inline-function.patch +Applying: cpuidle: fix up but return type for inline function diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..c0bcbc11adaa --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,6 @@ +Importing i2c based on 3.7-rc2 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 12250d843e8489ee00b5b7726da855e51694e792 +Unchanged quilt series jdelvare-hwmon +Importing device-mapper based on v3.7-rc1 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..400255008422 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20121024 -- 2.39.2