diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-29 12:51:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-29 12:51:58 +1100 |
| commit | 74bdbee1ad090575f8b97081219488f95ddff409 (patch) | |
| tree | e031242019e6c09b50e4c368761f6a6c4780e830 | |
| parent | 55370d915f51ace5b36db293dc0401ced82b8d74 (diff) | |
Add linux-next specific files for 20110329next-20110329
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 184 | ||||
| -rw-r--r-- | Next/Trees | 186 | ||||
| -rw-r--r-- | Next/merge.log | 1615 | ||||
| -rw-r--r-- | Next/quilt-import.log | 26 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2012 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..f01bf1e94d5e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,184 @@ +Name SHA1 +---- ---- +origin 036a98263a30930a329e7bb184d5e77f27358e40 +fixes 837d80bd88eb49008589f3201c0fcce7bf86c44d +kbuild-current b7bd182176960fdd139486cadb9962b39f8a2b50 +arm-current 18bcd0c8cb7d85a9063b88ec810dc1cdc0974518 +m68k-current 059718d572e8ad388313b863aff717623bb2552f +powerpc-merge a71f5d5d279375205009a4be56a3cf6682921292 +52xx-and-virtex-current dd9c1549edef02290edced639f67b54a25abbe0e +sparc-current 1c833bc3b60744a385ac66cc1bc72fbecd5670ab +scsi-rc-fixes 52208ae3fc60cbcb214c10fb8b82304199e2cc3a +net-current 1fbc78439291627642517f15b9b91f3125588143 +sound-current a45e3d6b13e97506b616980c0f122c3389bcefa4 +pci-current eca67315e0e0d5fd91264d79c88694006dbc7d31 +wireless-current 499fe9a419d43410be576bcc825658997b6ce822 +driver-core.current 4bbba111d94781d34081c37856bbc5eb33f6c72a +tty.current 4bbba111d94781d34081c37856bbc5eb33f6c72a +usb.current 6c5103890057b1bb781b26b7aae38d33e4c517d8 +staging.current 4bbba111d94781d34081c37856bbc5eb33f6c72a +cpufreq-current 2e270d84223262a38d4755c61d55f5c73ea89e56 +input-current d51ca07634b8a441f731e087e93775a67d629a8c +md-current f0b4f7e2f29af678bd9af43422c537dcb6008603 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 60af520cf264ea26b2af3a6871bbd71850522aea +ide-curent dd8717da6da9b0e745df49762be4573010f1013c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current d60cf53a30956e47919788b2ef49287786a959c9 +rmobile-current 2c34e939f9e98bb678a2b0d35e7a318bf2947024 +fbdev-current 53f358a81e10e798f44af896ffacaedd7ac0269b +devicetree-current 06fb01fd1dc624d891cbe039a88a44bc8a8a9ec1 +spi-current 06fb01fd1dc624d891cbe039a88a44bc8a8a9ec1 +arm 8309dfef888b2d767724787a7dcd1d6d377e706d +davinci 9a9fb12a4832bdf22751e21df298ef3559643b43 +i.MX 358020dd27b0818eeeb998dba9899426805e2342 +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +msm 8e76a80960bf06c245160a484d5a363ca6b520bb +omap 4fa8eebb045a6d798011f3935a38dd29de30e6c9 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p b0b6ff0b21057bb8e58b0be8b427a4713fd4b5a5 +tegra 84abf6084704673ae80a2105bf63ece5eee3edd5 +ux500-core 2b7dc9360261d26e770badf10d809c16cf6224b6 +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin 92a19d66a3cc17feae20b4c1147e8b4dbf7b2282 +cris 33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57 +ia64 054cfaacf88865bff1dd58d305443d5d6c068a08 +m68k 059718d572e8ad388313b863aff717623bb2552f +m68knommu 0db436ce8a08f3d1df6aa8a79fed8660969e8737 +microblaze 054cfaacf88865bff1dd58d305443d5d6c068a08 +mips 7ccc13016a363197733c63688f21bb6a521db498 +parisc 1c0f647690f1b9471d63af48dec960bc59492e61 +powerpc 831532035b12a5f7b600515a6f4da0b207b82d6e +4xx 831532035b12a5f7b600515a6f4da0b207b82d6e +52xx-and-virtex 0a95d92c0054e74fb79607ac2df958b7bf295706 +galak b0aea14bdc4a9ee5d1e8cb78488263d6ce32095e +s390 09b2172d2dfa6ef2816172d06bdade5bcc9225ae +sh b15ed691667f59867c9c130b8d84feda4050be04 +rmobile 9d9659b6c0ebf7dde65ebada4c67980818245913 +sparc 08351fc6a75731226e1112fc7254542bd3a2912e +tile 339dc50e59f4ea697e2b8cd6296328a8015a6c21 +unicore32 289d6b0e287e0acd85f3e6b7ea6c2cb5c234909a +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph 766fc43973b16f9becb6b7402b3e052dbb84adee +cifs f20b6c5cdb4ec1a39cf55c764cfdb4054d6bc242 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 9a5c06247dff5b13c5c012d123ce8c915b7553b1 +ext3 eddecbb601c9ea3fab7e67d7892010fc9426d1e6 +ext4 0ba0851714beebb800992e5105a79dc3a4c504b0 +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse e7c0a167860620bd2938366896964f729ddaeaaa +gfs2 054cfaacf88865bff1dd58d305443d5d6c068a08 +hfsplus 99943814ce60e4cd0165f19781abbfcc826f8d87 +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 036a98263a30930a329e7bb184d5e77f27358e40 +nfsd 954032d2527f2fce7355ba70709b5e143d6b686f +nilfs2 e2a40960f6bb4b8b2a6ab821a6a5cf84d986bca3 +ocfs2 272b62c1f0f6f742046e45b50b6fec98860208a0 +omfs 31be83aeaee22fa165862ad449c7131ceaf1cf91 +squashfs 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 +udf 6f644e5f97cc8dcb8dc7133562159cc20d27c38f +v9fs 521cb40b0c44418a4fd36dc633f575813d59a43d +ubifs a44f99c7efdb88fa41128065c9a9445c19894e34 +xfs 0c9ba97318fc9a905bcc1419b6966de061203a70 +vfs 0f60f240d522772467c7d2cebedb910748c78ed4 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci a44f99c7efdb88fa41128065c9a9445c19894e34 +hid 99759619b27662d1290901228d77a293e6e83200 +i2c 40471856f2e38e9bfa8d605295e8234421110dd6 +bjdooks-i2c 3e0e7388aa3176f335c2d95e923655321852c993 +jdelvare-hwmon 7b44135c0dd61fdd666299151f25eacced7d18f0 +hwmon-staging fed7cb3053b4d923747ba7d0bf5f091123dcbfef +kernel-doc 0600ac08fbfaa2cd1a85e78c7a91a9a72831b2b9 +v4l-dvb 2085637fac734c8d6c5d22687bed438bb52f7d02 +kbuild 4e4f34f4141cec2d9f2b29e4aa9194a7d072c542 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata 50be5e3657cd2851a297dc0b3fd459f25829d29b +infiniband cf55bb2439d2a7080fae6edf84919fd81f891574 +acpi 58d32cf9d26a7ece628cece17403666fbbede934 +idle-test 15e123e5d7e8ee9ba3717e743d8eb5fd0fe57712 +powertools a829eb4d7e08b316e2d48880ecab3630497f300f +ieee1394 2266b4a1841302e56865567cc962f468ef1b8378 +ubi a44f99c7efdb88fa41128065c9a9445c19894e34 +kvm 38f073a0c44e55ac45fcfe42d8c45e2561e44d14 +dlm 4bcad6c1ef53a9a0224f4654ceb3b9030d0769ec +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 +scsi 3703b2c5d041a68095cdd22380c23ce27d449ad7 +async_tx 3ea205c449d2b5996d0256aa8b2894f7aea228a2 +net 08351fc6a75731226e1112fc7254542bd3a2912e +wireless 7d2c16befae67b901e6750b845661c1fdffd19f1 +bluetooth 72ac7ad021cd391cffe2774ecbeae5ae36672368 +mtd fc2ff592b5b41f3f32e790dd124eeb3bc80706c8 +crypto 40bfc14f3250691dca6fcb00f791727e180a7f79 +sound 71113bbec6bc067f46849ab58417283946bd2f51 +sound-asoc e1bb31b444668bc957c337d33803db7cb3330745 +cpufreq bdce2595a2f539c6fdedd8f2bd281326b627bba3 +rr 9a3a41ce5b6a5a3f6321c6d5955f8c6750ba11d8 +input def179c271ac9b5020deca798470521f14d11edd +input-mt 521cb40b0c44418a4fd36dc633f575813d59a43d +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block a83493d12de16356353a951756ec382d13c7d92c +device-mapper 055d219441cc23f631240335fd369b6b5852681a +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 33619f0d3ff715a2a5499520967d526ad931d70d +battery 909a78b320b31ca9709d7ea5f602ec1bd2015192 +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 022b483596fabb5d1320aa4b76f43a754063f37e +kgdb 18bcd0c8cb7d85a9063b88ec810dc1cdc0974518 +slab 4fdccdfbb4652a7bbac8adbce7449eb093775118 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md f0b4f7e2f29af678bd9af43422c537dcb6008603 +mfd bb27e011ee3604ad2f5efce18752f9fd87323008 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 51eab416c9b4b3ed16553d405ec4a5f67daa34cf +fbdev 53f358a81e10e798f44af896ffacaedd7ac0269b +viafb 3f086fe93f734ba76f2e130777687f81e0cbb318 +omap_dss2 17c84ef1e1265fad787d4082bd40a63eb6f3eeb1 +voltage 27b91c2694de14bce1ed26048502503e66dea730 +security-testing c151694b2c48d956ac8c8c59c6927f89cc29ef70 +selinux c900ff323d761753a56d8d6a67b034ceee277b6e +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 5c7e18a380f20a616715509b7044d8eb7ec0a54d +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 2fe9723df8e45fd247782adea244a5e653c30bf4 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd a49fb4c3d035ab516507b31ec3bd49263caee14d +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +nommu 4bbba111d94781d34081c37856bbc5eb33f6c72a +trivial 99759619b27662d1290901228d77a293e6e83200 +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend 7e5f823fbcecc4f4c8ff296531e697494bcc9a80 +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree a7006c9747ef225ab070d96c054e85682a09a13e +spi 568a60eda2e90a11bb3d7f8ef3f6800e9b60d4e5 +tip 67ad5758b326927f8a501edd7c33c2167b64d903 +rcu 8884de627eaa697101535d7d3fbe4ed7acb499e8 +oprofile 855f905a48cf6798c7c65ab5a04f2ac172c168d9 +xen-two 9d93c77a680c24891c673ba60b036637e8c1cf60 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +edac-amd c6e0765687c100f13ac5973e691c3811dc64c346 +percpu ac24307b6910e7286910c1f227bd7951b87a3bae +workqueues 24d51add7438f9696a7205927bf9de3c5c787a58 +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 bd1573a5546b4351b5d042f1e4cd631ea67cc6b0 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 4bbba111d94781d34081c37856bbc5eb33f6c72a +tty 4bbba111d94781d34081c37856bbc5eb33f6c72a +usb 6c5103890057b1bb781b26b7aae38d33e4c517d8 +staging 4bbba111d94781d34081c37856bbc5eb33f6c72a +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..f24001bb7239 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,186 @@ +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 +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 +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..39cf478215d3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1615 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 16c29da Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 +Merging origin/master +$ git merge origin/master +Updating 16c29da..036a982 +Fast-forward + .../ABI/testing/sysfs-bus-pci-devices-cciss | 12 + + Documentation/DocBook/Makefile | 1 - + Documentation/DocBook/rapidio.tmpl | 1 - + Documentation/development-process/1.Intro | 18 +- + Documentation/development-process/2.Process | 177 +- + Documentation/development-process/3.Early-stage | 31 +- + Documentation/development-process/4.Coding | 21 +- + Documentation/development-process/5.Posting | 28 +- + Documentation/development-process/6.Followthrough | 16 +- + Documentation/development-process/7.AdvancedTopics | 4 +- + Documentation/dynamic-debug-howto.txt | 4 +- + Documentation/hwmon/f71882fg | 19 + + MAINTAINERS | 5 +- + arch/arm/mach-omap2/board-omap4panda.c | 28 - + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/gpmc.c | 13 +- + arch/arm/mach-omap2/omap_l3_smx.c | 11 +- + arch/arm/mach-ux500/board-mop500-regulators.h | 2 + + arch/arm/mach-ux500/board-mop500.c | 1 + + arch/arm/plat-omap/include/plat/irqs.h | 2 +- + arch/arm/plat-omap/include/plat/onenand.h | 1 + + arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 2 +- + arch/cris/Kconfig | 1 - + arch/cris/arch-v10/drivers/axisflashmap.c | 6 - + arch/cris/arch-v32/drivers/Kconfig | 1 - + arch/cris/arch-v32/drivers/axisflashmap.c | 6 - + arch/score/Kconfig | 2 + + arch/score/include/asm/irqflags.h | 2 +- + arch/score/kernel/irq.c | 53 +- + arch/tile/Kconfig | 1 + + arch/tile/kernel/irq.c | 45 +- + arch/x86/crypto/aesni-intel_asm.S | 5 +- + arch/x86/crypto/aesni-intel_glue.c | 14 +- + arch/x86/include/asm/percpu.h | 10 +- + arch/x86/lib/cmpxchg16b_emu.S | 14 +- + arch/x86/platform/olpc/olpc-xo1.c | 23 +- + drivers/acpi/video.c | 6 - + drivers/block/cciss.c | 86 +- + drivers/block/cciss.h | 1 + + drivers/block/cciss_cmd.h | 1 + + drivers/block/cciss_scsi.c | 13 +- + drivers/block/drbd/drbd_actlog.c | 335 +-- + drivers/block/drbd/drbd_bitmap.c | 750 ++++-- + drivers/block/drbd/drbd_int.h | 270 ++- + drivers/block/drbd/drbd_main.c | 673 ++++-- + drivers/block/drbd/drbd_nl.c | 183 +- + drivers/block/drbd/drbd_proc.c | 114 +- + drivers/block/drbd/drbd_receiver.c | 608 +++-- + drivers/block/drbd/drbd_req.c | 169 +- + drivers/block/drbd/drbd_req.h | 36 +- + drivers/block/drbd/drbd_strings.c | 6 +- + drivers/block/drbd/drbd_worker.c | 360 ++-- + drivers/block/drbd/drbd_wrappers.h | 2 +- + drivers/dma/ipu/ipu_irq.c | 58 +- + drivers/hwmon/Kconfig | 17 +- + drivers/hwmon/f71882fg.c | 126 +- + drivers/hwmon/pmbus_core.c | 70 +- + drivers/hwspinlock/Kconfig | 1 + + drivers/ide/ide-io.c | 12 +- + drivers/mfd/88pm860x-core.c | 11 +- + drivers/mfd/Kconfig | 3 +- + drivers/mfd/Makefile | 2 +- + drivers/mfd/ab3550-core.c | 12 +- + drivers/mfd/ab8500-core.c | 12 +- + drivers/mfd/asic3.c | 38 +- + drivers/mfd/cs5535-mfd.c | 16 + + drivers/mfd/ezx-pcap.c | 34 +- + drivers/mfd/htc-egpio.c | 23 +- + drivers/mfd/htc-i2cpld.c | 33 +- + drivers/mfd/jz4740-adc.c | 16 +- + drivers/mfd/max8925-core.c | 10 +- + drivers/mfd/max8997-irq.c | 377 +++ + drivers/mfd/max8998-irq.c | 8 +- + drivers/mfd/max8998.c | 4 +- + drivers/mfd/mfd-core.c | 53 +- + drivers/mfd/pcf50633-core.c | 2 +- + drivers/mfd/rdc321x-southbridge.c | 1 + + drivers/mfd/stmpe.c | 12 +- + drivers/mfd/t7l66xb.c | 21 +- + drivers/mfd/tc3589x.c | 12 +- + drivers/mfd/tc6393xb.c | 21 +- + drivers/mfd/tps6586x.c | 6 +- + drivers/mfd/twl4030-irq.c | 66 +- + drivers/mfd/twl6030-irq.c | 25 +- + drivers/mfd/wl1273-core.c | 2 +- + drivers/mfd/wm831x-irq.c | 8 +- + drivers/mfd/wm8350-irq.c | 8 +- + drivers/mfd/wm8994-irq.c | 8 +- + drivers/mtd/Kconfig | 18 +- + drivers/mtd/Makefile | 4 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 2 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 3 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 2 +- + drivers/mtd/devices/m25p80.c | 5 +- + drivers/mtd/devices/mtdram.c | 1 + + drivers/mtd/devices/phram.c | 3 + + drivers/mtd/maps/Kconfig | 13 +- + drivers/mtd/maps/Makefile | 1 + + drivers/mtd/maps/ceiva.c | 6 - + drivers/mtd/maps/integrator-flash.c | 10 - + drivers/mtd/maps/latch-addr-flash.c | 272 ++ + drivers/mtd/maps/physmap.c | 8 - + drivers/mtd/maps/physmap_of.c | 8 - + drivers/mtd/maps/sa1100-flash.c | 8 - + drivers/mtd/maps/ts5500_flash.c | 1 - + drivers/mtd/mtd_blkdevs.c | 42 +- + drivers/mtd/mtdconcat.c | 8 +- + drivers/mtd/mtdcore.c | 6 +- + drivers/mtd/mtdswap.c | 1587 ++++++++++++ + drivers/mtd/nand/Kconfig | 15 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/atmel_nand.c | 166 ++- + drivers/mtd/nand/davinci_nand.c | 3 - + drivers/mtd/nand/mpc5121_nfc.c | 5 +- + drivers/mtd/nand/mxc_nand.c | 31 +- + drivers/mtd/nand/nand_base.c | 42 +- + drivers/mtd/nand/nand_bbt.c | 8 +- + drivers/mtd/nand/nand_bch.c | 243 ++ + drivers/mtd/nand/nandsim.c | 43 +- + drivers/mtd/nand/omap2.c | 16 +- + drivers/mtd/nand/pxa3xx_nand.c | 977 ++++---- + drivers/mtd/onenand/omap2.c | 7 +- + drivers/mtd/onenand/onenand_base.c | 15 +- + drivers/mtd/sm_ftl.c | 18 + + drivers/mtd/tests/mtd_speedtest.c | 80 +- + drivers/mtd/tests/mtd_subpagetest.c | 10 +- + drivers/regulator/Kconfig | 2 +- + drivers/regulator/ab3100.c | 51 +- + drivers/regulator/ab8500.c | 270 ++- + drivers/regulator/core.c | 116 +- + drivers/regulator/max8997.c | 1 + + drivers/regulator/max8998.c | 1 + + drivers/regulator/tps6524x-regulator.c | 2 +- + drivers/regulator/wm831x-dcdc.c | 32 +- + drivers/regulator/wm831x-isink.c | 8 +- + drivers/regulator/wm831x-ldo.c | 17 +- + .../westbridge/astoria/block/cyasblkdev_block.c | 2 +- + fs/inode.c | 2 +- + fs/jffs2/xattr.c | 2 +- + fs/nfs/namespace.c | 4 +- + fs/nfs/pagelist.c | 4 +- + fs/nfs/write.c | 13 +- + fs/ocfs2/acl.c | 1 - + fs/ocfs2/alloc.c | 214 +- + fs/ocfs2/aops.c | 82 +- + fs/ocfs2/buffer_head_io.c | 49 +- + fs/ocfs2/cluster/heartbeat.c | 3 - + fs/ocfs2/cluster/masklog.c | 20 +- + fs/ocfs2/cluster/masklog.h | 105 +- + fs/ocfs2/cluster/tcp.c | 10 +- + fs/ocfs2/dcache.c | 45 +- + fs/ocfs2/dir.c | 121 +- + fs/ocfs2/dlm/dlmconvert.c | 6 +- + fs/ocfs2/dlm/dlmdomain.c | 36 +- + fs/ocfs2/dlm/dlmlock.c | 10 +- + fs/ocfs2/dlm/dlmmaster.c | 6 +- + fs/ocfs2/dlm/dlmrecovery.c | 9 +- + fs/ocfs2/dlm/dlmunlock.c | 4 +- + fs/ocfs2/dlmglue.c | 246 +-- + fs/ocfs2/export.c | 47 +- + fs/ocfs2/extent_map.c | 10 +- + fs/ocfs2/file.c | 220 +- + fs/ocfs2/heartbeat.c | 4 +- + fs/ocfs2/inode.c | 134 +- + fs/ocfs2/ioctl.c | 41 +- + fs/ocfs2/journal.c | 168 +- + fs/ocfs2/localalloc.c | 109 +- + fs/ocfs2/locks.c | 1 - + fs/ocfs2/mmap.c | 7 +- + fs/ocfs2/namei.c | 175 +- + fs/ocfs2/ocfs2.h | 23 +- + fs/ocfs2/ocfs2_trace.h | 2739 ++++++++++++++++++++ + fs/ocfs2/quota_global.c | 45 +- + fs/ocfs2/quota_local.c | 16 +- + fs/ocfs2/refcounttree.c | 158 +- + fs/ocfs2/reservations.c | 57 +- + fs/ocfs2/resize.c | 23 +- + fs/ocfs2/slot_map.c | 16 +- + fs/ocfs2/suballoc.c | 189 +- + fs/ocfs2/super.c | 89 +- + fs/ocfs2/symlink.c | 14 +- + fs/ocfs2/sysfile.c | 1 - + fs/ocfs2/uptodate.c | 73 +- + fs/ocfs2/xattr.c | 155 +- + fs/proc/task_mmu.c | 3 +- + include/linux/bch.h | 79 + + include/linux/drbd.h | 23 +- + include/linux/drbd_limits.h | 12 +- + include/linux/drbd_nl.h | 13 +- + include/linux/drbd_tag_magic.h | 1 + + include/linux/mfd/ab8500.h | 6 + + include/linux/mfd/core.h | 27 +- + include/linux/mfd/max8997-private.h | 21 + + include/linux/mfd/max8997.h | 7 +- + include/linux/mtd/blktrans.h | 3 + + include/linux/mtd/cfi.h | 1 + + include/linux/mtd/latch-addr-flash.h | 29 + + include/linux/mtd/nand.h | 3 + + include/linux/mtd/nand_bch.h | 72 + + include/linux/mtd/onenand.h | 1 + + include/linux/nfs_page.h | 1 - + include/linux/regulator/ab8500.h | 51 +- + include/linux/regulator/consumer.h | 2 + + include/linux/regulator/driver.h | 11 +- + include/linux/regulator/machine.h | 1 + + include/sound/pcm.h | 4 +- + ipc/util.c | 4 +- + lib/Kconfig | 39 + + lib/Makefile | 1 + + lib/bch.c | 1368 ++++++++++ + mm/memory.c | 2 +- + net/sunrpc/sched.c | 4 +- + sound/core/init.c | 4 + + sound/core/pcm_native.c | 9 - + sound/oss/dev_table.h | 2 +- + sound/oss/midi_synth.c | 30 +- + sound/oss/midi_synth.h | 2 +- + sound/oss/opl3.c | 23 +- + sound/oss/sequencer.c | 2 +- + sound/pci/asihpi/asihpi.c | 137 +- + sound/pci/hda/patch_analog.c | 89 + + sound/pci/hda/patch_realtek.c | 2 +- + sound/usb/quirks-table.h | 40 + + 223 files changed, 12577 insertions(+), 4571 deletions(-) + create mode 100644 drivers/mfd/max8997-irq.c + create mode 100644 drivers/mtd/maps/latch-addr-flash.c + create mode 100644 drivers/mtd/mtdswap.c + create mode 100644 drivers/mtd/nand/nand_bch.c + create mode 100644 fs/ocfs2/ocfs2_trace.h + create mode 100644 include/linux/bch.h + create mode 100644 include/linux/mtd/latch-addr-flash.h + create mode 100644 include/linux/mtd/nand_bch.h + create mode 100644 lib/bch.c +Merging fixes/fixes +$ git merge fixes/fixes +Updating 036a982..837d80b +Fast-forward + drivers/memstick/host/r592.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +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 +Already up-to-date. +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. + net/ipv4/fib_trie.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 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 +Merge made by recursive. + drivers/bluetooth/btusb.c | 6 +++++- + drivers/net/wireless/ath/ath9k/main.c | 4 ++++ + 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 +++++++++++++++++++++---------- + 12 files changed, 75 insertions(+), 28 deletions(-) +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/tablet/wacom_wac.c | 287 ++++++++++++++++++---------- + drivers/input/tablet/wacom_wac.h | 2 + + drivers/input/touchscreen/h3600_ts_input.c | 2 +- + 3 files changed, 190 insertions(+), 101 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 +Merge made by recursive. + drivers/video/via/chip.h | 1 - + drivers/video/via/hw.c | 17 ++++------ + drivers/video/via/hw.h | 3 +- + drivers/video/via/viafbdev.c | 74 +++++++++++++++++++++-------------------- + 4 files changed, 46 insertions(+), 49 deletions(-) +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging spi-current/spi/merge +$ git merge spi-current/spi/merge +Already up-to-date. +Merging arm/for-next +$ git merge arm/for-next +Merge made by recursive. + arch/arm/Kconfig | 1 + + arch/arm/boot/compressed/head.S | 10 +-- + arch/arm/boot/compressed/misc.c | 12 +-- + arch/arm/include/asm/mach/udc_pxa2xx.h | 2 - + arch/arm/kernel/bios32.c | 25 ---- + arch/arm/kernel/debug.S | 19 +--- + arch/arm/kernel/etm.c | 4 +- + arch/arm/kernel/kprobes-decode.c | 10 +- + arch/arm/kernel/perf_event.c | 33 ++++-- + arch/arm/kernel/perf_event_v6.c | 2 +- + arch/arm/kernel/perf_event_v7.c | 26 +++- + arch/arm/kernel/perf_event_xscale.c | 4 +- + arch/arm/kernel/sleep.S | 14 ++- + arch/arm/mach-dove/include/mach/dove.h | 2 +- + arch/arm/mach-dove/mpp.c | 3 - + arch/arm/mach-imx/Kconfig | 1 + + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +- + arch/arm/mach-kirkwood/sheevaplug-setup.c | 7 + + arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 14 ++- + arch/arm/mach-mx3/mach-pcm043.c | 12 ++- + arch/arm/mach-mx5/Kconfig | 1 + + arch/arm/mach-mx5/Makefile | 2 +- + arch/arm/mach-mx5/board-mx51_babbage.c | 5 +- + arch/arm/mach-mx5/board-mx53_evk.c | 9 +- + arch/arm/mach-mx5/board-mx53_loco.c | 25 ++++ + arch/arm/mach-mx5/clock-mx51-mx53.c | 9 ++ + arch/arm/mach-mx5/cpu.c | 59 ++++++++++ + arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 4 + + arch/arm/mach-mx5/mx51_efika.c | 7 +- + arch/arm/mach-mx5/system.c | 84 ++++++++++++++ + arch/arm/mach-mxs/Kconfig | 2 + + arch/arm/mach-mxs/clock-mx23.c | 15 +++ + arch/arm/mach-mxs/clock-mx28.c | 18 +++ + arch/arm/mach-mxs/devices-mx23.h | 4 + + arch/arm/mach-mxs/devices-mx28.h | 4 + + arch/arm/mach-mxs/devices/Kconfig | 3 + + arch/arm/mach-mxs/devices/Makefile | 1 + + arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 73 ++++++++++++ + arch/arm/mach-mxs/include/mach/devices-common.h | 13 ++ + arch/arm/mach-mxs/mach-mx23evk.c | 44 ++++++++ + arch/arm/mach-mxs/mach-mx28evk.c | 89 +++++++++++++++ + arch/arm/mach-mxs/module-tx28.c | 41 ++++++- + arch/arm/mach-mxs/module-tx28.h | 1 + + arch/arm/mach-orion5x/ts78xx-setup.c | 18 ++-- + arch/arm/mach-pxa/am200epd.c | 8 +- + arch/arm/mach-pxa/am300epd.c | 13 +- + arch/arm/mach-pxa/balloon3.c | 2 +- + arch/arm/mach-pxa/cm-x2xx.c | 2 +- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 2 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 2 +- + arch/arm/mach-pxa/corgi.c | 1 - + arch/arm/mach-pxa/devices.c | 9 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/eseries.c | 36 +++++-- + arch/arm/mach-pxa/ezx.c | 12 +- + arch/arm/mach-pxa/gumstix.c | 13 ++- + arch/arm/mach-pxa/idp.c | 2 +- + arch/arm/mach-pxa/include/mach/palmz72.h | 5 + + arch/arm/mach-pxa/include/mach/pxafb.h | 4 +- + arch/arm/mach-pxa/include/mach/z2.h | 3 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/lpd270.c | 2 +- + arch/arm/mach-pxa/lubbock.c | 2 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/palm27x.c | 5 +- + arch/arm/mach-pxa/palmtc.c | 2 +- + arch/arm/mach-pxa/palmte2.c | 33 ++---- + arch/arm/mach-pxa/palmz72.c | 127 +++++++++++++++++++++ + arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- + arch/arm/mach-pxa/poodle.c | 3 +- + arch/arm/mach-pxa/raumfeld.c | 2 +- + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/spitz.c | 2 +- + arch/arm/mach-pxa/tavorevb.c | 2 +- + arch/arm/mach-pxa/time.c | 5 +- + arch/arm/mach-pxa/tosa.c | 13 ++- + arch/arm/mach-pxa/trizeps4.c | 4 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-pxa/vpac270.c | 2 +- + arch/arm/mach-pxa/z2.c | 77 +++++++------- + arch/arm/mach-pxa/zeus.c | 2 +- + arch/arm/mach-pxa/zylonite.c | 4 +- + arch/arm/mach-realview/realview_eb.c | 2 +- + arch/arm/plat-mxc/devices/platform-fec.c | 2 +- + arch/arm/plat-mxc/devices/platform-imxdi_rtc.c | 2 +- + arch/arm/plat-mxc/include/mach/audmux.h | 10 ++- + arch/arm/plat-mxc/include/mach/iomux-mx2x.h | 12 +- + arch/arm/plat-mxc/include/mach/mx50.h | 4 + + arch/arm/plat-mxc/include/mach/mx51.h | 1 + + arch/arm/plat-mxc/include/mach/mxc.h | 23 ++++ + arch/arm/plat-mxc/include/mach/system.h | 6 +- + arch/arm/plat-mxc/time.c | 25 ++++- + drivers/ata/pata_palmld.c | 43 ++++---- + drivers/pcmcia/pxa2xx_colibri.c | 133 ++++++++-------------- + drivers/pcmcia/pxa2xx_palmld.c | 42 ++------ + drivers/pcmcia/pxa2xx_palmtc.c | 75 ++---------- + drivers/pcmcia/pxa2xx_palmtx.c | 57 ++-------- + drivers/pcmcia/pxa2xx_vpac270.c | 110 +++++------------- + drivers/usb/gadget/pxa25x_udc.c | 76 +------------ + drivers/video/pxafb.c | 136 +++++++++++++++-------- + drivers/video/pxafb.h | 3 +- + 104 files changed, 1201 insertions(+), 720 deletions(-) + create mode 100644 arch/arm/mach-mx5/system.c + create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-mmc.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Recorded preimage for 'arch/arm/mach-mxs/mach-mx28evk.c' +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 +Recorded resolution for 'arch/arm/mach-mxs/mach-mx28evk.c'. +[master 48462e1] 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 +Already up-to-date. +Merging tegra/for-next +$ git merge tegra/for-next +Already up-to-date. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Resolved 'arch/arm/configs/u8500_defconfig' using previous resolution. +Resolved 'arch/arm/plat-nomadik/gpio.c' using previous resolution. +Auto-merging arch/arm/configs/u8500_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/u8500_defconfig +Auto-merging arch/arm/plat-nomadik/gpio.c +CONFLICT (content): Merge conflict in arch/arm/plat-nomadik/gpio.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5e02026] Merge remote-tracking branch 'ux500-core/ux500-core' +$ git diff -M --stat --summary HEAD^.. + arch/arm/configs/u8500_defconfig | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Merge made by recursive. + arch/blackfin/configs/BF527-AD7160-EVAL_defconfig | 1 - + arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - + arch/blackfin/configs/BlackStamp_defconfig | 1 + + arch/blackfin/configs/CM-BF527_defconfig | 1 - + arch/blackfin/configs/CM-BF533_defconfig | 1 - + arch/blackfin/configs/CM-BF548_defconfig | 1 - + arch/blackfin/configs/DNP5370_defconfig | 1 - + arch/blackfin/configs/H8606_defconfig | 1 + + arch/blackfin/configs/SRV1_defconfig | 1 + + arch/blackfin/include/asm/bitops.h | 4 +- + arch/blackfin/kernel/module.c | 45 ++++++++------------ + 12 files changed, 24 insertions(+), 35 deletions(-) +Merging cris/for-next +$ git merge cris/for-next +Auto-merging arch/cris/Kconfig +Removing arch/cris/arch-v32/drivers/pcf8563.c +Merge made by recursive. + arch/cris/Kconfig | 3 +- + arch/cris/arch-v10/drivers/pcf8563.c | 2 +- + arch/cris/arch-v10/kernel/signal.c | 2 +- + arch/cris/arch-v32/drivers/Makefile | 1 - + arch/cris/arch-v32/drivers/pcf8563.c | 377 ---------------------------------- + 5 files changed, 3 insertions(+), 382 deletions(-) + delete mode 100644 arch/cris/arch-v32/drivers/pcf8563.c +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 +Merge made by recursive. + arch/m68k/kernel/irq.c | 2 +- + arch/m68k/platform/5249/intc2.c | 4 ++-- + arch/m68k/platform/5272/intc.c | 12 ++++++------ + arch/m68k/platform/68328/ints.c | 4 ++-- + arch/m68k/platform/68360/ints.c | 4 ++-- + arch/m68k/platform/coldfire/intc-2.c | 10 +++++----- + arch/m68k/platform/coldfire/intc-simr.c | 10 +++++----- + arch/m68k/platform/coldfire/intc.c | 6 +++--- + 8 files changed, 26 insertions(+), 26 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +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 +Already up-to-date. +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 +Already up-to-date. +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 37371e4] 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 +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 | 65 +- + 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 +- + 48 files changed, 9702 insertions(+), 1532 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 +Merge made by recursive. + fs/ecryptfs/crypto.c | 23 ++++- + fs/ecryptfs/ecryptfs_kernel.h | 32 +++--- + fs/ecryptfs/file.c | 12 ++- + fs/ecryptfs/inode.c | 42 +------ + fs/ecryptfs/keystore.c | 272 ++++++++++++++++++++++++++--------------- + fs/ecryptfs/main.c | 10 +- + fs/ecryptfs/mmap.c | 61 +++++---- + fs/ecryptfs/read_write.c | 12 +-- + fs/ecryptfs/super.c | 3 +- + 9 files changed, 263 insertions(+), 204 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +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 +Already up-to-date. +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 f924f71] 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 +Auto-merging fs/nilfs2/inode.c +Merge made by recursive. + fs/nilfs2/inode.c | 3 +-- + fs/nilfs2/nilfs.h | 14 +++++++------- + fs/nilfs2/segment.c | 6 ++---- + 3 files changed, 10 insertions(+), 13 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 +Resolved 'fs/xfs/linux-2.6/xfs_buf.c' using previous resolution. +Auto-merging fs/xfs/linux-2.6/xfs_buf.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_buf.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1f63034] Merge remote-tracking branch 'xfs/master' +$ git diff -M --stat --summary HEAD^.. + fs/xfs/linux-2.6/xfs_buf.c | 356 +++++++++++------------------------------- + fs/xfs/linux-2.6/xfs_buf.h | 40 +----- + fs/xfs/linux-2.6/xfs_file.c | 6 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 4 + + fs/xfs/linux-2.6/xfs_super.c | 36 +++-- + fs/xfs/linux-2.6/xfs_sync.c | 30 ++++- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_inode_item.c | 6 +- + fs/xfs/xfs_trans_buf.c | 3 +- + fs/xfs/xfs_vnodeops.c | 3 +- + fs/xfs/xfs_vnodeops.h | 1 + + 11 files changed, 167 insertions(+), 320 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at f6dbbcf Merge remote-tracking branch 'nilfs2/for-next' +Merging refs/next/20110325/xfs +$ git merge refs/next/20110325/xfs +Already up-to-date. +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 +Already up-to-date. +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Recorded preimage for 'arch/arm/mach-pxa/tosa.c' +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 +Recorded resolution for 'arch/arm/mach-pxa/tosa.c'. +[master 63fcd82] 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 +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. +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 +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/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/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 ++++++++++++++------ + 26 files changed, 162 insertions(+), 93 deletions(-) +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 +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 247482b] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. +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 +Already up-to-date. +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 +Already up-to-date. +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. + virt/kvm/eventfd.c | 2 +- + virt/kvm/kvm_main.c | 23 +++++++++++++++++++++-- + 2 files changed, 22 insertions(+), 3 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 +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +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/hidp/core.c +Auto-merging net/bluetooth/hidp/hidp.h +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/mgmt.c +Merge made by recursive. + include/net/bluetooth/hci.h | 32 +++++- + include/net/bluetooth/hci_core.h | 21 +++- + include/net/bluetooth/l2cap.h | 1 - + 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 | 3 +- + net/bluetooth/mgmt.c | 252 ++++++++++++++++++++++++++++++++++++- + 18 files changed, 600 insertions(+), 145 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 +Merge made by recursive. + include/sound/soc-dapm.h | 16 ++++++++-------- + 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 --- + 6 files changed, 56 insertions(+), 29 deletions(-) +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Already up-to-date. +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 +Already up-to-date! +Merge made by recursive. +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 5c29dce] 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 +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mmc/host/sh_mobile_sdhi.c +Merge made by recursive. + arch/arm/mach-shmobile/board-ap4evb.c | 6 +- + arch/arm/mach-shmobile/board-g4evm.c | 6 +- + arch/arm/mach-shmobile/board-mackerel.c | 8 +- + arch/sh/boards/mach-ap325rxa/setup.c | 6 +- + arch/sh/boards/mach-ecovec24/setup.c | 12 +- + arch/sh/boards/mach-kfr2r09/setup.c | 4 +- + arch/sh/boards/mach-migor/setup.c | 4 +- + arch/sh/boards/mach-se/7724/setup.c | 6 +- + drivers/mfd/Kconfig | 14 - + drivers/mfd/Makefile | 1 - + drivers/mmc/card/mmc_test.c | 3 +- + drivers/mmc/core/sd_ops.c | 14 +- + drivers/mmc/host/Kconfig | 14 +- + drivers/mmc/host/Makefile | 8 +- + drivers/mmc/host/dw_mmc.c | 4 +- + drivers/mmc/host/mmci.c | 13 +- + drivers/mmc/host/of_mmc_spi.c | 2 + + drivers/mmc/host/sdhci-esdhc-imx.c | 86 ++- + drivers/mmc/host/sdhci-esdhc.h | 3 +- + drivers/mmc/host/sdhci-of-esdhc.c | 3 +- + drivers/mmc/host/sdhci-pci.c | 6 +- + drivers/mmc/host/sdhci-pltfm.h | 2 +- + drivers/mmc/host/sdhci.h | 1 + + drivers/{mfd => mmc/host}/sh_mobile_sdhi.c | 95 +-- + drivers/mmc/host/tmio_mmc.c | 1285 +-------------------------- + drivers/mmc/host/tmio_mmc.h | 123 +++ + drivers/mmc/host/tmio_mmc_dma.c | 317 +++++++ + drivers/mmc/host/tmio_mmc_pio.c | 897 +++++++++++++++++++ + drivers/mmc/host/via-sdmmc.c | 5 +- + include/linux/{mfd => mmc}/sh_mobile_sdhi.h | 0 + include/linux/mmc/tmio.h | 63 ++ + 31 files changed, 1615 insertions(+), 1396 deletions(-) + rename drivers/{mfd => mmc/host}/sh_mobile_sdhi.c (63%) + create mode 100644 drivers/mmc/host/tmio_mmc.h + create mode 100644 drivers/mmc/host/tmio_mmc_dma.c + create mode 100644 drivers/mmc/host/tmio_mmc_pio.c + rename include/linux/{mfd => mmc}/sh_mobile_sdhi.h (100%) + create mode 100644 include/linux/mmc/tmio.h +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 +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging selinux/master +$ git merge selinux/master +Merge made by recursive. + security/selinux/include/security.h | 3 ++- + security/selinux/ss/policydb.c | 25 +++++++++++++++++++++++-- + security/selinux/ss/policydb.h | 3 ++- + security/selinux/ss/services.c | 20 +++++++++----------- + 4 files changed, 36 insertions(+), 15 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 +Auto-merging drivers/watchdog/max63xx_wdt.c +Auto-merging drivers/watchdog/nv_tco.c +Auto-merging drivers/watchdog/pnx4008_wdt.c +Auto-merging drivers/watchdog/s3c2410_wdt.c +Auto-merging drivers/watchdog/sp5100_tco.c +Merge made by recursive. + drivers/watchdog/davinci_wdt.c | 22 ++++++++++------------ + drivers/watchdog/max63xx_wdt.c | 20 ++++++++------------ + drivers/watchdog/nv_tco.c | 2 +- + drivers/watchdog/pnx4008_wdt.c | 28 +++++++++++++--------------- + drivers/watchdog/s3c2410_wdt.c | 19 ++++++++----------- + drivers/watchdog/sp5100_tco.c | 16 ++++++++++++++-- + 6 files changed, 54 insertions(+), 53 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 +Already up-to-date. +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Merge made by recursive. + arch/x86/power/Makefile | 3 ++- + include/linux/suspend.h | 15 +++++---------- + kernel/power/Kconfig | 4 ++++ + kernel/power/Makefile | 4 ++-- + kernel/power/main.c | 2 +- + kernel/power/power.h | 6 +++--- + 6 files changed, 17 insertions(+), 17 deletions(-) +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 35b71ef] 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 +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/probe_roms.c +Merge made by recursive. + arch/x86/Kconfig | 2 +- + 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/head32.c | 1 - + arch/x86/kernel/mpparse.c | 4 +- + arch/x86/kernel/{probe_roms_32.c => probe_roms.c} | 101 +++++++++++++++++++++ + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/platform/olpc/Makefile | 4 +- + arch/x86/platform/olpc/olpc.c | 51 ++++++----- + arch/x86/platform/olpc/olpc_dt.c | 19 ++++ + 13 files changed, 177 insertions(+), 46 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 +Auto-merging arch/x86/oprofile/nmi_int.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 +- + arch/x86/oprofile/nmi_int.c | 5 +++++ + arch/x86/oprofile/op_counter.h | 1 + + 15 files changed, 19 insertions(+), 34 deletions(-) +Merging xen-two/linux-next +$ git merge xen-two/linux-next +Merge made by recursive. +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 +Resolved 'include/linux/pci_ids.h' using previous resolution. +Auto-merging include/linux/pci_ids.h +CONFLICT (content): Merge conflict in include/linux/pci_ids.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bb8f66c] Merge remote-tracking branch 'edac-amd/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging percpu/for-next +$ git merge percpu/for-next +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 +Already up-to-date. +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 +Removing Documentation/ABI/testing/sysfs-platform-eeepc-wmi +Auto-merging MAINTAINERS +Merge made by recursive. + .../ABI/testing/sysfs-driver-samsung-laptop | 19 + + Documentation/ABI/testing/sysfs-platform-asus-wmi | 31 + + Documentation/ABI/testing/sysfs-platform-eeepc-wmi | 10 - + Documentation/laptops/sony-laptop.txt | 37 +- + MAINTAINERS | 30 +- + drivers/platform/x86/Kconfig | 90 +- + drivers/platform/x86/Makefile | 9 +- + drivers/platform/x86/acer-wmi.c | 127 +- + drivers/platform/x86/asus-laptop.c | 182 +-- + drivers/platform/x86/asus-nb-wmi.c | 98 ++ + drivers/platform/x86/asus-wmi.c | 1656 ++++++++++++++++++++ + drivers/platform/x86/asus-wmi.h | 58 + + drivers/platform/x86/compal-laptop.c | 8 +- + drivers/platform/x86/dell-wmi-aio.c | 171 ++ + drivers/platform/x86/eeepc-laptop.c | 2 +- + drivers/platform/x86/eeepc-wmi.c | 912 +---------- + drivers/platform/x86/hp-wmi.c | 312 ++++- + drivers/platform/x86/ideapad-laptop.c | 2 + + drivers/platform/x86/intel_ips.c | 2 +- + drivers/platform/x86/intel_mid_powerbtn.c | 148 ++ + drivers/platform/x86/intel_mid_thermal.c | 576 +++++++ + drivers/platform/x86/intel_rar_register.c | 2 +- + drivers/platform/x86/intel_scu_ipc.c | 2 +- + drivers/platform/x86/msi-laptop.c | 95 +- + drivers/platform/x86/samsung-laptop.c | 832 ++++++++++ + drivers/platform/x86/sony-laptop.c | 501 +++++-- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/xo15-ebook.c | 180 +++ + include/linux/input.h | 7 + + include/linux/sonypi.h | 1 + + 30 files changed, 4845 insertions(+), 1259 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-samsung-laptop + create mode 100644 Documentation/ABI/testing/sysfs-platform-asus-wmi + delete mode 100644 Documentation/ABI/testing/sysfs-platform-eeepc-wmi + create mode 100644 drivers/platform/x86/asus-nb-wmi.c + create mode 100644 drivers/platform/x86/asus-wmi.c + create mode 100644 drivers/platform/x86/asus-wmi.h + create mode 100644 drivers/platform/x86/dell-wmi-aio.c + create mode 100644 drivers/platform/x86/intel_mid_powerbtn.c + create mode 100644 drivers/platform/x86/intel_mid_thermal.c + create mode 100644 drivers/platform/x86/samsung-laptop.c + create mode 100644 drivers/platform/x86/xo15-ebook.c +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 55370d9] 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..22726435bf61 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,26 @@ +Importing i2c based on 2.6.38-git17 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 2.6.38-git17 +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 <randy.dunlap@oracle.com> --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 +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/kernel-doc +From ../quilt-tmp + + a8a6ee0...0600ac0 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..56d3d2540c12 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20110329 |