From 13d0b4a066ca280c3a720afb0c60ba9af9320ad7 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 11 Apr 2012 15:13:02 +1000 Subject: [PATCH] Add linux-next specific files for 20120411 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 190 +++ Next/Trees | 192 +++ Next/merge.log | 3579 +++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 10 + localversion-next | 1 + 5 files changed, 3972 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..0adf8956a954 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,190 @@ +Name SHA1 +---- ---- +origin a9e1e53bcfb29b3b503a5e75ce498d9a64f32c1e +fixes b1a808ff436343956a6ae63178ea1810c5e5a3a1 +kbuild-current 0eb043d0eec44cd083ea6910b1db2f77eb212ebd +arm-current b2bc9e0ee349db84035d8141e85babc7986594d7 +m68k-current 450aed725c9a53282483c48ebd012feefae94a07 +powerpc-merge 9b218f63e50e590fe0c7724a0838d7eaa6dae5ce +sparc d657784b70ef653350d7aa49da90a8484c29da7d +scsi-rc-fixes 41f8ad76362e7aefe3a03949c43e23102dae6e0b +net 18a223e0b9ec8979320ba364b47c9772391d6d05 +sound-current fae3d88a5c56c3f836e95c4516da883a48612437 +pci-current 314489bd4c7780fde6a069783d5128f6cef52919 +wireless 011afa1ed8c408d694957d2474d89dc81a60b70c +driver-core.current 282029c005e65ffdce3aa9f8220f88a8bbbc4dae +tty.current 11bbd5b6dae49fd7072ebf5eb63735827bd72f42 +usb.current a65a6f14dc24a90bde3f5d0073ba2364476200bf +staging.current 6490311f423b0d77969d6fa2ab6354b87e373bf9 +char-misc.current 0034102808e0dbbf3a2394b82b1bb40b5778de9e +cpufreq-current 6139b652c89ecd5ebf72ef895fec9f6d0d320cb1 +input-current fb16395ee65d22882a0af30850cbf5c9b9a2962c +md-current 5020ad7d143ccfcf8149974096220d59e5572120 +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current 511d63cb19329235bc9298b64010ec494b5e1408 +ide 0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 691c01c3f0b3252308162de90edcd02f7ca1733c +irqdomain-current 1acf771ee541792fc6cc7281b238da1858c9a336 +devicetree-current e46c11b947876235f18d137b051225cfbe7099f2 +spi-current cc4d22ae541ccd989ef163c46a38afde131e1644 +gpio-current 6270d830d030da48eddffbe31ed1e4444f203fc5 +arm b2bc9e0ee349db84035d8141e85babc7986594d7 +arm-perf c16fa4f2ad19908a47c63d8fa436a1178438c7e7 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p cfae12a37b567c7e04b679f2ee54da3681691771 +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +blackfin 35fe2e73bf097409abb9b81e041db83ea08b1c93 +c6x fde7d9049e55ab85a390be7f415d74c9f62dd0f9 +cris 4d5914d628360c607dc426ccb1acaf23909ac546 +hexagon 110b3723837f231b7dda418df975bcc09e780825 +ia64 16f2634490a6acf433fd447cdd6489232a1ff5cb +m68k 25d0b90894d383e1a4cece901c6b4703bca3de6a +m68knommu de6bd4f40385ec4184d8c9e759b91348631a9322 +microblaze 258f742635360175564e9470eb060ff4d4b984e7 +mips 2fea3778a54e5407527677bc326afd4e34985b62 +openrisc c88e692f162093769780c82179eed25f2548e04b +parisc c60dc74eb95cb10f8d3269cab1cc2e20532cda9a +powerpc 0195c00244dc2e9f522475868fa278c473ba7339 +4xx b5594a7760fa048730db64c501cf4534df06b3b3 +mpc5xxx 7b6bb64ab9d2c226c380e09773066cfcd22dc912 +galak fa1b42b45a9c96da77f3ddabf715f49525a87209 +s390 b7918da4a567938fae3c8871d0ba7885313421b3 +sh bbb4ce50f3169b08764f9965fd5b9655646d545a +sparc-next e9b57cca3dbdc7a0b90514af8bf613baf97105a5 +tile 0638f53573c9eca46c3a135db956320c7fb7ac02 +unicore32 099469502f62fbe0d7e4f0b83a2f22538367f734 +ceph c666601a935b94cc0f3310339411b6940de751ba +cifs f68e556e23d1a4176b563bcb25d8baf2c5313f91 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 6cfd4b42f29db32426499c9dca8885ea04b04839 +ext3 c2d9fae481e85baef30a7de63b868a66ba1075eb +ext4 9d547c35799a4ddd235f1565cec2fff6c9263504 +fuse 4273b793ec68753cc3fcf5be7cbfd88c2be2058d +gfs2 02ed02f9e93f0140ca0dfa9193c5e78cc52c4a98 +logfs cd8bfa9c8a13cf3facc5731da17e10188b3795d1 +nfs f30fb85b7d4bf18f6b89ea64dca632ecadf9279a +nfsd 797a9d797f8483bb67f265c761b76dcd5a077a23 +ocfs2 939255798a468e1a92f03546de6e87be7b491e57 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs 01627d968c8b5e2810fe8c417b406b968297c236 +ubifs dd775ae2549217d3ae09363e3edb305d0fa19928 +xfs 0034102808e0dbbf3a2394b82b1bb40b5778de9e +vfs 07c0c5d8b8c122b2f2df9ee574ac3083daefc981 +pci 314489bd4c7780fde6a069783d5128f6cef52919 +hid 2c8cee03124ddb62dcbdd5824f8d47323e8fe4d5 +i2c 85bb1a80a25f5a72b888e75b39e4f0daa4b37400 +bjdooks-i2c fc84fe19ffb9eee7e6b3301bc6cd45b22f187bd7 +i2c-embedded bbceeee82ef55c11db0161f4078edd79290e3bcf +jdelvare-hwmon e3a9568476a09671a419f7481a3be2bbca25d801 +hwmon-staging e03678700b1e00a72ccb5aa790d7525cf433a7ce +v4l-dvb 866c3866de21d95584f9e43a5e1e00e0e62735be +kbuild 51cbc3e93a5add14f1f8150e3b04d59c8f704320 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +libata b8cec3c253a2a001e463c43260fb75fb3223a04d +infiniband dd775ae2549217d3ae09363e3edb305d0fa19928 +acpi eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +ieee1394 19f8399884bcc99239aa1f7b700725a28cf72769 +ubi cc831464f839dc2559f896b96d13eaa0366282b0 +dlm 1b189b8889b7d8e0bddc2655d171c43cfd344157 +scsi 699316948628dab9e813c415640fe5b9f65cd5e3 +target-updates 187e70a554e0f0717a65998bc9199945cbbd4692 +target-merge 06de5ee455aa2695ecd595606355fe974e75d3f5 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci fbabacbb2f949bdd6aa8672874c838c1539b0d91 +slave-dma 91ae1e3576da25809dfbfb8ef98923d4a2eb59cb +dmaengine a2bd1140a264b561e38d99e656cd843c2d840e86 +net-next 06eb4eafbdc0796d741d139a44f1253278da8611 +wireless-next 78f9c85035101317d4189cdb31c582f96854b182 +bluetooth 30720c977619fc023f7be81f2443f6967fe3e111 +mtd 7b0e67f604e1829e5292e1ad7743eb18dc42ea7c +l2-mtd 711ab3ac26fc257f54e0d5032ca8eec21ac78ac8 +crypto d788fec855e832ee3381d9d3afc91c9c0292e428 +sound 8592db47248b3b0df35030263c97b9196a07c7cb +sound-asoc 07b6335e4424a010577ebfaceb71332cb9a87f71 +cpufreq a7b422cda5084db7265c3b23310a959b43b47529 +rr 2a22b634997e16f378097816944229cbafac556c +input d568778298f58330bcc8cc23845676d1143c8d33 +input-mt 0034102808e0dbbf3a2394b82b1bb40b5778de9e +cgroup cbe128e348e5994516304f94865ff90c40c1c5ae +block f52b69f86e27903d6896ed5fa7cd280fec8de532 +device-mapper 4b63eba90a8afecb232826d323e066ad44f53a0b +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc aaed8df9d79637627607410c654fd36ca688d2d9 +kgdb 3751d3e85cf693e10e2c47c03c8caa65e171099b +slab b80b6c007771f2d8f4f50b14bc89a7039a11673c +uclinux 5e442a493fc59fa536c76db1fff5b49ca36a88c5 +md bee6cd3db57264d65e28770fa0539b9d4a4c7fcb +mfd b8589e2a8065b8e7773742b60ae96b63b757bb69 +battery 5cdd4d7fa5424f2018193a0c2af3bef9036c973e +drm 5466c7b1683a23dbbcfb7ee4a71c4f23886001c7 +fbdev 688ec344a62e85f221d7a310a1209cf9b1209fd3 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 df01d53068bdf31609aafd9a857901a1f16dfa52 +regulator cf0ff3d95584073cc735066356c9faca242396ab +security 9ccf010f8172b699ea80178860e8ea228f7dce56 +selinux ecf093df43944bba0c96dd44a1c657267297bf5f +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 0034102808e0dbbf3a2394b82b1bb40b5778de9e +dwmw2-iommu c3b92c8787367a8bb53d57d9789b558f1295cc96 +iommu 7de473066f1512e52ea806e3c9698e5ea325b26c +osd 72749a270b6d254b4a018e290b853c27edb2fa62 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial b3aa1584e9f3449b0669ab2beb9b9bf99874e1d6 +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +pm c4772d192c70b61d52262b0db76f7abd8aeb51c6 +apm f283d22713b0bdc147097c92c9b45855339cf1c8 +fsnotify 1aec9c0d718693553543349e92138033b0bcea4c +edac a4b4be3fd7a76021f67380b03d8bccebf067db72 +edac-amd 305f1c3cfd7eef63bef2128b6934a9054d902976 +devicetree 0f22dd395fc473cee252b9af50249b8e0f32fde7 +spi 6810d770847c0f24555c13dd80b64fcc30c47ad8 +tip 911bcb25143c2cbe3daac8785285d8daf03cf9fc +rcu 1cc85961e214773cb7d7f2ccbe3bc644dd466df0 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kmemleak d65b4e98d7ea3038b767b70fe8be959b2913f16d +kvm e08759215b7dcb7111e94f0f96918dd98e86ca6b +oprofile c16fa4f2ad19908a47c63d8fa436a1178438c7e7 +xen 59e9a6b1ee9fa3992860eb6c48a37b163e97d205 +xen-two 2efe928d9f721fb54f7bef90dbf37cbd9a68f48b +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu adb795062f89b8d67d295ee25e04034bccce6779 +workqueues e06ffa1ede4146cbc261d90f5dff3d63fe2e9d7a +drivers-x86 86924de2a612b275a45e92ba80d6f47d4e97d620 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 41326c1b672ea9f8293ce0835b7cb29d87b6123c +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +driver-core ecf1948985247cf35b5536fa62e02f56476f41f1 +tty 59d59b0600e541b4e94b891148c92f2e2d18f7c0 +usb af5810597ab38ed1eb1d38e04b6e89c9ccec988e +staging b330f606ed7591dc078acd856454e3a383299fb3 +char-misc 0034102808e0dbbf3a2394b82b1bb40b5778de9e +tmem 9c9fc31d65250b25459c83da739dccbc2c264038 +writeback 697e6fed9fc620eb6c79ebcfe6865b66773c0221 +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl a57be237f6aa7ed747c29fd4b89ea4d0c2898b4f +tegra 2ac6b1ec98be25c94b97b45676658690287a8d97 +moduleh ed93e94eaea8c85383da2b2e6402c1a039cdbc70 +vhost 437578b5d30f9c580bb82397eb3a8efa9ee191db +kmap_atomic 317b6e128247f75976b0fc2b9fd8d2c20ef13b3a +modem-shm 3cff1cc0d7703b289fc2e1dbf6cc7790ccac9d5e +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc e12bc14b88d44e5c1456dccb59ff58103f6c6edc +irqdomain 409a6f61db9b2433e45299f476f57a4624ee605d +gpio f141ed65f256ec036c7fba604da6b7c448096ef9 +arm-soc ce9f68e3084afb92559963b64a38aa1453adc317 +kvmtool 63091b3043df14cb53cd895e0f3e8894f2b853db +dma-mapping 0034102808e0dbbf3a2394b82b1bb40b5778de9e +dma-buf 9f28056eee49f080166ca6c3aea449e0df189134 +ktest 648a182c615272f01b5cda01dc87a16de9f695bb +cpuidle-cons 203b52e38129988b21ebcc21d34262ada966ecc2 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm 5175be8ba7b68f48e27c0bcf2c7a70c3cb525088 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..1b81ec2a2954 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,192 @@ +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/~rmk/linux-next.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 +scsi-rc-fixes git git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6.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 +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +sh-current git git://github.com/pmundt/linux-sh.git#sh-fixes-for-linus +irqdomain-current git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/merge +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +gpio-current git git://git.secretlab.ca/git/linux-2.6#gpio/merge +arm git git://ftp.arm.linux.org.uk/~rmk/linux-next.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +s5p git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon quilt https://www.codeaurora.org/patches/quic/hlk/linux-next/ +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://github.com/pmundt/linux-sh.git#sh-latest +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://github.com/gxt/linux.git#unicore32 +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs.git#for-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +i2c-embedded git git://git.pengutronix.de/git/wsa/linux.git#i2c-embedded/for-next +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://github.com/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +scsi git git://bedivere.hansenpartnership.com/git/scsi-misc-2.6.git#master +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 +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 +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://github.com/rydberg/linux.git#for-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper quilt http://people.redhat.com/agk/patches/linux/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +battery git git://git.infradead.org/battery-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +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 +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 +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +cputime git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#cputime +uprobes git git://github.com/srikard/linux.git#for-next +kmemleak git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git#kmemleak +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +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 +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 +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next +moduleh git git://openlinux.windriver.com/people/paulg/linux-next#for-sfr +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +kmap_atomic git git://github.com/congwang/linux.git#kmap_atomic +modem-shm git git://github.com/sjurbren/modem-ipc.git#for-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 +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.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 +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +cpuidle-cons git git://git.linaro.org/people/rob_lee/linux.git#cpuidle_consol_pull +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm mmotm http://userweb.kernel.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..0dc7c34f9a34 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3579 @@ +$ date +Wed Apr 11 11:09:04 EST 2012 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 0034102 Linux 3.4-rc2 +Merging origin/master (a9e1e53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge origin/master +Updating 0034102..a9e1e53 +Fast-forward + arch/sparc/kernel/leon_pci.c | 13 --- + arch/sparc/mm/fault_32.c | 37 ++++++-- + arch/sparc/mm/fault_64.c | 37 ++++++-- + arch/um/drivers/cow.h | 35 -------- + arch/um/drivers/cow_user.c | 43 +++++---- + arch/um/drivers/mconsole_kern.c | 1 + + arch/um/include/asm/Kbuild | 3 +- + arch/um/kernel/Makefile | 7 +- + arch/um/kernel/process.c | 6 +- + arch/um/kernel/skas/mmu.c | 1 - + arch/x86/Makefile.um | 3 + + arch/x86/um/asm/barrier.h | 75 ++++++++++++++++ + arch/x86/um/asm/system.h | 135 ---------------------------- + crypto/Kconfig | 6 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 1 - + drivers/regulator/anatop-regulator.c | 6 +- + drivers/staging/android/lowmemorykiller.c | 48 ++-------- + scripts/mod/modpost.c | 7 +- + scripts/mod/modpost.h | 1 + + 19 files changed, 186 insertions(+), 279 deletions(-) + create mode 100644 arch/x86/um/asm/barrier.h + delete mode 100644 arch/x86/um/asm/system.h +Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (0eb043d Subject: [PATCH] tags.sh: Add missing quotes) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/fixes (b2bc9e0 ARM: 7366/1: amba: Remove AMBA level regulator support) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/common/vic.c | 9 ++++----- + arch/arm/mm/fault.c | 2 +- + drivers/amba/bus.c | 42 +----------------------------------------- + drivers/mfd/db8500-prcmu.c | 1 + + drivers/spi/spi-pl022.c | 2 -- + include/linux/amba/bus.h | 8 -------- + 6 files changed, 7 insertions(+), 57 deletions(-) +Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge (9b218f6 powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (d657784 sparc32,leon: fix leon build) +$ git merge sparc/master +Already up-to-date. +Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576) +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net/master (18a223e tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample) +$ git merge net/master +Merge made by the 'recursive' strategy. + include/linux/netfilter_ipv6/ip6_tables.h | 12 +++++++++++- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 12 ++++++++++-- + net/ipv4/tcp.c | 3 +-- + net/ipv4/tcp_input.c | 7 +++++-- + net/ipv6/netfilter/ip6_tables.c | 14 -------------- + net/netfilter/nf_conntrack_core.c | 2 +- + net/netfilter/nf_conntrack_proto_tcp.c | 4 ++-- + 7 files changed, 30 insertions(+), 24 deletions(-) +Merging sound-current/for-linus (fae3d88 ALSA: hda - hide HDMI/ELD printks unless snd.debug=2) +$ git merge sound-current/for-linus +Auto-merging sound/soc/soc-core.c +Auto-merging sound/soc/imx/imx-audmux.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + include/sound/core.h | 10 ++++ + sound/isa/sscape.c | 6 ++- + sound/oss/msnd_pinnacle.c | 8 ++- + sound/pci/asihpi/hpi_internal.h | 4 +- + sound/pci/asihpi/hpios.c | 10 ++-- + sound/pci/hda/hda_codec.h | 3 ++ + sound/pci/hda/hda_eld.c | 6 +-- + sound/pci/hda/hda_proc.c | 13 +++-- + sound/pci/hda/patch_conexant.c | 108 +++++++++++++++------------------------ + sound/pci/hda/patch_hdmi.c | 9 ++-- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/sgtl5000.c | 25 ++++----- + sound/soc/imx/imx-audmux.c | 5 +- + sound/soc/pxa/pxa2xx-i2s.c | 1 + + sound/soc/soc-core.c | 2 + + sound/soc/tegra/tegra_i2s.c | 6 ++- + sound/soc/tegra/tegra_spdif.c | 4 ++ + 18 files changed, 120 insertions(+), 106 deletions(-) +Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (011afa1 Revert "ath9k: fix going to full-sleep on PS idle") +$ git merge wireless/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +++---- + drivers/bcma/Kconfig | 2 +- + drivers/bcma/driver_pci_host.c | 1 + + drivers/bluetooth/ath3k.c | 4 ++++ + drivers/bluetooth/btusb.c | 5 ++++- + drivers/bluetooth/hci_ldisc.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 8 +++---- + drivers/net/wireless/rt2x00/rt2x00dev.c | 6 +----- + drivers/net/wireless/rtlwifi/base.c | 5 ++++- + drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 6 ------ + include/net/bluetooth/hci.h | 3 ++- + include/net/bluetooth/hci_core.h | 12 ++++++----- + include/net/bluetooth/mgmt.h | 2 +- + include/net/mac80211.h | 2 +- + net/bluetooth/hci_core.c | 7 ++++++ + net/bluetooth/l2cap_core.c | 3 +++ + net/bluetooth/l2cap_sock.c | 5 +++-- + net/bluetooth/mgmt.c | 13 +++++++---- + net/mac80211/mlme.c | 3 +-- + net/wireless/nl80211.c | 31 ++++++++++++++++----------- + net/wireless/wext-core.c | 6 ++++-- + 21 files changed, 79 insertions(+), 55 deletions(-) +Merging driver-core.current/driver-core-linus (282029c kobject: provide more diagnostic info for kobject_add_internal() failures) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/soc.c | 4 +--- + fs/sysfs/dir.c | 5 ++++- + fs/sysfs/group.c | 6 +++++- + lib/kobject.c | 14 +++++++------- + 4 files changed, 17 insertions(+), 12 deletions(-) +Merging tty.current/tty-linus (11bbd5b pch_uart: Add Kontron COMe-mTT10 uart clock quirk) +$ git merge tty.current/tty-linus +Auto-merging drivers/tty/serial/pch_uart.c +Merge made by the 'recursive' strategy. + drivers/char/hpet.c | 4 ++-- + drivers/isdn/gigaset/interface.c | 2 +- + drivers/tty/serial/8250/8250.c | 12 +++++----- + drivers/tty/serial/8250/8250_pci.c | 16 +------------- + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/altera_uart.c | 4 ++-- + drivers/tty/serial/amba-pl011.c | 8 +++---- + drivers/tty/serial/atmel_serial.c | 4 ++++ + drivers/tty/serial/omap-serial.c | 43 +++++++++++++++++------------------- + drivers/tty/serial/pch_uart.c | 8 +++++++ + drivers/tty/serial/samsung.c | 1 + + drivers/tty/vt/vt.c | 3 +-- + include/linux/serial_core.h | 2 +- + 13 files changed, 52 insertions(+), 57 deletions(-) +Merging usb.current/usb-linus (a65a6f1 USB: serial: fix race between probe and open) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + Documentation/usb/URB.txt | 22 ++++++++++++++++++++++ + Documentation/usb/usbmon.txt | 6 +++--- + drivers/usb/Kconfig | 16 ++++++++-------- + drivers/usb/core/driver.c | 9 +++++++-- + drivers/usb/core/hcd.c | 12 ++++++++++++ + drivers/usb/core/message.c | 11 ++++++----- + drivers/usb/core/urb.c | 12 ++++++++++++ + drivers/usb/gadget/inode.c | 1 - + drivers/usb/host/ehci-hcd.c | 3 +++ + drivers/usb/host/ehci-hub.c | 31 ++++++++++++++++--------------- + drivers/usb/host/ehci-tegra.c | 2 ++ + drivers/usb/host/ehci.h | 2 ++ + drivers/usb/host/uhci-hub.c | 5 +++-- + drivers/usb/serial/bus.c | 5 ----- + drivers/usb/serial/ftdi_sio.c | 36 ++++++++++++++++++++---------------- + drivers/usb/serial/metro-usb.c | 6 +++--- + drivers/usb/serial/option.c | 1 + + drivers/usb/serial/pl2303.c | 2 +- + drivers/usb/serial/sierra.c | 1 + + drivers/usb/serial/usb-serial.c | 31 ++++++++++--------------------- + drivers/usb/storage/usb.c | 30 ++++++++++++++++++++++++++++++ + include/linux/usb/serial.h | 8 -------- + 22 files changed, 162 insertions(+), 90 deletions(-) +Merging staging.current/staging-linus (6490311 staging/xgifb: fix display on XGI Volari Z11m cards) +$ git merge staging.current/staging-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/staging/android/Kconfig | 3 ++- + drivers/staging/android/timed_gpio.c | 27 +++++++++++++----------- + drivers/staging/iio/inkern.c | 1 + + drivers/staging/iio/magnetometer/ak8975.c | 8 ++++--- + drivers/staging/media/as102/as102_fw.c | 2 +- + drivers/staging/omapdrm/omap_drv.c | 7 ++++--- + drivers/staging/ozwpan/TODO | 4 +++- + drivers/staging/ramster/Kconfig | 6 +----- + drivers/staging/rts_pstor/ms.c | 3 ++- + drivers/staging/rts_pstor/rtsx.c | 5 +++++ + drivers/staging/rts_pstor/rtsx_transport.c | 11 +++++----- + drivers/staging/sep/sep_main.c | 6 +++--- + drivers/staging/vme/devices/vme_pio2_core.c | 4 ++-- + drivers/staging/vt6655/key.c | 3 +++ + drivers/staging/vt6656/key.c | 3 +++ + drivers/staging/xgifb/vb_init.c | 2 +- + drivers/staging/xgifb/vb_setmode.c | 7 +++++++ + drivers/staging/xgifb/vb_table.h | 11 +++++++++- + drivers/staging/zsmalloc/zsmalloc-main.c | 30 ++++++++++++++++----------- + 20 files changed, 93 insertions(+), 51 deletions(-) +Merging char-misc.current/char-misc-linus (0034102 Linux 3.4-rc2) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes) +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus (fb16395 Input: trackpoint - use psmouse_fmt() for messages) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/mouse/elantech.c | 10 ++++++++-- + drivers/input/mouse/sentelic.c | 8 ++++++++ + drivers/input/mouse/trackpoint.c | 14 ++++++++------ + drivers/input/touchscreen/tps6507x-ts.c | 4 +--- + 4 files changed, 25 insertions(+), 11 deletions(-) +Merging md-current/for-linus (5020ad7 md/raid1,raid10: don't compare excess byte during consistency check.) +$ 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 (511d63c crypto: talitos - properly lock access to global talitos registers) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/sha512_generic.c | 2 +- + drivers/crypto/ixp4xx_crypto.c | 1 + + drivers/crypto/talitos.c | 20 +++++++++++++++++--- + 3 files changed, 19 insertions(+), 4 deletions(-) +Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) +$ 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 (691c01c arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible) +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging irqdomain-current/irqdomain/merge (1acf771 irq_domain: Fix debug output to use "irq" instead of "virq") +$ git merge irqdomain-current/irqdomain/merge +Merge made by the 'recursive' strategy. + arch/c6x/include/asm/irq.h | 4 ---- + arch/c6x/kernel/irq.c | 13 ------------- + arch/powerpc/include/asm/irq.h | 2 -- + arch/powerpc/kernel/irq.c | 6 ------ + include/linux/irq.h | 5 +++++ + include/linux/irqdomain.h | 6 ------ + include/linux/types.h | 6 ++++++ + kernel/irq/Kconfig | 2 +- + kernel/irq/irqdomain.c | 11 ++++++----- + 9 files changed, 18 insertions(+), 37 deletions(-) +Merging devicetree-current/devicetree/merge (e46c11b of/irq: add empty irq_of_parse_and_map() for non-dt builds) +$ git merge devicetree-current/devicetree/merge +Merge made by the 'recursive' strategy. + include/linux/of_irq.h | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging spi-current/spi/merge (cc4d22a spi/imx: mark base member in spi_imx_data as __iomem) +$ git merge spi-current/spi/merge +Merge made by the 'recursive' strategy. + drivers/spi/spi-davinci.c | 6 +++--- + drivers/spi/spi-fsl-spi.c | 4 +++- + drivers/spi/spi-imx.c | 2 +- + include/linux/amba/pl022.h | 2 ++ + 4 files changed, 9 insertions(+), 5 deletions(-) +Merging gpio-current/gpio/merge (6270d83 gpio: Fix range check in of_gpio_simple_xlate()) +$ git merge gpio-current/gpio/merge +Merge made by the 'recursive' strategy. + drivers/gpio/Kconfig | 2 +- + drivers/gpio/gpio-adp5588.c | 2 +- + drivers/gpio/gpio-sodaville.c | 23 ++++++++++------------- + drivers/of/gpio.c | 2 +- + 4 files changed, 13 insertions(+), 16 deletions(-) +Merging arm/for-next (b2bc9e0 ARM: 7366/1: amba: Remove AMBA level regulator support) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (c16fa4f Linux 3.3) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +Already up-to-date. +Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next (cfae12a Merge branch 'next/iommu-samsung' into for-next) +$ git merge s5p/for-next +Removing arch/arm/plat-samsung/include/plat/sysmmu.h +Removing arch/arm/plat-s5p/sysmmu.c +Removing arch/arm/mach-exynos/include/mach/regs-sysmmu.h +Merge made by the 'recursive' strategy. + arch/arm/mach-exynos/Kconfig | 10 +- + arch/arm/mach-exynos/Makefile | 2 +- + arch/arm/mach-exynos/Makefile.boot | 3 + + arch/arm/mach-exynos/clock-exynos4.c | 79 ++-- + arch/arm/mach-exynos/clock-exynos4.h | 2 + + arch/arm/mach-exynos/clock-exynos4210.c | 11 + + arch/arm/mach-exynos/clock-exynos4212.c | 28 +- + arch/arm/mach-exynos/clock-exynos5.c | 90 +++++ + arch/arm/mach-exynos/common.c | 65 ++-- + arch/arm/mach-exynos/dev-sysmmu.c | 457 ++++++++++++----------- + arch/arm/mach-exynos/include/mach/irqs.h | 27 +- + arch/arm/mach-exynos/include/mach/map.h | 42 +++ + arch/arm/mach-exynos/include/mach/regs-clock.h | 11 + + arch/arm/mach-exynos/include/mach/regs-sysmmu.h | 28 -- + arch/arm/mach-exynos/include/mach/sysmmu.h | 88 +++-- + arch/arm/mach-exynos/mach-armlex4210.c | 1 - + arch/arm/mach-exynos/mach-exynos5-dt.c | 2 +- + arch/arm/mach-exynos/mach-nuri.c | 51 +-- + arch/arm/mach-exynos/mach-smdkv310.c | 1 - + arch/arm/mach-exynos/mach-universal_c210.c | 5 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 18 + + arch/arm/mach-s5pv210/dma.c | 2 - + arch/arm/mach-s5pv210/mach-aquila.c | 4 +- + arch/arm/mach-s5pv210/mach-goni.c | 4 +- + arch/arm/plat-s5p/Kconfig | 8 - + arch/arm/plat-s5p/Makefile | 1 - + arch/arm/plat-s5p/sysmmu.c | 313 ---------------- + arch/arm/plat-samsung/include/plat/devs.h | 1 - + arch/arm/plat-samsung/include/plat/sysmmu.h | 95 ----- + 29 files changed, 603 insertions(+), 846 deletions(-) + delete mode 100644 arch/arm/mach-exynos/include/mach/regs-sysmmu.h + delete mode 100644 arch/arm/plat-s5p/sysmmu.c + delete mode 100644 arch/arm/plat-samsung/include/plat/sysmmu.h +Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) +$ git merge xilinx/arm-next +Already up-to-date. +Merging blackfin/for-linus (35fe2e7 blackfin: update defconfig for bf527-ezkit) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (4d5914d cris/mm/fault.c: Port OOM changes to do_page_fault) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. + Documentation/cris/README | 62 +++++++++++++++---------------- + arch/cris/arch-v10/kernel/kgdb.c | 2 +- + arch/cris/arch-v32/drivers/cryptocop.c | 6 +-- + arch/cris/arch-v32/kernel/ptrace.c | 2 - + arch/cris/include/arch-v32/arch/cache.h | 2 +- + arch/cris/include/asm/posix_types.h | 2 + + arch/cris/kernel/vmlinux.lds.S | 1 + + arch/cris/mm/fault.c | 31 +++++++++++++--- + drivers/net/cris/eth_v10.c | 1 - + 9 files changed, 64 insertions(+), 45 deletions(-) +Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h) +$ git merge quilt/hexagon +Resolved 'arch/hexagon/Kconfig' using previous resolution. +Auto-merging arch/hexagon/kernel/vdso.c +Auto-merging arch/hexagon/kernel/ptrace.c +Auto-merging arch/hexagon/kernel/dma.c +Auto-merging arch/hexagon/Kconfig +CONFLICT (content): Merge conflict in arch/hexagon/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 16cc62d] Merge branch 'quilt/hexagon' +$ git diff -M --stat --summary HEAD^.. + arch/hexagon/Kconfig | 23 ++++------------------- + arch/hexagon/Makefile | 4 ---- + arch/hexagon/include/asm/spinlock_types.h | 2 -- + arch/hexagon/kernel/dma.c | 1 + + arch/hexagon/kernel/ptrace.c | 1 + + arch/hexagon/kernel/time.c | 7 +++---- + arch/hexagon/kernel/vdso.c | 1 + + 7 files changed, 10 insertions(+), 29 deletions(-) +Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method) +$ git merge ia64/next +Auto-merging arch/ia64/sn/kernel/irq.c +Auto-merging arch/ia64/kernel/msi_ia64.c +Auto-merging arch/ia64/kernel/iosapic.c +Merge made by the 'recursive' strategy. + arch/ia64/kernel/iosapic.c | 4 +++- + arch/ia64/kernel/msi_ia64.c | 4 ++-- + arch/ia64/sn/kernel/irq.c | 2 +- + arch/ia64/sn/kernel/msi_sn.c | 2 +- + 4 files changed, 7 insertions(+), 5 deletions(-) +Merging m68k/for-next (25d0b90 scsi/atari: Make more functions static) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/amiga/platform.c | 126 ++++++++++++++++++++++++--------- + arch/m68k/atari/ataints.c | 4 +- + arch/m68k/include/asm/atariints.h | 4 +- + arch/m68k/include/asm/entry.h | 2 - + drivers/net/ethernet/amd/ariadne.c | 8 +-- + drivers/net/ethernet/amd/atarilance.c | 11 ++- + drivers/scsi/atari_scsi.c | 26 ++++--- + drivers/scsi/atari_scsi.h | 5 -- + 8 files changed, 122 insertions(+), 64 deletions(-) +Merging m68knommu/for-next (de6bd4f m68k: merge the MMU and non-MMU signal.c code) +$ git merge m68knommu/for-next +Auto-merging arch/m68k/platform/68VZ328/bootlogo.h +Removing arch/m68k/kernel/signal_no.c +Removing arch/m68k/kernel/signal_mm.c +Merge made by the 'recursive' strategy. + arch/m68k/kernel/signal.c | 1201 +++++++++++++++++++- + arch/m68k/kernel/signal_mm.c | 1115 ------------------ + arch/m68k/kernel/signal_no.c | 765 ------------- + arch/m68k/platform/68EZ328/Makefile | 6 - + arch/m68k/platform/68VZ328/Makefile | 9 +- + arch/m68k/platform/{68EZ328 => 68VZ328}/bootlogo.h | 2 +- + 6 files changed, 1202 insertions(+), 1896 deletions(-) + delete mode 100644 arch/m68k/kernel/signal_mm.c + delete mode 100644 arch/m68k/kernel/signal_no.c + rename arch/m68k/platform/{68EZ328 => 68VZ328}/bootlogo.h (99%) +Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h) +$ git merge openrisc/for-upstream +Merge made by the 'recursive' strategy. +Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next) +$ git merge parisc/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging powerpc/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system) +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board) +$ git merge 4xx/next +Already up-to-date. +Merging mpc5xxx/next (7b6bb64 powerpc/5200: convert mpc5200 to use of_platform_populate()) +$ git merge mpc5xxx/next +Merge made by the 'recursive' strategy. +Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0) +$ git merge galak/next +Already up-to-date. +Merging s390/features (b7918da [S390] update default configuration) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 - + arch/s390/defconfig | 37 +++++++++++------------ + arch/s390/include/asm/pgalloc.h | 3 -- + arch/s390/include/asm/tlb.h | 22 +------------- + arch/s390/mm/maccess.c | 27 +++++++++++------ + arch/s390/mm/pgtable.c | 63 +++++++++++++++++++++++++++++++++++++-- + drivers/s390/block/dasd_eckd.c | 24 ++++++++++----- + drivers/s390/char/vmur.c | 2 +- + 8 files changed, 114 insertions(+), 65 deletions(-) +Merging sh/sh-latest (bbb4ce5 serial: sh-sci: modify sci_break_ctl()) +$ git merge sh/sh-latest +Merge made by the 'recursive' strategy. + drivers/tty/serial/sh-sci.c | 30 ++++++++++++++++++++++++++---- + include/linux/serial_sci.h | 2 ++ + 2 files changed, 28 insertions(+), 4 deletions(-) +Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address) +$ git merge sparc-next/master +Auto-merging arch/sparc/kernel/unaligned_64.c +Auto-merging arch/sparc/kernel/ds.c +Merge made by the 'recursive' strategy. + arch/sparc/kernel/ds.c | 2 +- + arch/sparc/kernel/unaligned_64.c | 1 - + arch/sparc/mm/srmmu.c | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) +Merging tile/master (0638f53 arch/tile: tilegx PCI root complex support) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 48 +- + arch/tile/Makefile | 2 + + arch/tile/gxio/Kconfig | 34 + + arch/tile/gxio/Makefile | 8 + + arch/tile/gxio/dma_queue.c | 236 +++ + arch/tile/gxio/iorpc_globals.c | 102 + + arch/tile/gxio/iorpc_mpipe.c | 571 ++++++ + arch/tile/gxio/iorpc_mpipe_info.c | 95 + + arch/tile/gxio/iorpc_trio.c | 352 ++++ + arch/tile/gxio/kiorpc.c | 60 + + arch/tile/gxio/mpipe.c | 630 ++++++ + arch/tile/gxio/trio.c | 49 + + arch/tile/include/arch/mpipe.h | 321 +++ + arch/tile/include/arch/mpipe_constants.h | 42 + + arch/tile/include/arch/mpipe_def.h | 39 + + arch/tile/include/arch/mpipe_shm.h | 421 ++++ + arch/tile/include/arch/mpipe_shm_def.h | 23 + + arch/tile/include/arch/spr_def_32.h | 56 + + arch/tile/include/arch/spr_def_64.h | 43 + + arch/tile/include/arch/trio.h | 68 + + arch/tile/include/arch/trio_constants.h | 36 + + arch/tile/include/arch/trio_def.h | 41 + + arch/tile/include/arch/trio_pcie_intfc.h | 203 ++ + arch/tile/include/arch/trio_pcie_intfc_def.h | 32 + + arch/tile/include/arch/trio_pcie_rc.h | 144 ++ + arch/tile/include/arch/trio_pcie_rc_def.h | 24 + + arch/tile/include/arch/trio_shm.h | 111 ++ + arch/tile/include/arch/trio_shm_def.h | 19 + + arch/tile/include/asm/Kbuild | 2 +- + arch/tile/include/asm/atomic_32.h | 10 + + arch/tile/include/asm/byteorder.h | 20 + + arch/tile/include/asm/cachectl.h | 42 + + arch/tile/include/asm/compat.h | 3 - + arch/tile/include/asm/elf.h | 5 + + arch/tile/include/asm/futex.h | 143 +- + arch/tile/include/asm/hardwall.h | 18 +- + arch/tile/include/asm/hugetlb.h | 21 + + arch/tile/include/asm/io.h | 110 +- + arch/tile/include/asm/irqflags.h | 34 +- + arch/tile/include/asm/kexec.h | 12 + + arch/tile/include/asm/mmu.h | 2 +- + arch/tile/include/asm/mmu_context.h | 8 +- + arch/tile/include/asm/module.h | 40 + + arch/tile/include/asm/page.h | 18 +- + arch/tile/include/asm/pci.h | 97 +- + arch/tile/include/asm/pgalloc.h | 92 +- + arch/tile/include/asm/pgtable.h | 111 +- + arch/tile/include/asm/pgtable_32.h | 40 +- + arch/tile/include/asm/pgtable_64.h | 57 +- + arch/tile/include/asm/processor.h | 17 +- + arch/tile/include/asm/setup.h | 10 +- + arch/tile/include/asm/syscalls.h | 3 +- + arch/tile/include/asm/tlbflush.h | 17 +- + arch/tile/include/asm/uaccess.h | 222 ++- + arch/tile/include/asm/unistd.h | 4 +- + arch/tile/include/gxio/common.h | 40 + + arch/tile/include/gxio/dma_queue.h | 59 + + arch/tile/include/gxio/iorpc_globals.h | 38 + + arch/tile/include/gxio/iorpc_mpipe.h | 124 ++ + arch/tile/include/gxio/iorpc_mpipe_info.h | 46 + + arch/tile/include/gxio/iorpc_trio.h | 198 ++ + arch/tile/include/gxio/kiorpc.h | 29 + + arch/tile/include/gxio/mpipe.h | 1986 +++++++++++++++++++ + arch/tile/include/gxio/trio.h | 303 +++ + arch/tile/include/hv/drv_mpipe_intf.h | 602 ++++++ + arch/tile/include/hv/drv_trio_intf.h | 196 ++ + arch/tile/include/hv/drv_xgbe_intf.h | 2 +- + arch/tile/include/hv/hypervisor.h | 309 ++- + arch/tile/include/hv/iorpc.h | 716 +++++++ + arch/tile/kernel/Makefile | 7 +- + arch/tile/kernel/entry.S | 3 +- + arch/tile/kernel/hardwall.c | 754 +++++--- + arch/tile/kernel/head_32.S | 8 +- + arch/tile/kernel/head_64.S | 22 +- + arch/tile/kernel/hvglue.lds | 3 +- + arch/tile/kernel/intvec_64.S | 80 +- + arch/tile/kernel/machine_kexec.c | 42 +- + arch/tile/kernel/module.c | 12 +- + arch/tile/kernel/pci_gx.c | 1597 +++++++++++++++ + arch/tile/kernel/proc.c | 1 + + arch/tile/kernel/process.c | 16 +- + .../{relocate_kernel.S => relocate_kernel_32.S} | 0 + arch/tile/kernel/relocate_kernel_64.S | 260 +++ + arch/tile/kernel/setup.c | 166 +- + arch/tile/kernel/single_step.c | 16 +- + arch/tile/kernel/smp.c | 2 +- + arch/tile/kernel/smpboot.c | 2 + + arch/tile/kernel/sys.c | 10 +- + arch/tile/kernel/sysfs.c | 8 + + arch/tile/kernel/tlb.c | 11 +- + arch/tile/kernel/traps.c | 30 +- + arch/tile/lib/atomic_32.c | 47 +- + arch/tile/lib/exports.c | 8 - + arch/tile/lib/memchr_64.c | 8 +- + arch/tile/lib/memcpy_64.c | 23 +- + arch/tile/lib/memcpy_tile64.c | 8 +- + arch/tile/lib/strchr_64.c | 15 +- + arch/tile/lib/string-endian.h | 33 + + arch/tile/lib/strlen_64.c | 11 +- + arch/tile/lib/usercopy_32.S | 76 - + arch/tile/lib/usercopy_64.S | 49 - + arch/tile/mm/fault.c | 34 +- + arch/tile/mm/homecache.c | 1 + + arch/tile/mm/hugetlbpage.c | 241 ++- + arch/tile/mm/init.c | 19 +- + arch/tile/mm/migrate.h | 6 + + arch/tile/mm/migrate_32.S | 36 +- + arch/tile/mm/migrate_64.S | 34 +- + arch/tile/mm/pgtable.c | 47 +- + drivers/net/ethernet/tile/Kconfig | 1 + + drivers/net/ethernet/tile/Makefile | 4 +- + drivers/net/ethernet/tile/tilegx.c | 2045 ++++++++++++++++++++ + drivers/pci/quirks.c | 6 +- + include/asm-generic/pgtable.h | 5 +- + include/linux/hugetlb.h | 8 + + init/main.c | 25 +- + mm/hugetlb.c | 1 + + mm/pgtable-generic.c | 4 +- + 118 files changed, 14239 insertions(+), 1222 deletions(-) + create mode 100644 arch/tile/gxio/Kconfig + create mode 100644 arch/tile/gxio/Makefile + create mode 100644 arch/tile/gxio/dma_queue.c + create mode 100644 arch/tile/gxio/iorpc_globals.c + create mode 100644 arch/tile/gxio/iorpc_mpipe.c + create mode 100644 arch/tile/gxio/iorpc_mpipe_info.c + create mode 100644 arch/tile/gxio/iorpc_trio.c + create mode 100644 arch/tile/gxio/kiorpc.c + create mode 100644 arch/tile/gxio/mpipe.c + create mode 100644 arch/tile/gxio/trio.c + create mode 100644 arch/tile/include/arch/mpipe.h + create mode 100644 arch/tile/include/arch/mpipe_constants.h + create mode 100644 arch/tile/include/arch/mpipe_def.h + create mode 100644 arch/tile/include/arch/mpipe_shm.h + create mode 100644 arch/tile/include/arch/mpipe_shm_def.h + create mode 100644 arch/tile/include/arch/trio.h + create mode 100644 arch/tile/include/arch/trio_constants.h + create mode 100644 arch/tile/include/arch/trio_def.h + create mode 100644 arch/tile/include/arch/trio_pcie_intfc.h + create mode 100644 arch/tile/include/arch/trio_pcie_intfc_def.h + create mode 100644 arch/tile/include/arch/trio_pcie_rc.h + create mode 100644 arch/tile/include/arch/trio_pcie_rc_def.h + create mode 100644 arch/tile/include/arch/trio_shm.h + create mode 100644 arch/tile/include/arch/trio_shm_def.h + create mode 100644 arch/tile/include/asm/cachectl.h + create mode 100644 arch/tile/include/asm/module.h + create mode 100644 arch/tile/include/gxio/common.h + create mode 100644 arch/tile/include/gxio/dma_queue.h + create mode 100644 arch/tile/include/gxio/iorpc_globals.h + create mode 100644 arch/tile/include/gxio/iorpc_mpipe.h + create mode 100644 arch/tile/include/gxio/iorpc_mpipe_info.h + create mode 100644 arch/tile/include/gxio/iorpc_trio.h + create mode 100644 arch/tile/include/gxio/kiorpc.h + create mode 100644 arch/tile/include/gxio/mpipe.h + create mode 100644 arch/tile/include/gxio/trio.h + create mode 100644 arch/tile/include/hv/drv_mpipe_intf.h + create mode 100644 arch/tile/include/hv/drv_trio_intf.h + create mode 100644 arch/tile/include/hv/iorpc.h + create mode 100644 arch/tile/kernel/pci_gx.c + rename arch/tile/kernel/{relocate_kernel.S => relocate_kernel_32.S} (100%) + create mode 100644 arch/tile/kernel/relocate_kernel_64.S + create mode 100644 arch/tile/lib/string-endian.h + create mode 100644 drivers/net/ethernet/tile/tilegx.c +Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two")) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging ceph/master (c666601 rbd: move snap_rwsem to the device, rename to header_rwsem) +$ git merge ceph/master +Already up-to-date. +Merging cifs/master (f68e556 Make the "word-at-a-time" helper functions more commonly usable) +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic()) +$ git merge ecryptfs/next +Resolved 'fs/ecryptfs/ecryptfs_kernel.h' using previous resolution. +Auto-merging fs/ecryptfs/mmap.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cb09e98] Merge remote-tracking branch 'ecryptfs/next' +$ git diff -M --stat --summary HEAD^.. + fs/ecryptfs/mmap.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +Merging ext3/for_next (c2d9fae ext2: Remove s_dirt handling) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext3.txt | 6 +++--- + fs/ext2/balloc.c | 2 -- + fs/ext2/ialloc.c | 2 -- + fs/ext2/super.c | 6 ------ + fs/ext2/xattr.c | 1 - + fs/ext3/ialloc.c | 20 ++------------------ + fs/jbd/commit.c | 10 +++++++--- + fs/jbd/journal.c | 2 ++ + fs/jbd/transaction.c | 2 -- + include/linux/jbd.h | 15 +++++++++------ + include/trace/events/jbd.h | 24 ++++++++---------------- + 11 files changed, 31 insertions(+), 59 deletions(-) +Merging ext4/dev (9d547c3 vfs: remove unused superblock helpers) +$ git merge ext4/dev +Already up-to-date. +Merging fuse/for-next (4273b79 fuse: O_DIRECT support for files) +$ git merge fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 25 ++++++----- + fs/fuse/file.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++-------- + 2 files changed, 127 insertions(+), 27 deletions(-) +Merging gfs2/master (02ed02f GFS2: Allow caching of rindex glock) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/Kconfig | 7 ++----- + fs/gfs2/aops.c | 4 ++-- + fs/gfs2/bmap.c | 6 +++++- + fs/gfs2/dir.c | 4 ++++ + fs/gfs2/inode.c | 13 +++++++++++-- + fs/gfs2/log.c | 13 ++++--------- + fs/gfs2/lops.c | 25 +++++++++++-------------- + fs/gfs2/rgrp.c | 8 +++++--- + fs/gfs2/xattr.c | 12 ++++++++++++ + 9 files changed, 56 insertions(+), 36 deletions(-) +Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio) +$ git merge logfs/master +Merge made by the 'recursive' strategy. + fs/logfs/dev_bdev.c | 1 + + fs/logfs/inode.c | 16 ++++++++++++++++ + fs/logfs/readwrite.c | 1 - + fs/logfs/segment.c | 2 +- + 4 files changed, 18 insertions(+), 2 deletions(-) +Merging nfs/linux-next (f30fb85 NFS: check for req==NULL in nfs_try_to_update_request cleanup) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4state.c | 7 +++++++ + fs/nfs/write.c | 3 ++- + net/sunrpc/sunrpc_syms.c | 17 +++++++++-------- + 3 files changed, 18 insertions(+), 9 deletions(-) +Merging nfsd/nfsd-next (797a9d7 nfsd: only register cld pipe notifier when CONFIG_NFSD_V4 is enabled) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap) +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (dd775ae Linux 3.4-rc1) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (0034102 Linux 3.4-rc2) +$ git merge xfs/for-next +Already up-to-date. +Merging vfs/for-next (07c0c5d ext4: initialization of ext4_li_mtx needs to be done earlier) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (2c8cee0 Merge branches 'logitech', 'wacom' and 'waltop' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 9 +- + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 25 +++++- + drivers/hid/hid-lg.c | 55 +++++++----- + drivers/hid/hid-lg.h | 5 ++ + drivers/hid/hid-lg4ff.c | 6 +- + drivers/hid/hid-tivo.c | 2 +- + drivers/hid/hid-wacom.c | 62 ++++++------- + drivers/hid/hid-waltop.c | 189 +++++++++++++++++++++++++++++++++++++++ + drivers/hid/usbhid/hid-core.c | 65 +++++++++++--- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/usbhid/usbhid.h | 1 + + 13 files changed, 341 insertions(+), 81 deletions(-) +Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN) +$ git merge quilt/i2c +Merge made by the 'recursive' strategy. + drivers/i2c/i2c-dev.c | 30 ++++++++++++++++++++++++++---- + 1 file changed, 26 insertions(+), 4 deletions(-) +Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap) +$ git merge bjdooks-i2c/next-i2c +Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution. +Auto-merging drivers/i2c/busses/i2c-omap.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0b659b1] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. +Merging i2c-embedded/i2c-embedded/for-next (bbceeee i2c-eg20t: Remove write-only variables) +$ git merge i2c-embedded/i2c-embedded/for-next +Already up-to-date. +Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver) +$ git merge quilt/jdelvare-hwmon +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (e0367870 hwmon: use module_pci_driver) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/it87 | 28 +++++++--- + drivers/hwmon/fam15h_power.c | 13 +---- + drivers/hwmon/it87.c | 125 +++++++++++++++++++++++++++++++++--------- + drivers/hwmon/k10temp.c | 13 +---- + drivers/hwmon/k8temp.c | 13 +---- + 5 files changed, 121 insertions(+), 71 deletions(-) +Merging v4l-dvb/master (eb56984 Merge /home/v4l/v4l/for_upstream) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/dvb/dvb-core/dvb_frontend.c | 12 ++++++- + drivers/media/dvb/dvb-usb/it913x.c | 54 +++++++++++++++++++++-------- + drivers/media/radio/radio-rtrack2.c | 1 + + drivers/media/rc/ir-raw.c | 4 ++- + drivers/media/video/ivtv/ivtv-fileops.c | 6 ++-- + drivers/media/video/ivtv/ivtv-ioctl.c | 4 +-- + drivers/media/video/pwc/pwc-if.c | 9 +++++ + drivers/media/video/pwc/pwc-v4l.c | 2 ++ + drivers/media/video/uvc/uvc_video.c | 50 ++++++++++++++++---------- + drivers/media/video/videobuf-core.c | 3 +- + drivers/media/video/videobuf2-core.c | 48 +++++++++++++++++-------- + drivers/media/video/vivi.c | 9 +---- + sound/pci/Kconfig | 4 +-- + 13 files changed, 142 insertions(+), 64 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 1b4eae5 Merge remote-tracking branch 'hwmon-staging/hwmon-next' +Merging refs/next/20120410/v4l-dvb +$ git merge refs/next/20120410/v4l-dvb +Merge made by the 'recursive' strategy. + drivers/media/dvb/dvb-core/dvb_frontend.c | 12 ++++++- + drivers/media/dvb/dvb-usb/it913x.c | 54 +++++++++++++++++++++-------- + drivers/media/radio/radio-rtrack2.c | 1 + + drivers/media/video/ivtv/ivtv-fileops.c | 6 ++-- + drivers/media/video/ivtv/ivtv-ioctl.c | 4 +-- + drivers/media/video/pwc/pwc-if.c | 9 +++++ + drivers/media/video/pwc/pwc-v4l.c | 2 ++ + drivers/media/video/uvc/uvc_video.c | 50 ++++++++++++++++---------- + drivers/media/video/videobuf-core.c | 3 +- + drivers/media/video/videobuf2-core.c | 48 +++++++++++++++++-------- + drivers/media/video/vivi.c | 9 +---- + sound/pci/Kconfig | 4 +-- + 12 files changed, 139 insertions(+), 63 deletions(-) +Merging kbuild/for-next (51cbc3e Merge branch 'kbuild/rc-fixes' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next) +$ git merge kconfig/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging libata/NEXT (b8cec3c pata_cmd64x: implement sff_irq_check() method) +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next (dd775ae Linux 3.4-rc1) +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/next (eeaab2d Merge branches 'idle-fix' and 'misc' into release) +$ git merge acpi/next +Already up-to-date. +Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging ieee1394/for-next (19f8399 Merge branch 'iso-flush' into for-next) +$ git merge ieee1394/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ubi/linux-next (cc83146 UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TARGET_BITFLIPS) +$ git merge ubi/linux-next +Already up-to-date. +Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used) +$ git merge dlm/next +Already up-to-date. +Merging scsi/master (6993169 [SCSI] ipr: Driver version 2.5.3) +$ git merge scsi/master +Already up-to-date. +Merging target-updates/for-next (187e70a ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (06de5ee tcm_qla2xxx: Add >= 24xx series fabric module for target-core) +$ git merge target-merge/for-next-merge +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/Kconfig | 8 + + drivers/scsi/qla2xxx/Makefile | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 5 +- + drivers/scsi/qla2xxx/qla_dbg.c | 5 + + drivers/scsi/qla2xxx/qla_dbg.h | 5 + + drivers/scsi/qla2xxx/qla_def.h | 69 +- + drivers/scsi/qla2xxx/qla_gbl.h | 7 + + drivers/scsi/qla2xxx/qla_gs.c | 4 +- + drivers/scsi/qla2xxx/qla_init.c | 82 +- + drivers/scsi/qla2xxx/qla_iocb.c | 102 +- + drivers/scsi/qla2xxx/qla_isr.c | 83 +- + drivers/scsi/qla2xxx/qla_mbx.c | 101 + + drivers/scsi/qla2xxx/qla_mid.c | 17 +- + drivers/scsi/qla2xxx/qla_os.c | 133 +- + drivers/scsi/qla2xxx/qla_target.c | 4724 ++++++++++++++++++++++++++++++++++++ + drivers/scsi/qla2xxx/qla_target.h | 986 ++++++++ + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 1981 +++++++++++++++ + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 149 ++ + 18 files changed, 8429 insertions(+), 35 deletions(-) + create mode 100644 drivers/scsi/qla2xxx/qla_target.c + create mode 100644 drivers/scsi/qla2xxx/qla_target.h + create mode 100644 drivers/scsi/qla2xxx/tcm_qla2xxx.c + create mode 100644 drivers/scsi/qla2xxx/tcm_qla2xxx.h +Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) +$ git merge ibft/linux-next +Already up-to-date. +Merging isci/all (fbabacb Merge branches 'devel', 'rnc-devel' and 'fixes' into all) +$ git merge isci/all +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/mvsas/mv_sas.c +Auto-merging drivers/scsi/isci/request.c +Auto-merging drivers/scsi/isci/host.c +Auto-merging drivers/scsi/ipr.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 3 + + drivers/ata/libata-core.c | 67 ++- + drivers/ata/libata-eh.c | 59 +- + drivers/ata/libata-scsi.c | 35 +- + drivers/ata/libata.h | 2 +- + drivers/scsi/ipr.c | 6 +- + drivers/scsi/isci/host.c | 705 ++++++++-------------- + drivers/scsi/isci/host.h | 126 ++-- + drivers/scsi/isci/init.c | 271 ++++++++- + drivers/scsi/isci/phy.c | 76 ++- + drivers/scsi/isci/phy.h | 9 +- + drivers/scsi/isci/port.c | 68 ++- + drivers/scsi/isci/port.h | 11 +- + drivers/scsi/isci/port_config.c | 18 +- + drivers/scsi/isci/probe_roms.c | 12 - + drivers/scsi/isci/probe_roms.h | 2 - + drivers/scsi/isci/registers.h | 8 + + drivers/scsi/isci/remote_device.c | 576 +++++++++++++----- + drivers/scsi/isci/remote_device.h | 63 +- + drivers/scsi/isci/remote_node_context.c | 393 ++++++++---- + drivers/scsi/isci/remote_node_context.h | 43 +- + drivers/scsi/isci/request.c | 715 ++++++++++------------ + drivers/scsi/isci/request.h | 125 +--- + drivers/scsi/isci/scu_completion_codes.h | 2 + + drivers/scsi/isci/task.c | 800 +++++-------------------- + drivers/scsi/isci/task.h | 132 +--- + drivers/scsi/isci/unsolicited_frame_control.c | 30 +- + drivers/scsi/isci/unsolicited_frame_control.h | 6 +- + drivers/scsi/libsas/sas_ata.c | 158 ++++- + drivers/scsi/libsas/sas_discover.c | 153 +++-- + drivers/scsi/libsas/sas_dump.c | 1 + + drivers/scsi/libsas/sas_event.c | 40 +- + drivers/scsi/libsas/sas_expander.c | 91 ++- + drivers/scsi/libsas/sas_init.c | 140 ++++- + drivers/scsi/libsas/sas_internal.h | 7 +- + drivers/scsi/libsas/sas_phy.c | 42 +- + drivers/scsi/libsas/sas_port.c | 67 ++- + drivers/scsi/libsas/sas_scsi_host.c | 195 +++++- + drivers/scsi/mvsas/mv_sas.c | 21 +- + drivers/scsi/pm8001/pm8001_sas.c | 37 +- + drivers/scsi/scsi.c | 4 + + drivers/scsi/scsi_lib.c | 10 +- + drivers/scsi/scsi_pm.c | 2 +- + drivers/scsi/scsi_priv.h | 2 + + drivers/scsi/scsi_transport_sas.c | 6 +- + drivers/scsi/sd.c | 5 +- + include/linux/libata.h | 19 +- + include/scsi/libsas.h | 90 ++- + include/scsi/sas.h | 1 + + include/scsi/sas_ata.h | 19 +- + 50 files changed, 2934 insertions(+), 2539 deletions(-) +Merging slave-dma/next (91ae1e3 dmaengine: mxs-dma: assign cookie in prepare) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/mxs-dma.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops) +$ git merge dmaengine/next +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/ipv4/tcp.c +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/dma/iop-adma.c +Auto-merging drivers/dma/ioat/dma_v3.c +Auto-merging drivers/dma/ioat/dma_v2.c +Auto-merging drivers/dma/ioat/dma.h +Auto-merging drivers/dma/ioat/dma.c +Auto-merging drivers/dma/dmaengine.c +Merge made by the 'recursive' strategy. + drivers/dma/dmaengine.c | 14 +++++++++++++ + drivers/dma/ioat/dma.c | 16 +++++++-------- + drivers/dma/ioat/dma.h | 6 +++--- + drivers/dma/ioat/dma_v2.c | 12 +++++------ + drivers/dma/ioat/dma_v2.h | 4 ++-- + drivers/dma/ioat/dma_v3.c | 49 +++++++++++++++++++++++++++++++++++++++++---- + drivers/dma/iop-adma.c | 4 ++-- + include/linux/dmaengine.h | 1 + + net/ipv4/tcp.c | 4 ++-- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + 12 files changed, 86 insertions(+), 30 deletions(-) +Merging net-next/master (06eb4ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge net-next/master +Auto-merging net/wireless/wext-core.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/netfilter/nf_conntrack_proto_tcp.c +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +Removing net/core/kmap_skb.h +Removing drivers/net/ethernet/xscale/ixp2000/pm3386.h +Removing drivers/net/ethernet/xscale/ixp2000/pm3386.c +Removing drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h +Removing drivers/net/ethernet/xscale/ixp2000/ixpdev.h +Removing drivers/net/ethernet/xscale/ixp2000/ixpdev.c +Removing drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.ucode +Removing drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc +Removing drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.ucode +Removing drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc +Removing drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h +Removing drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c +Removing drivers/net/ethernet/xscale/ixp2000/enp2611.c +Removing drivers/net/ethernet/xscale/ixp2000/caleb.h +Removing drivers/net/ethernet/xscale/ixp2000/caleb.c +Removing drivers/net/ethernet/xscale/ixp2000/Makefile +Removing drivers/net/ethernet/xscale/ixp2000/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/stmmac.txt | 29 +- + MAINTAINERS | 6 - + arch/arm/mach-ixp4xx/include/mach/ixp46x_ts.h | 3 + + crypto/ablkcipher.c | 12 +- + crypto/aead.c | 12 +- + crypto/ahash.c | 6 +- + crypto/blkcipher.c | 6 +- + crypto/crypto_user.c | 22 +- + crypto/pcompress.c | 6 +- + crypto/rng.c | 6 +- + crypto/shash.c | 6 +- + drivers/atm/horizon.c | 5 - + drivers/hv/ring_buffer.c | 31 - + drivers/infiniband/core/cma.c | 6 +- + drivers/infiniband/core/netlink.c | 3 +- + drivers/net/can/dev.c | 31 +- + drivers/net/ethernet/8390/ax88796.c | 1 + + drivers/net/ethernet/8390/etherh.c | 1 + + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/adaptec/starfire.c | 54 +- + drivers/net/ethernet/adi/bfin_mac.c | 20 + + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 5 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 17 +- + drivers/net/ethernet/broadcom/bnx2.c | 41 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 20 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 155 ++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 49 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 10 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 92 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 217 +++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 729 +++++------- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 3 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 302 ++--- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 5 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 6 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 3 - + drivers/net/ethernet/broadcom/tg3.c | 1 + + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 61 +- + drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | 142 ++- + drivers/net/ethernet/brocade/bna/bfi_reg.h | 6 + + drivers/net/ethernet/brocade/bna/bnad.c | 316 +++-- + drivers/net/ethernet/brocade/bna/bnad.h | 11 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 6 +- + drivers/net/ethernet/cadence/macb.c | 1 + + drivers/net/ethernet/cisco/enic/enic_main.c | 22 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 34 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 295 ++--- + drivers/net/ethernet/dec/tulip/tulip_core.c | 27 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 443 ++++--- + drivers/net/ethernet/dec/tulip/winbond-840.c | 17 +- + drivers/net/ethernet/dec/tulip/xircom_cb.c | 280 +++-- + drivers/net/ethernet/dlink/dl2k.c | 416 ++++--- + drivers/net/ethernet/dlink/dl2k.h | 19 +- + drivers/net/ethernet/dlink/sundance.c | 12 +- + drivers/net/ethernet/dnet.c | 1 + + drivers/net/ethernet/fealnx.c | 14 +- + drivers/net/ethernet/freescale/fec.c | 1 + + drivers/net/ethernet/freescale/fec_mpc52xx.c | 1 + + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 1 + + drivers/net/ethernet/freescale/gianfar.h | 3 + + drivers/net/ethernet/freescale/gianfar_ethtool.c | 30 + + drivers/net/ethernet/freescale/gianfar_ptp.c | 2 + + drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 1 + + drivers/net/ethernet/intel/Kconfig | 13 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 26 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 52 +- + drivers/net/ethernet/intel/e1000e/hw.h | 47 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 81 +- + drivers/net/ethernet/intel/igb/Makefile | 1 + + drivers/net/ethernet/intel/igb/igb.h | 21 +- + drivers/net/ethernet/intel/igb/igb_main.c | 178 +-- + drivers/net/ethernet/intel/igb/igb_ptp.c | 381 +++++++ + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 25 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 1 + + drivers/net/ethernet/marvell/pxa168_eth.c | 1 + + drivers/net/ethernet/marvell/sky2.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/Kconfig | 12 + + drivers/net/ethernet/mellanox/mlx4/Makefile | 1 + + drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 254 +++++ + drivers/net/ethernet/mellanox/mlx4/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 26 +- + drivers/net/ethernet/mellanox/mlx4/en_port.h | 2 + + drivers/net/ethernet/mellanox/mlx4/en_resources.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 20 + + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 28 +- + drivers/net/ethernet/mellanox/mlx4/port.c | 62 + + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 7 +- + drivers/net/ethernet/natsemi/natsemi.c | 67 +- + drivers/net/ethernet/neterion/s2io.c | 14 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 24 +- + drivers/net/ethernet/neterion/vxge/vxge-main.h | 15 +- + drivers/net/ethernet/nvidia/forcedeth.c | 5 - + drivers/net/ethernet/nxp/lpc_eth.c | 6 +- + drivers/net/ethernet/packetengines/hamachi.c | 11 +- + drivers/net/ethernet/packetengines/yellowfin.c | 32 +- + drivers/net/ethernet/rdc/r6040.c | 1 + + drivers/net/ethernet/realtek/8139cp.c | 21 +- + drivers/net/ethernet/realtek/8139too.c | 136 +-- + drivers/net/ethernet/realtek/r8169.c | 1 + + drivers/net/ethernet/renesas/Kconfig | 7 +- + drivers/net/ethernet/renesas/sh_eth.c | 114 +- + drivers/net/ethernet/renesas/sh_eth.h | 5 +- + drivers/net/ethernet/silan/sc92031.c | 34 +- + drivers/net/ethernet/sis/sis190.c | 26 +- + drivers/net/ethernet/sis/sis900.c | 375 +++--- + drivers/net/ethernet/smsc/epic100.c | 403 ++++--- + drivers/net/ethernet/smsc/smsc911x.c | 1 + + drivers/net/ethernet/smsc/smsc9420.c | 48 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 19 +- + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 4 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 42 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 12 +- + drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 1 + + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 48 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 109 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 36 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 3 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 2 - + drivers/net/ethernet/sun/sunhme.c | 18 +- + drivers/net/ethernet/sun/sunhme.h | 1 + + drivers/net/ethernet/tehuti/tehuti.c | 4 - + drivers/net/ethernet/ti/davinci_emac.c | 1 + + drivers/net/ethernet/via/via-rhine.c | 12 +- + drivers/net/ethernet/via/via-velocity.c | 9 +- + drivers/net/ethernet/wiznet/Kconfig | 81 ++ + drivers/net/ethernet/wiznet/Makefile | 2 + + drivers/net/ethernet/wiznet/w5100.c | 808 +++++++++++++ + drivers/net/ethernet/wiznet/w5300.c | 722 ++++++++++++ + drivers/net/ethernet/xilinx/ll_temac_main.c | 1 + + drivers/net/ethernet/xscale/Kconfig | 6 +- + drivers/net/ethernet/xscale/Makefile | 1 - + drivers/net/ethernet/xscale/ixp2000/Kconfig | 6 - + drivers/net/ethernet/xscale/ixp2000/Makefile | 3 - + drivers/net/ethernet/xscale/ixp2000/caleb.c | 136 --- + drivers/net/ethernet/xscale/ixp2000/caleb.h | 22 - + drivers/net/ethernet/xscale/ixp2000/enp2611.c | 232 ---- + drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c | 212 ---- + drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h | 115 -- + drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc | 408 ------- + .../net/ethernet/xscale/ixp2000/ixp2400_rx.ucode | 130 --- + drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc | 272 ----- + .../net/ethernet/xscale/ixp2000/ixp2400_tx.ucode | 98 -- + drivers/net/ethernet/xscale/ixp2000/ixpdev.c | 437 ------- + drivers/net/ethernet/xscale/ixp2000/ixpdev.h | 29 - + drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h | 57 - + drivers/net/ethernet/xscale/ixp2000/pm3386.c | 351 ------ + drivers/net/ethernet/xscale/ixp2000/pm3386.h | 29 - + drivers/net/ethernet/xscale/ixp4xx_eth.c | 29 + + drivers/net/hippi/rrunner.c | 82 +- + drivers/net/hyperv/netvsc.c | 41 +- + drivers/net/hyperv/netvsc_drv.c | 6 +- + drivers/net/macvlan.c | 3 +- + drivers/net/phy/bcm63xx.c | 5 +- + drivers/net/phy/davicom.c | 7 +- + drivers/net/phy/dp83640.c | 31 + + drivers/net/phy/marvell.c | 18 +- + drivers/net/ppp/pptp.c | 4 +- + drivers/net/team/Kconfig | 11 + + drivers/net/team/Makefile | 1 + + drivers/net/team/team.c | 80 +- + drivers/net/team/team_mode_loadbalance.c | 188 +++ + drivers/net/usb/usbnet.c | 1 + + drivers/net/wireless/ath/ath6kl/testmode.c | 5 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 131 +-- + drivers/net/wireless/ipw2x00/ipw2100.h | 1 + + drivers/net/wireless/ipw2x00/ipw2200.c | 4 - + drivers/net/wireless/iwlwifi/iwl-testmode.c | 71 +- + drivers/net/wireless/mac80211_hwsim.c | 24 +- + drivers/net/wireless/wl12xx/testmode.c | 9 +- + drivers/ptp/ptp_clock.c | 6 + + drivers/ptp/ptp_ixp46x.c | 3 + + include/linux/dcbnl.h | 12 + + include/linux/ethtool.h | 29 + + include/linux/filter.h | 7 +- + include/linux/hyperv.h | 27 + + include/linux/if_link.h | 2 + + include/linux/if_team.h | 8 + + include/linux/mlx4/cmd.h | 4 + + include/linux/mlx4/device.h | 3 + + include/linux/mlx4/qp.h | 3 +- + include/linux/netfilter/ipset/ip_set.h | 46 +- + include/linux/netfilter/ipset/ip_set_ahash.h | 21 +- + include/linux/phy.h | 3 + + include/linux/platform_data/wiznet.h | 24 + + include/linux/ptp_clock_kernel.h | 8 + + include/linux/stmmac.h | 55 +- + include/net/dcbnl.h | 2 + + include/net/icmp.h | 1 - + include/net/netlink.h | 169 +-- + include/net/xfrm.h | 5 +- + net/8021q/vlan_netlink.c | 16 +- + net/appletalk/ddp.c | 6 +- + net/bridge/br_fdb.c | 8 +- + net/bridge/br_netlink.c | 25 +- + net/caif/chnl_net.c | 14 +- + net/core/ethtool.c | 59 +- + net/core/fib_rules.c | 32 +- + net/core/filter.c | 70 +- + net/core/gen_stats.c | 3 +- + net/core/kmap_skb.h | 19 - + net/core/neighbour.c | 75 +- + net/core/rtnetlink.c | 70 +- + net/core/skbuff.c | 42 +- + net/dcb/dcbnl.c | 92 +- + net/decnet/dn_dev.c | 14 +- + net/decnet/dn_rules.c | 10 +- + net/ieee802154/nl-mac.c | 146 ++- + net/ieee802154/nl-phy.c | 29 +- + net/ipv4/devinet.c | 20 +- + net/ipv4/fib_rules.c | 16 +- + net/ipv4/fib_semantics.c | 47 +- + net/ipv4/igmp.c | 2 +- + net/ipv4/ip_gre.c | 23 +- + net/ipv4/ipmr.c | 9 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 5 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 12 +- + net/ipv4/route.c | 47 +- + net/ipv6/addrconf.c | 57 +- + net/ipv6/addrconf_core.c | 2 +- + net/ipv6/datagram.c | 10 +- + net/ipv6/exthdrs.c | 13 +- + net/ipv6/exthdrs_core.c | 3 +- + net/ipv6/fib6_rules.c | 18 +- + net/ipv6/icmp.c | 5 +- + net/ipv6/ip6mr.c | 9 +- + net/ipv6/mcast.c | 2 +- + net/ipv6/ndisc.c | 5 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 9 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 12 +- + net/ipv6/route.c | 39 +- + net/ipv6/sit.c | 6 +- + net/l2tp/l2tp_netlink.c | 114 +- + net/netfilter/ipset/ip_set_bitmap_ip.c | 33 +- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 43 +- + net/netfilter/ipset/ip_set_bitmap_port.c | 29 +- + net/netfilter/ipset/ip_set_core.c | 43 +- + net/netfilter/ipset/ip_set_hash_ip.c | 20 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 37 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 45 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 69 +- + net/netfilter/ipset/ip_set_hash_net.c | 45 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 52 +- + net/netfilter/ipset/ip_set_hash_netport.c | 61 +- + net/netfilter/ipset/ip_set_list_set.c | 23 +- + net/netfilter/ipvs/ip_vs_ctl.c | 108 +- + net/netfilter/nf_conntrack_core.c | 5 +- + net/netfilter/nf_conntrack_netlink.c | 83 +- + net/netfilter/nf_conntrack_proto_dccp.c | 18 +- + net/netfilter/nf_conntrack_proto_generic.c | 3 +- + net/netfilter/nf_conntrack_proto_gre.c | 9 +- + net/netfilter/nf_conntrack_proto_sctp.c | 22 +- + net/netfilter/nf_conntrack_proto_tcp.c | 68 +- + net/netfilter/nf_conntrack_proto_udp.c | 9 +- + net/netfilter/nf_conntrack_proto_udplite.c | 9 +- + net/netfilter/nfnetlink_acct.c | 10 +- + net/netfilter/nfnetlink_cttimeout.c | 11 +- + net/netfilter/nfnetlink_log.c | 100 +- + net/netfilter/nfnetlink_queue.c | 59 +- + net/netlink/genetlink.c | 35 +- + net/nfc/netlink.c | 70 +- + net/openvswitch/datapath.c | 34 +- + net/openvswitch/flow.c | 18 +- + net/phonet/pn_netlink.c | 8 +- + net/sched/act_api.c | 9 +- + net/sched/act_csum.c | 6 +- + net/sched/act_gact.c | 9 +- + net/sched/act_ipt.c | 14 +- + net/sched/act_mirred.c | 6 +- + net/sched/act_nat.c | 6 +- + net/sched/act_pedit.c | 6 +- + net/sched/act_police.c | 13 +- + net/sched/act_simple.c | 8 +- + net/sched/act_skbedit.c | 27 +- + net/sched/cls_api.c | 3 +- + net/sched/cls_basic.c | 5 +- + net/sched/cls_flow.c | 35 +- + net/sched/cls_fw.c | 15 +- + net/sched/cls_route.c | 16 +- + net/sched/cls_rsvp.h | 16 +- + net/sched/cls_tcindex.c | 14 +- + net/sched/cls_u32.c | 40 +- + net/sched/em_meta.c | 19 +- + net/sched/ematch.c | 6 +- + net/sched/sch_api.c | 9 +- + net/sched/sch_atm.c | 21 +- + net/sched/sch_cbq.c | 18 +- + net/sched/sch_choke.c | 5 +- + net/sched/sch_drr.c | 3 +- + net/sched/sch_dsmark.c | 18 +- + net/sched/sch_fifo.c | 3 +- + net/sched/sch_generic.c | 3 +- + net/sched/sch_gred.c | 6 +- + net/sched/sch_hfsc.c | 6 +- + net/sched/sch_htb.c | 6 +- + net/sched/sch_mqprio.c | 3 +- + net/sched/sch_multiq.c | 3 +- + net/sched/sch_netem.c | 21 +- + net/sched/sch_prio.c | 3 +- + net/sched/sch_qfq.c | 5 +- + net/sched/sch_red.c | 5 +- + net/sched/sch_sfb.c | 3 +- + net/sched/sch_sfq.c | 3 +- + net/sched/sch_tbf.c | 3 +- + net/unix/af_unix.c | 15 +- + net/wireless/nl80211.c | 1204 +++++++++++--------- + net/wireless/wext-core.c | 3 +- + net/xfrm/xfrm_user.c | 105 +- + 319 files changed, 8878 insertions(+), 7700 deletions(-) + create mode 100644 drivers/net/ethernet/intel/igb/igb_ptp.c + create mode 100644 drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c + create mode 100644 drivers/net/ethernet/wiznet/Kconfig + create mode 100644 drivers/net/ethernet/wiznet/Makefile + create mode 100644 drivers/net/ethernet/wiznet/w5100.c + create mode 100644 drivers/net/ethernet/wiznet/w5300.c + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/Kconfig + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/Makefile + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/caleb.c + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/caleb.h + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/enp2611.c + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.ucode + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.ucode + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixpdev.c + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixpdev.h + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/pm3386.c + delete mode 100644 drivers/net/ethernet/xscale/ixp2000/pm3386.h + create mode 100644 drivers/net/team/team_mode_loadbalance.c + create mode 100644 include/linux/platform_data/wiznet.h + delete mode 100644 net/core/kmap_skb.h +Merging wireless-next/master (78f9c85 b43: claim support for IBSS RSN) +$ git merge wireless-next/master +Recorded preimage for 'net/wireless/nl80211.c' +Resolved 'drivers/net/wireless/iwlwifi/iwl-testmode.c' using previous resolution. +Auto-merging net/wireless/nl80211.c +CONFLICT (content): Merge conflict in net/wireless/nl80211.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/debugfs_sta.c +Auto-merging net/mac80211/debugfs_netdev.c +Auto-merging include/net/mac80211.h +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-testmode.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-testmode.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-debugfs.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rs.c +Auto-merging drivers/net/wireless/iwlegacy/4965-rs.c +Auto-merging drivers/net/wireless/ath/ath9k/rc.c +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath5k/debug.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'net/wireless/nl80211.c'. +[master 2e6dfff] Merge remote-tracking branch 'wireless-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 2 +- + .../networking/mac80211-auth-assoc-deauth.txt | 10 +- + drivers/net/wireless/ath/ath5k/ani.c | 44 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 29 +- + drivers/net/wireless/ath/ath5k/attach.c | 2 + + drivers/net/wireless/ath/ath5k/base.c | 22 + + drivers/net/wireless/ath/ath5k/debug.c | 17 +- + drivers/net/wireless/ath/ath5k/desc.c | 2 + + drivers/net/wireless/ath/ath5k/dma.c | 2 + + drivers/net/wireless/ath/ath5k/eeprom.c | 2 + + drivers/net/wireless/ath/ath5k/initvals.c | 5 +- + drivers/net/wireless/ath/ath5k/led.c | 2 + + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 + + drivers/net/wireless/ath/ath5k/pci.c | 4 +- + drivers/net/wireless/ath/ath5k/phy.c | 2 + + drivers/net/wireless/ath/ath5k/qcu.c | 2 + + drivers/net/wireless/ath/ath5k/reset.c | 2 + + drivers/net/wireless/ath/ath5k/sysfs.c | 2 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 + + drivers/net/wireless/ath/ath6kl/init.c | 2 + + drivers/net/wireless/ath/ath6kl/main.c | 2 + + drivers/net/wireless/ath/ath6kl/txrx.c | 2 + + drivers/net/wireless/ath/ath9k/ani.c | 49 +- + drivers/net/wireless/ath/ath9k/ani.h | 6 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 38 - + .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 10 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 49 -- + drivers/net/wireless/ath/ath9k/ath9k.h | 3 + + drivers/net/wireless/ath/ath9k/debug.h | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 11 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 4 +- + drivers/net/wireless/ath/ath9k/hw.c | 73 ++ + drivers/net/wireless/ath/ath9k/init.c | 15 +- + drivers/net/wireless/ath/ath9k/main.c | 48 +- + drivers/net/wireless/ath/ath9k/pci.c | 9 +- + drivers/net/wireless/ath/ath9k/rc.c | 7 +- + drivers/net/wireless/ath/ath9k/recv.c | 4 + + drivers/net/wireless/ath/carl9170/fw.c | 2 + + drivers/net/wireless/ath/main.c | 4 +- + drivers/net/wireless/ath/regd.c | 4 +- + drivers/net/wireless/b43/main.c | 16 + + drivers/net/wireless/b43/xmit.c | 2 +- + drivers/net/wireless/b43legacy/xmit.c | 14 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 4 +- + drivers/net/wireless/iwlegacy/4965-rs.c | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 8 + + drivers/net/wireless/iwlwifi/Makefile | 2 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 1 - + drivers/net/wireless/iwlwifi/iwl-2000.c | 19 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 1 - + drivers/net/wireless/iwlwifi/iwl-6000.c | 3 - + drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 3 - + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 24 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 261 ++++++- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 144 +++- + drivers/net/wireless/iwlwifi/iwl-agn.c | 786 +++++++++++++++++++- + drivers/net/wireless/iwlwifi/iwl-agn.h | 23 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 484 +----------- + drivers/net/wireless/iwlwifi/iwl-core.h | 15 - + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 58 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 24 +- + drivers/net/wireless/iwlwifi/iwl-mac80211.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-notif-wait.c | 44 +- + drivers/net/wireless/iwlwifi/iwl-notif-wait.h | 21 +- + drivers/net/wireless/iwlwifi/iwl-op-mode.h | 17 +- + drivers/net/wireless/iwlwifi/iwl-pci.c | 3 + + drivers/net/wireless/iwlwifi/iwl-phy-db.c | 273 +++++++ + drivers/net/wireless/iwlwifi/iwl-phy-db.h | 123 +++ + drivers/net/wireless/iwlwifi/iwl-power.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 53 +- + drivers/net/wireless/iwlwifi/iwl-shared.h | 32 +- + drivers/net/wireless/iwlwifi/iwl-testmode.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 148 +--- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 514 ++----------- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 218 +----- + drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 270 ++----- + drivers/net/wireless/iwlwifi/iwl-trans.h | 95 +-- + drivers/net/wireless/iwlwifi/iwl-ucode.c | 133 ++-- + drivers/net/wireless/mac80211_hwsim.c | 29 +- + drivers/net/wireless/mwifiex/11n.c | 17 +- + drivers/net/wireless/mwifiex/cfg80211.c | 81 +- + drivers/net/wireless/mwifiex/fw.h | 23 +- + drivers/net/wireless/mwifiex/ioctl.h | 49 +- + drivers/net/wireless/mwifiex/join.c | 14 +- + drivers/net/wireless/mwifiex/main.h | 14 +- + drivers/net/wireless/mwifiex/scan.c | 17 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 98 +++ + drivers/net/wireless/mwifiex/sta_cmdresp.c | 80 +- + drivers/net/wireless/mwifiex/sta_event.c | 15 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 33 - + drivers/net/wireless/p54/main.c | 11 +- + drivers/net/wireless/p54/p54.h | 1 + + drivers/net/wireless/p54/p54usb.c | 195 +++-- + drivers/net/wireless/p54/p54usb.h | 3 + + drivers/net/wireless/p54/txrx.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00leds.c | 16 +- + drivers/net/wireless/rtlwifi/cam.c | 5 +- + drivers/net/wireless/rtlwifi/pci.c | 7 +- + drivers/net/wireless/rtlwifi/rc.c | 3 +- + drivers/net/wireless/rtlwifi/usb.c | 34 +- + drivers/net/wireless/rtlwifi/wifi.h | 30 +- + drivers/net/wireless/wl12xx/main.c | 5 +- + include/linux/ieee80211.h | 32 +- + include/linux/nl80211.h | 34 +- + include/net/cfg80211.h | 18 +- + include/net/mac80211.h | 53 +- + net/mac80211/Kconfig | 11 + + net/mac80211/Makefile | 3 +- + net/mac80211/agg-rx.c | 18 +- + net/mac80211/agg-tx.c | 18 +- + net/mac80211/cfg.c | 22 +- + net/mac80211/chan.c | 26 - + net/mac80211/debugfs_netdev.c | 83 +-- + net/mac80211/debugfs_sta.c | 5 +- + net/mac80211/driver-ops.h | 25 +- + net/mac80211/driver-trace.h | 41 +- + net/mac80211/ht.c | 9 - + net/mac80211/ibss.c | 18 +- + net/mac80211/ieee80211_i.h | 60 +- + net/mac80211/iface.c | 8 +- + net/mac80211/main.c | 6 +- + net/mac80211/mesh.c | 33 +- + net/mac80211/mesh.h | 23 +- + net/mac80211/mesh_hwmp.c | 28 +- + net/mac80211/mesh_plink.c | 4 +- + net/mac80211/mesh_sync.c | 296 ++++++++ + net/mac80211/mlme.c | 303 ++++---- + net/mac80211/rate.h | 7 +- + net/mac80211/rc80211_minstrel_ht.c | 15 +- + net/mac80211/rx.c | 10 +- + net/mac80211/sta_info.c | 16 +- + net/mac80211/sta_info.h | 11 + + net/mac80211/tx.c | 34 +- + net/mac80211/util.c | 101 +-- + net/mac80211/wme.c | 46 +- + net/mac80211/wme.h | 3 - + net/wireless/mesh.c | 3 + + net/wireless/mlme.c | 32 +- + net/wireless/nl80211.c | 23 +- + net/wireless/reg.c | 10 + + net/wireless/scan.c | 2 +- + 143 files changed, 3872 insertions(+), 2775 deletions(-) + create mode 100644 drivers/net/wireless/iwlwifi/iwl-phy-db.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-phy-db.h + create mode 100644 net/mac80211/mesh_sync.c +Merging bluetooth/master (30720c9 Bluetooth: Adds set_default function in L2CAP setup) +$ git merge bluetooth/master +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_core.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_ldisc.c | 2 +- + drivers/bluetooth/hci_vhci.c | 3 +- + include/net/bluetooth/bluetooth.h | 13 +++ + include/net/bluetooth/hci.h | 7 ++ + include/net/bluetooth/hci_core.h | 16 +-- + include/net/bluetooth/l2cap.h | 63 +++++++++++- + include/net/bluetooth/mgmt.h | 9 ++ + include/net/bluetooth/smp.h | 2 +- + net/bluetooth/hci_core.c | 29 +++++- + net/bluetooth/hci_event.c | 58 +++++++++-- + net/bluetooth/hci_sysfs.c | 5 +- + net/bluetooth/l2cap_core.c | 52 +++++----- + net/bluetooth/l2cap_sock.c | 13 +-- + net/bluetooth/mgmt.c | 194 +++++++++++++++++++++++++------------ + net/bluetooth/smp.c | 2 +- + 15 files changed, 344 insertions(+), 124 deletions(-) +Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (711ab3a sh: Use the plat_nand default partition parser) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + arch/arm/mach-ep93xx/snappercl15.c | 3 --- + arch/arm/mach-ep93xx/ts72xx.c | 3 --- + arch/arm/mach-ixp4xx/ixdp425-setup.c | 3 --- + arch/arm/mach-omap1/board-fsample.c | 3 --- + arch/arm/mach-omap1/board-h2.c | 3 --- + arch/arm/mach-omap1/board-h3.c | 3 --- + arch/arm/mach-omap1/board-perseus2.c | 3 --- + arch/arm/mach-orion5x/ts78xx-setup.c | 3 --- + arch/arm/mach-pxa/balloon3.c | 3 --- + arch/arm/mach-pxa/em-x270.c | 3 --- + arch/arm/mach-pxa/palmtx.c | 3 --- + arch/blackfin/mach-bf561/boards/acvilon.c | 3 --- + arch/mips/alchemy/devboards/db1200.c | 3 --- + arch/mips/alchemy/devboards/db1300.c | 3 --- + arch/mips/alchemy/devboards/db1550.c | 3 --- + arch/mips/pnx833x/common/platform.c | 6 ------ + arch/sh/boards/mach-migor/setup.c | 1 - + drivers/mtd/nand/plat_nand.c | 8 ++++++-- + 18 files changed, 6 insertions(+), 54 deletions(-) +Merging crypto/master (d788fec crypto, xor: Sanitize checksumming function selection output) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + crypto/xor.c | 5 +++-- + drivers/crypto/caam/caamalg.c | 14 ++++++++++---- + drivers/crypto/caam/ctrl.c | 16 ++++++++++++++++ + 3 files changed, 29 insertions(+), 6 deletions(-) +Merging sound/for-next (8592db4 Merge branch 'topic/hda' into for-next) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_conexant.c | 90 ++++++++++++++++++++++++++++++++++------ + sound/pci/riptide/riptide.c | 3 +- + 2 files changed, 78 insertions(+), 15 deletions(-) +Merging sound-asoc/for-next (07b6335 Merge branch 'for-3.5' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/tegra/tegra_spdif.h +Removing sound/soc/tegra/tegra_spdif.c +Removing sound/soc/tegra/tegra_i2s.h +Removing sound/soc/tegra/tegra_i2s.c +Removing sound/soc/tegra/tegra_das.h +Removing sound/soc/tegra/tegra_das.c +Removing sound/soc/imx/Makefile +Removing sound/soc/imx/Kconfig +Auto-merging sound/soc/fsl/imx-ssi.c +Auto-merging sound/soc/fsl/imx-pcm.h +Auto-merging sound/soc/fsl/imx-pcm-dma.c +Auto-merging sound/soc/fsl/eukrea-tlv320.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/sound/imx-audio-sgtl5000.txt | 49 + + MAINTAINERS | 6 + + arch/arm/mach-tegra/board-dt-tegra20.c | 6 +- + arch/arm/mach-tegra/board-harmony.c | 1 - + arch/arm/mach-tegra/board-seaboard.c | 1 - + arch/arm/mach-tegra/board-trimslice.c | 1 - + arch/arm/mach-tegra/devices.c | 11 +- + arch/arm/mach-tegra/devices.h | 1 - + arch/arm/mach-tegra/tegra2_clocks.c | 4 +- + arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 1 + + arch/powerpc/configs/mpc85xx_defconfig | 1 + + arch/powerpc/configs/mpc85xx_smp_defconfig | 1 + + include/sound/max98095.h | 12 + + include/sound/soc-dai.h | 1 + + include/sound/soc-dapm.h | 17 +- + include/sound/soc.h | 56 +- + sound/soc/Kconfig | 1 - + sound/soc/Makefile | 1 - + sound/soc/codecs/Kconfig | 8 + + sound/soc/codecs/Makefile | 6 +- + sound/soc/codecs/ac97.c | 4 +- + sound/soc/codecs/ad1836.c | 4 +- + sound/soc/codecs/ad193x.c | 4 +- + sound/soc/codecs/adau1701.c | 3 +- + sound/soc/codecs/ak4104.c | 3 +- + sound/soc/codecs/ak4535.c | 3 +- + sound/soc/codecs/ak4641.c | 113 +- + sound/soc/codecs/alc5623.c | 3 +- + sound/soc/codecs/alc5632.c | 3 +- + sound/soc/codecs/cs4270.c | 11 +- + sound/soc/codecs/cs4271.c | 3 +- + sound/soc/codecs/cs42l51.c | 9 +- + sound/soc/codecs/cs42l73.c | 29 +- + sound/soc/codecs/da7210.c | 157 +- + sound/soc/codecs/jz4740.c | 3 +- + sound/soc/codecs/lm49453.c | 1550 ++++++++++++++++++++ + sound/soc/codecs/lm49453.h | 380 +++++ + sound/soc/codecs/max98095.c | 158 +- + sound/soc/codecs/max98095.h | 22 + + sound/soc/codecs/ml26124.c | 681 +++++++++ + sound/soc/codecs/ml26124.h | 184 +++ + sound/soc/codecs/rt5631.c | 3 +- + sound/soc/codecs/sgtl5000.c | 25 +- + sound/soc/codecs/ssm2602.c | 9 +- + sound/soc/codecs/sta32x.c | 3 +- + sound/soc/codecs/tlv320aic23.c | 13 +- + sound/soc/codecs/tlv320aic26.c | 3 +- + sound/soc/codecs/tlv320aic3x.c | 3 +- + sound/soc/codecs/tlv320dac33.c | 35 +- + sound/soc/codecs/twl4030.c | 18 +- + sound/soc/codecs/twl6040.c | 9 +- + sound/soc/codecs/uda134x.c | 6 +- + sound/soc/codecs/uda1380.c | 6 +- + sound/soc/codecs/wl1273.c | 6 +- + sound/soc/codecs/wm1250-ev1.c | 18 +- + sound/soc/codecs/wm5100.c | 9 +- + sound/soc/codecs/wm8400.c | 135 +- + sound/soc/codecs/wm8510.c | 3 +- + sound/soc/codecs/wm8523.c | 3 +- + sound/soc/codecs/wm8728.c | 3 +- + sound/soc/codecs/wm8737.c | 3 +- + sound/soc/codecs/wm8741.c | 3 +- + sound/soc/codecs/wm8750.c | 3 +- + sound/soc/codecs/wm8753.c | 6 +- + sound/soc/codecs/wm8900.c | 3 +- + sound/soc/codecs/wm8903.c | 3 +- + sound/soc/codecs/wm8940.c | 3 +- + sound/soc/codecs/wm8960.c | 3 +- + sound/soc/codecs/wm8962.c | 18 +- + sound/soc/codecs/wm8971.c | 3 +- + sound/soc/codecs/wm8978.c | 3 +- + sound/soc/codecs/wm8988.c | 3 +- + sound/soc/codecs/wm8990.c | 3 +- + sound/soc/codecs/wm8994.c | 115 +- + sound/soc/codecs/wm8994.h | 1 + + sound/soc/codecs/wm9705.c | 4 +- + sound/soc/codecs/wm9712.c | 10 +- + sound/soc/ep93xx/ep93xx-ac97.c | 74 +- + sound/soc/ep93xx/ep93xx-i2s.c | 49 +- + sound/soc/fsl/Kconfig | 121 +- + sound/soc/fsl/Makefile | 29 +- + sound/soc/{imx => fsl}/eukrea-tlv320.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 167 ++- + sound/soc/fsl/fsl_utils.c | 91 ++ + sound/soc/fsl/fsl_utils.h | 26 + + sound/soc/{imx => fsl}/imx-audmux.c | 0 + sound/soc/{imx => fsl}/imx-audmux.h | 0 + .../{imx/imx-pcm-dma-mx2.c => fsl/imx-pcm-dma.c} | 3 +- + sound/soc/{imx => fsl}/imx-pcm-fiq.c | 0 + sound/soc/{imx => fsl}/imx-pcm.c | 0 + sound/soc/{imx => fsl}/imx-pcm.h | 1 + + sound/soc/fsl/imx-sgtl5000.c | 190 +++ + sound/soc/{imx => fsl}/imx-ssi.c | 2 +- + sound/soc/{imx => fsl}/imx-ssi.h | 0 + sound/soc/fsl/mpc8610_hpcd.c | 166 +-- + sound/soc/{imx => fsl}/mx27vis-aic32x4.c | 0 + sound/soc/fsl/p1022_ds.c | 158 +- + sound/soc/{imx => fsl}/phycore-ac97.c | 0 + sound/soc/{imx => fsl}/wm1133-ev1.c | 0 + sound/soc/imx/Kconfig | 79 - + sound/soc/imx/Makefile | 22 - + sound/soc/jz4740/jz4740-i2s.c | 4 +- + sound/soc/pxa/pxa2xx-i2s.c | 4 +- + sound/soc/soc-core.c | 346 ++--- + sound/soc/soc-dapm.c | 252 ++-- + sound/soc/soc-jack.c | 5 +- + sound/soc/soc-pcm.c | 9 +- + sound/soc/tegra/Kconfig | 39 +- + sound/soc/tegra/Makefile | 14 +- + sound/soc/tegra/tegra20_das.c | 260 ++++ + sound/soc/tegra/tegra20_das.h | 135 ++ + sound/soc/tegra/tegra20_i2s.c | 501 +++++++ + sound/soc/tegra/tegra20_i2s.h | 165 +++ + sound/soc/tegra/tegra20_spdif.c | 399 +++++ + sound/soc/tegra/tegra20_spdif.h | 472 ++++++ + sound/soc/tegra/tegra_alc5632.c | 48 +- + sound/soc/tegra/tegra_asoc_utils.c | 37 +- + sound/soc/tegra/tegra_asoc_utils.h | 9 +- + sound/soc/tegra/tegra_das.c | 261 ---- + sound/soc/tegra/tegra_das.h | 135 -- + sound/soc/tegra/tegra_i2s.c | 459 ------ + sound/soc/tegra/tegra_i2s.h | 166 --- + sound/soc/tegra/tegra_pcm.c | 28 +- + sound/soc/tegra/tegra_pcm.h | 5 +- + sound/soc/tegra/tegra_spdif.c | 364 ----- + sound/soc/tegra/tegra_spdif.h | 473 ------ + sound/soc/tegra/tegra_wm8903.c | 29 +- + sound/soc/tegra/trimslice.c | 7 +- + 128 files changed, 6549 insertions(+), 3266 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt + create mode 100644 sound/soc/codecs/lm49453.c + create mode 100644 sound/soc/codecs/lm49453.h + create mode 100644 sound/soc/codecs/ml26124.c + create mode 100644 sound/soc/codecs/ml26124.h + rename sound/soc/{imx => fsl}/eukrea-tlv320.c (99%) + create mode 100644 sound/soc/fsl/fsl_utils.c + create mode 100644 sound/soc/fsl/fsl_utils.h + rename sound/soc/{imx => fsl}/imx-audmux.c (100%) + rename sound/soc/{imx => fsl}/imx-audmux.h (100%) + rename sound/soc/{imx/imx-pcm-dma-mx2.c => fsl/imx-pcm-dma.c} (97%) + rename sound/soc/{imx => fsl}/imx-pcm-fiq.c (100%) + rename sound/soc/{imx => fsl}/imx-pcm.c (100%) + rename sound/soc/{imx => fsl}/imx-pcm.h (93%) + create mode 100644 sound/soc/fsl/imx-sgtl5000.c + rename sound/soc/{imx => fsl}/imx-ssi.c (99%) + rename sound/soc/{imx => fsl}/imx-ssi.h (100%) + rename sound/soc/{imx => fsl}/mx27vis-aic32x4.c (100%) + rename sound/soc/{imx => fsl}/phycore-ac97.c (100%) + rename sound/soc/{imx => fsl}/wm1133-ev1.c (100%) + delete mode 100644 sound/soc/imx/Kconfig + delete mode 100644 sound/soc/imx/Makefile + create mode 100644 sound/soc/tegra/tegra20_das.c + create mode 100644 sound/soc/tegra/tegra20_das.h + create mode 100644 sound/soc/tegra/tegra20_i2s.c + create mode 100644 sound/soc/tegra/tegra20_i2s.h + create mode 100644 sound/soc/tegra/tegra20_spdif.c + create mode 100644 sound/soc/tegra/tegra20_spdif.h + delete mode 100644 sound/soc/tegra/tegra_das.c + delete mode 100644 sound/soc/tegra/tegra_das.h + delete mode 100644 sound/soc/tegra/tegra_i2s.c + delete mode 100644 sound/soc/tegra/tegra_i2s.h + delete mode 100644 sound/soc/tegra/tegra_spdif.c + delete mode 100644 sound/soc/tegra/tegra_spdif.h +Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.) +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.) +$ git merge quilt/rr +Recorded preimage for 'init/main.c' +Resolved 'arch/arm/kernel/kprobes.c' using previous resolution. +Resolved 'drivers/virtio/virtio_balloon.c' using previous resolution. +Auto-merging init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merging drivers/virtio/virtio_balloon.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c +Auto-merging arch/arm/kernel/kprobes.c +CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c +Auto-merging Documentation/virtual/virtio-spec.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'init/main.c'. +[master 8b88d45] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/virtio-spec.txt | 1000 ++++++++++++++++++++++++++++++--- + 1 file changed, 927 insertions(+), 73 deletions(-) +Merging input/next (d568778 Input: wacom_i2c - do not use irq_to_gpio) +$ git merge input/next +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/tablet/wacom_wac.c +Auto-merging drivers/input/tablet/wacom_sys.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-wacom | 15 +- + drivers/input/joystick/a3d.c | 13 +- + drivers/input/joystick/adi.c | 17 +- + drivers/input/joystick/cobra.c | 13 +- + drivers/input/joystick/gf2k.c | 13 +- + drivers/input/joystick/grip.c | 13 +- + drivers/input/joystick/grip_mp.c | 13 +- + drivers/input/joystick/guillemot.c | 13 +- + drivers/input/joystick/interact.c | 13 +- + drivers/input/joystick/joydump.c | 13 +- + drivers/input/joystick/magellan.c | 17 +- + drivers/input/joystick/sidewinder.c | 13 +- + drivers/input/joystick/spaceball.c | 17 +- + drivers/input/joystick/spaceorb.c | 17 +- + drivers/input/joystick/stinger.c | 17 +- + drivers/input/joystick/tmdc.c | 13 +- + drivers/input/joystick/twidjoy.c | 17 +- + drivers/input/joystick/warrior.c | 17 +- + drivers/input/joystick/zhenhua.c | 17 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/hil_kbd.c | 13 +- + drivers/input/keyboard/lkkbd.c | 17 +- + drivers/input/keyboard/lm8333.c | 236 +++++++++++++++++++++ + drivers/input/keyboard/newtonkbd.c | 13 +- + drivers/input/keyboard/stowaway.c | 13 +- + drivers/input/keyboard/sunkbd.c | 17 +- + drivers/input/keyboard/xtkbd.c | 13 +- + drivers/input/mouse/sermouse.c | 13 +- + drivers/input/mouse/vsxxxaa.c | 14 +- + drivers/input/serio/ps2mult.c | 13 +- + drivers/input/serio/serio_raw.c | 13 +- + drivers/input/serio/xilinx_ps2.c | 35 ++-- + drivers/input/tablet/wacom_sys.c | 96 +++++++-- + drivers/input/tablet/wacom_wac.c | 125 +++++++++++- + drivers/input/tablet/wacom_wac.h | 4 + + drivers/input/touchscreen/Kconfig | 12 ++ + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/dynapro.c | 17 +- + drivers/input/touchscreen/elo.c | 17 +- + drivers/input/touchscreen/fujitsu_ts.c | 13 +- + drivers/input/touchscreen/gunze.c | 17 +- + drivers/input/touchscreen/h3600_ts_input.c | 17 +- + drivers/input/touchscreen/hampshire.c | 17 +- + drivers/input/touchscreen/inexio.c | 17 +- + drivers/input/touchscreen/mtouch.c | 17 +- + drivers/input/touchscreen/penmount.c | 17 +- + drivers/input/touchscreen/st1232.c | 20 +- + drivers/input/touchscreen/touchit213.c | 17 +- + drivers/input/touchscreen/touchright.c | 17 +- + drivers/input/touchscreen/touchwin.c | 17 +- + drivers/input/touchscreen/tsc40.c | 12 +- + drivers/input/touchscreen/wacom_i2c.c | 282 ++++++++++++++++++++++++++ + drivers/input/touchscreen/wacom_w8001.c | 13 +- + include/linux/gameport.h | 13 ++ + include/linux/input/lm8333.h | 24 +++ + include/linux/serio.h | 13 ++ + 57 files changed, 880 insertions(+), 637 deletions(-) + create mode 100644 drivers/input/keyboard/lm8333.c + create mode 100644 drivers/input/touchscreen/wacom_i2c.c + create mode 100644 include/linux/input/lm8333.h +Merging input-mt/for-next (0034102 Linux 3.4-rc2) +$ git merge input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (cbe128e cgroup: get rid of populate for memcg) +$ git merge cgroup/for-next +Auto-merging kernel/cpuset.c +Auto-merging Documentation/feature-removal-schedule.txt +Merge made by the 'recursive' strategy. + Documentation/feature-removal-schedule.txt | 9 + + block/blk-cgroup.c | 45 +-- + include/linux/cgroup.h | 80 ++-- + include/net/sock.h | 12 +- + include/net/tcp_memcontrol.h | 4 +- + kernel/cgroup.c | 550 +++++++++++++++++++++------- + kernel/cgroup_freezer.c | 11 +- + kernel/cpuset.c | 31 +- + kernel/sched/core.c | 16 +- + mm/memcontrol.c | 115 +++--- + net/core/netprio_cgroup.c | 30 +- + net/core/sock.c | 10 +- + net/ipv4/tcp_memcontrol.c | 77 ++-- + net/sched/cls_cgroup.c | 31 +- + security/device_cgroup.c | 10 +- + 15 files changed, 637 insertions(+), 394 deletions(-) +Merging block/for-next (f52b69f Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh) +$ git merge block/for-next +Already up-to-date. +Merging quilt/device-mapper (4b63eba This device-mapper target creates a read-only device that transparently validates the data on one underlying device against a pre-generated tree of cryptographic checksums stored on a second device.) +$ git merge quilt/device-mapper +Merge made by the 'recursive' strategy. +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (aaed8df mmc: sdhci: Log what timeout was set if the timeout is too large) +$ git merge mmc/mmc-next +Merge made by the 'recursive' strategy. + drivers/mmc/card/block.c | 54 +++++++++++++++++++-------- + drivers/mmc/card/queue.c | 2 +- + drivers/mmc/core/core.c | 9 +++-- + drivers/mmc/host/davinci_mmc.c | 1 + + drivers/mmc/host/dw_mmc.c | 4 +- + drivers/mmc/host/omap_hsmmc.c | 80 +++++++++++++++++++++++----------------- + drivers/mmc/host/sdhci.c | 4 +- + 7 files changed, 97 insertions(+), 57 deletions(-) +Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()) +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next) +$ git merge slab/for-next +Auto-merging mm/slub.c +Auto-merging include/linux/slub_def.h +Merge made by the 'recursive' strategy. + include/linux/slub_def.h | 1 - + mm/slub.c | 166 +++++++++++++++++++++++++--------------------- + 2 files changed, 89 insertions(+), 78 deletions(-) +Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (b58fc3e md/raid1,raid10: Fix calculation of 'vcnt' when processing error recovery.) +$ git merge md/for-next +Auto-merging crypto/xor.c +Merge made by the 'recursive' strategy. + crypto/xor.c | 13 +- + drivers/md/bitmap.c | 3 - + drivers/md/md.c | 296 ++++++++++- + drivers/md/md.h | 8 +- + drivers/md/raid1.c | 7 +- + drivers/md/raid10.c | 1242 +++++++++++++++++++++++++++++++++++++++------ + drivers/md/raid10.h | 35 +- + drivers/md/raid5.c | 206 ++++++-- + drivers/md/raid5.h | 6 + + include/linux/raid/md_p.h | 15 +- + include/linux/raid/pq.h | 18 +- + lib/raid6/algos.c | 128 +++-- + lib/raid6/mktables.c | 25 + + lib/raid6/recov.c | 341 ++++++++++++- + lib/raid6/test/test.c | 32 +- + lib/raid6/x86.h | 13 +- + 16 files changed, 2073 insertions(+), 315 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 8b29a8c Merge remote-tracking branch 'slab/for-next' +Merging refs/next/20120410/md +$ git merge refs/next/20120410/md +Merge made by the 'recursive' strategy. + drivers/md/md.c | 299 ++++++++++- + drivers/md/md.h | 8 +- + drivers/md/raid1.c | 4 +- + drivers/md/raid10.c | 1236 +++++++++++++++++++++++++++++++++++++++------ + drivers/md/raid10.h | 35 +- + drivers/md/raid5.c | 206 ++++++-- + drivers/md/raid5.h | 6 + + include/linux/raid/md_p.h | 15 +- + 8 files changed, 1565 insertions(+), 244 deletions(-) +Merging mfd/for-next (b8589e2 gpio/twl: Add DT support to gpio-twl4030 driver) +$ git merge mfd/for-next +Already up-to-date. +Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling) +$ git merge battery/master +Already up-to-date. +Merging drm/drm-next (5466c7b drm/i915: use DDC_ADDR instead of hard-coding it) +$ git merge drm/drm-next +Already up-to-date. +Merging fbdev/fbdev-next (688ec34 video: pxa3xx-gcu: Simplify the logic to exit while loop in pxa3xx_gcu_wait_idle) +$ git merge fbdev/fbdev-next +Auto-merging arch/arm/mach-s5pv210/mach-goni.c +Auto-merging arch/arm/mach-s5pv210/mach-aquila.c +Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c +Auto-merging arch/arm/mach-exynos/mach-universal_c210.c +Auto-merging arch/arm/mach-exynos/mach-smdkv310.c +Auto-merging arch/arm/mach-exynos/mach-nuri.c +Merge made by the 'recursive' strategy. + arch/arm/mach-exynos/mach-nuri.c | 26 +- + arch/arm/mach-exynos/mach-origen.c | 24 +- + arch/arm/mach-exynos/mach-smdkv310.c | 28 ++- + arch/arm/mach-exynos/mach-universal_c210.c | 26 +- + arch/arm/mach-s3c24xx/mach-smdk2416.c | 27 +- + arch/arm/mach-s3c64xx/mach-anw6410.c | 25 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 25 +- + arch/arm/mach-s3c64xx/mach-hmt.c | 24 +- + arch/arm/mach-s3c64xx/mach-mini6410.c | 92 ++++--- + arch/arm/mach-s3c64xx/mach-real6410.c | 90 ++++--- + arch/arm/mach-s3c64xx/mach-smartq5.c | 26 +- + arch/arm/mach-s3c64xx/mach-smartq7.c | 26 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 25 +- + arch/arm/mach-s5p64x0/mach-smdk6440.c | 24 +- + arch/arm/mach-s5p64x0/mach-smdk6450.c | 24 +- + arch/arm/mach-s5pc100/mach-smdkc100.c | 27 +- + arch/arm/mach-s5pv210/mach-aquila.c | 36 ++- + arch/arm/mach-s5pv210/mach-goni.c | 26 +- + arch/arm/mach-s5pv210/mach-smdkv210.c | 24 +- + arch/arm/plat-samsung/include/plat/fb.h | 11 +- + drivers/video/au1100fb.c | 5 +- + drivers/video/au1200fb.c | 2 +- + drivers/video/kyro/STG4000Reg.h | 376 ++++++++++++++-------------- + drivers/video/pxa3xx-gcu.c | 5 +- + drivers/video/s3c-fb.c | 135 +++++----- + drivers/video/uvesafb.c | 11 +- + 26 files changed, 628 insertions(+), 542 deletions(-) +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 (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (cf0ff3d Merge branch 'regulator-drivers' into regulator-next) +$ git merge regulator/for-next +Auto-merging sound/soc/codecs/sgtl5000.c +Merge made by the 'recursive' strategy. + drivers/regulator/88pm8607.c | 107 +++----- + drivers/regulator/Kconfig | 21 +- + drivers/regulator/Makefile | 4 +- + drivers/regulator/aat2870-regulator.c | 9 +- + drivers/regulator/ab3100.c | 29 +-- + drivers/regulator/ab8500.c | 43 +-- + drivers/regulator/ad5398.c | 19 +- + drivers/regulator/anatop-regulator.c | 9 +- + drivers/regulator/core.c | 138 +++++----- + drivers/regulator/da903x.c | 8 +- + drivers/regulator/da9052-regulator.c | 324 +++++++---------------- + drivers/regulator/db8500-prcmu.c | 8 +- + drivers/regulator/dummy.c | 6 +- + drivers/regulator/fixed.c | 65 ++--- + drivers/regulator/gpio-regulator.c | 21 +- + drivers/regulator/isl6271a-regulator.c | 18 +- + drivers/regulator/lp3971.c | 87 ++----- + drivers/regulator/lp3972.c | 74 ++---- + drivers/regulator/max1586.c | 12 +- + drivers/regulator/max8649.c | 30 +-- + drivers/regulator/max8660.c | 12 +- + drivers/regulator/max8925-regulator.c | 25 +- + drivers/regulator/max8952.c | 46 ++-- + drivers/regulator/max8997.c | 179 +++++-------- + drivers/regulator/max8998.c | 28 +- + drivers/regulator/mc13783-regulator.c | 12 +- + drivers/regulator/mc13892-regulator.c | 25 +- + drivers/regulator/mc13xxx-regulator-core.c | 54 +--- + drivers/regulator/mc13xxx.h | 2 - + drivers/regulator/pcap-regulator.c | 54 ++-- + drivers/regulator/pcf50633-regulator.c | 88 +++---- + drivers/regulator/rc5t583-regulator.c | 361 ++++++++++++++++++++++++++ + drivers/regulator/s5m8767.c | 321 +++++++++++------------ + drivers/regulator/tps6105x-regulator.c | 11 +- + drivers/regulator/tps62360-regulator.c | 46 ++-- + drivers/regulator/tps65023-regulator.c | 131 +++------- + drivers/regulator/tps6507x-regulator.c | 8 +- + drivers/regulator/tps65090-regulator.c | 201 ++++++++++++++ + drivers/regulator/tps65217-regulator.c | 10 +- + drivers/regulator/tps6524x-regulator.c | 44 +--- + drivers/regulator/tps6586x-regulator.c | 107 +++----- + drivers/regulator/tps65910-regulator.c | 8 +- + drivers/regulator/tps65912-regulator.c | 53 ++-- + drivers/regulator/twl-regulator.c | 72 ++--- + drivers/regulator/wm831x-dcdc.c | 41 +-- + drivers/regulator/wm831x-isink.c | 8 +- + drivers/regulator/wm831x-ldo.c | 28 +- + drivers/regulator/wm8350-regulator.c | 11 +- + drivers/regulator/wm8400-regulator.c | 7 +- + drivers/regulator/wm8994-regulator.c | 10 +- + include/linux/mfd/rc5t583.h | 29 +++ + include/linux/mfd/s5m87xx/s5m-core.h | 1 + + include/linux/mfd/s5m87xx/s5m-pmic.h | 29 +++ + include/linux/regulator/driver.h | 36 ++- + include/linux/regulator/fixed.h | 7 + + include/linux/regulator/tps65090-regulator.h | 50 ++++ + sound/soc/codecs/sgtl5000.c | 8 +- + 57 files changed, 1738 insertions(+), 1457 deletions(-) + create mode 100644 drivers/regulator/rc5t583-regulator.c + create mode 100644 drivers/regulator/tps65090-regulator.c + create mode 100644 include/linux/regulator/tps65090-regulator.h +Merging security/next (9ccf010 maintainers: update wiki url for the security subsystem) +$ git merge security/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging selinux/master (ecf093d SELinux: add default_type statements) +$ git merge selinux/master +Auto-merging security/selinux/selinuxfs.c +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_policy.c | 1 + + security/selinux/include/security.h | 4 +++- + security/selinux/selinuxfs.c | 3 ++- + security/selinux/ss/context.h | 20 ++++++++++++++++ + security/selinux/ss/mls.c | 24 +++++++++++++++++++ + security/selinux/ss/policydb.c | 44 +++++++++++++++++++++++++++++++++++ + security/selinux/ss/policydb.h | 14 +++++++++++ + security/selinux/ss/services.c | 42 ++++++++++++++++++++++++++------- + 8 files changed, 141 insertions(+), 11 deletions(-) +Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/master (0034102 Linux 3.4-rc2) +$ git merge watchdog/master +Already up-to-date. +Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next) +$ git merge iommu/next +Already up-to-date. +Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (b3aa158 workqueue: Fix workqueue_execute_end() comment) +$ git merge trivial/for-next +Auto-merging drivers/video/au1100fb.c +Auto-merging drivers/regulator/tps65910-regulator.c +Auto-merging drivers/net/ethernet/realtek/r8169.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 4 ++-- + Documentation/hwmon/wm831x | 2 +- + Documentation/sound/oss/ALS | 4 ++-- + Documentation/usb/dwc3.txt | 2 +- + Documentation/usb/wusb-cbaf | 2 +- + Documentation/video4linux/README.cpia2 | 2 +- + MAINTAINERS | 2 +- + Makefile | 12 +++++++----- + arch/alpha/kernel/pci_iommu.c | 20 ++++++++++---------- + arch/arm/nwfpe/fpmodule.c | 2 +- + arch/mips/kernel/mips-mt.c | 2 +- + arch/mips/lantiq/xway/gpio.c | 2 +- + arch/mips/lantiq/xway/gpio_ebu.c | 2 +- + arch/mips/lantiq/xway/gpio_stp.c | 2 +- + arch/mips/pci/pci-lantiq.c | 2 +- + arch/mips/sni/pcimt.c | 2 +- + drivers/gpu/drm/radeon/radeon_gart.c | 2 +- + drivers/mfd/tps65911-comparator.c | 2 +- + drivers/mtd/devices/docg3.c | 16 ++++++++-------- + drivers/net/ethernet/realtek/r8169.c | 2 +- + drivers/parisc/superio.c | 2 +- + drivers/platform/x86/fujitsu-laptop.c | 2 +- + drivers/power/bq27x00_battery.c | 2 +- + drivers/regulator/tps65910-regulator.c | 20 ++++++++++---------- + drivers/scsi/esp_scsi.c | 2 +- + drivers/usb/gadget/u_serial.c | 2 +- + drivers/usb/storage/unusual_devs.h | 2 +- + drivers/video/au1100fb.c | 2 +- + drivers/w1/w1.c | 2 +- + fs/btrfs/disk-io.c | 2 +- + include/linux/mfd/wm831x/pdata.h | 2 +- + include/trace/events/workqueue.h | 2 +- + kernel/semaphore.c | 2 +- + net/atm/lec.h | 4 ++-- + sound/isa/als100.c | 2 +- + sound/pci/hda/patch_realtek.c | 2 +- + 36 files changed, 70 insertions(+), 68 deletions(-) +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge audit/for-next +Already up-to-date. +Merging pm/linux-next (c4772d1 PM / QoS: add pm_qos_update_request_timeout() API) +$ git merge pm/linux-next +Already up-to-date. +Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl) +$ git merge apm/for-next +Already up-to-date. +Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Auto-merging fs/notify/notification.c +Merge made by the 'recursive' strategy. + fs/notify/dnotify/dnotify.c | 4 +- + fs/notify/fanotify/fanotify.c | 6 +++ + fs/notify/fanotify/fanotify_user.c | 37 +++++++++----- + fs/notify/group.c | 47 ++++++++++-------- + fs/notify/inode_mark.c | 14 ++++-- + fs/notify/inotify/inotify_fsnotify.c | 4 +- + fs/notify/inotify/inotify_user.c | 34 ++++++------- + fs/notify/mark.c | 91 +++++++++++++++++++--------------- + fs/notify/notification.c | 1 + + fs/notify/vfsmount_mark.c | 14 ++++-- + include/linux/fsnotify_backend.h | 31 ++++++++---- + kernel/audit_tree.c | 10 ++-- + kernel/audit_watch.c | 4 +- + 13 files changed, 178 insertions(+), 119 deletions(-) +Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. +Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging spi/spi/next (6810d77 spi/devicetree: Move devicetree support code into spi directory) +$ git merge spi/spi/next +Removing include/linux/of_spi.h +Removing drivers/of/of_spi.c +Merge made by the 'recursive' strategy. + drivers/of/Kconfig | 6 -- + drivers/of/Makefile | 1 - + drivers/of/of_spi.c | 99 ------------------------------- + drivers/spi/spi-dw-pci.c | 13 +--- + drivers/spi/spi-fsl-espi.c | 1 - + drivers/spi/spi-fsl-lib.c | 1 - + drivers/spi/spi-omap2-mcspi.c | 132 ++++++++++++++++------------------------- + drivers/spi/spi-ppc4xx.c | 1 - + drivers/spi/spi-pxa2xx-pci.c | 12 +--- + drivers/spi/spi.c | 92 +++++++++++++++++++++++++++- + include/linux/of_spi.h | 23 ------- + 11 files changed, 143 insertions(+), 238 deletions(-) + delete mode 100644 drivers/of/of_spi.c + delete mode 100644 include/linux/of_spi.h +Merging tip/auto-latest (911bcb2 Merge branch 'linus') +$ git merge tip/auto-latest +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da04671b] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 + + MAINTAINERS | 8 + + Makefile | 10 + + arch/Kconfig | 17 + + arch/x86/Kconfig | 36 +- + arch/x86/boot/compressed/eboot.c | 14 +- + arch/x86/boot/header.S | 26 +- + arch/x86/boot/tools/build.c | 24 +- + arch/x86/include/asm/e820.h | 7 + + arch/x86/include/asm/efi.h | 5 - + arch/x86/include/asm/msr-index.h | 5 + + arch/x86/include/asm/perf_event.h | 2 + + arch/x86/include/asm/spinlock.h | 2 - + arch/x86/include/asm/thread_info.h | 2 + + arch/x86/include/asm/uprobes.h | 57 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/cpu/perf_event_amd_ibs.c | 438 ++++++- + arch/x86/kernel/e820.c | 3 +- + arch/x86/kernel/reboot.c | 277 ++--- + arch/x86/kernel/setup.c | 21 +- + arch/x86/kernel/signal.c | 6 + + arch/x86/kernel/uprobes.c | 674 +++++++++++ + arch/x86/mm/init.c | 21 +- + arch/x86/mm/tlb.c | 8 +- + arch/x86/platform/efi/efi.c | 37 +- + arch/x86/platform/efi/efi_64.c | 17 - + fs/proc/stat.c | 34 +- + include/linux/mm_types.h | 2 + + include/linux/sched.h | 4 + + include/linux/uprobes.h | 164 +++ + kernel/events/Makefile | 3 + + kernel/events/uprobes.c | 1662 ++++++++++++++++++++++++++ + kernel/fork.c | 9 + + kernel/itimer.c | 5 +- + kernel/signal.c | 4 + + lib/Kconfig.debug | 9 + + mm/mmap.c | 33 +- + scripts/kconfig/Makefile | 7 +- + tools/kvm/.gitignore | 12 + + tools/kvm/CREDITS-Git | 30 + + tools/kvm/Documentation/kernel-debugging.txt | 15 + + tools/kvm/Documentation/kvm-balloon.txt | 24 + + tools/kvm/Documentation/kvm-debug.txt | 16 + + tools/kvm/Documentation/kvm-list.txt | 16 + + tools/kvm/Documentation/kvm-pause.txt | 16 + + tools/kvm/Documentation/kvm-resume.txt | 16 + + tools/kvm/Documentation/kvm-run.txt | 62 + + tools/kvm/Documentation/kvm-sandbox.txt | 16 + + tools/kvm/Documentation/kvm-setup.txt | 15 + + tools/kvm/Documentation/kvm-stat.txt | 19 + + tools/kvm/Documentation/kvm-stop.txt | 16 + + tools/kvm/Documentation/kvm-version.txt | 21 + + tools/kvm/Documentation/virtio-console.txt | 41 + + tools/kvm/Makefile | 427 +++++++ + tools/kvm/README | 109 ++ + tools/kvm/builtin-balloon.c | 80 ++ + tools/kvm/builtin-debug.c | 103 ++ + tools/kvm/builtin-help.c | 63 + + tools/kvm/builtin-list.c | 149 +++ + tools/kvm/builtin-pause.c | 88 ++ + tools/kvm/builtin-resume.c | 88 ++ + tools/kvm/builtin-run.c | 1378 +++++++++++++++++++++ + tools/kvm/builtin-sandbox.c | 9 + + tools/kvm/builtin-setup.c | 232 ++++ + tools/kvm/builtin-stat.c | 127 ++ + tools/kvm/builtin-stop.c | 70 ++ + tools/kvm/builtin-version.c | 15 + + tools/kvm/code16gcc.h | 15 + + tools/kvm/command-list.txt | 15 + + tools/kvm/config/feature-tests.mak | 168 +++ + tools/kvm/config/utilities.mak | 188 +++ + tools/kvm/disk/blk.c | 42 + + tools/kvm/disk/core.c | 260 ++++ + tools/kvm/disk/qcow.c | 1529 +++++++++++++++++++++++ + tools/kvm/disk/raw.c | 141 +++ + tools/kvm/framebuffer.c | 75 ++ + tools/kvm/guest/init.c | 38 + + tools/kvm/guest/init_stage2.c | 55 + + tools/kvm/guest/passwd | 1 + + tools/kvm/guest_compat.c | 99 ++ + tools/kvm/hw/i8042.c | 348 ++++++ + tools/kvm/hw/pci-shmem.c | 268 +++++ + tools/kvm/hw/rtc.c | 137 +++ + tools/kvm/hw/serial.c | 447 +++++++ + tools/kvm/hw/vesa.c | 85 ++ + tools/kvm/include/asm/hweight.h | 8 + + tools/kvm/include/bios/memcpy.h | 9 + + tools/kvm/include/kvm/8250-serial.h | 11 + + tools/kvm/include/kvm/apic.h | 17 + + tools/kvm/include/kvm/brlock.h | 41 + + tools/kvm/include/kvm/builtin-balloon.h | 9 + + tools/kvm/include/kvm/builtin-debug.h | 18 + + tools/kvm/include/kvm/builtin-help.h | 6 + + tools/kvm/include/kvm/builtin-list.h | 10 + + tools/kvm/include/kvm/builtin-pause.h | 9 + + tools/kvm/include/kvm/builtin-resume.h | 9 + + tools/kvm/include/kvm/builtin-run.h | 11 + + tools/kvm/include/kvm/builtin-sandbox.h | 6 + + tools/kvm/include/kvm/builtin-setup.h | 11 + + tools/kvm/include/kvm/builtin-stat.h | 9 + + tools/kvm/include/kvm/builtin-stop.h | 9 + + tools/kvm/include/kvm/builtin-version.h | 6 + + tools/kvm/include/kvm/compiler.h | 10 + + tools/kvm/include/kvm/disk-image.h | 81 ++ + tools/kvm/include/kvm/e820.h | 13 + + tools/kvm/include/kvm/framebuffer.h | 35 + + tools/kvm/include/kvm/guest_compat.h | 9 + + tools/kvm/include/kvm/i8042.h | 12 + + tools/kvm/include/kvm/ioeventfd.h | 27 + + tools/kvm/include/kvm/ioport.h | 69 ++ + tools/kvm/include/kvm/irq.h | 33 + + tools/kvm/include/kvm/kvm-cmd.h | 17 + + tools/kvm/include/kvm/kvm-cpu.h | 24 + + tools/kvm/include/kvm/kvm-ipc.h | 24 + + tools/kvm/include/kvm/kvm.h | 93 ++ + tools/kvm/include/kvm/msi.h | 10 + + tools/kvm/include/kvm/mutex.h | 33 + + tools/kvm/include/kvm/parse-options.h | 214 ++++ + tools/kvm/include/kvm/pci-shmem.h | 28 + + tools/kvm/include/kvm/pci.h | 95 ++ + tools/kvm/include/kvm/qcow.h | 133 +++ + tools/kvm/include/kvm/rbtree-interval.h | 28 + + tools/kvm/include/kvm/read-write.h | 43 + + tools/kvm/include/kvm/rtc.h | 9 + + tools/kvm/include/kvm/rwsem.h | 39 + + tools/kvm/include/kvm/sdl.h | 22 + + tools/kvm/include/kvm/segment.h | 21 + + tools/kvm/include/kvm/strbuf.h | 19 + + tools/kvm/include/kvm/symbol.h | 30 + + tools/kvm/include/kvm/term.h | 20 + + tools/kvm/include/kvm/threadpool.h | 37 + + tools/kvm/include/kvm/types.h | 7 + + tools/kvm/include/kvm/uip.h | 358 ++++++ + tools/kvm/include/kvm/util.h | 95 ++ + tools/kvm/include/kvm/vesa.h | 18 + + tools/kvm/include/kvm/virtio-9p.h | 74 ++ + tools/kvm/include/kvm/virtio-balloon.h | 8 + + tools/kvm/include/kvm/virtio-blk.h | 12 + + tools/kvm/include/kvm/virtio-console.h | 9 + + tools/kvm/include/kvm/virtio-net.h | 23 + + tools/kvm/include/kvm/virtio-pci-dev.h | 37 + + tools/kvm/include/kvm/virtio-pci.h | 49 + + tools/kvm/include/kvm/virtio-rng.h | 9 + + tools/kvm/include/kvm/virtio-trans.h | 44 + + tools/kvm/include/kvm/virtio.h | 67 ++ + tools/kvm/include/kvm/vnc.h | 20 + + tools/kvm/include/linux/bitops.h | 33 + + tools/kvm/include/linux/byteorder.h | 7 + + tools/kvm/include/linux/compiler.h | 19 + + tools/kvm/include/linux/kernel.h | 39 + + tools/kvm/include/linux/module.h | 6 + + tools/kvm/include/linux/prefetch.h | 6 + + tools/kvm/include/linux/types.h | 51 + + tools/kvm/ioeventfd.c | 209 ++++ + tools/kvm/ioport.c | 195 +++ + tools/kvm/kvm-cmd.c | 91 ++ + tools/kvm/kvm-cpu.c | 175 +++ + tools/kvm/kvm-ipc.c | 231 ++++ + tools/kvm/kvm.c | 587 +++++++++ + tools/kvm/main.c | 19 + + tools/kvm/mmio.c | 137 +++ + tools/kvm/net/uip/arp.c | 30 + + tools/kvm/net/uip/buf.c | 114 ++ + tools/kvm/net/uip/core.c | 190 +++ + tools/kvm/net/uip/csum.c | 92 ++ + tools/kvm/net/uip/dhcp.c | 203 ++++ + tools/kvm/net/uip/icmp.c | 29 + + tools/kvm/net/uip/ipv4.c | 29 + + tools/kvm/net/uip/tcp.c | 317 +++++ + tools/kvm/net/uip/udp.c | 236 ++++ + tools/kvm/pci.c | 213 ++++ + tools/kvm/powerpc/boot.c | 8 + + tools/kvm/powerpc/cpu_info.c | 83 ++ + tools/kvm/powerpc/cpu_info.h | 43 + + tools/kvm/powerpc/include/kvm/barrier.h | 6 + + tools/kvm/powerpc/include/kvm/kvm-arch.h | 88 ++ + tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 ++ + tools/kvm/powerpc/ioport.c | 18 + + tools/kvm/powerpc/irq.c | 75 ++ + tools/kvm/powerpc/kvm-cpu.c | 291 +++++ + tools/kvm/powerpc/kvm.c | 460 +++++++ + tools/kvm/powerpc/spapr.h | 93 ++ + tools/kvm/powerpc/spapr_hcall.c | 134 +++ + tools/kvm/powerpc/spapr_hvcons.c | 102 ++ + tools/kvm/powerpc/spapr_hvcons.h | 19 + + tools/kvm/powerpc/spapr_pci.c | 423 +++++++ + tools/kvm/powerpc/spapr_pci.h | 57 + + tools/kvm/powerpc/spapr_rtas.c | 229 ++++ + tools/kvm/powerpc/xics.c | 514 ++++++++ + tools/kvm/powerpc/xics.h | 23 + + tools/kvm/symbol.c | 131 ++ + tools/kvm/term.c | 166 +++ + tools/kvm/tests/Makefile | 19 + + tools/kvm/tests/boot/Makefile | 13 + + tools/kvm/tests/boot/init.c | 11 + + tools/kvm/tests/kernel/.gitignore | 2 + + tools/kvm/tests/kernel/Makefile | 20 + + tools/kvm/tests/kernel/README | 16 + + tools/kvm/tests/kernel/kernel.S | 8 + + tools/kvm/tests/pit/.gitignore | 2 + + tools/kvm/tests/pit/Makefile | 20 + + tools/kvm/tests/pit/README | 16 + + tools/kvm/tests/pit/tick.S | 109 ++ + tools/kvm/ui/sdl.c | 303 +++++ + tools/kvm/ui/vnc.c | 230 ++++ + tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 + + tools/kvm/util/generate-cmdlist.sh | 23 + + tools/kvm/util/kvm-ifup-vbr0 | 6 + + tools/kvm/util/parse-options.c | 577 +++++++++ + tools/kvm/util/rbtree-interval.c | 89 ++ + tools/kvm/util/read-write.c | 344 ++++++ + tools/kvm/util/set_private_br.sh | 51 + + tools/kvm/util/strbuf.c | 39 + + tools/kvm/util/threadpool.c | 145 +++ + tools/kvm/util/util.c | 115 ++ + tools/kvm/virtio/9p-pdu.c | 287 +++++ + tools/kvm/virtio/9p.c | 1326 ++++++++++++++++++++ + tools/kvm/virtio/balloon.c | 275 +++++ + tools/kvm/virtio/blk.c | 290 +++++ + tools/kvm/virtio/console.c | 203 ++++ + tools/kvm/virtio/core.c | 158 +++ + tools/kvm/virtio/net.c | 547 +++++++++ + tools/kvm/virtio/pci.c | 380 ++++++ + tools/kvm/virtio/rng.c | 203 ++++ + tools/kvm/virtio/trans.c | 24 + + 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 | 55 + + tools/kvm/x86/include/kvm/assembly.h | 24 + + tools/kvm/x86/include/kvm/barrier.h | 16 + + 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 | 65 + + 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 | 229 ++++ + tools/kvm/x86/kvm-cpu.c | 425 +++++++ + tools/kvm/x86/kvm.c | 385 ++++++ + tools/kvm/x86/mptable.c | 287 +++++ + tools/perf/builtin-sched.c | 1 + + 256 files changed, 27508 insertions(+), 229 deletions(-) + create mode 100644 arch/x86/include/asm/uprobes.h + create mode 100644 arch/x86/kernel/uprobes.c + create mode 100644 include/linux/uprobes.h + create mode 100644 kernel/events/uprobes.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/init_stage2.c + create mode 100644 tools/kvm/guest/passwd + create mode 100644 tools/kvm/guest_compat.c + create mode 100644 tools/kvm/hw/i8042.c + create mode 100644 tools/kvm/hw/pci-shmem.c + create mode 100644 tools/kvm/hw/rtc.c + create mode 100644 tools/kvm/hw/serial.c + create mode 100644 tools/kvm/hw/vesa.c + create mode 100644 tools/kvm/include/asm/hweight.h + create mode 100644 tools/kvm/include/bios/memcpy.h + create mode 100644 tools/kvm/include/kvm/8250-serial.h + create mode 100644 tools/kvm/include/kvm/apic.h + create mode 100644 tools/kvm/include/kvm/brlock.h + create mode 100644 tools/kvm/include/kvm/builtin-balloon.h + create mode 100644 tools/kvm/include/kvm/builtin-debug.h + create mode 100644 tools/kvm/include/kvm/builtin-help.h + create mode 100644 tools/kvm/include/kvm/builtin-list.h + create mode 100644 tools/kvm/include/kvm/builtin-pause.h + create mode 100644 tools/kvm/include/kvm/builtin-resume.h + create mode 100644 tools/kvm/include/kvm/builtin-run.h + create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h + create mode 100644 tools/kvm/include/kvm/builtin-setup.h + create mode 100644 tools/kvm/include/kvm/builtin-stat.h + create mode 100644 tools/kvm/include/kvm/builtin-stop.h + create mode 100644 tools/kvm/include/kvm/builtin-version.h + create mode 100644 tools/kvm/include/kvm/compiler.h + create mode 100644 tools/kvm/include/kvm/disk-image.h + create mode 100644 tools/kvm/include/kvm/e820.h + create mode 100644 tools/kvm/include/kvm/framebuffer.h + create mode 100644 tools/kvm/include/kvm/guest_compat.h + create mode 100644 tools/kvm/include/kvm/i8042.h + create mode 100644 tools/kvm/include/kvm/ioeventfd.h + create mode 100644 tools/kvm/include/kvm/ioport.h + create mode 100644 tools/kvm/include/kvm/irq.h + create mode 100644 tools/kvm/include/kvm/kvm-cmd.h + create mode 100644 tools/kvm/include/kvm/kvm-cpu.h + create mode 100644 tools/kvm/include/kvm/kvm-ipc.h + create mode 100644 tools/kvm/include/kvm/kvm.h + create mode 100644 tools/kvm/include/kvm/msi.h + create mode 100644 tools/kvm/include/kvm/mutex.h + create mode 100644 tools/kvm/include/kvm/parse-options.h + create mode 100644 tools/kvm/include/kvm/pci-shmem.h + create mode 100644 tools/kvm/include/kvm/pci.h + create mode 100644 tools/kvm/include/kvm/qcow.h + create mode 100644 tools/kvm/include/kvm/rbtree-interval.h + create mode 100644 tools/kvm/include/kvm/read-write.h + create mode 100644 tools/kvm/include/kvm/rtc.h + create mode 100644 tools/kvm/include/kvm/rwsem.h + create mode 100644 tools/kvm/include/kvm/sdl.h + create mode 100644 tools/kvm/include/kvm/segment.h + create mode 100644 tools/kvm/include/kvm/strbuf.h + create mode 100644 tools/kvm/include/kvm/symbol.h + create mode 100644 tools/kvm/include/kvm/term.h + create mode 100644 tools/kvm/include/kvm/threadpool.h + create mode 100644 tools/kvm/include/kvm/types.h + create mode 100644 tools/kvm/include/kvm/uip.h + create mode 100644 tools/kvm/include/kvm/util.h + create mode 100644 tools/kvm/include/kvm/vesa.h + create mode 100644 tools/kvm/include/kvm/virtio-9p.h + create mode 100644 tools/kvm/include/kvm/virtio-balloon.h + create mode 100644 tools/kvm/include/kvm/virtio-blk.h + create mode 100644 tools/kvm/include/kvm/virtio-console.h + create mode 100644 tools/kvm/include/kvm/virtio-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-trans.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/types.h + create mode 100644 tools/kvm/ioeventfd.c + create mode 100644 tools/kvm/ioport.c + create mode 100644 tools/kvm/kvm-cmd.c + create mode 100644 tools/kvm/kvm-cpu.c + create mode 100644 tools/kvm/kvm-ipc.c + create mode 100644 tools/kvm/kvm.c + create mode 100644 tools/kvm/main.c + create mode 100644 tools/kvm/mmio.c + create mode 100644 tools/kvm/net/uip/arp.c + create mode 100644 tools/kvm/net/uip/buf.c + create mode 100644 tools/kvm/net/uip/core.c + create mode 100644 tools/kvm/net/uip/csum.c + create mode 100644 tools/kvm/net/uip/dhcp.c + create mode 100644 tools/kvm/net/uip/icmp.c + create mode 100644 tools/kvm/net/uip/ipv4.c + create mode 100644 tools/kvm/net/uip/tcp.c + create mode 100644 tools/kvm/net/uip/udp.c + create mode 100644 tools/kvm/pci.c + create mode 100644 tools/kvm/powerpc/boot.c + create mode 100644 tools/kvm/powerpc/cpu_info.c + create mode 100644 tools/kvm/powerpc/cpu_info.h + create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h + create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h + create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h + create mode 100644 tools/kvm/powerpc/ioport.c + create mode 100644 tools/kvm/powerpc/irq.c + create mode 100644 tools/kvm/powerpc/kvm-cpu.c + create mode 100644 tools/kvm/powerpc/kvm.c + create mode 100644 tools/kvm/powerpc/spapr.h + create mode 100644 tools/kvm/powerpc/spapr_hcall.c + create mode 100644 tools/kvm/powerpc/spapr_hvcons.c + create mode 100644 tools/kvm/powerpc/spapr_hvcons.h + create mode 100644 tools/kvm/powerpc/spapr_pci.c + create mode 100644 tools/kvm/powerpc/spapr_pci.h + create mode 100644 tools/kvm/powerpc/spapr_rtas.c + create mode 100644 tools/kvm/powerpc/xics.c + create mode 100644 tools/kvm/powerpc/xics.h + create mode 100644 tools/kvm/symbol.c + create mode 100644 tools/kvm/term.c + create mode 100644 tools/kvm/tests/Makefile + create mode 100644 tools/kvm/tests/boot/Makefile + create mode 100644 tools/kvm/tests/boot/init.c + create mode 100644 tools/kvm/tests/kernel/.gitignore + create mode 100644 tools/kvm/tests/kernel/Makefile + create mode 100644 tools/kvm/tests/kernel/README + create mode 100644 tools/kvm/tests/kernel/kernel.S + create mode 100644 tools/kvm/tests/pit/.gitignore + create mode 100644 tools/kvm/tests/pit/Makefile + create mode 100644 tools/kvm/tests/pit/README + create mode 100644 tools/kvm/tests/pit/tick.S + create mode 100644 tools/kvm/ui/sdl.c + create mode 100644 tools/kvm/ui/vnc.c + create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN + create mode 100755 tools/kvm/util/generate-cmdlist.sh + create mode 100755 tools/kvm/util/kvm-ifup-vbr0 + create mode 100644 tools/kvm/util/parse-options.c + create mode 100644 tools/kvm/util/rbtree-interval.c + create mode 100644 tools/kvm/util/read-write.c + create mode 100755 tools/kvm/util/set_private_br.sh + create mode 100644 tools/kvm/util/strbuf.c + create mode 100644 tools/kvm/util/threadpool.c + create mode 100644 tools/kvm/util/util.c + create mode 100644 tools/kvm/virtio/9p-pdu.c + create mode 100644 tools/kvm/virtio/9p.c + create mode 100644 tools/kvm/virtio/balloon.c + create mode 100644 tools/kvm/virtio/blk.c + create mode 100644 tools/kvm/virtio/console.c + create mode 100644 tools/kvm/virtio/core.c + create mode 100644 tools/kvm/virtio/net.c + create mode 100644 tools/kvm/virtio/pci.c + create mode 100644 tools/kvm/virtio/rng.c + create mode 100644 tools/kvm/virtio/trans.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 +Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited) +$ git merge rcu/rcu/next +Already up-to-date. +Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) +$ git merge cputime/cputime +Already up-to-date. +Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3) +$ git merge kmemleak/kmemleak +Already up-to-date. +Merging kvm/linux-next (e087592 KVM: Resolve RCU vs. async page fault problem) +$ git merge kvm/linux-next +Already up-to-date. +Merging oprofile/for-next (c16fa4f Linux 3.3) +$ git merge oprofile/for-next +Already up-to-date. +Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen) +$ git merge xen/upstream/xen +Resolved 'arch/x86/include/asm/cmpxchg.h' using previous resolution. +Auto-merging arch/x86/include/asm/cmpxchg.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 756d812] Merge remote-tracking branch 'xen/upstream/xen' +$ git diff -M --stat --summary HEAD^.. +Merging xen-two/linux-next (2efe928 Merge branch 'stable/for-linus-3.4' into linux-next) +$ git merge xen-two/linux-next +Resolved 'arch/x86/include/asm/io_apic.h' using previous resolution. +Resolved 'arch/x86/kernel/apic/io_apic.c' using previous resolution. +Auto-merging arch/x86/kernel/apic/io_apic.c +CONFLICT (content): Merge conflict in arch/x86/kernel/apic/io_apic.c +Auto-merging arch/x86/include/asm/io_apic.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8822098] Merge remote-tracking branch 'xen-two/linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/xen/cpu_hotplug.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 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 (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (e06ffa1 workqueue: use percpu allocator for cwq on UP) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/linux-next (86924de acer-wmi: add quirk table for video backlight vendor mode) +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (36e88a5 Merge branch 'regmap-stride' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 3 + + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/internal.h | 22 +++- + drivers/base/regmap/regcache-lzo.c | 11 +- + drivers/base/regmap/regcache-rbtree.c | 44 ++++--- + drivers/base/regmap/regcache.c | 34 +++-- + drivers/base/regmap/regmap-debugfs.c | 18 ++- + drivers/base/regmap/regmap-i2c.c | 13 +- + drivers/base/regmap/regmap-irq.c | 34 +++-- + drivers/base/regmap/regmap-mmio.c | 224 +++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap-spi.c | 13 +- + drivers/base/regmap/regmap.c | 169 +++++++++++++++++++------ + include/linux/regmap.h | 28 ++++- + 13 files changed, 503 insertions(+), 111 deletions(-) + create mode 100644 drivers/base/regmap/regmap-mmio.c +$ git reset --hard HEAD^ +HEAD is now at 8822098 Merge remote-tracking branch 'xen-two/linux-next' +Merging refs/next/20120410/regmap +$ git merge refs/next/20120410/regmap +Auto-merging drivers/base/regmap/regcache-rbtree.c +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 3 + + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/internal.h | 11 +- + drivers/base/regmap/regcache-rbtree.c | 4 +- + drivers/base/regmap/regcache.c | 20 ++-- + drivers/base/regmap/regmap-i2c.c | 13 +- + drivers/base/regmap/regmap-mmio.c | 211 +++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap-spi.c | 13 +- + drivers/base/regmap/regmap.c | 87 ++++++++++---- + include/linux/regmap.h | 19 ++- + 10 files changed, 332 insertions(+), 50 deletions(-) + create mode 100644 drivers/base/regmap/regmap-mmio.c +Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Already up-to-date. +Merging driver-core/driver-core-next (ecf1948 w1: fix slave driver registration error message) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/hv/hv.c | 2 +- + drivers/hv/hyperv_vmbus.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging tty/tty-next (59d59b0 ISDN: remove uses of isdn_tty_revision) +$ git merge tty/tty-next +Auto-merging drivers/usb/gadget/u_serial.c +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/tty/serial/pch_uart.c +Removing drivers/tty/serial/68328serial.h +Merge made by the 'recursive' strategy. + drivers/isdn/i4l/isdn_common.c | 5 - + drivers/isdn/i4l/isdn_tty.c | 466 +++++++++++++++----------------------- + drivers/net/usb/hso.c | 105 ++++----- + drivers/s390/char/con3215.c | 74 +++--- + drivers/s390/char/keyboard.c | 30 +-- + drivers/s390/char/keyboard.h | 14 +- + drivers/s390/char/sclp_tty.c | 33 +-- + drivers/s390/char/sclp_vt220.c | 33 ++- + drivers/s390/char/tty3270.c | 121 +++++----- + drivers/tty/bfin_jtag_comm.c | 44 ++-- + drivers/tty/hvc/hvc_console.c | 93 ++++---- + drivers/tty/hvc/hvc_console.h | 4 +- + drivers/tty/hvc/hvcs.c | 74 +++--- + drivers/tty/hvc/hvsi.c | 128 +++++------ + drivers/tty/hvc/hvsi_lib.c | 2 +- + drivers/tty/ipwireless/tty.c | 81 +++---- + drivers/tty/serial/68328serial.c | 383 +++++++++++++------------------ + drivers/tty/serial/68328serial.h | 186 --------------- + drivers/tty/serial/crisv10.c | 28 +-- + drivers/tty/serial/pch_uart.c | 53 +++-- + drivers/tty/tty_buffer.c | 85 +++++-- + drivers/tty/vt/vt.c | 68 +++--- + drivers/usb/gadget/u_serial.c | 51 ++--- + include/linux/generic_serial.h | 64 +----- + include/linux/isdn.h | 26 +-- + net/bluetooth/rfcomm/tty.c | 133 +++++------ + 26 files changed, 946 insertions(+), 1438 deletions(-) + delete mode 100644 drivers/tty/serial/68328serial.h +Merging usb/usb-next (af58105 USB: io_ti: fix abuse of interface data) +$ git merge usb/usb-next +Auto-merging drivers/usb/serial/metro-usb.c +Merge made by the 'recursive' strategy. + drivers/usb/serial/io_ti.c | 17 +- + drivers/usb/serial/metro-usb.c | 83 +++++- + drivers/usb/serial/whiteheat.c | 544 +--------------------------------------- + 3 files changed, 94 insertions(+), 550 deletions(-) +Merging staging/staging-next (b330f60 staging: replace open-coded ARRAY_SIZEs) +$ git merge staging/staging-next +Auto-merging drivers/staging/xgifb/vb_table.h +Auto-merging drivers/staging/xgifb/vb_setmode.c +Auto-merging drivers/staging/xgifb/vb_init.c +Removing drivers/staging/serial/TODO +Removing drivers/staging/serial/Makefile +Removing drivers/staging/serial/Kconfig +Removing drivers/staging/serial/68360serial.c +Auto-merging drivers/staging/rts_pstor/rtsx_transport.c +Auto-merging drivers/staging/rts_pstor/ms.c +Auto-merging drivers/staging/omapdrm/omap_drv.c +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/android/persistent_ram.c | 4 +- + drivers/staging/bcm/DDRInit.c | 26 +- + drivers/staging/bcm/IPv6Protocol.c | 409 +-- + drivers/staging/bcm/Misc.c | 2 +- + drivers/staging/comedi/Kconfig | 112 +- + drivers/staging/comedi/comedi_fops.c | 43 +- + drivers/staging/comedi/comedidev.h | 15 +- + drivers/staging/comedi/drivers.c | 253 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 2 +- + drivers/staging/comedi/drivers/adl_pci7230.c | 2 +- + drivers/staging/comedi/drivers/adl_pci7296.c | 2 +- + drivers/staging/comedi/drivers/adl_pci7432.c | 2 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 2 +- + 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/amplc_dio200.c | 79 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 65 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 67 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 147 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidio.c | 2 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 2 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 2 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 2 +- + drivers/staging/comedi/drivers/daqboard2000.c | 2 +- + drivers/staging/comedi/drivers/das08.c | 123 +- + drivers/staging/comedi/drivers/dt3000.c | 2 +- + drivers/staging/comedi/drivers/dt9812.c | 2 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 2 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 2 +- + drivers/staging/comedi/drivers/jr3_pci.c | 2 +- + drivers/staging/comedi/drivers/ke_counter.c | 2 +- + drivers/staging/comedi/drivers/me4000.c | 2 +- + drivers/staging/comedi/drivers/me_daq.c | 2 +- + drivers/staging/comedi/drivers/ni_6527.c | 2 +- + drivers/staging/comedi/drivers/ni_65xx.c | 2 +- + drivers/staging/comedi/drivers/ni_660x.c | 2 +- + drivers/staging/comedi/drivers/ni_670x.c | 2 +- + drivers/staging/comedi/drivers/ni_labpc.c | 2 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 2 +- + drivers/staging/comedi/drivers/rtd520.c | 10 +- + drivers/staging/comedi/drivers/s626.c | 2 +- + drivers/staging/comedi/drivers/skel.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 124 +- + drivers/staging/comedi/drivers/usbduxfast.c | 10 +- + drivers/staging/comedi/drivers/usbduxsigma.c | 12 +- + drivers/staging/comedi/drivers/vmk80xx.c | 6 +- + drivers/staging/comedi/internal.h | 1 + + drivers/staging/iio/Documentation/generic_buffer.c | 4 +- + drivers/staging/iio/accel/lis3l02dq_core.c | 2 +- + drivers/staging/iio/adc/max1363_core.c | 10 +- + drivers/staging/iio/iio.h | 2 + + drivers/staging/iio/imu/adis16400_core.c | 2 +- + drivers/staging/iio/meter/ade7758_core.c | 2 +- + drivers/staging/media/as102/as102_usb_drv.c | 5 +- + drivers/staging/media/go7007/README | 2 +- + drivers/staging/mei/init.c | 2 +- + drivers/staging/mei/interface.h | 3 +- + drivers/staging/mei/main.c | 21 +- + drivers/staging/mei/wd.c | 74 +- + drivers/staging/nvec/nvec.h | 2 +- + drivers/staging/octeon/ethernet-rx.c | 2 +- + drivers/staging/octeon/ethernet-tx.c | 10 +- + drivers/staging/octeon/ethernet-util.h | 2 +- + drivers/staging/octeon/ethernet.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 2 +- + drivers/staging/omapdrm/Makefile | 1 + + drivers/staging/omapdrm/omap_dmm_tiler.c | 4 +- + drivers/staging/omapdrm/omap_drv.c | 4 +- + drivers/staging/omapdrm/omap_drv.h | 7 + + drivers/staging/omapdrm/omap_fb.c | 2 +- + drivers/staging/omapdrm/omap_gem.c | 26 +- + drivers/staging/omapdrm/omap_gem_dmabuf.c | 150 + + drivers/staging/omapdrm/tcm-sita.c | 2 +- + drivers/staging/ozwpan/ozappif.h | 12 +- + drivers/staging/ozwpan/ozcdev.c | 17 - + drivers/staging/ozwpan/ozevent.c | 195 +- + drivers/staging/ozwpan/ozevent.h | 11 +- + drivers/staging/ozwpan/ozeventdef.h | 19 +- + drivers/staging/ozwpan/ozhcd.c | 2 +- + drivers/staging/ozwpan/ozmain.c | 8 +- + drivers/staging/panel/panel.c | 2 +- + drivers/staging/quatech_usb2/quatech_usb2.c | 2 +- + drivers/staging/ramster/cluster/tcp.c | 4 +- + drivers/staging/ramster/xvmalloc.c | 2 +- + drivers/staging/ramster/zcache-main.c | 2 +- + .../rtl8187se/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8187se/r8185b_init.c | 1325 ++++----- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 +- + drivers/staging/rtl8192e/rtllib_wx.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8192u/r8192U_wx.c | 4 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +- + drivers/staging/rts5139/ms.c | 5 +- + drivers/staging/rts_pstor/ms.c | 2 +- + drivers/staging/rts_pstor/rtsx_transport.c | 4 +- + drivers/staging/serial/68360serial.c | 2979 -------------------- + drivers/staging/serial/Kconfig | 16 - + drivers/staging/serial/Makefile | 1 - + drivers/staging/serial/TODO | 6 - + drivers/staging/telephony/ixj.c | 228 +- + drivers/staging/tidspbridge/core/io_sm.c | 2 +- + drivers/staging/tidspbridge/core/ue_deh.c | 2 +- + drivers/staging/usbip/stub_dev.c | 12 +- + drivers/staging/usbip/usbip_common.h | 17 + + drivers/staging/usbip/usbip_protocol.txt | 2 +- + .../staging/usbip/userspace/libsrc/vhci_driver.c | 20 +- + drivers/staging/usbip/vhci_hcd.c | 8 +- + drivers/staging/usbip/vhci_rx.c | 2 +- + drivers/staging/usbip/vhci_sysfs.c | 4 +- + drivers/staging/vme/bridges/vme_tsi148.c | 181 +- + drivers/staging/vme/bridges/vme_tsi148.h | 21 +- + drivers/staging/vme/devices/vme_pio2_gpio.c | 2 +- + drivers/staging/vme/devices/vme_user.c | 43 +- + drivers/staging/vt6655/wpa.c | 4 +- + drivers/staging/vt6656/wpa.c | 4 +- + drivers/staging/wlags49_h2/README.ubuntu | 2 +- + drivers/staging/wlags49_h2/wl_netdev.c | 9 +- + drivers/staging/wlags49_h2/wl_profile.c | 8 +- + drivers/staging/xgifb/XGI_main.h | 221 +- + drivers/staging/xgifb/XGI_main_26.c | 101 +- + drivers/staging/xgifb/XGIfb.h | 6 +- + drivers/staging/xgifb/vb_init.c | 78 +- + drivers/staging/xgifb/vb_setmode.c | 1457 +++------- + drivers/staging/xgifb/vb_struct.h | 27 - + drivers/staging/xgifb/vb_table.h | 725 +---- + drivers/staging/xgifb/vgatypes.h | 2 - + 141 files changed, 2967 insertions(+), 6791 deletions(-) + create mode 100644 drivers/staging/omapdrm/omap_gem_dmabuf.c + delete mode 100644 drivers/staging/serial/68360serial.c + delete mode 100644 drivers/staging/serial/Kconfig + delete mode 100644 drivers/staging/serial/Makefile + delete mode 100644 drivers/staging/serial/TODO +Merging char-misc/char-misc-next (0034102 Linux 3.4-rc2) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging tmem/linux-next (9c9fc31 Merge commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d' into linux-next) +$ git merge tmem/linux-next +Auto-merging mm/swapfile.c +Auto-merging include/linux/swap.h +Merge made by the 'recursive' strategy. + Documentation/vm/frontswap.txt | 210 +++++++++++++++++++++++++++++++ + include/linux/frontswap.h | 126 +++++++++++++++++++ + include/linux/swap.h | 4 + + include/linux/swapfile.h | 13 ++ + mm/Kconfig | 17 +++ + mm/Makefile | 1 + + mm/frontswap.c | 273 ++++++++++++++++++++++++++++++++++++++++ + mm/page_io.c | 12 ++ + mm/swapfile.c | 54 ++++++-- + 9 files changed, 697 insertions(+), 13 deletions(-) + create mode 100644 Documentation/vm/frontswap.txt + create mode 100644 include/linux/frontswap.h + create mode 100644 include/linux/swapfile.h + create mode 100644 mm/frontswap.c +Merging writeback/writeback-for-next (697e6fe writeback: Remove outdated comment) +$ 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 (a57be23 pinctrl: tegra: Add complete device tree support) +$ git merge pinctrl/for-next +Removing Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/nvidia,tegra20-pinmux.txt | 132 +++++++++++ + .../bindings/pinctrl/nvidia,tegra30-pinmux.txt | 132 +++++++++++ + .../bindings/pinctrl/pinctrl-bindings.txt | 128 ++++++++++ + .../devicetree/bindings/pinmux/pinmux_nvidia.txt | 5 - + Documentation/pinctrl.txt | 46 ++-- + drivers/of/base.c | 41 ++++ + drivers/pinctrl/Kconfig | 5 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/core.c | 112 +++++++-- + drivers/pinctrl/core.h | 11 +- + drivers/pinctrl/devicetree.c | 249 ++++++++++++++++++++ + drivers/pinctrl/devicetree.h | 35 +++ + drivers/pinctrl/pinconf.c | 3 +- + drivers/pinctrl/pinctrl-coh901.c | 4 +- + drivers/pinctrl/pinctrl-pxa3xx.c | 24 +- + drivers/pinctrl/pinctrl-sirf.c | 20 +- + drivers/pinctrl/pinctrl-tegra.c | 245 ++++++++++++++++--- + drivers/pinctrl/pinctrl-u300.c | 20 +- + drivers/pinctrl/pinmux.c | 11 +- + include/linux/of.h | 35 +++ + include/linux/pinctrl/machine.h | 2 + + include/linux/pinctrl/pinctrl.h | 13 +- + include/linux/pinctrl/pinmux.h | 7 +- + 23 files changed, 1134 insertions(+), 147 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt + delete mode 100644 Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt + create mode 100644 drivers/pinctrl/devicetree.c + create mode 100644 drivers/pinctrl/devicetree.h +Merging tegra/for-next (2ac6b1e Merge branch 'for-3.5/debug' into for-next) +$ git merge tegra/for-next +Auto-merging drivers/usb/host/ehci-tegra.c +Removing arch/arm/mach-tegra/pinmux.c +Removing arch/arm/mach-tegra/pinmux-tegra30-tables.c +Removing arch/arm/mach-tegra/pinmux-tegra20-tables.c +Removing arch/arm/mach-tegra/include/mach/pinmux.h +Removing arch/arm/mach-tegra/include/mach/pinmux-tegra30.h +Removing arch/arm/mach-tegra/include/mach/pinmux-tegra20.h +Auto-merging arch/arm/mach-tegra/devices.c +Auto-merging arch/arm/mach-tegra/board-trimslice.c +Auto-merging arch/arm/mach-tegra/board-seaboard.c +Auto-merging arch/arm/mach-tegra/board-dt-tegra20.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra-cardhu.dts | 44 + + arch/arm/boot/dts/tegra-harmony.dts | 224 +++++ + arch/arm/boot/dts/tegra-paz00.dts | 220 +++++ + arch/arm/boot/dts/tegra-seaboard.dts | 243 +++++ + arch/arm/boot/dts/tegra-trimslice.dts | 230 +++++ + arch/arm/boot/dts/tegra-ventana.dts | 230 +++++ + arch/arm/mach-tegra/Kconfig | 29 +- + arch/arm/mach-tegra/Makefile | 3 - + arch/arm/mach-tegra/board-dt-tegra20.c | 31 - + arch/arm/mach-tegra/board-harmony-pinmux.c | 266 +++--- + arch/arm/mach-tegra/board-paz00-pinmux.c | 263 +++--- + arch/arm/mach-tegra/board-pinmux.c | 105 +-- + arch/arm/mach-tegra/board-pinmux.h | 38 +- + arch/arm/mach-tegra/board-seaboard-pinmux.c | 346 ++++---- + arch/arm/mach-tegra/board-seaboard.c | 21 +- + arch/arm/mach-tegra/board-trimslice-pinmux.c | 264 +++--- + arch/arm/mach-tegra/board-trimslice.c | 15 +- + arch/arm/mach-tegra/devices.c | 3 + + arch/arm/mach-tegra/include/mach/gpio-tegra.h | 9 - + arch/arm/mach-tegra/include/mach/pinmux-tegra20.h | 184 ---- + arch/arm/mach-tegra/include/mach/pinmux-tegra30.h | 320 ------- + arch/arm/mach-tegra/include/mach/pinmux.h | 302 ------- + arch/arm/mach-tegra/include/mach/uncompress.h | 176 ++-- + arch/arm/mach-tegra/pinmux-tegra20-tables.c | 244 ----- + arch/arm/mach-tegra/pinmux-tegra30-tables.c | 376 -------- + arch/arm/mach-tegra/pinmux.c | 987 --------------------- + arch/arm/mach-tegra/usb_phy.c | 1 - + drivers/gpio/gpio-tegra.c | 39 +- + drivers/mmc/host/sdhci-tegra.c | 24 +- + drivers/pinctrl/pinctrl-tegra.c | 6 +- + drivers/usb/host/ehci-tegra.c | 13 +- + include/linux/platform_data/tegra_usb.h | 1 + + 32 files changed, 1996 insertions(+), 3261 deletions(-) + delete mode 100644 arch/arm/mach-tegra/include/mach/pinmux-tegra20.h + delete mode 100644 arch/arm/mach-tegra/include/mach/pinmux-tegra30.h + delete mode 100644 arch/arm/mach-tegra/include/mach/pinmux.h + delete mode 100644 arch/arm/mach-tegra/pinmux-tegra20-tables.c + delete mode 100644 arch/arm/mach-tegra/pinmux-tegra30-tables.c + delete mode 100644 arch/arm/mach-tegra/pinmux.c +Merging moduleh/for-sfr (ed93e94 ia64: populate the cmpxchg header with appropriate code) +$ git merge moduleh/for-sfr +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/atomic.h | 68 +---------------- + arch/alpha/include/asm/cmpxchg.h | 71 +++++++++++++++++ + arch/alpha/include/asm/xchg.h | 4 +- + arch/ia64/include/asm/cmpxchg.h | 148 +++++++++++++++++++++++++++++++++++- + arch/ia64/include/asm/intrinsics.h | 114 +-------------------------- + 5 files changed, 222 insertions(+), 183 deletions(-) + create mode 100644 arch/alpha/include/asm/cmpxchg.h +Merging vhost/linux-next (437578b virtio-pci: switch to PM ops macro to initialise PM functions) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. +Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal) +$ git merge kmap_atomic/kmap_atomic +Already up-to-date. +Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400) +$ git merge modem-shm/for-next +Auto-merging include/linux/Kbuild +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Merge made by the 'recursive' strategy. + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/modem_shm/Kconfig | 62 ++ + drivers/modem_shm/Makefile | 5 + + drivers/modem_shm/dummy_c2c_genio.c | 76 ++ + drivers/modem_shm/shm_boot.c | 1208 ++++++++++++++++++++++++++ + drivers/modem_shm/shm_bus.c | 113 +++ + drivers/modem_shm/shm_chr.c | 1242 +++++++++++++++++++++++++++ + drivers/modem_shm/shm_dev.c | 527 ++++++++++++ + drivers/modem_shm/shm_ipctoc.h | 154 ++++ + drivers/net/caif/Kconfig | 12 +- + drivers/net/caif/Makefile | 3 +- + drivers/net/caif/caif_shm.c | 900 +++++++++++++++++++ + include/linux/Kbuild | 1 + + include/linux/c2c_genio.h | 195 +++++ + include/linux/modem_shm/Kbuild | 1 + + include/linux/modem_shm/modem_shm_netlink.h | 95 ++ + include/linux/modem_shm/shm_dev.h | 245 ++++++ + 18 files changed, 4840 insertions(+), 2 deletions(-) + create mode 100644 drivers/modem_shm/Kconfig + create mode 100644 drivers/modem_shm/Makefile + create mode 100644 drivers/modem_shm/dummy_c2c_genio.c + create mode 100644 drivers/modem_shm/shm_boot.c + create mode 100644 drivers/modem_shm/shm_bus.c + create mode 100644 drivers/modem_shm/shm_chr.c + create mode 100644 drivers/modem_shm/shm_dev.c + create mode 100644 drivers/modem_shm/shm_ipctoc.h + create mode 100644 drivers/net/caif/caif_shm.c + create mode 100644 include/linux/c2c_genio.h + create mode 100644 include/linux/modem_shm/Kbuild + create mode 100644 include/linux/modem_shm/modem_shm_netlink.h + create mode 100644 include/linux/modem_shm/shm_dev.h +Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) +$ git merge memblock/memblock-kill-early_node_map +Already up-to-date. +Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/) +$ git merge remoteproc/for-next +Already up-to-date. +Merging irqdomain/irqdomain/next (409a6f6 Merge branch 'irqdomain-for-grant' of git://sources.calxeda.com/kernel/linux into irqdomain/next) +$ git merge irqdomain/irqdomain/next +Resolved 'arch/arm/Kconfig' using previous resolution. +Auto-merging include/linux/irq.h +Auto-merging drivers/gpio/gpio-pl061.c +Auto-merging arch/arm/common/Kconfig +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b86bd81] Merge remote-tracking branch 'irqdomain/irqdomain/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/pl061-gpio.txt | 15 ++ + arch/arm/Kconfig | 2 +- + arch/arm/common/Kconfig | 2 - + drivers/gpio/gpio-pl061.c | 48 ++++--- + include/linux/irq.h | 15 ++ + kernel/irq/generic-chip.c | 152 +++++++++++++++++--- + 6 files changed, 186 insertions(+), 48 deletions(-) +Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio) +$ git merge gpio/gpio/next +Auto-merging drivers/of/Makefile +Auto-merging drivers/of/Kconfig +Auto-merging drivers/gpio/gpio-sodaville.c +Auto-merging drivers/gpio/Kconfig +Merge made by the 'recursive' strategy. + Documentation/gpio.txt | 3 ++ + drivers/gpio/Kconfig | 13 +++++--- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-bt8xx.c | 12 +------ + drivers/gpio/gpio-langwell.c | 51 +++++++++++++++++++++++------- + drivers/gpio/gpio-ml-ioh.c | 12 +------ + drivers/gpio/gpio-pch.c | 12 +------ + drivers/gpio/gpio-sodaville.c | 12 +------ + drivers/{of/gpio.c => gpio/gpiolib-of.c} | 0 + drivers/gpio/gpiolib.c | 12 ++++++- + drivers/of/Kconfig | 6 ---- + drivers/of/Makefile | 1 - + include/linux/gpio.h | 19 +++++++++++ + 13 files changed, 86 insertions(+), 68 deletions(-) + rename drivers/{of/gpio.c => gpio/gpiolib-of.c} (100%) +Merging arm-soc/for-next (ce9f68e Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Auto-merging drivers/mmc/host/atmel-mci.c +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 4 +- + arch/arm/arm-soc-for-next-contents.txt | 169 ++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/omap3-beagle.dts | 49 +++++++++ + arch/arm/boot/dts/omap3.dtsi | 102 +++++++++++++++++++ + arch/arm/boot/dts/omap4-panda.dts | 56 +++++++++++ + arch/arm/boot/dts/omap4-sdp.dts | 97 ++++++++++++++++++ + arch/arm/boot/dts/omap4.dtsi | 117 ++++++++++++++++++++++ + arch/arm/boot/dts/twl4030.dtsi | 39 ++++++++ + arch/arm/boot/dts/twl6030.dtsi | 86 ++++++++++++++++ + arch/arm/mach-at91/Kconfig | 21 +++- + arch/arm/mach-omap2/board-generic.c | 37 +------ + arch/arm/mach-omap2/devices.c | 4 +- + arch/arm/mach-omap2/gpio.c | 8 +- + drivers/char/hw_random/Kconfig | 2 +- + drivers/dma/Kconfig | 5 +- + drivers/input/touchscreen/Kconfig | 4 +- + drivers/mmc/host/Kconfig | 23 +---- + drivers/mmc/host/atmel-mci.c | 2 - + drivers/rtc/Kconfig | 2 +- + 19 files changed, 752 insertions(+), 75 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/twl4030.dtsi + create mode 100644 arch/arm/boot/dts/twl6030.dtsi +Merging kvmtool/master (63091b3 kvm tools: Drop unnecessary headers in barrier.h) +$ git merge kvmtool/master +Removing tools/kvm/virtio/trans.c +Removing tools/kvm/include/kvm/virtio-trans.h +Merge made by the 'recursive' strategy. + tools/kvm/Makefile | 2 +- + tools/kvm/builtin-run.c | 2 + + tools/kvm/include/kvm/ioeventfd.h | 3 +- + tools/kvm/include/kvm/pci.h | 2 +- + tools/kvm/include/kvm/virtio-9p.h | 13 +- + tools/kvm/include/kvm/virtio-mmio.h | 58 ++++++++ + tools/kvm/include/kvm/virtio-net.h | 7 +- + tools/kvm/include/kvm/virtio-pci-dev.h | 4 +- + tools/kvm/include/kvm/virtio-pci.h | 15 +- + tools/kvm/include/kvm/virtio-trans.h | 44 ------ + tools/kvm/include/kvm/virtio.h | 38 ++++- + tools/kvm/ioeventfd.c | 19 ++- + tools/kvm/virtio/9p.c | 36 +++-- + tools/kvm/virtio/balloon.c | 17 +-- + tools/kvm/virtio/blk.c | 21 ++- + tools/kvm/virtio/console.c | 13 +- + tools/kvm/virtio/core.c | 46 +++++- + tools/kvm/virtio/mmio.c | 256 ++++++++++++++++++++++++++++++++ + tools/kvm/virtio/net.c | 32 ++-- + tools/kvm/virtio/pci.c | 101 ++++++------- + tools/kvm/virtio/rng.c | 14 +- + tools/kvm/virtio/trans.c | 24 --- + tools/kvm/x86/include/kvm/barrier.h | 5 +- + tools/kvm/x86/include/kvm/kvm-arch.h | 1 + + 24 files changed, 544 insertions(+), 229 deletions(-) + create mode 100644 tools/kvm/include/kvm/virtio-mmio.h + delete mode 100644 tools/kvm/include/kvm/virtio-trans.h + create mode 100644 tools/kvm/virtio/mmio.c + delete mode 100644 tools/kvm/virtio/trans.c +Merging dma-mapping/dma-mapping-next (0034102 Linux 3.4-rc2) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.) +$ git merge dma-buf/for-next +Resolved 'include/linux/dma-buf.h' using previous resolution. +Auto-merging include/linux/dma-buf.h +CONFLICT (content): Merge conflict in include/linux/dma-buf.h +Auto-merging drivers/base/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 78c897e] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/base/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS) +$ git merge ktest/for-next +Already up-to-date. +Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate time keeping and irq enable) +$ git merge cpuidle-cons/cpuidle_consol_pull +Resolved 'arch/arm/mach-at91/cpuidle.c' using previous resolution. +Resolved 'arch/arm/mach-davinci/cpuidle.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/cpuidle.c' using previous resolution. +Resolved 'drivers/cpuidle/cpuidle.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/cpuidle.c +CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c +Auto-merging arch/arm/mach-shmobile/cpuidle.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/cpuidle.c +Auto-merging arch/arm/mach-davinci/cpuidle.c +CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c +Auto-merging arch/arm/mach-at91/cpuidle.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c +Auto-merging arch/arm/include/asm/cpuidle.h +CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/include/asm/cpuidle.h'. +[master 58fc946] Merge remote-tracking branch 'cpuidle-cons/cpuidle_consol_pull' +$ git diff -M --stat --summary HEAD^.. +Merging scsi-post-merge/merge-base:master () +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm +From ../next + * [new branch] quilt/akpm -> akpm +$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base +From ../next + * [new branch] quilt/akpm-base -> akpm-base +$ git checkout akpm +Switched to branch 'akpm' +$ git rebase --onto master akpm-base +First, rewinding head to replay your work on top of it... +Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314 +Applying: acerhdf: add support for new hardware +Applying: acerhdf: lowered default temp fanon/fanoff values +Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver +Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND +Applying: drivers/xen/Kconfig: fix Kconfig layout +Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file +Applying: avr32: don't mask signals in the error path +Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn +Applying: avr32: use block_sigmask() +Applying: m32r: use set_current_blocked() and block_sigmask() +Applying: m68k: use set_current_blocked() and block_sigmask() +Applying: mn10300: use set_current_blocked() and block_sigmask() +Applying: cris: use set_current_blocked() and block_sigmask() +Applying: cris: select GENERIC_ATOMIC64 +Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs +Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix +Applying: x86: change percpu_read_stable() to this_cpu_read_stable() +Applying: net: use this_cpu_xxx replace percpu_xxx funcs +Applying: percpu: remove percpu_xxx() functions +Applying: percpu-remove-percpu_xxx-functions-fix +Applying: ia64: use set_current_blocked() and block_sigmask() +Applying: microblaze: don't reimplement force_sigsegv() +Applying: microblaze: no need to reset handler if SA_ONESHOT +Applying: microblaze: fix signal masking +Applying: microblaze: use set_current_blocked() and block_sigmask() +Applying: MIPS: use set_current_blocked() and block_sigmask() +Applying: score: don't mask signals if we fail to setup signal stack +Applying: score: use set_current_blocked() and block_sigmask() +Applying: h8300: use set_current_blocked() and block_sigmask() +Applying: unicore32: use block_sigmask() +Applying: blackfin: use set_current_blocked() and block_sigmask() +Applying: ocfs2: use find_last_bit() +Applying: ocfs2: use bitmap_weight() +Applying: parisc: use set_current_blocked() and block_sigmask() +Applying: vfs: increment iversion when a file is truncated +Applying: fs: symlink restrictions on sticky directories +Applying: fs: hardlink creation restrictions +Applying: brlocks/lglocks: cleanups +Applying: mm/memory_failure: let the compiler add the function name +Applying: mm: fix page-faults detection in swap-token logic +Applying: mm: add extra free kbytes tunable +Applying: mm-add-extra-free-kbytes-tunable-update +Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes +Applying: memcg: fix/change behavior of shared anon at moving task +Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup +Applying: memcg swap: use mem_cgroup_uncharge_swap() +Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled +Applying: mm/memcg: move reclaim_stat into lruvec +Applying: mm: push lru index into shrink_[in]active_list() +Applying: mm-push-lru-index-into-shrink_active_list-fix +Applying: mm: mark mm-inline functions as __always_inline +Applying: mm: remove lru type checks from __isolate_lru_page() +Applying: mm/memcg: kill mem_cgroup_lru_del() +Applying: mm/memcg: use vm_swappiness from target memory cgroup +Applying: security/keys/keyctl.c: suppress memory allocation failure warning +Applying: frv: use set_current_blocked() and block_sigmask() +Applying: um/kernel/trap.c: port OOM changes to handle_page_fault() +Applying: block: use lockdep_assert_held() for queue locking +Applying: sgi-xp: use lockdep_assert_held() +Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked() +Applying: XFS: fix lock ASSERT on UP +Applying: mm/huge_memory.c: use lockdep_assert_held() +Applying: futex: use lockdep_assert_held() for lock checking +Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked() +Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct +Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad +Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix +Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use +Applying: checkpatch: check for spin_is_locked() +Applying: vsprintf: further optimize decimal conversion +Applying: vsprintf-further-optimize-decimal-conversion-v2 +Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes +Applying: leds: add LED driver for lm3556 chip +Applying: leds-add-led-driver-for-lm3556-chip-fix-2 +Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes +Applying: leds-add-led-driver-for-lm3556-chip-fix +Applying: checkpatch: suggest pr_ over printk(KERN_ +Applying: rtc/spear: add Device Tree probing capability +Applying: kmod: unexport call_usermodehelper_freeinfo() +Applying: kmod: convert two call sites to call_usermodehelper_fns() +Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers +Applying: kmod: avoid deadlock from recursive kmod call +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: rapidio: add DMA engine support for RIO data transfers +Applying: rapidio/tsi721: add DMA engine support +Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE +Applying: fs, proc: introduce /proc//task//children entry +Applying: syscalls, x86: add __NR_kcmp syscall +Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat +Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries +Applying: c/r: prctl: add ability to set new mm_struct::exe_file +Applying: c-r-prctl-add-ability-to-set-new-mm_struct-exe_file-v2 +Applying: c/r: prctl: add ability to get clear_tid_address +Applying: c-r-prctl-add-ability-to-get-clear_tid_address-fix +Applying: ramoops: use pstore interface +Applying: ramoops: fix printk format warnings +Applying: notify_change(): check that i_mutex is held +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm +From ../rebase-tmp + + 949e4ed...5175be8 akpm -> akpm (forced update) +$ rm -rf ../rebase-tmp +Merging akpm (5175be8 notify_change(): check that i_mutex is held) +$ git merge --no-ff akpm +Merge made by the 'recursive' strategy. + Documentation/cgroups/memory.txt | 9 +- + .../devicetree/bindings/rtc/spear-rtc.txt | 18 + + Documentation/filesystems/proc.txt | 23 + + Documentation/ramoops.txt | 8 +- + Documentation/spinlocks.txt | 43 + + Documentation/sysctl/fs.txt | 42 + + Documentation/sysctl/vm.txt | 16 + + arch/arm/mach-ux500/mbox-db5500.c | 2 +- + arch/avr32/kernel/signal.c | 26 +- + arch/blackfin/kernel/signal.c | 17 +- + arch/cris/Kconfig | 1 + + arch/cris/arch-v10/kernel/signal.c | 34 +- + arch/cris/arch-v32/kernel/signal.c | 37 +- + arch/frv/kernel/signal.c | 32 +- + arch/h8300/kernel/signal.c | 33 +- + arch/ia64/kernel/signal.c | 15 +- + arch/m32r/kernel/signal.c | 12 +- + arch/m68k/kernel/signal.c | 22 +- + arch/microblaze/kernel/signal.c | 42 +- + arch/mips/kernel/signal.c | 27 +- + arch/mips/kernel/signal32.c | 20 +- + arch/mips/kernel/signal_n32.c | 10 +- + arch/mn10300/kernel/signal.c | 32 +- + arch/parisc/kernel/signal.c | 12 +- + arch/score/kernel/signal.c | 13 +- + arch/um/kernel/trap.c | 24 +- + arch/unicore32/kernel/signal.c | 5 +- + arch/x86/include/asm/compat.h | 2 +- + arch/x86/include/asm/current.h | 2 +- + arch/x86/include/asm/desc.h | 1 + + arch/x86/include/asm/fpu-internal.h | 6 +- + arch/x86/include/asm/hardirq.h | 9 +- + arch/x86/include/asm/irq_regs.h | 4 +- + arch/x86/include/asm/mmu_context.h | 12 +- + arch/x86/include/asm/percpu.h | 24 +- + arch/x86/include/asm/smp.h | 4 +- + arch/x86/include/asm/stackprotector.h | 4 +- + arch/x86/include/asm/thread_info.h | 2 +- + arch/x86/include/asm/tlbflush.h | 4 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce.c | 4 +- + arch/x86/kernel/i387.c | 2 +- + arch/x86/kernel/nmi_selftest.c | 1 + + arch/x86/kernel/paravirt.c | 12 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 10 +- + arch/x86/mm/tlb.c | 10 +- + arch/x86/platform/iris/iris.c | 67 +- + arch/x86/syscalls/syscall_32.tbl | 1 + + arch/x86/syscalls/syscall_64.tbl | 1 + + block/blk-throttle.c | 2 +- + drivers/char/Kconfig | 1 + + drivers/char/ramoops.c | 204 +++-- + drivers/leds/Kconfig | 9 + + drivers/leds/Makefile | 2 +- + drivers/leds/leds-lm3556.c | 468 +++++++++++ + drivers/misc/sgi-xp/xpc_channel.c | 6 +- + drivers/misc/sgi-xp/xpc_sn2.c | 2 +- + drivers/misc/sgi-xp/xpc_uv.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.h | 2 +- + drivers/net/irda/sir_dev.c | 5 - + drivers/platform/x86/acerhdf.c | 67 +- + drivers/platform/x86/intel_mid_powerbtn.c | 2 +- + drivers/rapidio/Kconfig | 14 + + drivers/rapidio/devices/Makefile | 3 + + drivers/rapidio/devices/tsi721.c | 211 +++-- + drivers/rapidio/devices/tsi721.h | 105 ++- + drivers/rapidio/devices/tsi721_dma.c | 823 ++++++++++++++++++++ + drivers/rapidio/rio.c | 81 ++ + drivers/rtc/rtc-spear.c | 10 + + drivers/scsi/aha152x.c | 3 - + drivers/xen/Kconfig | 22 +- + fs/Kconfig | 60 ++ + fs/attr.c | 8 +- + fs/dcache.c | 4 +- + fs/file_table.c | 17 +- + fs/internal.h | 3 +- + fs/namei.c | 193 ++++- + fs/namespace.c | 139 ++-- + fs/ocfs2/cluster/heartbeat.c | 40 +- + fs/pnode.c | 4 +- + fs/proc/array.c | 143 +++- + fs/proc/base.c | 3 + + fs/proc/internal.h | 1 + + fs/proc_namespace.c | 4 +- + fs/xfs/xfs_iget.c | 4 +- + include/asm-generic/bitsperlong.h | 4 + + include/linux/blkdev.h | 18 +- + include/linux/dmaengine.h | 12 + + include/linux/fs.h | 2 + + include/linux/kcmp.h | 17 + + include/linux/kmod.h | 34 +- + include/linux/leds-lm3556.h | 242 ++++++ + include/linux/lglock.h | 187 +---- + include/linux/memcontrol.h | 14 - + include/linux/mm_inline.h | 8 +- + include/linux/mm_types.h | 1 + + include/linux/mmzone.h | 41 +- + include/linux/percpu.h | 54 -- + include/linux/prctl.h | 8 + + include/linux/rio.h | 47 ++ + include/linux/rio_drv.h | 9 + + include/linux/spinlock.h | 9 + + include/linux/swap.h | 47 +- + include/linux/syscalls.h | 2 + + include/linux/topology.h | 4 +- + ipc/sem.c | 250 ++++-- + kernel/Makefile | 5 +- + kernel/fork.c | 1 + + kernel/futex.c | 5 +- + kernel/kcmp.c | 187 +++++ + kernel/kmod.c | 59 +- + kernel/lglock.c | 136 ++++ + kernel/pid_namespace.c | 6 +- + kernel/sys.c | 201 +++-- + kernel/sys_ni.c | 3 + + kernel/sysctl.c | 31 +- + lib/vsprintf.c | 281 ++++--- + mm/compaction.c | 4 +- + mm/huge_memory.c | 4 +- + mm/memcontrol.c | 92 +-- + mm/memory-failure.c | 8 +- + mm/memory.c | 13 + + mm/page_alloc.c | 45 +- + mm/rmap.c | 3 +- + mm/swap.c | 16 +- + mm/swapfile.c | 31 - + mm/vmscan.c | 105 +-- + net/netfilter/xt_TEE.c | 12 +- + net/socket.c | 4 +- + scripts/checkpatch.pl | 27 + + security/keys/keyctl.c | 2 +- + security/keys/request_key.c | 13 +- + tools/testing/selftests/Makefile | 2 +- + tools/testing/selftests/kcmp/Makefile | 29 + + tools/testing/selftests/kcmp/kcmp_test.c | 94 +++ + 137 files changed, 4416 insertions(+), 1443 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/spear-rtc.txt + create mode 100644 drivers/leds/leds-lm3556.c + create mode 100644 drivers/rapidio/devices/tsi721_dma.c + create mode 100644 include/linux/kcmp.h + create mode 100644 include/linux/leds-lm3556.h + create mode 100644 kernel/kcmp.c + create mode 100644 kernel/lglock.c + create mode 100644 tools/testing/selftests/kcmp/Makefile + create mode 100644 tools/testing/selftests/kcmp/kcmp_test.c +$ git revert e46c11b94787 +[master 57942ad] Revert "of/irq: add empty irq_of_parse_and_map() for non-dt builds" + 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..4ff607731199 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,10 @@ +Importing hexagon based on v3.2-rc2 +Unchanged quilt series hexagon +Importing i2c based on 3.4-rc1 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 437538267b672f9320833907f1b5acbb2605f4be +Unchanged quilt series jdelvare-hwmon +Importing rr based on v3.3-rc5-86-g5ffca28 +Unchanged quilt series rr +Importing device-mapper based on v3.3-5825-g4375382 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..86ef92d126a2 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20120411 -- 2.39.2