From 338afa8f4fc3b9f511a6e59e06782019546e68bb Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 4 Apr 2011 14:23:29 +1000 Subject: Add linux-next specific files for 20110404 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 186 +++++ Next/Trees | 188 +++++ Next/merge.log | 1982 +++++++++++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 33 + localversion-next | 1 + 5 files changed, 2390 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..c8ecb53a2b12 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,186 @@ +Name SHA1 +---- ---- +origin 78fca1b95837a44983608302e89c7258981be9b3 +fixes 89078d572eb9ce8d4c04264b8b0ba86de0d74c8f +kbuild-current b7bd182176960fdd139486cadb9962b39f8a2b50 +arm-current 6aba74f2791287ec407e0f92487a725a25908067 +m68k-current c4ffcc9ddaeb58e291028e4a445d663e8f9e4630 +powerpc-merge c0bb9e45f3a7f67fc358946727bc3d5f23d0f55d +52xx-and-virtex-current dd9c1549edef02290edced639f67b54a25abbe0e +sparc-current 47c7c97a93a5b8f719093dbf83555090b3b8228b +scsi-rc-fixes 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +net-current 4dd5ffe4fc36128dc86568ddeaeae359e6037762 +sound-current a0334c50bf0ba7c720ed00f931e721c989efd233 +pci-current eca67315e0e0d5fd91264d79c88694006dbc7d31 +wireless-current ffd8c746fbef50cf12df239f9d23c2afe1a2c3cb +driver-core.current 4bbba111d94781d34081c37856bbc5eb33f6c72a +tty.current 4bbba111d94781d34081c37856bbc5eb33f6c72a +usb.current 6c5103890057b1bb781b26b7aae38d33e4c517d8 +staging.current 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +cpufreq-current 2e270d84223262a38d4755c61d55f5c73ea89e56 +input-current e28e1d93e9591d21e440f5210a9b4317c59445df +md-current f0b4f7e2f29af678bd9af43422c537dcb6008603 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 60af520cf264ea26b2af3a6871bbd71850522aea +ide-curent dd8717da6da9b0e745df49762be4573010f1013c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current d60cf53a30956e47919788b2ef49287786a959c9 +rmobile-current 2c34e939f9e98bb678a2b0d35e7a318bf2947024 +fbdev-current e9c5db0b8dce1bcdc99ad26e718230810d6b5cff +devicetree-current df45268844149b2ccb2a3fe0970954e3eb4834c3 +spi-current 88aab9341a315d81118be6b41c45e4fe32b94bc1 +arm 6aba74f2791287ec407e0f92487a725a25908067 +davinci 9a9fb12a4832bdf22751e21df298ef3559643b43 +i.MX 358020dd27b0818eeeb998dba9899426805e2342 +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +msm 8e76a80960bf06c245160a484d5a363ca6b520bb +omap 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p 4c1b8574ff7c51cef79e29df5db87fb3b154f32f +tegra 84abf6084704673ae80a2105bf63ece5eee3edd5 +ux500-core abbe788ff6035223aa8ad7cdcacd2a3f1612af64 +xilinx 705e7b8a5062b5d5ce45a8c0d9cbb596d1af32aa +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin 6aba74f2791287ec407e0f92487a725a25908067 +cris d5af30cff76cea7e97806cda53110fbb1b7c3c07 +ia64 4275f4c8f7589bcac55d880529f58dac39815c95 +m68k c4ffcc9ddaeb58e291028e4a445d663e8f9e4630 +m68knommu 0ca3da154619be81ff5ca74c57217cc7fcf1dee7 +microblaze 9e1491de519712c73ec621c4ef4872eca6f2bb57 +mips 7ccc13016a363197733c63688f21bb6a521db498 +parisc 1c0f647690f1b9471d63af48dec960bc59492e61 +powerpc 831532035b12a5f7b600515a6f4da0b207b82d6e +4xx 831532035b12a5f7b600515a6f4da0b207b82d6e +52xx-and-virtex 0a95d92c0054e74fb79607ac2df958b7bf295706 +galak b0aea14bdc4a9ee5d1e8cb78488263d6ce32095e +s390 09b2172d2dfa6ef2816172d06bdade5bcc9225ae +sh 9a86cad62a0b8b830a7bea465141bed26de25fe4 +rmobile 9d9659b6c0ebf7dde65ebada4c67980818245913 +sparc 08351fc6a75731226e1112fc7254542bd3a2912e +tile 339dc50e59f4ea697e2b8cd6296328a8015a6c21 +unicore32 6b794743b2c5e21825d35b5d5dd57d6fcc388198 +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph 4b2a58abd1e17c0ee53c8dded879e015917cca67 +cifs cc065951c09aa42186a81e3e78a430f0ab7563b0 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 9a5c06247dff5b13c5c012d123ce8c915b7553b1 +ext3 b03f24567ce7caf2420b8be4c6eb74c191d59a91 +ext4 0ba0851714beebb800992e5105a79dc3a4c504b0 +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse e7c0a167860620bd2938366896964f729ddaeaaa +gfs2 12c752be57e16db3812cd6a84f32199cfd681dd7 +hfsplus 99943814ce60e4cd0165f19781abbfcc826f8d87 +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 78fca1b95837a44983608302e89c7258981be9b3 +nfsd 954032d2527f2fce7355ba70709b5e143d6b686f +nilfs2 519ba39dd296dbe025f81826157fc1392d3fc537 +ocfs2 272b62c1f0f6f742046e45b50b6fec98860208a0 +omfs 31be83aeaee22fa165862ad449c7131ceaf1cf91 +squashfs 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 +udf 6f644e5f97cc8dcb8dc7133562159cc20d27c38f +v9fs 78fca1b95837a44983608302e89c7258981be9b3 +ubifs 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +xfs 89b3600ccfb01aed6873bc499442fc0bed00bbdd +vfs 0f60f240d522772467c7d2cebedb910748c78ed4 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci a44f99c7efdb88fa41128065c9a9445c19894e34 +hid 99759619b27662d1290901228d77a293e6e83200 +i2c 1df9cb14cc885dc528080d9c61a173de42076de1 +bjdooks-i2c 3e0e7388aa3176f335c2d95e923655321852c993 +jdelvare-hwmon 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +hwmon-staging c4757ee58ae08fa6eb4df6d5e0f417e11d40bc0e +kernel-doc 90508404ac02c87552ab88a437bf8c4691130326 +v4l-dvb e8a0231c7d9f9ab680b4bfed1565ccae9c388e91 +kbuild b41cd399c705f48ea22f10b3a9b68089c6794058 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata 50be5e3657cd2851a297dc0b3fd459f25829d29b +infiniband 92d7d8fd21a4649018eee869f5f7f8d3ecab5735 +acpi 58d32cf9d26a7ece628cece17403666fbbede934 +idle-test 42be29a3d2b7c07ca0c97150aa3598b964f5a8ee +powertools a829eb4d7e08b316e2d48880ecab3630497f300f +ieee1394 2266b4a1841302e56865567cc962f468ef1b8378 +ubi 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +kvm 52c43c79d09f3a2a4eff8548aca81aec939eda1e +dlm 4bcad6c1ef53a9a0224f4654ceb3b9030d0769ec +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 +scsi 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +async_tx 3ea205c449d2b5996d0256aa8b2894f7aea228a2 +net 0a5c047507aaaf00519921336d19c0f8f5f9f363 +wireless 83860c594f65945b1a2c99e84338e1145cd34890 +bluetooth 220b881a77eca96afdd6037dbca3441e8938228f +mtd 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +crypto 40bfc14f3250691dca6fcb00f791727e180a7f79 +sound 8f8adcc12569f91729a9f8b4305d9a02ae0647da +sound-asoc f6fcdc145679f5c86ff3fe587b060c9c3709d360 +cpufreq bdce2595a2f539c6fdedd8f2bd281326b627bba3 +rr 9a3a41ce5b6a5a3f6321c6d5955f8c6750ba11d8 +input def179c271ac9b5020deca798470521f14d11edd +input-mt 521cb40b0c44418a4fd36dc633f575813d59a43d +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 1df30acfef2b53f0ab87808dca2b857b9ce7d72d +device-mapper 055d219441cc23f631240335fd369b6b5852681a +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 33619f0d3ff715a2a5499520967d526ad931d70d +battery 909a78b320b31ca9709d7ea5f602ec1bd2015192 +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 67f68cb827c89f338ff28313e6079d4c5ad5f71c +kgdb 18bcd0c8cb7d85a9063b88ec810dc1cdc0974518 +slab 4fdccdfbb4652a7bbac8adbce7449eb093775118 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md f0b4f7e2f29af678bd9af43422c537dcb6008603 +mfd bb27e011ee3604ad2f5efce18752f9fd87323008 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 51eab416c9b4b3ed16553d405ec4a5f67daa34cf +fbdev e9c5db0b8dce1bcdc99ad26e718230810d6b5cff +viafb 3f086fe93f734ba76f2e130777687f81e0cbb318 +omap_dss2 0da5637569bb9bf93e6930cd1c3b452eede50ba2 +voltage a0b0f7485bcb458d0870cf0210b463260d810753 +security-testing cfc64fd91fabed099a4c3df58559f4b7efe9bcce +selinux f50a3ec961f90e38c0311411179d5dfee1412192 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 262c6c40cd8b9eee1fb137557a16dd7d7a23973c +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 2fe9723df8e45fd247782adea244a5e653c30bf4 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd a49fb4c3d035ab516507b31ec3bd49263caee14d +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +nommu 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +trivial 8d1a7ed9d0ce3556a962a7472a3d09a8332d030a +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend 16c29dafcc86024048f1dbb8349d31cb22c7c55a +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree a7006c9747ef225ab070d96c054e85682a09a13e +spi 3b8a4dd3ebfcc647260ad5c39ef4f73eb3a6b155 +tip ac1856768840e035c2860ad5beb8de7422cdf5bd +rcu 8884de627eaa697101535d7d3fbe4ed7acb499e8 +oprofile 855f905a48cf6798c7c65ab5a04f2ac172c168d9 +ptrace 321fb561971ba0f10ce18c0f8a4b9fbfc7cef4b9 +xen-two f5ae8ccdae0ea5d7598e1a67c0375b228aecb509 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +edac-amd a9f0fbe2bbf328f869fc5ee5a12c6a4118c32689 +percpu ac24307b6910e7286910c1f227bd7951b87a3bae +workqueues e2de9e0862778f4aba103027ce575efbddb8117f +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 e74169c9c66f48816d825f224af4c851924daede +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 4bbba111d94781d34081c37856bbc5eb33f6c72a +tty 4bbba111d94781d34081c37856bbc5eb33f6c72a +usb 6c5103890057b1bb781b26b7aae38d33e4c517d8 +staging 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +bkl-config 4ba8216cd90560bc402f52076f64d8546e8aefcb +cleancache 5231e92e133d6db6681a4485b1794a01469ca9ad +scsi-post-merge c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2fd7ceebc1db --- /dev/null +++ b/Next/Trees @@ -0,0 +1,188 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +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 +52xx-and-virtex-current git git://git.secretlab.ca/git/linux-2.6#powerpc/merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-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-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +sh-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus +rmobile-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus +fbdev-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#fbdev-fixes-for-linus +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 +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#for-next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next +i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next +linux-spec git http://git.kernel.org/pub/scm/linux/kernel/git/dwalker/linux-spec#for-next +msm git git://codeaurora.org/quic/kernel/davidb/linux-msm.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-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 +tegra git git://android.git.kernel.org/kernel/tegra.git#for-next +ux500-core git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git#ux500-core +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +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/upstream-sfr.git#mips-for-linux-next +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 +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#powerpc/next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-latest +rmobile git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-latest +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git#unicore32 +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/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/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +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-2.6-nmw.git#master +hfsplus git git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus.git#for-next +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.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 +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +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#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-scale git git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin.git#vfs-scale-working +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +idle-test git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#idle-test +powertools git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git#tools-test +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git#master +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git#master +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.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://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/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-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +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/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.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 +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#master +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 +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.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 +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +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 +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +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-current.git#for-next +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +i7300_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac.git#linux_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/linux-2.6-tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git#rcu/next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +ptrace git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#ptrace +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 +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-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 +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#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-2.6.git#master +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-next +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +cleancache git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..f02c950ce040 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1982 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6aba74f Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +Merging origin/master +$ git merge origin/master +Updating 6aba74f..78fca1b9 +Fast-forward + arch/ia64/sn/kernel/irq.c | 2 +- + arch/ia64/sn/kernel/sn2/sn_proc_fs.c | 42 --- + arch/powerpc/include/asm/machdep.h | 3 +- + arch/powerpc/include/asm/smp.h | 5 +- + arch/powerpc/kernel/head_32.S | 9 + + arch/powerpc/kernel/head_64.S | 7 + + arch/powerpc/kernel/idle_power4.S | 21 -- + arch/powerpc/kernel/irq.c | 3 +- + arch/powerpc/kernel/smp.c | 153 +++++++---- + arch/powerpc/kernel/time.c | 15 +- + arch/powerpc/platforms/powermac/pmac.h | 1 - + arch/powerpc/platforms/powermac/setup.c | 56 ---- + arch/powerpc/platforms/powermac/smp.c | 154 +++++++--- + arch/powerpc/platforms/pseries/offline_states.h | 2 - + arch/sparc/include/asm/unistd.h | 3 +- + arch/sparc/kernel/auxio_64.c | 2 +- + arch/sparc/kernel/central.c | 4 +- + arch/sparc/kernel/ds.c | 2 +- + arch/sparc/kernel/entry.S | 2 +- + arch/sparc/kernel/mdesc.c | 2 +- + arch/sparc/kernel/pci_fire.c | 2 +- + arch/sparc/kernel/pci_psycho.c | 2 +- + arch/sparc/kernel/pci_sabre.c | 2 +- + arch/sparc/kernel/pci_schizo.c | 2 +- + arch/sparc/kernel/pci_sun4v.c | 2 +- + arch/sparc/kernel/power.c | 2 +- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 2 + + arch/sparc/kernel/time_64.c | 6 +- + drivers/atm/solos-pci.c | 39 +-- + drivers/connector/cn_queue.c | 58 ++--- + drivers/connector/connector.c | 47 +--- + drivers/macintosh/therm_pm72.c | 60 ++-- + drivers/net/atlx/atl2.c | 22 +- + drivers/net/bonding/bond_alb.h | 2 +- + drivers/net/irda/via-ircc.c | 94 ++----- + drivers/net/mlx4/eq.c | 4 +- + drivers/net/mlx4/mcg.c | 3 +- + drivers/net/phy/phy_device.c | 8 +- + drivers/net/usb/Kconfig | 15 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/cdc_ether.c | 21 +- + drivers/net/usb/lg-vl600.c | 346 +++++++++++++++++++++++ + drivers/net/usb/usbnet.c | 10 +- + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/apbuart.c | 34 +-- + fs/ceph/mds_client.c | 6 + + fs/ceph/super.c | 2 +- + fs/nilfs2/file.c | 11 +- + fs/nilfs2/nilfs.h | 14 +- + fs/nilfs2/page.c | 4 +- + include/keys/ceph-type.h | 8 + + include/linux/atmdev.h | 1 + + include/linux/ceph/auth.h | 4 +- + include/linux/ceph/libceph.h | 2 +- + include/linux/connector.h | 16 +- + include/linux/kexec.h | 1 + + include/linux/skbuff.h | 2 +- + include/linux/usb/usbnet.h | 3 + + include/net/if_inet6.h | 16 + + include/net/ip.h | 8 + + include/sound/soc-dapm.h | 16 +- + kernel/kexec.c | 5 +- + net/appletalk/ddp.c | 11 +- + net/atm/common.c | 1 + + net/bridge/br_multicast.c | 2 +- + net/bridge/br_stp_if.c | 2 +- + net/ceph/Kconfig | 1 + + net/ceph/auth.c | 8 +- + net/ceph/auth_x.c | 8 +- + net/ceph/ceph_common.c | 112 +++++++- + net/ceph/crypto.c | 73 +++++ + net/ceph/crypto.h | 4 + + net/ceph/mon_client.c | 2 +- + net/ceph/osd_client.c | 12 +- + net/core/dev.c | 24 ++- + net/ipv4/arp.c | 3 + + net/ipv4/fib_frontend.c | 2 + + net/ipv6/ndisc.c | 2 + + net/sctp/protocol.c | 4 +- + sound/core/pcm_lib.c | 4 +- + sound/firewire/speakers.c | 3 +- + sound/pci/ens1370.c | 23 ++- + sound/pci/hda/patch_conexant.c | 1 + + sound/pci/hda/patch_realtek.c | 21 ++- + sound/soc/codecs/tlv320dac33.c | 32 ++- + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 9 +- + sound/soc/imx/imx-ssi.h | 3 - + sound/soc/pxa/corgi.c | 2 +- + 90 files changed, 1159 insertions(+), 609 deletions(-) + create mode 100644 drivers/net/usb/lg-vl600.c + create mode 100644 include/keys/ceph-type.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/include/asm/unistd.h | 6 +++++- + arch/m68k/kernel/entry_mm.S | 4 ++++ + arch/m68k/kernel/syscalltable.S | 4 ++++ + 3 files changed, 13 insertions(+), 1 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging 52xx-and-virtex-current/powerpc/merge +$ git merge 52xx-and-virtex-current/powerpc/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/bluetooth/btusb.c | 6 ++++- + drivers/net/starfire.c | 6 +---- + drivers/net/usb/cdc_eem.c | 2 +- + drivers/net/usb/cdc_ether.c | 2 +- + drivers/net/usb/cdc_ncm.c | 2 +- + drivers/net/usb/cdc_subset.c | 8 ++++++ + drivers/net/usb/gl620a.c | 2 +- + drivers/net/usb/net1080.c | 2 +- + drivers/net/usb/plusb.c | 2 +- + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/usbnet.c | 3 +- + drivers/net/usb/zaurus.c | 8 +++--- + drivers/net/wireless/ath/ath9k/main.c | 4 +++ + drivers/net/wireless/ath/carl9170/carl9170.h | 1 + + drivers/net/wireless/ath/carl9170/main.c | 1 + + drivers/net/wireless/ath/carl9170/tx.c | 7 ++++++ + drivers/net/wireless/iwlegacy/iwl-core.c | 10 ++++++++ + drivers/net/wireless/iwlegacy/iwl3945-base.c | 7 ++--- + drivers/net/wireless/rt2x00/rt2800usb.c | 10 ++++++-- + include/linux/netdevice.h | 4 +- + include/linux/usb/usbnet.h | 2 + + include/net/bluetooth/hci.h | 2 + + net/bluetooth/hci_core.c | 10 ++++++- + net/bluetooth/hci_event.c | 4 ++- + net/bluetooth/l2cap_core.c | 4 ++- + net/bluetooth/l2cap_sock.c | 5 ++- + net/bluetooth/mgmt.c | 2 + + net/mac80211/key.c | 7 +++-- + net/mac80211/rc80211_minstrel_ht.c | 25 +++++++++++++++------ + net/mac80211/rx.c | 3 +- + net/wireless/scan.c | 31 +++++++++++++++++-------- + 31 files changed, 130 insertions(+), 54 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging driver-core.current/driver-core-linus +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/keyboard/spear-keyboard.c | 2 +- + drivers/input/misc/uinput.c | 6 +- + drivers/input/mouse/synaptics.c | 4 +- + drivers/input/serio/i8042.c | 7 +- + drivers/input/serio/rpckbd.c | 2 +- + drivers/input/sparse-keymap.c | 14 ++ + drivers/input/tablet/wacom_wac.c | 291 ++++++++++++++++++---------- + drivers/input/tablet/wacom_wac.h | 2 + + drivers/input/touchscreen/h3600_ts_input.c | 2 +- + 9 files changed, 221 insertions(+), 109 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Auto-merging arch/sh/boards/mach-ap325rxa/setup.c +Auto-merging arch/sh/boards/mach-ecovec24/setup.c +Merge made by recursive. + arch/sh/boards/mach-ap325rxa/setup.c | 32 +++++++++++---- + arch/sh/boards/mach-ecovec24/setup.c | 18 ++++++++ + drivers/video/console/fbcon.c | 2 - + drivers/video/efifb.c | 3 + + drivers/video/s3fb.c | 48 +++++++++++++++------ + drivers/video/sh_mobile_lcdcfb.c | 52 ++++++++++++++++++++++-- + drivers/video/sh_mobile_lcdcfb.h | 1 + + drivers/video/via/chip.h | 1 - + drivers/video/via/hw.c | 17 +++----- + drivers/video/via/hw.h | 3 +- + drivers/video/via/viafbdev.c | 74 +++++++++++++++++---------------- + 11 files changed, 174 insertions(+), 77 deletions(-) +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Removing arch/powerpc/boot/dtc-src/.gitignore +Merge made by recursive. + arch/powerpc/boot/.gitignore | 1 - + arch/powerpc/boot/dtc-src/.gitignore | 3 --- + 2 files changed, 0 insertions(+), 4 deletions(-) + delete mode 100644 arch/powerpc/boot/dtc-src/.gitignore +Merging spi-current/spi/merge +$ git merge spi-current/spi/merge +Merge made by recursive. + drivers/gpio/ml_ioh_gpio.c | 1 + + drivers/gpio/pca953x.c | 5 +++-- + drivers/gpio/pch_gpio.c | 1 + + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging arm/for-next +$ git merge arm/for-next +Already up-to-date. +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Resolved 'arch/arm/mach-mxs/mach-mx28evk.c' using previous resolution. +Auto-merging arch/arm/mach-mxs/mach-mx28evk.c +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mx28evk.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1a1bafc] Merge remote-tracking branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next +$ git merge s5p/for-next +Merge made by recursive. + arch/arm/configs/exynos4_defconfig | 2 + + arch/arm/mach-exynos4/Kconfig | 2 + + arch/arm/mach-exynos4/Makefile | 1 + + arch/arm/mach-exynos4/cpuidle.c | 86 ++++++++++++++++++++++++++++++++++ + arch/arm/mach-exynos4/mach-nuri.c | 89 ++++++++++++++++++++++++++++++++++++ + 5 files changed, 180 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-exynos4/cpuidle.c +Merging tegra/for-next +$ git merge tegra/for-next +Already up-to-date. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Removing arch/arm/mach-ux500/cpufreq.c +Removing arch/arm/mach-ux500/include/mach/prcmu-defs.h +Removing arch/arm/mach-ux500/include/mach/prcmu.h +Removing arch/arm/mach-ux500/prcmu.c +Merge made by recursive. + arch/arm/configs/u8500_defconfig | 29 +- + arch/arm/mach-ux500/Kconfig | 15 +- + arch/arm/mach-ux500/Makefile | 10 +- + arch/arm/mach-ux500/board-mop500-sdi.c | 41 +- + arch/arm/mach-ux500/board-mop500.c | 19 +- + arch/arm/mach-ux500/board-mop500.h | 5 + + arch/arm/mach-ux500/board-snowball-pins.c | 133 ++ + arch/arm/mach-ux500/board-snowball.c | 359 ++++ + arch/arm/mach-ux500/board-snowball.h | 12 + + arch/arm/mach-ux500/clock-db8500.c | 1291 +++++++++++++ + arch/arm/mach-ux500/clock.c | 904 +++------- + arch/arm/mach-ux500/clock.h | 225 +-- + arch/arm/mach-ux500/cpu-db5500.c | 2 + + arch/arm/mach-ux500/cpu-db8500.c | 2 + + arch/arm/mach-ux500/cpu.c | 7 +- + arch/arm/mach-ux500/cpufreq.c | 211 -- + arch/arm/mach-ux500/include/mach/db5500-regs.h | 20 +- + arch/arm/mach-ux500/include/mach/db8500-regs.h | 37 +- + arch/arm/mach-ux500/include/mach/hardware.h | 1 + + arch/arm/mach-ux500/include/mach/id.h | 20 + + .../mach-ux500/include/mach/irqs-board-mop500.h | 5 + + .../arm/mach-ux500/include/mach/irqs-board-u5500.h | 21 + + arch/arm/mach-ux500/include/mach/irqs-db5500.h | 27 + + arch/arm/mach-ux500/include/mach/irqs-db8500.h | 54 + + arch/arm/mach-ux500/include/mach/irqs.h | 46 +- + arch/arm/mach-ux500/include/mach/prcmu-db5500.h | 45 + + arch/arm/mach-ux500/include/mach/prcmu-defs.h | 30 - + arch/arm/mach-ux500/include/mach/prcmu-fw-api.h | 523 +++++ + .../arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h | 467 +++++ + arch/arm/mach-ux500/include/mach/prcmu-regs.h | 27 +- + arch/arm/mach-ux500/include/mach/prcmu.h | 28 - + arch/arm/mach-ux500/include/mach/uncompress.h | 3 +- + arch/arm/mach-ux500/pins-db8500.h | 142 +- + arch/arm/mach-ux500/pm/Kconfig | 6 + + arch/arm/mach-ux500/pm/Makefile | 4 + + arch/arm/mach-ux500/pm/cpufreq.c | 171 ++ + arch/arm/mach-ux500/prcmu-db5500.c | 449 +++++ + arch/arm/mach-ux500/prcmu-db8500.c | 2018 ++++++++++++++++++++ + arch/arm/mach-ux500/prcmu-regs-db8500.h | 162 ++ + arch/arm/mach-ux500/prcmu.c | 394 ---- + arch/arm/plat-nomadik/include/plat/pincfg.h | 5 - + drivers/mfd/ab8500-i2c.c | 2 +- + 42 files changed, 6391 insertions(+), 1581 deletions(-) + create mode 100644 arch/arm/mach-ux500/board-snowball-pins.c + create mode 100644 arch/arm/mach-ux500/board-snowball.c + create mode 100644 arch/arm/mach-ux500/board-snowball.h + create mode 100644 arch/arm/mach-ux500/clock-db8500.c + delete mode 100644 arch/arm/mach-ux500/cpufreq.c + create mode 100644 arch/arm/mach-ux500/include/mach/irqs-board-u5500.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-db5500.h + delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-api.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h + delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h + create mode 100644 arch/arm/mach-ux500/pm/Kconfig + create mode 100644 arch/arm/mach-ux500/pm/Makefile + create mode 100644 arch/arm/mach-ux500/pm/cpufreq.c + create mode 100644 arch/arm/mach-ux500/prcmu-db5500.c + create mode 100644 arch/arm/mach-ux500/prcmu-db8500.c + create mode 100644 arch/arm/mach-ux500/prcmu-regs-db8500.h + delete mode 100644 arch/arm/mach-ux500/prcmu.c +Merging xilinx/arm-next +$ git merge xilinx/arm-next +Auto-merging arch/arm/Kconfig +Merge made by recursive. + arch/arm/Kconfig | 14 + + arch/arm/Makefile | 1 + + arch/arm/mach-xilinx/Kconfig | 14 + + arch/arm/mach-xilinx/Makefile | 7 + + arch/arm/mach-xilinx/Makefile.boot | 3 + + arch/arm/mach-xilinx/board_ep107.c | 85 +++++++ + arch/arm/mach-xilinx/common.c | 114 +++++++++ + arch/arm/mach-xilinx/common.h | 30 +++ + arch/arm/mach-xilinx/include/mach/clkdev.h | 33 +++ + arch/arm/mach-xilinx/include/mach/debug-macro.S | 36 +++ + arch/arm/mach-xilinx/include/mach/entry-macro.S | 30 +++ + arch/arm/mach-xilinx/include/mach/hardware.h | 18 ++ + arch/arm/mach-xilinx/include/mach/io.h | 33 +++ + arch/arm/mach-xilinx/include/mach/irqs.h | 29 +++ + arch/arm/mach-xilinx/include/mach/memory.h | 23 ++ + arch/arm/mach-xilinx/include/mach/system.h | 28 +++ + arch/arm/mach-xilinx/include/mach/timex.h | 23 ++ + arch/arm/mach-xilinx/include/mach/uart.h | 25 ++ + arch/arm/mach-xilinx/include/mach/uncompress.h | 51 ++++ + arch/arm/mach-xilinx/include/mach/vmalloc.h | 20 ++ + arch/arm/mach-xilinx/include/mach/xilinx_soc.h | 48 ++++ + arch/arm/mach-xilinx/timer.c | 297 +++++++++++++++++++++++ + arch/arm/mm/Kconfig | 2 +- + 23 files changed, 963 insertions(+), 1 deletions(-) + create mode 100644 arch/arm/mach-xilinx/Kconfig + create mode 100644 arch/arm/mach-xilinx/Makefile + create mode 100644 arch/arm/mach-xilinx/Makefile.boot + create mode 100644 arch/arm/mach-xilinx/board_ep107.c + create mode 100644 arch/arm/mach-xilinx/common.c + create mode 100644 arch/arm/mach-xilinx/common.h + create mode 100644 arch/arm/mach-xilinx/include/mach/clkdev.h + create mode 100644 arch/arm/mach-xilinx/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-xilinx/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-xilinx/include/mach/hardware.h + create mode 100644 arch/arm/mach-xilinx/include/mach/io.h + create mode 100644 arch/arm/mach-xilinx/include/mach/irqs.h + create mode 100644 arch/arm/mach-xilinx/include/mach/memory.h + create mode 100644 arch/arm/mach-xilinx/include/mach/system.h + create mode 100644 arch/arm/mach-xilinx/include/mach/timex.h + create mode 100644 arch/arm/mach-xilinx/include/mach/uart.h + create mode 100644 arch/arm/mach-xilinx/include/mach/uncompress.h + create mode 100644 arch/arm/mach-xilinx/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-xilinx/include/mach/xilinx_soc.h + create mode 100644 arch/arm/mach-xilinx/timer.c +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v32/arch/cache.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/lib/Makefile_mm +Removing arch/m68k/lib/Makefile_no +Removing arch/m68k/lib/muldi3_mm.c +Removing arch/m68k/lib/muldi3_no.c +Removing arch/m68k/lib/string.c +Merge made by recursive. + arch/m68k/kernel/m68k_ksyms_no.c | 7 - + arch/m68k/lib/Makefile | 13 ++- + arch/m68k/lib/Makefile_mm | 6 - + arch/m68k/lib/Makefile_no | 7 - + arch/m68k/lib/memcpy.c | 128 +++++++++++--------- + arch/m68k/lib/memmove.c | 2 - + arch/m68k/lib/memset.c | 114 +++++++++++------- + arch/m68k/lib/muldi3.c | 99 +++++++++++++++- + arch/m68k/lib/muldi3_mm.c | 63 ---------- + arch/m68k/lib/muldi3_no.c | 86 ------------- + arch/m68k/lib/string.c | 245 -------------------------------------- + 11 files changed, 251 insertions(+), 519 deletions(-) + delete mode 100644 arch/m68k/lib/Makefile_mm + delete mode 100644 arch/m68k/lib/Makefile_no + delete mode 100644 arch/m68k/lib/muldi3_mm.c + delete mode 100644 arch/m68k/lib/muldi3_no.c + delete mode 100644 arch/m68k/lib/string.c +Merging microblaze/next +$ git merge microblaze/next +Merge made by recursive. + arch/microblaze/include/asm/unistd.h | 6 +++++- + arch/microblaze/kernel/Makefile | 1 + + arch/microblaze/kernel/ftrace.c | 10 ++++++---- + arch/microblaze/kernel/intc.c | 4 ++-- + arch/microblaze/kernel/syscall_table.S | 4 ++++ + arch/microblaze/lib/Makefile | 6 ++++++ + 6 files changed, 24 insertions(+), 7 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Merge made by recursive. +Merging parisc/for-next +$ git merge parisc/for-next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/powerpc/next +$ git merge 52xx-and-virtex/powerpc/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/oprofile/hwsampler.c | 6 +----- + 1 files changed, 1 insertions(+), 5 deletions(-) +Merging sh/sh-latest +$ git merge sh/sh-latest +Merge made by recursive. + arch/sh/boards/board-sh7757lcr.c | 2 +- + arch/sh/boards/mach-landisk/setup.c | 5 ++--- + drivers/dma/shdma.c | 7 ++++++- + drivers/tty/serial/sh-sci.c | 25 ++++++++++++------------- + 4 files changed, 21 insertions(+), 18 deletions(-) +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 +$ git merge unicore32/unicore32 +Removing arch/unicore32/include/asm/futex.h +Merge made by recursive. + arch/unicore32/Makefile | 2 +- + arch/unicore32/include/asm/futex.h | 143 --------------------------------- + arch/unicore32/include/mach/PKUnity.h | 10 --- + arch/unicore32/include/mach/memory.h | 1 - + arch/unicore32/kernel/puv3-core.c | 5 - + arch/unicore32/kernel/rtc.c | 9 -- + arch/unicore32/kernel/setup.c | 15 +--- + arch/unicore32/kernel/traps.c | 1 - + arch/unicore32/kernel/vmlinux.lds.S | 7 +- + arch/unicore32/mm/mmu.c | 20 ----- + drivers/video/fb-puv3.c | 28 ++++--- + 11 files changed, 24 insertions(+), 217 deletions(-) + delete mode 100644 arch/unicore32/include/asm/futex.h +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/boot/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4bfb415] Merge remote-tracking branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Auto-merging fs/cifs/file.c +Removing fs/cifs/smbdes.c +Auto-merging fs/super.c +Merge made by recursive. + fs/cifs/Kconfig | 35 +- + fs/cifs/Makefile | 4 +- + fs/cifs/README | 28 - + fs/cifs/TODO | 2 + + fs/cifs/cache.c | 8 +- + fs/cifs/cifs_debug.c | 386 ++++---- + fs/cifs/cifs_debug.h | 12 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifs_fs_sb.h | 4 +- + fs/cifs/cifs_spnego.c | 6 +- + fs/cifs/cifs_spnego.h | 2 +- + fs/cifs/cifs_unicode.c | 61 ++ + fs/cifs/cifs_unicode.h | 10 + + fs/cifs/cifsacl.c | 6 +- + fs/cifs/cifsacl.h | 2 +- + fs/cifs/cifsencrypt.c | 32 +- + fs/cifs/cifsfs.c | 66 +- + fs/cifs/cifsfs.h | 14 +- + fs/cifs/cifsglob.h | 196 +++-- + fs/cifs/cifspdu.h | 6 +- + fs/cifs/cifsproto.h | 182 ++-- + fs/cifs/cifssmb.c | 532 ++++++----- + fs/cifs/connect.c | 190 +++-- + fs/cifs/dir.c | 8 +- + fs/cifs/export.c | 4 +- + fs/cifs/file.c | 197 +--- + fs/cifs/fscache.c | 6 +- + fs/cifs/fscache.h | 8 +- + fs/cifs/inode.c | 52 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/link.c | 16 +- + fs/cifs/maperror.c | 1830 ++++++++++++++++++++++++++++++++++ + fs/cifs/misc.c | 45 +- + fs/cifs/ntlmssp.h | 10 + + fs/cifs/readdir.c | 8 +- + fs/cifs/sess.c | 78 +- + fs/cifs/smb2glob.h | 258 +++++ + fs/cifs/smb2misc.c | 336 +++++++ + fs/cifs/smb2pdu.c | 2506 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/smb2pdu.h | 996 +++++++++++++++++++ + fs/cifs/smb2proto.h | 200 ++++ + fs/cifs/smb2sess.c | 80 ++ + fs/cifs/smb2status.h | 1782 +++++++++++++++++++++++++++++++++ + fs/cifs/smb2transport.c | 322 ++++++ + fs/cifs/smbdes.c | 418 -------- + fs/cifs/smbencrypt.c | 124 ++- + fs/cifs/transport.c | 135 ++-- + fs/cifs/xattr.c | 28 +- + fs/super.c | 3 +- + 49 files changed, 9704 insertions(+), 1534 deletions(-) + create mode 100644 fs/cifs/maperror.c + create mode 100644 fs/cifs/smb2glob.h + create mode 100644 fs/cifs/smb2misc.c + create mode 100644 fs/cifs/smb2pdu.c + create mode 100644 fs/cifs/smb2pdu.h + create mode 100644 fs/cifs/smb2proto.h + create mode 100644 fs/cifs/smb2sess.c + create mode 100644 fs/cifs/smb2status.h + create mode 100644 fs/cifs/smb2transport.c + delete mode 100644 fs/cifs/smbdes.c +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Resolved 'fs/ecryptfs/ecryptfs_kernel.h' using previous resolution. +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/ecryptfs/file.c +Auto-merging fs/ecryptfs/inode.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 19c35e9] Merge remote-tracking branch 'ecryptfs/next' +$ git diff -M --stat --summary HEAD^.. + fs/ecryptfs/crypto.c | 21 +++++++++++++++++++++ + fs/ecryptfs/ecryptfs_kernel.h | 2 ++ + fs/ecryptfs/file.c | 3 ++- + fs/ecryptfs/inode.c | 18 +++--------------- + 4 files changed, 28 insertions(+), 16 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging fs/ext3/inode.c +Auto-merging fs/quota/dquot.c +Merge made by recursive. + fs/ext3/inode.c | 2 +- + fs/quota/dquot.c | 13 ++++--------- + 2 files changed, 5 insertions(+), 10 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Resolved 'fs/gfs2/log.c' using previous resolution. +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/log.c +CONFLICT (content): Merge conflict in fs/gfs2/log.c +Auto-merging fs/gfs2/lops.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5897df5] Merge remote-tracking branch 'gfs2/master' +$ git diff -M --stat --summary HEAD^.. + fs/gfs2/aops.c | 2 +- + fs/gfs2/dir.c | 188 +++++++++++++++++++++---------------------------- + fs/gfs2/file.c | 58 +++++++++++++--- + fs/gfs2/glock.c | 33 ++++----- + fs/gfs2/glock.h | 3 +- + fs/gfs2/glops.c | 4 + + fs/gfs2/inode.c | 56 +++++++++++---- + fs/gfs2/inode.h | 3 +- + fs/gfs2/log.c | 15 ++--- + fs/gfs2/lops.c | 12 ++-- + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/rgrp.c | 24 +++++-- + fs/gfs2/super.c | 34 +++++++--- + 13 files changed, 247 insertions(+), 187 deletions(-) +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/extents.c | 9 ++++++--- + fs/hfsplus/super.c | 9 +++++++++ + fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- + fs/hfsplus/wrapper.c | 9 +++------ + 4 files changed, 45 insertions(+), 17 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master eb4a9d4] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/nfsd/lockd.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/inode.c | 3 +-- + fs/nilfs2/segment.c | 6 ++---- + 2 files changed, 3 insertions(+), 6 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/xfs/linux-2.6/xfs_buf.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/i2c-core.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Resolved 'arch/arm/mach-pxa/tosa.c' using previous resolution. +Resolved 'drivers/i2c/busses/i2c-pxa.c' using previous resolution. +Auto-merging arch/arm/mach-pxa/tosa.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/Makefile +Auto-merging drivers/i2c/busses/i2c-designware-core.c +Removing drivers/i2c/busses/i2c-intel-mid.c +Auto-merging drivers/i2c/busses/i2c-pxa.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c145079] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. + drivers/i2c/busses/Kconfig | 25 +- + drivers/i2c/busses/Makefile | 6 +- + .../{i2c-designware.c => i2c-designware-core.c} | 383 ++----- + drivers/i2c/busses/i2c-designware-core.h | 106 ++ + drivers/i2c/busses/i2c-designware-pcidrv.c | 405 +++++++ + drivers/i2c/busses/i2c-designware-platdrv.c | 215 ++++ + drivers/i2c/busses/i2c-intel-mid.c | 1135 -------------------- + 7 files changed, 862 insertions(+), 1413 deletions(-) + rename drivers/i2c/busses/{i2c-designware.c => i2c-designware-core.c} (65%) + create mode 100644 drivers/i2c/busses/i2c-designware-core.h + create mode 100644 drivers/i2c/busses/i2c-designware-pcidrv.c + create mode 100644 drivers/i2c/busses/i2c-designware-platdrv.c + delete mode 100644 drivers/i2c/busses/i2c-intel-mid.c +$ git am -3 ../patches/0001-i2c-designware-mdelay-use-needs-linux-delay.h-inclus.patch +Applying: i2c-designware: mdelay use needs linux/delay.h inclusion +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/i2c/busses/i2c-designware-core.c +$ git add . +$ git commit -v -a --amend +[master 4e47b46] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Already up-to-date. +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Merge made by recursive. + drivers/hwmon/twl4030-madc-hwmon.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merging kernel/signal.c +Merge made by recursive. + .../ABI/testing/sysfs-driver-hid-roccat-kone | 2 +- + .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 8 +- + .../ABI/testing/sysfs-driver-hid-roccat-kovaplus | 8 +- + .../ABI/testing/sysfs-driver-hid-roccat-pyra | 8 +- + .../ABI/testing/sysfs-platform-asus-laptop | 2 +- + Documentation/cgroups/cgroups.txt | 12 +- + Documentation/devicetree/booting-without-of.txt | 6 +- + Documentation/dvb/udev.txt | 2 +- + Documentation/edac.txt | 2 +- + Documentation/kernel-parameters.txt | 16 ++- + Documentation/kmemleak.txt | 4 +- + Documentation/laptops/asus-laptop.txt | 4 +- + Documentation/leds/00-INDEX | 10 ++ + Documentation/{ => leds}/leds-class.txt | 0 + Documentation/{ => leds}/leds-lp3944.txt | 0 + Documentation/networking/batman-adv.txt | 2 +- + Documentation/s390/Debugging390.txt | 2 +- + Documentation/scsi/sym53c8xx_2.txt | 2 +- + Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- + Documentation/sound/oss/AudioExcelDSP16 | 6 +- + Documentation/sound/oss/README.ymfsb | 2 +- + Documentation/video4linux/bttv/Insmod-options | 2 +- + Documentation/video4linux/bttv/Sound-FAQ | 2 +- + Documentation/video4linux/et61x251.txt | 4 +- + Documentation/video4linux/sn9c102.txt | 4 +- + Documentation/video4linux/w9968cf.txt | 2 +- + Documentation/video4linux/zc0301.txt | 6 +- + arch/powerpc/mm/tlb_low_64e.S | 2 +- + arch/powerpc/platforms/Kconfig | 2 +- + kernel/signal.c | 153 ++++++++++++++------ + lib/Kconfig.debug | 6 +- + 31 files changed, 180 insertions(+), 103 deletions(-) + create mode 100644 Documentation/leds/00-INDEX + rename Documentation/{ => leds}/leds-class.txt (100%) + rename Documentation/{ => leds}/leds-lp3944.txt (100%) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution. +Resolved 'drivers/staging/Kconfig' using previous resolution. +Resolved 'drivers/staging/easycap/easycap_ioctl.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/devices.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c +Removing drivers/media/dvb/frontends/drx397xD.c +Removing drivers/media/dvb/frontends/drx397xD.h +Removing drivers/media/dvb/frontends/drx397xD_fw.h +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging drivers/staging/easycap/easycap_ioctl.c +CONFLICT (content): Merge conflict in drivers/staging/easycap/easycap_ioctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master abd1f6f] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/video4linux/CARDLIST.em28xx | 2 +- + drivers/media/common/saa7146_core.c | 7 +- + drivers/media/common/tuners/xc5000.c | 32 +- + drivers/media/dvb/b2c2/flexcop-pci.c | 4 +- + drivers/media/dvb/bt8xx/bt878.c | 2 +- + drivers/media/dvb/dvb-usb/lmedm04.c | 12 +- + drivers/media/dvb/frontends/Kconfig | 12 +- + drivers/media/dvb/frontends/Makefile | 3 +- + drivers/media/dvb/frontends/drx397xD.c | 1511 -------------- + drivers/media/dvb/frontends/drx397xD.h | 130 -- + drivers/media/dvb/frontends/drx397xD_fw.h | 40 - + drivers/media/dvb/frontends/drxd.h | 61 + + drivers/media/dvb/frontends/drxd_firm.c | 929 +++++++++ + drivers/media/dvb/frontends/drxd_firm.h | 115 + + drivers/media/dvb/frontends/drxd_hard.c | 3000 +++++++++++++++++++++++++++ + drivers/media/dvb/frontends/drxd_map_firm.h | 1013 +++++++++ + drivers/media/dvb/mantis/hopper_cards.c | 2 +- + drivers/media/dvb/mantis/mantis_cards.c | 2 +- + drivers/media/dvb/mantis/mantis_pci.c | 5 +- + drivers/media/radio/wl128x/fmdrv_common.c | 16 +- + drivers/media/video/bt8xx/bttv-driver.c | 2 +- + drivers/media/video/cx18/cx18-driver.c | 2 +- + drivers/media/video/cx23885/cx23885-core.c | 2 +- + drivers/media/video/cx88/cx88-mpeg.c | 2 +- + drivers/media/video/cx88/cx88-video.c | 2 +- + drivers/media/video/em28xx/Kconfig | 1 + + drivers/media/video/em28xx/em28xx-cards.c | 21 +- + drivers/media/video/em28xx/em28xx-dvb.c | 22 +- + drivers/media/video/em28xx/em28xx.h | 2 +- + drivers/media/video/ivtv/ivtv-driver.c | 4 +- + drivers/media/video/saa7134/saa7134-core.c | 2 +- + drivers/media/video/saa7164/saa7164-core.c | 2 +- + drivers/media/video/zoran/zoran_card.c | 2 +- + drivers/staging/altera-stapl/altera-jtag.c | 1 + + include/media/soc_camera_platform.h | 50 + + 35 files changed, 5267 insertions(+), 1748 deletions(-) + delete mode 100644 drivers/media/dvb/frontends/drx397xD.c + delete mode 100644 drivers/media/dvb/frontends/drx397xD.h + delete mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h + create mode 100644 drivers/media/dvb/frontends/drxd.h + create mode 100644 drivers/media/dvb/frontends/drxd_firm.c + create mode 100644 drivers/media/dvb/frontends/drxd_firm.h + create mode 100644 drivers/media/dvb/frontends/drxd_hard.c + create mode 100644 drivers/media/dvb/frontends/drxd_map_firm.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Already up-to-date! +Merge made by recursive. +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/cxgb4/cm.c | 16 +++++++--------- + drivers/infiniband/hw/cxgb4/device.c | 6 +++--- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 4 ++-- + drivers/infiniband/hw/cxgb4/qp.c | 1 - + 4 files changed, 12 insertions(+), 15 deletions(-) +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + drivers/acpi/acpica/acglobal.h | 13 +++---- + drivers/acpi/acpica/evmisc.c | 74 +++++++++++++++++++++------------------ + drivers/acpi/acpica/utmutex.c | 12 +++++-- + drivers/acpi/osl.c | 33 +++++++++++++---- + include/acpi/acpiosxf.h | 3 ++ + 5 files changed, 83 insertions(+), 52 deletions(-) +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/acpi.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/include/asm/system.h +Auto-merging arch/x86/kernel/apm_32.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/process_64.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/xen/setup.c +Auto-merging drivers/block/floppy.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 2 +- + Documentation/kernel-parameters.txt | 14 +-- + arch/arm/kernel/process.c | 4 +- + arch/sh/kernel/idle.c | 6 +- + arch/x86/Kconfig | 11 -- + arch/x86/include/asm/acpi.h | 2 +- + arch/x86/include/asm/idle.h | 2 +- + arch/x86/include/asm/processor.h | 18 +-- + arch/x86/include/asm/system.h | 9 - + arch/x86/kernel/acpi/cstate.c | 24 +++ + arch/x86/kernel/apm_32.c | 232 ---------------------------- + arch/x86/kernel/cpu/bugs.c | 13 +-- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/proc.c | 2 - + arch/x86/kernel/process.c | 167 +++++---------------- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 4 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/xen/setup.c | 6 +- + drivers/acpi/processor_idle.c | 3 +- + drivers/block/floppy.c | 35 ---- + drivers/cpuidle/cpuidle.c | 50 ++++--- + drivers/cpuidle/cpuidle.h | 1 + + drivers/cpuidle/driver.c | 3 + + drivers/cpuidle/governor.c | 3 + + drivers/cpuidle/governors/menu.c | 4 +- + include/linux/cpuidle.h | 4 + + 28 files changed, 136 insertions(+), 495 deletions(-) +Merging powertools/tools-test +$ git merge powertools/tools-test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date! +Merge made by recursive. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging virt/kvm/kvm_main.c +Merge made by recursive. + arch/x86/kvm/x86.c | 37 ++++++++++++++++++++++++++++--------- + virt/kvm/eventfd.c | 2 +- + virt/kvm/kvm_main.c | 23 +++++++++++++++++++++-- + 3 files changed, 50 insertions(+), 12 deletions(-) +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/user.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Removing firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex +Removing firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex +Removing firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex +Auto-merging include/linux/netdevice.h +Merge made by recursive. + drivers/isdn/gigaset/ev-layer.c | 26 +- + drivers/isdn/hysdn/hysdn_proclog.c | 11 +- + drivers/net/atlx/atl1.c | 2 +- + drivers/net/bcm63xx_enet.c | 4 +- + drivers/net/benet/be.h | 8 +- + drivers/net/benet/be_cmds.c | 107 + + drivers/net/benet/be_cmds.h | 21 + + drivers/net/benet/be_ethtool.c | 21 + + drivers/net/benet/be_hw.h | 4 + + drivers/net/benet/be_main.c | 112 +- + drivers/net/bnx2x/bnx2x_cmn.h | 13 +- + drivers/net/bnx2x/bnx2x_dcb.c | 22 + + drivers/net/bnx2x/bnx2x_dcb.h | 8 +- + drivers/net/bnx2x/bnx2x_hsi.h | 2 +- + drivers/net/bnx2x/bnx2x_main.c | 5 + + drivers/net/cnic.c | 64 +- + drivers/net/cnic.h | 1 + + drivers/net/cnic_if.h | 6 +- + drivers/net/cris/eth_v10.c | 4 +- + drivers/net/enic/Makefile | 2 +- + drivers/net/enic/enic.h | 4 +- + drivers/net/enic/enic_dev.c | 62 +- + drivers/net/enic/enic_dev.h | 7 +- + drivers/net/enic/enic_main.c | 198 +- + drivers/net/enic/enic_pp.c | 264 + + drivers/net/enic/enic_pp.h | 27 + + drivers/net/enic/vnic_dev.c | 97 +- + drivers/net/enic/vnic_dev.h | 6 +- + drivers/net/enic/vnic_devcmd.h | 57 +- + drivers/net/enic/vnic_vic.c | 5 +- + drivers/net/enic/vnic_vic.h | 13 +- + drivers/net/ibmlana.c | 3 +- + drivers/net/jme.c | 77 +- + drivers/net/jme.h | 2 - + drivers/net/macb.c | 3 +- + drivers/net/netxen/netxen_nic_main.c | 2 +- + drivers/net/niu.c | 3 +- + drivers/net/qla3xxx.c | 2 +- + drivers/net/r8169.c | 309 +- + drivers/net/smsc911x.c | 292 +- + drivers/net/smsc911x.h | 22 +- + drivers/net/sungem.c | 3 +- + drivers/net/sunhme.c | 6 +- + drivers/net/tg3.c | 4 +- + drivers/net/usb/smsc75xx.c | 124 +- + drivers/net/usb/smsc95xx.c | 83 +- + drivers/net/veth.c | 45 +- + drivers/net/via-rhine.c | 2 +- + drivers/net/virtio_net.c | 46 +- + drivers/net/xen-netfront.c | 60 +- + firmware/Makefile | 6 +- + firmware/WHENCE | 9 +- + firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex | 9483 ------------------ + firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex | 9484 ++++++++++++++++++ + firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex |13181 ------------------------- + firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex |13192 +++++++++++++++++++++++++ + firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex |15456 ----------------------------- + firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex |15473 ++++++++++++++++++++++++++++++ + include/linux/netdevice.h | 1 + + include/net/flow.h | 25 +- + include/net/route.h | 60 +- + net/8021q/vlan.c | 8 +- + net/8021q/vlan_dev.c | 50 +- + net/core/dev.c | 23 +- + net/core/ethtool.c | 6 +- + net/ipv4/fib_trie.c | 103 +- + net/ipv4/inet_connection_sock.c | 18 +- + net/ipv4/ip_output.c | 18 +- + net/ipv4/raw.c | 18 +- + net/ipv4/syncookies.c | 18 +- + net/ipv4/udp.c | 18 +- + 71 files changed, 39782 insertions(+), 39139 deletions(-) + create mode 100644 drivers/net/enic/enic_pp.c + create mode 100644 drivers/net/enic/enic_pp.h + delete mode 100644 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex + delete mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex + delete mode 100644 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex +$ git reset --hard HEAD^ +HEAD is now at b536fbb Merge remote-tracking branch 'dlm/next' +Merging refs/next/20110401/net +$ git merge refs/next/20110401/net +Merge made by recursive. + drivers/isdn/gigaset/ev-layer.c | 26 +-- + drivers/isdn/hysdn/hysdn_proclog.c | 11 +- + drivers/net/atlx/atl1.c | 2 +- + drivers/net/bcm63xx_enet.c | 4 +- + drivers/net/benet/be.h | 8 +- + drivers/net/benet/be_cmds.c | 107 ++++++++++++ + drivers/net/benet/be_cmds.h | 21 +++ + drivers/net/benet/be_ethtool.c | 21 +++ + drivers/net/benet/be_hw.h | 4 + + drivers/net/benet/be_main.c | 112 +++++++------ + drivers/net/cris/eth_v10.c | 4 +- + drivers/net/enic/Makefile | 2 +- + drivers/net/enic/enic.h | 4 +- + drivers/net/enic/enic_dev.c | 62 +++++++- + drivers/net/enic/enic_dev.h | 7 +- + drivers/net/enic/enic_main.c | 198 ++++++---------------- + drivers/net/enic/enic_pp.c | 264 +++++++++++++++++++++++++++++ + drivers/net/enic/enic_pp.h | 27 +++ + drivers/net/enic/vnic_dev.c | 97 ++++++----- + drivers/net/enic/vnic_dev.h | 6 +- + drivers/net/enic/vnic_devcmd.h | 57 ++++++- + drivers/net/enic/vnic_vic.c | 5 +- + drivers/net/enic/vnic_vic.h | 13 ++- + drivers/net/ibmlana.c | 3 +- + drivers/net/macb.c | 3 +- + drivers/net/netxen/netxen_nic_main.c | 2 +- + drivers/net/niu.c | 3 +- + drivers/net/qla3xxx.c | 2 +- + drivers/net/r8169.c | 309 +++++++++++++++++++++++++++++++--- + drivers/net/smsc911x.c | 292 ++++++++++++++++---------------- + drivers/net/smsc911x.h | 22 +-- + drivers/net/tg3.c | 4 +- + drivers/net/via-rhine.c | 2 +- + drivers/net/xen-netfront.c | 3 +- + net/ipv4/fib_trie.c | 103 +++++++----- + 35 files changed, 1276 insertions(+), 534 deletions(-) + create mode 100644 drivers/net/enic/enic_pp.c + create mode 100644 drivers/net/enic/enic_pp.h +Merging wireless/master +$ git merge wireless/master +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging net/mac80211/rx.c +Merge made by recursive. + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 2 + + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 45 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 43 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 90 - + drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 925 ------- + drivers/net/wireless/ath/ath9k/ath9k.h | 4 +- + drivers/net/wireless/ath/ath9k/beacon.c | 97 +- + drivers/net/wireless/ath/ath9k/debug.c | 94 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 6 + + drivers/net/wireless/ath/ath9k/eeprom_def.c | 7 + + drivers/net/wireless/ath/ath9k/gpio.c | 14 +- + drivers/net/wireless/ath/ath9k/htc.h | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 9 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 33 +- + drivers/net/wireless/ath/ath9k/hw.c | 181 +- + drivers/net/wireless/ath/ath9k/hw.h | 61 +- + drivers/net/wireless/ath/ath9k/init.c | 53 +- + drivers/net/wireless/ath/ath9k/mac.c | 111 +- + drivers/net/wireless/ath/ath9k/main.c | 14 + + drivers/net/wireless/ath/ath9k/phy.h | 14 - + drivers/net/wireless/ath/ath9k/reg.h | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 29 +- + drivers/net/wireless/ath/key.c | 32 + + drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- + drivers/net/wireless/libertas/if_spi.c | 65 + + drivers/net/wireless/mwifiex/11n.c | 922 +++++++ + drivers/net/wireless/mwifiex/11n.h | 178 ++ + drivers/net/wireless/mwifiex/11n_aggr.c | 423 +++ + drivers/net/wireless/mwifiex/11n_aggr.h | 32 + + drivers/net/wireless/mwifiex/11n_rxreorder.c | 637 +++++ + drivers/net/wireless/mwifiex/11n_rxreorder.h | 67 + + drivers/net/wireless/mwifiex/Kconfig | 21 + + drivers/net/wireless/mwifiex/Makefile | 41 + + drivers/net/wireless/mwifiex/README | 204 ++ + drivers/net/wireless/mwifiex/cfg80211.c | 1517 +++++++++++ + drivers/net/wireless/mwifiex/cfg80211.h | 31 + + drivers/net/wireless/mwifiex/cfp.c | 368 +++ + drivers/net/wireless/mwifiex/cmdevt.c | 1463 ++++++++++ + drivers/net/wireless/mwifiex/debugfs.c | 773 ++++++ + drivers/net/wireless/mwifiex/decl.h | 177 ++ + drivers/net/wireless/mwifiex/fw.h | 1376 ++++++++++ + drivers/net/wireless/mwifiex/init.c | 665 +++++ + drivers/net/wireless/mwifiex/ioctl.h | 433 +++ + drivers/net/wireless/mwifiex/join.c | 1464 ++++++++++ + drivers/net/wireless/mwifiex/main.c | 1102 ++++++++ + drivers/net/wireless/mwifiex/main.h | 1081 ++++++++ + drivers/net/wireless/mwifiex/scan.c | 3098 ++++++++++++++++++++++ + drivers/net/wireless/mwifiex/sdio.c | 1770 ++++++++++++ + drivers/net/wireless/mwifiex/sdio.h | 305 +++ + drivers/net/wireless/mwifiex/sta_cmd.c | 1226 +++++++++ + drivers/net/wireless/mwifiex/sta_cmdresp.c | 986 +++++++ + drivers/net/wireless/mwifiex/sta_event.c | 405 +++ + drivers/net/wireless/mwifiex/sta_ioctl.c | 2478 +++++++++++++++++ + drivers/net/wireless/mwifiex/sta_rx.c | 182 ++ + drivers/net/wireless/mwifiex/sta_tx.c | 202 ++ + drivers/net/wireless/mwifiex/txrx.c | 202 ++ + drivers/net/wireless/mwifiex/util.c | 252 ++ + drivers/net/wireless/mwifiex/util.h | 32 + + drivers/net/wireless/mwifiex/wmm.c | 1237 +++++++++ + drivers/net/wireless/mwifiex/wmm.h | 112 + + drivers/net/wireless/mwl8k.c | 740 +++++- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- + include/linux/ath9k_platform.h | 5 + + include/net/cfg80211.h | 9 + + net/mac80211/rx.c | 2 + + net/mac80211/sta_info.c | 2 + + net/mac80211/status.c | 11 +- + net/wireless/mlme.c | 9 + + net/wireless/nl80211.c | 34 + + net/wireless/nl80211.h | 3 + + 73 files changed, 26718 insertions(+), 1501 deletions(-) + create mode 100644 drivers/net/wireless/mwifiex/11n.c + create mode 100644 drivers/net/wireless/mwifiex/11n.h + create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.c + create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.h + create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.c + create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.h + create mode 100644 drivers/net/wireless/mwifiex/Kconfig + create mode 100644 drivers/net/wireless/mwifiex/Makefile + create mode 100644 drivers/net/wireless/mwifiex/README + create mode 100644 drivers/net/wireless/mwifiex/cfg80211.c + create mode 100644 drivers/net/wireless/mwifiex/cfg80211.h + create mode 100644 drivers/net/wireless/mwifiex/cfp.c + create mode 100644 drivers/net/wireless/mwifiex/cmdevt.c + create mode 100644 drivers/net/wireless/mwifiex/debugfs.c + create mode 100644 drivers/net/wireless/mwifiex/decl.h + create mode 100644 drivers/net/wireless/mwifiex/fw.h + create mode 100644 drivers/net/wireless/mwifiex/init.c + create mode 100644 drivers/net/wireless/mwifiex/ioctl.h + create mode 100644 drivers/net/wireless/mwifiex/join.c + create mode 100644 drivers/net/wireless/mwifiex/main.c + create mode 100644 drivers/net/wireless/mwifiex/main.h + create mode 100644 drivers/net/wireless/mwifiex/scan.c + create mode 100644 drivers/net/wireless/mwifiex/sdio.c + create mode 100644 drivers/net/wireless/mwifiex/sdio.h + create mode 100644 drivers/net/wireless/mwifiex/sta_cmd.c + create mode 100644 drivers/net/wireless/mwifiex/sta_cmdresp.c + create mode 100644 drivers/net/wireless/mwifiex/sta_event.c + create mode 100644 drivers/net/wireless/mwifiex/sta_ioctl.c + create mode 100644 drivers/net/wireless/mwifiex/sta_rx.c + create mode 100644 drivers/net/wireless/mwifiex/sta_tx.c + create mode 100644 drivers/net/wireless/mwifiex/txrx.c + create mode 100644 drivers/net/wireless/mwifiex/util.c + create mode 100644 drivers/net/wireless/mwifiex/util.h + create mode 100644 drivers/net/wireless/mwifiex/wmm.c + create mode 100644 drivers/net/wireless/mwifiex/wmm.h +Merging bluetooth/master +$ git merge bluetooth/master +Auto-merging include/net/bluetooth/hci.h +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/mgmt.c +Merge made by recursive. + include/net/bluetooth/hci.h | 40 ++++- + include/net/bluetooth/hci_core.h | 22 ++- + include/net/bluetooth/l2cap.h | 2 - + include/net/bluetooth/mgmt.h | 33 +++ + net/bluetooth/bnep/bnep.h | 146 +++++++------- + net/bluetooth/bnep/core.c | 50 +++-- + net/bluetooth/bnep/sock.c | 2 +- + net/bluetooth/cmtp/cmtp.h | 2 +- + net/bluetooth/cmtp/core.c | 9 +- + net/bluetooth/cmtp/sock.c | 2 +- + net/bluetooth/hci_core.c | 68 ++++++- + net/bluetooth/hci_event.c | 70 ++++++- + net/bluetooth/hci_sysfs.c | 6 +- + net/bluetooth/hidp/core.c | 37 ++-- + net/bluetooth/hidp/hidp.h | 4 +- + net/bluetooth/hidp/sock.c | 7 +- + net/bluetooth/l2cap_core.c | 27 ++- + net/bluetooth/mgmt.c | 415 +++++++++++++++++++++++++++++++++++++- + 18 files changed, 787 insertions(+), 155 deletions(-) +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + .../devicetree/bindings/crypto/fsl-sec4.txt | 397 +++++ + arch/powerpc/boot/dts/p4080ds.dts | 86 +- + drivers/crypto/Kconfig | 2 + + drivers/crypto/Makefile | 1 + + drivers/crypto/caam/Kconfig | 72 + + drivers/crypto/caam/Makefile | 8 + + drivers/crypto/caam/caamalg.c | 1163 ++++++++++++++ + drivers/crypto/caam/compat.h | 35 + + drivers/crypto/caam/ctrl.c | 270 ++++ + drivers/crypto/caam/desc.h | 1605 ++++++++++++++++++++ + drivers/crypto/caam/desc_constr.h | 204 +++ + drivers/crypto/caam/error.c | 248 +++ + drivers/crypto/caam/error.h | 10 + + drivers/crypto/caam/intern.h | 113 ++ + drivers/crypto/caam/jr.c | 523 +++++++ + drivers/crypto/caam/jr.h | 21 + + drivers/crypto/caam/regs.h | 663 ++++++++ + drivers/crypto/padlock-sha.c | 269 ++++- + drivers/crypto/picoxcell_crypto.c | 64 +- + 19 files changed, 5719 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt + create mode 100644 drivers/crypto/caam/Kconfig + create mode 100644 drivers/crypto/caam/Makefile + create mode 100644 drivers/crypto/caam/caamalg.c + create mode 100644 drivers/crypto/caam/compat.h + create mode 100644 drivers/crypto/caam/ctrl.c + create mode 100644 drivers/crypto/caam/desc.h + create mode 100644 drivers/crypto/caam/desc_constr.h + create mode 100644 drivers/crypto/caam/error.c + create mode 100644 drivers/crypto/caam/error.h + create mode 100644 drivers/crypto/caam/intern.h + create mode 100644 drivers/crypto/caam/jr.c + create mode 100644 drivers/crypto/caam/jr.h + create mode 100644 drivers/crypto/caam/regs.h +Merging sound/for-next +$ git merge sound/for-next +Already up-to-date! +Merge made by recursive. +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Auto-merging sound/soc/soc-jack.c +Merge made by recursive. + include/linux/mfd/wm8994/pdata.h | 49 ++ + include/sound/soc.h | 14 +- + sound/arm/pxa2xx-pcm-lib.c | 3 + + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/au1x/db1200.c | 2 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 13 +- + sound/soc/blackfin/bf5xx-ac97.c | 166 ++---- + sound/soc/blackfin/bf5xx-ad1836.c | 42 +- + sound/soc/blackfin/bf5xx-ad193x.c | 56 ++- + sound/soc/blackfin/bf5xx-ad1980.c | 45 +- + sound/soc/blackfin/bf5xx-ad73311.c | 42 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 23 +- + sound/soc/blackfin/bf5xx-i2s.c | 172 +++---- + sound/soc/blackfin/bf5xx-sport.c | 159 ++++-- + sound/soc/blackfin/bf5xx-sport.h | 16 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 42 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 23 +- + sound/soc/blackfin/bf5xx-tdm.c | 110 ++--- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/Makefile | 2 +- + sound/soc/codecs/ad193x.c | 23 +- + sound/soc/codecs/ad1980.c | 2 +- + sound/soc/codecs/ad73311.c | 2 +- + sound/soc/codecs/ak4535.c | 19 +- + sound/soc/codecs/ak4671.c | 18 +- + sound/soc/codecs/cx20442.c | 18 +- + sound/soc/codecs/max98088.c | 25 +- + sound/soc/codecs/sn95031.c | 17 +- + sound/soc/codecs/ssm2602.c | 140 ++---- + sound/soc/codecs/tlv320aic23.c | 19 +- + sound/soc/codecs/wm8711.c | 18 +- + sound/soc/codecs/wm8728.c | 18 +- + sound/soc/codecs/wm8731.c | 22 +- + sound/soc/codecs/wm8903.c | 18 +- + sound/soc/codecs/wm8958-dsp2.c | 1028 +++++++++++++++++++++++++++++++++++ + sound/soc/codecs/wm8994.c | 364 ++----------- + sound/soc/codecs/wm8994.h | 97 ++++ + sound/soc/codecs/wm9705.c | 18 +- + sound/soc/codecs/wm9712.c | 18 +- + sound/soc/codecs/wm9713.c | 19 +- + sound/soc/imx/imx-ssi.c | 6 - + sound/soc/pxa/corgi.c | 2 +- + sound/soc/pxa/poodle.c | 2 +- + sound/soc/pxa/pxa2xx-pcm.c | 1 + + sound/soc/pxa/spitz.c | 41 +- + sound/soc/pxa/zylonite.c | 6 +- + sound/soc/soc-cache.c | 568 ++++++------------- + sound/soc/soc-core.c | 54 ++- + sound/soc/soc-jack.c | 2 +- + 49 files changed, 2083 insertions(+), 1485 deletions(-) + create mode 100644 sound/soc/codecs/wm8958-dsp2.c +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merging drivers/char/virtio_console.c +Auto-merging kernel/module.c +Merge made by recursive. + drivers/block/virtio_blk.c | 88 ++++++++++++++++++++++++++++++++++++----- + drivers/char/virtio_console.c | 16 ------- + drivers/virtio/virtio_pci.c | 15 ++++--- + include/linux/module.h | 28 +++++++------ + include/linux/moduleparam.h | 7 ++- + kernel/module.c | 4 +- + kernel/params.c | 9 +++- + 7 files changed, 113 insertions(+), 54 deletions(-) +Merging input/next +$ git merge input/next +Already up-to-date. +Merging input-mt/next +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Merge made by recursive. + block/blk-core.c | 4 +- + block/blk-flush.c | 6 +- + block/blk-integrity.c | 12 ++++- + block/blk-throttle.c | 4 +- + block/elevator.c | 35 ++++++-------- + drivers/ide/ide-io.c | 3 +- + drivers/md/dm-table.c | 114 ++++++++++++++++++++++++++++++++-------------- + fs/inode.c | 9 +++- + fs/nilfs2/page.c | 2 - + fs/ubifs/xattr.c | 4 +- + fs/ufs/truncate.c | 1 - + include/linux/blkdev.h | 2 + + include/linux/elevator.h | 1 - + include/linux/fs.h | 2 + + 14 files changed, 128 insertions(+), 71 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 95baa3f] Merge remote-tracking branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Merge made by recursive. + arch/arm/mach-tegra/include/mach/sdhci.h | 1 + + drivers/mmc/card/block.c | 81 ++++++++++++++++++++++++++++-- + drivers/mmc/card/queue.c | 8 --- + drivers/mmc/core/mmc.c | 15 ++++++ + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/sdhci-pci.c | 1 + + drivers/mmc/host/sdhci-tegra.c | 2 + + include/linux/mmc/card.h | 3 + + include/linux/mmc/mmc.h | 5 ++ + 9 files changed, 105 insertions(+), 13 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging fbdev/master +$ git merge fbdev/master +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Merge made by recursive. + arch/arm/mach-omap2/board-4430sdp.c | 132 ++++++++++++++++-- + drivers/video/omap2/dss/dsi.c | 240 +++++++++++++++++++++----------- + drivers/video/omap2/dss/dss.c | 51 ++++++- + drivers/video/omap2/dss/dss_features.c | 9 +- + drivers/video/omap2/dss/dss_features.h | 30 +++-- + 5 files changed, 346 insertions(+), 116 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 24 +++++++++++++++--------- + drivers/regulator/tps6105x-regulator.c | 1 + + 2 files changed, 16 insertions(+), 9 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + include/linux/key.h | 13 +++++++++++++ + net/dns_resolver/dns_key.c | 10 ++++++---- + security/Kconfig | 1 + + security/keys/internal.h | 4 +++- + security/keys/keyctl.c | 6 ++++++ + security/keys/keyring.c | 37 ++++++++++++++++++++++++------------- + security/keys/proc.c | 2 +- + security/keys/process_keys.c | 12 +++++++----- + security/keys/request_key.c | 3 +-- + security/keys/request_key_auth.c | 3 ++- + security/keys/user_defined.c | 4 ++-- + security/tomoyo/memory.c | 1 + + 12 files changed, 67 insertions(+), 29 deletions(-) +Merging selinux/master +$ git merge selinux/master +Auto-merging MAINTAINERS +Auto-merging security/selinux/ss/services.c +Merge made by recursive. + MAINTAINERS | 3 +- + security/selinux/include/security.h | 7 +++-- + security/selinux/selinuxfs.c | 16 +++++++++++++- + security/selinux/ss/policydb.c | 25 +++++++++++++++++++++- + security/selinux/ss/policydb.h | 3 +- + security/selinux/ss/services.c | 37 +++++++++++++++++------------------ + 6 files changed, 63 insertions(+), 28 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/mpc8xxx_wdt.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merging drivers/pci/intel-iommu.c +Merge made by recursive. + drivers/pci/intel-iommu.c | 17 ++++++++++++++--- + 1 files changed, 14 insertions(+), 3 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + CREDITS | 2 +- + Documentation/stable_api_nonsense.txt | 2 +- + MAINTAINERS | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/cachefiles/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/notify/mark.c +Auto-merging include/linux/fsnotify_backend.h +Merge made by recursive. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/Kbuild'. +[master b6cc037] Merge remote-tracking branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging drivers/edac/i7core_edac.c +Merge made by recursive. + drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- + 1 files changed, 20 insertions(+), 3 deletions(-) +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/devicetree/next +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging spi/spi/next +$ git merge spi/spi/next +Merge made by recursive. + drivers/spi/dw_spi.c | 202 ++++++++++++++++--------------------------------- + drivers/spi/dw_spi.h | 2 - + 2 files changed, 66 insertions(+), 138 deletions(-) +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/probe_roms.c +Auto-merging sound/soc/codecs/sn95031.c +Merge made by recursive. + Documentation/scheduler/sched-domains.txt | 32 +++- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/apic.h | 1 - + arch/x86/include/asm/dma.h | 1 - + arch/x86/include/asm/mach_traps.h | 18 ++- + arch/x86/include/asm/olpc_ofw.h | 9 +- + arch/x86/include/asm/probe_roms.h | 8 + + arch/x86/include/asm/setup.h | 2 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/amd_nb.c | 2 +- + arch/x86/kernel/apic/hw_nmi.c | 1 + + arch/x86/kernel/apic/x2apic_uv_x.c | 10 ++ + arch/x86/kernel/cpu/mcheck/mce.c | 2 +- + arch/x86/kernel/cpu/mtrr/main.c | 20 ++- + arch/x86/kernel/cpu/perf_event_p4.c | 2 +- + arch/x86/kernel/head32.c | 1 - + arch/x86/kernel/irq.c | 1 + + arch/x86/kernel/microcode_core.c | 1 + + arch/x86/kernel/mpparse.c | 4 +- + arch/x86/kernel/{probe_roms_32.c => probe_roms.c} | 101 ++++++++++++ + arch/x86/kernel/reboot.c | 1 + + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/oprofile/nmi_int.c | 5 + + arch/x86/oprofile/op_counter.h | 1 + + arch/x86/platform/olpc/Makefile | 4 +- + arch/x86/platform/olpc/olpc.c | 51 ++++--- + arch/x86/platform/olpc/olpc_dt.c | 19 +++ + arch/x86/platform/uv/tlb_uv.c | 1 + + drivers/media/rc/ite-cir.c | 1 + + drivers/scsi/ultrastor.c | 1 + + include/asm-generic/bug.h | 7 + + include/linux/pci_ids.h | 2 +- + include/linux/perf_event.h | 2 +- + include/linux/rcupdate.h | 20 +++ + kernel/perf_event.c | 9 +- + kernel/sched.c | 11 ++ + kernel/sched_fair.c | 5 +- + sound/soc/codecs/sn95031.c | 2 + + tools/perf/Documentation/perf-script.txt | 52 ++++++- + tools/perf/Makefile | 8 +- + tools/perf/builtin-record.c | 25 +++- + tools/perf/builtin-script.c | 171 +++++++++++++++------ + tools/perf/builtin-top.c | 44 ++++-- + tools/perf/util/debug.c | 10 ++ + tools/perf/util/debug.h | 1 + + tools/perf/util/event.c | 2 +- + tools/perf/util/probe-finder.c | 72 +++++++++ + tools/perf/util/probe-finder.h | 2 + + tools/perf/util/setup.py | 7 +- + tools/perf/util/symbol.c | 5 + + 50 files changed, 616 insertions(+), 147 deletions(-) + create mode 100644 arch/x86/include/asm/probe_roms.h + rename arch/x86/kernel/{probe_roms_32.c => probe_roms.c} (65%) +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Merge made by recursive. + Documentation/RCU/00-INDEX | 2 +- + Documentation/RCU/stallwarn.txt | 23 +++-- + Documentation/RCU/trace.txt | 77 ++++++++-------- + kernel/rcutree.c | 161 ++++++++++++---------------------- + kernel/rcutree.h | 42 ++++----- + kernel/rcutree_plugin.h | 182 +++++++++++++++++++++------------------ + kernel/rcutree_trace.c | 23 ++--- + lib/Kconfig.debug | 30 +------ + 8 files changed, 240 insertions(+), 300 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Auto-merging arch/s390/oprofile/init.c +Merge made by recursive. + arch/alpha/oprofile/common.c | 5 +---- + arch/avr32/oprofile/op_model_avr32.c | 5 +---- + arch/blackfin/oprofile/bfin_oprofile.c | 4 +--- + arch/ia64/oprofile/init.c | 2 +- + arch/m32r/oprofile/init.c | 4 +--- + arch/microblaze/oprofile/microblaze_oprofile.c | 4 +--- + arch/mips/oprofile/common.c | 2 +- + arch/mn10300/oprofile/op_model_null.c | 5 +---- + arch/parisc/oprofile/init.c | 4 +--- + arch/powerpc/oprofile/common.c | 4 +--- + arch/s390/oprofile/init.c | 2 +- + arch/sparc/oprofile/init.c | 4 +--- + arch/x86/oprofile/init.c | 2 +- + 13 files changed, 13 insertions(+), 34 deletions(-) +Merging ptrace/ptrace +$ git merge ptrace/ptrace +Auto-merging include/linux/sched.h +Auto-merging kernel/exit.c +Auto-merging kernel/ptrace.c +Auto-merging kernel/signal.c +Merge made by recursive. + fs/exec.c | 1 + + include/linux/sched.h | 17 ++- + include/linux/tracehook.h | 27 ---- + kernel/exit.c | 84 ++++++++-- + kernel/ptrace.c | 118 ++++++++++----- + kernel/signal.c | 375 +++++++++++++++++++++++++++++++++------------ + 6 files changed, 442 insertions(+), 180 deletions(-) +Merging xen-two/linux-next +$ git merge xen-two/linux-next +Auto-merging arch/x86/xen/setup.c +Merge made by recursive. + arch/x86/xen/p2m.c | 28 ++++++++++++++++++++++++++-- + arch/x86/xen/setup.c | 6 ++++++ + drivers/xen/events.c | 6 ++---- + 3 files changed, 34 insertions(+), 6 deletions(-) +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging mm/percpu.c +Merge made by recursive. + arch/alpha/kernel/vmlinux.lds.S | 2 +- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/blackfin/kernel/vmlinux.lds.S | 2 +- + arch/cris/kernel/vmlinux.lds.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 2 +- + arch/m32r/kernel/vmlinux.lds.S | 2 +- + arch/mips/kernel/vmlinux.lds.S | 2 +- + arch/mn10300/kernel/vmlinux.lds.S | 2 +- + arch/parisc/kernel/vmlinux.lds.S | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/s390/kernel/vmlinux.lds.S | 2 +- + arch/sh/kernel/vmlinux.lds.S | 2 +- + arch/sparc/kernel/vmlinux.lds.S | 2 +- + arch/tile/kernel/vmlinux.lds.S | 2 +- + arch/um/include/asm/common.lds.S | 2 +- + arch/x86/include/asm/percpu.h | 7 ++++++- + arch/x86/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + include/asm-generic/vmlinux.lds.h | 17 ++++++++--------- + kernel/workqueue.c | 4 +--- + mm/percpu.c | 6 ++++-- + 21 files changed, 36 insertions(+), 32 deletions(-) +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + Documentation/workqueue.txt | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 40 insertions(+), 0 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Auto-merging Documentation/feature-removal-schedule.txt +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 20 - + drivers/platform/x86/Kconfig | 3 +- + drivers/platform/x86/acer-wmi.c | 32 +- + drivers/platform/x86/asus-laptop.c | 34 +- + drivers/platform/x86/asus-wmi.c | 26 +- + drivers/platform/x86/asus_acpi.c | 77 ++-- + drivers/platform/x86/compal-laptop.c | 22 +- + drivers/platform/x86/dell-laptop.c | 12 +- + drivers/platform/x86/dell-wmi-aio.c | 3 +- + drivers/platform/x86/dell-wmi.c | 17 +- + drivers/platform/x86/eeepc-laptop.c | 20 +- + drivers/platform/x86/eeepc-wmi.c | 16 +- + drivers/platform/x86/fujitsu-laptop.c | 39 +- + drivers/platform/x86/hdaps.c | 19 +- + drivers/platform/x86/hp-wmi.c | 43 +-- + drivers/platform/x86/ibm_rtl.c | 23 +- + drivers/platform/x86/ideapad-laptop.c | 2 + + drivers/platform/x86/intel_menlow.c | 5 +- + drivers/platform/x86/intel_mid_thermal.c | 606 ++++++++++++++-------------- + drivers/platform/x86/intel_pmic_gpio.c | 14 +- + drivers/platform/x86/msi-laptop.c | 9 +- + drivers/platform/x86/msi-wmi.c | 45 +-- + drivers/platform/x86/sony-laptop.c | 104 +++--- + drivers/platform/x86/tc1100-wmi.c | 7 +- + drivers/platform/x86/thinkpad_acpi.c | 471 +++++++++------------- + drivers/platform/x86/topstar-laptop.c | 2 +- + drivers/platform/x86/toshiba_acpi.c | 59 ++-- + drivers/platform/x86/toshiba_bluetooth.c | 11 +- + drivers/platform/x86/wmi.c | 10 +- + drivers/platform/x86/xo15-ebook.c | 5 +- + 30 files changed, 801 insertions(+), 955 deletions(-) +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next +$ git merge staging/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'fs/super.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Resolved 'mm/truncate.c' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/mpage.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/xen/interface/xen.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/truncate.c +CONFLICT (content): Merge conflict in mm/truncate.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c26edee] Merge remote-tracking branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. +$ rm -rf ../rebase-tmp diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..54d2fc4c671b --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,33 @@ +Importing i2c based on 2.6.39-rc1 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 2.6.39-rc1 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 2.6.38-git18 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 16c29dafcc86024048f1dbb8349d31cb22c7c55a +HEAD is now at 16c29da Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 +$ git quiltimport --author Randy Dunlap --patches ../quilt/kernel-doc +docum-kmemleak-update03.patch +kern-signal-typo10.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:192: space before tab in indent. + * so check explicitly for the right codes here. +warning: 1 line adds whitespace errors. +kern-signal-kerndoc11.patch +docum-kernprms-panicvalues.patch +0001-Fix-some-minor-typos.patch +docum-build-kmemleaktest-modonly.patch +docum-collect-leds-files.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:168: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +docum-cgroups-groupnames.patch +docum-leds-add-indexfile.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/kernel-doc +From ../quilt-tmp + + 6c37588...9050840 master -> quilt/kernel-doc (forced update) +Importing rr based on v2.6.38-rc6-93-gef32428 +Unchanged quilt series rr +Importing device-mapper based on v2.6.38-rc4-213-g055d219 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..ddc38cb27260 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20110404 -- cgit v1.2.3