diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-04-23 14:51:55 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-04-23 14:51:55 +1000 |
| commit | 3dd41f824da01d2ea5258dad0c9108d18da0b7ac (patch) | |
| tree | 78528b1b18ef32360947c5860801e911649190a1 | |
| parent | 3701e0a815a47cb1ff0abf2b411d323498ee4cce (diff) | |
| download | linux-3dd41f824da01d2ea5258dad0c9108d18da0b7ac.tar.gz linux-3dd41f824da01d2ea5258dad0c9108d18da0b7ac.tar.xz | |
Add linux-next specific files for 20150423next-20150423
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 216 | ||||
| -rw-r--r-- | Next/Trees | 218 | ||||
| -rw-r--r-- | Next/merge.log | 3902 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4339 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..40aeb64e79ad --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,216 @@ +Name SHA1 +---- ---- +origin 27cf3a16b2535a490f8cf1d29a6634f1c70f7831 +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current c517d838eb7d07bbe9507871fab3931deccff539 +arc-current e4140819dadc3624accac8294881bca8a3cba4ed +arm-current 6c5c2a01fcfdb70f2e95e30e96ccf53b88e81023 +m68k-current b24f670b7f5b2058b95370caa9f104b3cefb9f1d +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge-mpe a7e73e711e48e138a25265c156cca9a1ed109b50 +powerpc-merge c517d838eb7d07bbe9507871fab3931deccff539 +sparc acc455cffa75070d55e74fc7802b49edbc080e92 +net 608404290e2d9d1756db4013c4ee12fa7617dad9 +ipsec 092a29a40bab8bb4530bb3e58a0597001cdecdef +sound-current 7d1b6e29327428993ba568bdd8c66734070f45e0 +pci-current 9fbbda5c8e0ab9c391e4160a0eb3a06260f9f668 +wireless-drivers 69628cd0652a091591ef44ac07c150063b789c4a +driver-core.current bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 +tty.current f22e6e847115abc3a0e2ad7bb18d243d42275af1 +usb.current f22e6e847115abc3a0e2ad7bb18d243d42275af1 +usb-gadget-fixes 65582a7f4ce5bd7a1fb61516d9c2476f4f166f4e +usb-serial-fixes 39a8804455fb23f09157341d3ba7db6d7ae6ee76 +staging.current f22e6e847115abc3a0e2ad7bb18d243d42275af1 +char-misc.current bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 +input-current 48853389f206b689260ddfd3006816779ca7a52a +crypto-current 3abafaf2192b1712079edfd4232b19877d6f41a5 +ide d681f1166919d6829083c069a83edcd59bfd5e34 +devicetree-current 41d9489319f28f06cf51731131bc353d5a6bce59 +rr-fixes f476893459318cb2eff3ecd2a05d4ceacf82e73e +vfio-fixes ec76f4007079469e86e2e44c3e5d1d11086de9d6 +kselftest-fixes 67d8712dcc70aa16d8e14a52eb73870e3cbddfc2 +drm-intel-fixes 39a8804455fb23f09157341d3ba7db6d7ae6ee76 +asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf +arc d8f6ad85cbb740b7e8ca5275b12838fab685540c +arm ddb4404765c808b0c1bd2505ede45c961e837f48 +arm-perf 39a8804455fb23f09157341d3ba7db6d7ae6ee76 +arm-soc 0f0175702e2e16f05577bf71aa70cf4409d6f0b4 +at91 d8a291a1177804af4ed05c790c02f228b8fbc23a +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +rpi 9a5a3543e1689a25fbb4f92e931c009aea881854 +berlin c517d838eb7d07bbe9507871fab3931deccff539 +cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290 +imx-mxs 33e156f34c269981fa0f782e6199b4ff48fba869 +keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917 +mvebu 02577ca1b7e4c25ededf2ca18d52ded8ab1fd59b +omap 23aa6c6f4bedf09008465638643476606f410dd1 +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +renesas 53a6e52502915f364c87d282b66402f2c333b083 +samsung 5d5443b9c3bac7231ae473c01bcfe4c7650b13c5 +sunxi 5a04c6a64b0142e8f47141ca2580aea1cd196e38 +tegra 47ee17a644f4a12af7620c4c14e3874476e4253c +arm64 6d1966dfd6e0ad2f8aa4b664ae1a62e33abe1998 +arm64-acpi 7676fa70feb2f3bcdd4b854a553a57d8ef8505aa +blackfin 275f5a8573e7832d0cf344a1b29da357c7038870 +c6x 3083ca2376a76072dc0071fb211de80b0ac44bd1 +cris d939b52abe0cee9cc3167f554da6b864db86d3f2 +hexagon 8914d7e857807e1e60975000cba3750c9b2643e8 +ia64 62f269ef819156889b121ae27998e928b784c219 +m68k b24f670b7f5b2058b95370caa9f104b3cefb9f1d +m68knommu 6e4206136faa9a4d588946dfa604e1d989a9b3b6 +metag 40346a0327fed526baeea701a707b65ceeea71ed +microblaze c2219eda547813c0c50dba90d9e989ae36cc3ab8 +mips 3e20a26b02bd4f24945c87407df51948dd488620 +nios2 4a89c3088ff61aa24754e9cd6dc665cc719f7efe +parisc-hd db4fd9c5d072a20ea6b7e40276a9822e04732610 +powerpc-mpe 2fe0753d49402aee325cc39c476b46fd51a8afec +powerpc 65e7bb2a34fe7b5fc3ae4532308150c600188118 +fsl d41444daba1fd65e5a998c83398f44524f638d07 +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 db86b54acc930556d6e411995d92e94be80da9f5 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 128f3cb9398b5eeb4ee04b60bd5e314f5c122821 +uml fe205bdd1321f95f8f3c35d243ea7cb22af8fbe1 +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 2ba9268dd603d23e17643437b2246acb6844953b +btrfs e082f56313f374d723b0366978ddb062c8fe79ea +ceph 84b54fefaa051ac625ada7740bb260a77c35b9b7 +cifs be4a8e38d68f71c5079ffaa55f0f623e0a64f6cf +ecryptfs 6d65261a09adaa374c05de807f73a144d783669e +ext3 3adc12e9648291149a1e3f354d0ad158fc2571e7 +ext4 6ddb2447846a8ece111e316a2863c2355023682d +f2fs 10027551ccf5459cc771c31ac8bc8e5cc8db45f8 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 94e4fe2cab3d43b3ba7c3f721743006a8c9d913a +gfs2 a31a0529efadd3caf60aaa295eb42688a6ccd7b7 +jfs 7d2ac45611b072a24e5014a56a65e6be31c1f884 +nfs 9eccca0843205f87c00404b663188b88eb248051 +nfsd bff175238a2416110e2258989c462234baeb5f46 +overlayfs 71cbad7e694ee81233b3be3a38b81c3d5872cc6f +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs f569d3ef8254d4b3b8daa4f131f9397d48bf296c +ubifs 502690674281a047abd45f81e64c498bc23a8bb3 +xfs 542c311813d5cb2e6f0dfa9557f41c829b8fb6a0 +file-locks 7505256626b0b3d11ea5a3ec1a89046d07c3c366 +net-next 04b7fe6a4a231871ef681bc95e08fe66992f7b1f +vfs 6d3b3d3367cb85b4b17d5bf4ae1ef13251bdc66b +pci 5468d5a64bf1e002e5081fa280186d0eba09fa0e +hid e7f236eb0af94052832468029f39d3656206e93f +i2c 64fb1d0e975e92e012802d371e417266d6531676 +jdelvare-hwmon 26bc420b59a38e4e6685a73345a0def461136dce +hwmon-staging f354169e0f7dcd1b2c82cf1f98f6d976e85f74c3 +v4l-dvb bfb4e26f253201aa4f63f13be9447116b3785194 +kbuild 1be735fc0329d08b1e9ba6eab79588cc02378c16 +kconfig bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +libata e0e2674b92056c24c69940d5f405ea4aef5e4010 +pm c72c2c92ac29cdca6b695a5d39679e234fcf0840 +idle 9d72137b19300c9a322282f079beb85d2e6d2597 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 75229df63655fefc8e970c4017ba4db0174ab000 +thermal-soc 62d0817a0acaeb0ed2a412bd243f9bd9012cc06a +ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma a49d0296b7261d4f2ea2c8687e8d4e2796797796 +ipsec-next 74005991b78a0a7a6546004fb37d33a651c613e7 +wireless-drivers-next f56d9e23b78e311fbd992a1bd80b8bf2adaee29b +bluetooth 35ef6e90d198628c8b863e3693a08a54f0b3685e +infiniband c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf +mtd 3e550d2396d9deef77328237ed992e19dcfefca5 +l2-mtd 81a1209c90914cbf5639a2bc9a325d9821f89faa +crypto b617b702da4e922277806f81c411d3051107d462 +drm cec32a47010647e8b0603726ebb75b990a4057a4 +drm-panel 1c550fa193d08920255240743f57731d4d57cd4d +drm-intel 37ef01ab5d24d1d520dc79f6a98099d451c2a901 +drm-tegra 535a65db484ff4e4654a037f2ea7e1ff21431b77 +drm-misc a3c6d686443e912e33cebdf9cd80f94df3ded7b0 +drm-exynos 3cf711584d3ec23f86cdbfb3a0be48efd8f2bf91 +drm-msm d5af49c92a8aff8236e7b0bb35e9af364000c017 +sound 7d1b6e29327428993ba568bdd8c66734070f45e0 +sound-asoc 1702c59fa76a200bb13dda9b48c489221915764e +modules 4a3893d069b788f3570c19c12d9e986e8e15870f +virtio 9abbfb486f5c254805bb6a3f263bc14d989eb90b +input c9eeb5084b27ffede2709e8775827729d0c7c46c +block 889fa31f00b218a2cef96c32a6b3f57e6d3bf918 +device-mapper 44c144f9c8e8fbd73ede2848da8253b3aae42ec2 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 96541bac0b4e62efa42e7900d9b32e6baa9a214c +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 9ffc8f7cb9647b13dfe4d1ad0d5e1427bb8b46d6 +mfd e554a99ee8d09132e80dc467433c9a4df9054645 +backlight b1f85c0fec20e6cde2a511345f24f6133f247e70 +battery 5939d9dfe4406a49d8688eb827d88abcaf233c42 +omap_dss2 72fc8b7187cd846be08d3bc0fec9380fdad29b45 +regulator 3c24567c65bf4111963e312585516d1111a03993 +security 5deeb5cece3f9b30c8129786726b9d02c412c8ca +integrity 7bea7ff67e0cbb30f53ebee7194e238491ddeaab +selinux cf7b6c0205f11cdb015384244c0b423b00e35c69 +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog fe92a2e3572742e6ff24bae0db00ccdc9bcff30f +iommu 7f65ef01e131650d455875598099cd06fea6096b +dwmw2-iommu 03ecc32c5274962b9b1904d7a730e71c95bac05f +vfio 5a0ff17741c1785b27229a16b5ab77470d71b170 +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs 197175427a221fe3200f7727ea35e261727e7228 +trivial 0e4f93e5017d9d8080bbd34db17836e090eb46fe +audit 724e7bfcc566375158219c1454b4b6fc416b2c4a +devicetree a2166ca5f3204794e8b59f01c93a0f1564e3e138 +dt-rh 6480827357923b3977b97c9413a7307be850975d +mailbox ee23d66af9219dfe2407a9b08ef9a165dbe6f994 +spi 9331bf51ea99aec6531cb7e8a790016b057215e0 +tip 88256d924879d9cc74adc4c49be8dd83778dc1cb +clockevents 4c8305221193e14752e0fa833a38f856bbe1d22b +edac fec53af531dd040e41fe358abe00b33747af2688 +edac-amd 1afaa05515212b136d96a48b2ba2251f40437d87 +irqchip a8bcdc32fafbeb236910e6ddc0161003a458ffc1 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace c4b00d27e405a4c421c170d322b68380737af660 +rcu 8d7dc9283f399e1fda4e48a1c453f689326d9396 +kvm b79013b2449c23f1f505bdf39c5a6c330338b244 +kvm-arm fd1d0ddf2ae92fb3df42ed476939861806c5d785 +kvm-ppc b79013b2449c23f1f505bdf39c5a6c330338b244 +kvms390 816c7667ea97c61884e014cfeedaede5b67b0e58 +xen-tip 0b97b03d88b40bfbd7ff0e069186a137d9786d43 +percpu 4c907baf36d8339f393bb576d0bab29194d0e6ad +workqueues 6ba94429c8e7b87b0fff13c5ac90731b239b77fa +drivers-x86 cdbff611940882b36d6964ced177bc167012f5c0 +chrome-platform 8ce580932f8ee40903017a6f1408ccfff319a6a5 +regmap 04b7fe6a4a231871ef681bc95e08fe66992f7b1f +hsi 265ef3ee9575e6d150f485d28dbe153a50d27f4c +leds 1fbaf327b79c1de49efd2a4d5a651f119c106c44 +ipmi d0acf734d886ce50bb5103cc75f7ca39f280e8a7 +driver-core c9e15f25f514a76d906be01e621f400cdee94558 +tty 5dbc32a88f1e73f244e6134fc119dd4d60a398c0 +usb 00fe52deb45b1a5ef42b0aa82e632e2df012eddc +usb-gadget bbc78c07a51f6fd29c227b1220a9016e585358ba +usb-serial 65dd82ae453f5290be0ea83ed0f23163ea49c0eb +staging c610f7f772aa06ae2bd8e5ace87cde4d90f70198 +char-misc ea5505fabd3b59608750bfd3721d0f8bc5c8b0bb +extcon 66bee35f29683fc4a9a530a1c56a0ec45e3f7d72 +kdbus 9fb9cd0f4434a23487b6ef3237e733afae90e336 +cgroup 34ebe933417e16f46bc30ea77a66e7f30d0cf0f8 +scsi 694600bc1e55bd5a4d5ae9f0764f583f7cb58885 +target-updates 68d4cef3bab3fb9bb0dbac690ba35a96cb5a16d9 +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +pinctrl b99e6fb86541e4dc28f5c3ff7418347fa9d8d29c +vhost f4aaa799cf9aed1467918743ad0f0823c880ce39 +remoteproc 315491e5d6ee66838a18a8ca0c14e6ffb376e48c +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 03daa6f82f2b634019fe8261698f6af3c133497f +dma-mapping 04abab698285297115e5096b3100df1064045529 +pwm 71d54bfabb28cabddf8afd2b0858b57656749116 +dma-buf 72449cb47b0104c32ff8fb9380ade9113375d8d1 +userns e0c9c0afd2fc958ffa34b697972721d81df8a56f +ktest 7c2c49eceb79eb4738f38a00270830057b5bfb76 +clk 03bc10ab5b0f9b8f81bffbe6e40c944f9d3dbcc5 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 5f785de588735306ec4d7c875caf9d28481c8b21 +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 2bfd4d1f8c2bee8b0b8832be0c38d3916713625f +y2038 ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d +luto-misc a6c5170d1edea97c538c81e377e56c7b5c5b7e63 +access_once bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 +livepatching 075b759be1bbdeb215d7eba6a0db70883ad5acb2 +akpm-current 5d77fd3b294b90658bbdf17f5710f1eb06d60e7f +akpm 405a4e9f7d26acc9102dbc496566ac3cf4b9c60f diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a7a556755b15 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,218 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm64-acpi git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git#for-next/acpi +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.rocketboards.org/linux-socfpga-next.git#nios2-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +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/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +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 +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +kdbus git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#kdbus +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +access_once git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..ccd5c68fb13f --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3902 @@ +$ date +Thursday 23 April 10:49:34 AEST 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b8ce8d7222b5 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input +Merging origin/master (27cf3a16b253 Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit) +$ git merge origin/master +Updating b8ce8d7222b5..27cf3a16b253 +Fast-forward + CREDITS | 4 + + Documentation/ABI/testing/sysfs-class-mtd | 10 + + Documentation/Makefile | 2 +- + Documentation/arm/00-INDEX | 2 - + Documentation/arm/Makefile | 1 - + Documentation/arm/Marvell/README | 5 + + Documentation/arm/SH-Mobile/Makefile | 7 - + Documentation/arm/SH-Mobile/vrl4.c | 170 -- + Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 - + Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt | 42 - + Documentation/arm/msm/gpiomux.txt | 176 -- + .../devicetree/bindings/arm/al,alpine.txt | 88 + + Documentation/devicetree/bindings/arm/amlogic.txt | 4 + + .../devicetree/bindings/arm/armada-39x.txt | 20 + + .../devicetree/bindings/arm/atmel-at91.txt | 4 +- + Documentation/devicetree/bindings/arm/cci.txt | 7 +- + .../bindings/arm/cpu-enable-method/al,alpine-smp | 52 + + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../bindings/arm/exynos/power_domain.txt | 3 + + .../devicetree/bindings/arm/geniatech.txt | 5 - + Documentation/devicetree/bindings/arm/gic.txt | 2 + + .../devicetree/bindings/arm/marvell,kirkwood.txt | 1 + + .../bindings/arm/msm/qcom,idle-state.txt | 84 + + .../devicetree/bindings/arm/msm/qcom,saw2.txt | 40 +- + .../devicetree/bindings/arm/msm/timer.txt | 16 +- + .../devicetree/bindings/arm/omap/ctrl.txt | 79 + + Documentation/devicetree/bindings/arm/omap/l4.txt | 26 + + .../devicetree/bindings/arm/omap/prcm.txt | 6 +- + Documentation/devicetree/bindings/arm/rockchip.txt | 4 + + Documentation/devicetree/bindings/arm/shmobile.txt | 8 - + .../bindings/arm/tegra/nvidia,tegra30-actmon.txt | 32 + + .../devicetree/bindings/bus/omap-ocp2scp.txt | 3 +- + .../devicetree/bindings/bus/renesas,bsc.txt | 46 + + .../devicetree/bindings/bus/simple-pm-bus.txt | 44 + + .../bindings/clock/renesas,r8a7778-cpg-clocks.txt | 25 + + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + .../devicetree/bindings/media/ti,omap3isp.txt | 71 + + .../devicetree/bindings/mfd/qcom,tcsr.txt | 22 + + Documentation/devicetree/bindings/mtd/m25p80.txt | 13 +- + .../devicetree/bindings/mtd/pxa3xx-nand.txt | 2 +- + .../devicetree/bindings/mtd/sunxi-nand.txt | 2 +- + .../devicetree/bindings/net/wireless/ti,wlcore.txt | 47 + + .../devicetree/bindings/power/fsl,imx-gpc.txt | 59 + + .../bindings/power/renesas,sysc-rmobile.txt | 1 + + .../devicetree/bindings/serial/atmel-usart.txt | 3 +- + .../devicetree/bindings/serial/omap_serial.txt | 20 + + .../devicetree/bindings/soc/mediatek/pwrap.txt | 58 + + .../devicetree/bindings/soc/qcom/qcom,gsbi.txt | 30 +- + .../devicetree/bindings/sound/omap-twl4030.txt | 3 +- + .../devicetree/bindings/vendor-prefixes.txt | 3 + + .../devicetree/bindings/video/atmel,lcdc.txt | 12 +- + Documentation/filesystems/nfs/nfs-rdma.txt | 9 +- + MAINTAINERS | 50 +- + arch/arm/Kconfig | 63 +- + arch/arm/Kconfig.debug | 53 +- + arch/arm/Makefile | 3 +- + arch/arm/boot/compressed/Makefile | 15 - + arch/arm/boot/compressed/head-shmobile.S | 30 - + arch/arm/boot/compressed/mmcif-sh7372.c | 88 - + arch/arm/boot/compressed/sdhi-sh7372.c | 95 - + arch/arm/boot/compressed/sdhi-shmobile.c | 449 ---- + arch/arm/boot/compressed/sdhi-shmobile.h | 11 - + arch/arm/boot/dts/Makefile | 35 +- + arch/arm/boot/dts/alpine-db.dts | 35 + + arch/arm/boot/dts/alpine.dtsi | 160 ++ + arch/arm/boot/dts/am335x-chiliboard.dts | 112 + + arch/arm/boot/dts/am335x-chilisom.dtsi | 239 ++ + arch/arm/boot/dts/am335x-evmsk.dts | 11 + + arch/arm/boot/dts/am335x-nano.dts | 18 +- + arch/arm/boot/dts/am33xx-clocks.dtsi | 2 +- + arch/arm/boot/dts/am33xx.dtsi | 87 +- + arch/arm/boot/dts/am3517.dtsi | 2 +- + arch/arm/boot/dts/am35xx-clocks.dtsi | 2 +- + arch/arm/boot/dts/am4372.dtsi | 91 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 22 + + arch/arm/boot/dts/am43x-epos-evm.dts | 84 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 2 +- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 58 +- + arch/arm/boot/dts/armada-370-db.dts | 13 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +- + arch/arm/boot/dts/armada-370-rd.dts | 2 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 3 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 11 +- + arch/arm/boot/dts/armada-370.dtsi | 3 +- + arch/arm/boot/dts/armada-375-db.dts | 2 +- + arch/arm/boot/dts/armada-375.dtsi | 15 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 44 +- + arch/arm/boot/dts/armada-388-db.dts | 4 +- + arch/arm/boot/dts/armada-388-gp.dts | 5 +- + arch/arm/boot/dts/armada-388-rd.dts | 12 +- + arch/arm/boot/dts/armada-38x.dtsi | 23 +- + arch/arm/boot/dts/armada-390.dtsi | 57 + + arch/arm/boot/dts/armada-398-db.dts | 153 ++ + arch/arm/boot/dts/armada-398.dtsi | 60 + + arch/arm/boot/dts/armada-39x.dtsi | 508 ++++ + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 +- + arch/arm/boot/dts/armada-xp-db.dts | 2 +- + arch/arm/boot/dts/armada-xp-gp.dts | 2 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 3 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 393 ++++ + arch/arm/boot/dts/armada-xp-matrix.dts | 2 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 - + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 - + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 3 +- + arch/arm/boot/dts/armada-xp.dtsi | 8 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 14 + + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 241 ++ + arch/arm/boot/dts/at91-sama5d4ek.dts | 55 +- + arch/arm/boot/dts/at91rm9200.dtsi | 8 +- + arch/arm/boot/dts/at91sam9260.dtsi | 2 +- + arch/arm/boot/dts/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/at91sam9263.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g25.dtsi | 1 + + arch/arm/boot/dts/at91sam9g25ek.dts | 18 + + arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 11 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 18 + + arch/arm/boot/dts/at91sam9rl.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5_isi.dtsi | 46 + + arch/arm/boot/dts/at91sam9x5cm.dtsi | 4 + + arch/arm/boot/dts/at91sam9x5ek.dtsi | 48 + + arch/arm/boot/dts/bcm-cygnus.dtsi | 78 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 77 + + arch/arm/boot/dts/bcm7445.dtsi | 14 +- + arch/arm/boot/dts/bcm911360_entphn.dts | 13 + + arch/arm/boot/dts/bcm958300k.dts | 8 + + arch/arm/boot/dts/bcm958305k.dts | 53 + + arch/arm/boot/dts/dm8168-evm.dts | 14 +- + arch/arm/boot/dts/dm816x.dtsi | 60 + + arch/arm/boot/dts/dove.dtsi | 63 +- + arch/arm/boot/dts/dra7-evm.dts | 8 + + arch/arm/boot/dts/dra7.dtsi | 182 +- + arch/arm/boot/dts/dra72-evm.dts | 8 + + arch/arm/boot/dts/dra72x.dtsi | 5 + + arch/arm/boot/dts/dra74x.dtsi | 5 + + arch/arm/boot/dts/dra7xx-clocks.dtsi | 8 + + arch/arm/boot/dts/emev2-kzm9d.dts | 13 + + arch/arm/boot/dts/emev2.dtsi | 10 + + arch/arm/boot/dts/exynos3250.dtsi | 4 + + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 + + arch/arm/boot/dts/exynos5250-snow.dts | 57 +- + arch/arm/boot/dts/exynos5250-spring.dts | 21 +- + arch/arm/boot/dts/exynos5250.dtsi | 2 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 99 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 7 + + arch/arm/boot/dts/exynos5420-smdk5420.dts | 7 +- + arch/arm/boot/dts/exynos5420.dtsi | 10 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 21 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 71 +- + arch/arm/boot/dts/imx25-pdk.dts | 58 + + arch/arm/boot/dts/imx25-pinfunc.h | 86 +- + arch/arm/boot/dts/imx27.dtsi | 2 + + arch/arm/boot/dts/imx28-apf28.dts | 2 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 30 +- + arch/arm/boot/dts/imx28.dtsi | 14 + + arch/arm/boot/dts/imx35.dtsi | 1 + + arch/arm/boot/dts/imx50.dtsi | 3 + + arch/arm/boot/dts/imx51.dtsi | 3 + + arch/arm/boot/dts/imx53.dtsi | 3 + + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 4 + + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 4 + + arch/arm/boot/dts/imx6dl-cubox-i.dts | 38 + + arch/arm/boot/dts/imx6dl-hummingboard.dts | 38 + + arch/arm/boot/dts/imx6q-cubox-i.dts | 38 + + arch/arm/boot/dts/imx6q-hummingboard.dts | 38 + + arch/arm/boot/dts/imx6q.dtsi | 20 +- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 62 + + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 101 +- + arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 38 + + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 38 + + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 35 + + arch/arm/boot/dts/imx6qdl.dtsi | 49 +- + arch/arm/boot/dts/imx6sl-warp.dts | 262 +++ + arch/arm/boot/dts/imx6sl.dtsi | 13 +- + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 143 ++ + arch/arm/boot/dts/imx6sx-sdb.dts | 603 +---- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 562 +++++ + arch/arm/boot/dts/imx6sx.dtsi | 9 +- + arch/arm/boot/dts/kirkwood-nas2big.dts | 143 ++ + arch/arm/boot/dts/kirkwood-net2big.dts | 5 + + arch/arm/boot/dts/meson.dtsi | 20 + + arch/arm/boot/dts/meson6-atv1200.dts | 4 + + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 128 ++ + arch/arm/boot/dts/meson8.dtsi | 68 + + arch/arm/boot/dts/mt6589.dtsi | 5 + + arch/arm/boot/dts/nspire-classic.dtsi | 5 + + arch/arm/boot/dts/nspire-cx.dts | 4 + + arch/arm/boot/dts/nspire.dtsi | 21 + + arch/arm/boot/dts/omap2420.dtsi | 80 +- + arch/arm/boot/dts/omap2430-clocks.dtsi | 8 +- + arch/arm/boot/dts/omap2430.dtsi | 107 +- + arch/arm/boot/dts/omap24xx-clocks.dtsi | 6 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 1 - + arch/arm/boot/dts/omap3-beagle.dts | 53 +- + arch/arm/boot/dts/omap3-cm-t3517.dts | 10 + + arch/arm/boot/dts/omap3-cm-t3730.dts | 10 + + arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 1 - + arch/arm/boot/dts/omap3-devkit8000.dts | 1 - + arch/arm/boot/dts/omap3-evm-common.dtsi | 10 + + arch/arm/boot/dts/omap3-gta04.dtsi | 1 - + arch/arm/boot/dts/omap3-igep.dtsi | 1 - + arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 9 + + arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 9 + + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 1 - + arch/arm/boot/dts/omap3-n9.dts | 37 + + arch/arm/boot/dts/omap3-n900.dts | 16 +- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 2 +- + arch/arm/boot/dts/omap3-n950.dts | 37 + + arch/arm/boot/dts/omap3-overo-base.dtsi | 1 - + arch/arm/boot/dts/omap3-pandora-1ghz.dts | 70 + + arch/arm/boot/dts/omap3-pandora-600mhz.dts | 65 + + arch/arm/boot/dts/omap3-pandora-common.dtsi | 640 ++++++ + arch/arm/boot/dts/omap3-tao3530.dtsi | 12 +- + arch/arm/boot/dts/omap3-zoom3.dts | 10 + + arch/arm/boot/dts/omap3.dtsi | 96 +- + arch/arm/boot/dts/omap34xx-hs.dtsi | 16 - + arch/arm/boot/dts/omap34xx.dtsi | 17 + + arch/arm/boot/dts/omap36xx-hs.dtsi | 16 - + arch/arm/boot/dts/omap36xx.dtsi | 17 + + arch/arm/boot/dts/omap3xxx-clocks.dtsi | 13 +- + arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 4 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 10 + + arch/arm/boot/dts/omap4-sdp.dts | 11 + + arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 10 + + arch/arm/boot/dts/omap4.dtsi | 200 +- + arch/arm/boot/dts/omap5.dtsi | 182 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 51 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 2 + + arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 1 + + arch/arm/boot/dts/qcom-apq8084-mtp.dts | 1 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 56 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 52 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 8 + + arch/arm/boot/dts/qcom-msm8960.dtsi | 15 + + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 2 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 56 +- + arch/arm/boot/dts/qcom-pm8841.dtsi | 18 + + arch/arm/boot/dts/qcom-pm8941.dtsi | 18 + + arch/arm/boot/dts/qcom-pma8084.dtsi | 18 + + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 156 -- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 59 +- + arch/arm/boot/dts/r8a73a4.dtsi | 557 ++++- + arch/arm/boot/dts/r8a7740.dtsi | 79 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 174 ++ + arch/arm/boot/dts/r8a7778.dtsi | 293 +++ + arch/arm/boot/dts/r8a7779-marzen.dts | 9 + + arch/arm/boot/dts/r8a7790-lager.dts | 87 + + arch/arm/boot/dts/r8a7790.dtsi | 259 ++- + arch/arm/boot/dts/r8a7791-henninger.dts | 11 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 87 +- + arch/arm/boot/dts/r8a7791.dtsi | 278 ++- + arch/arm/boot/dts/r8a7794-alt.dts | 13 + + arch/arm/boot/dts/r8a7794.dtsi | 157 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 16 + + arch/arm/boot/dts/rk3288-evb-act8846.dts | 10 + + arch/arm/boot/dts/rk3288-evb-rk808.dts | 7 + + arch/arm/boot/dts/rk3288-evb.dtsi | 13 + + arch/arm/boot/dts/rk3288-firefly.dtsi | 20 + + arch/arm/boot/dts/rk3288-popmetal.dts | 447 ++++ + arch/arm/boot/dts/rk3288.dtsi | 35 + + arch/arm/boot/dts/sama5d3.dtsi | 36 +- + arch/arm/boot/dts/sama5d35ek.dts | 2 - + arch/arm/boot/dts/sama5d3_can.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_gmac.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_lcd.dtsi | 207 +- + arch/arm/boot/dts/sama5d3_mci2.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_tcb1.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_uart.dtsi | 2 +- + arch/arm/boot/dts/sama5d4.dtsi | 344 ++- + arch/arm/boot/dts/sh7372-mackerel.dts | 26 - + arch/arm/boot/dts/sh7372.dtsi | 35 - + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 366 --- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 378 ++- + arch/arm/boot/dts/sh73a0.dtsi | 245 +- + arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 2421 ++++++++++++++++++++ + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 559 +++-- + arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 2023 ++++++++++++++++ + arch/arm/boot/dts/tegra124-nyan-big.dts | 2121 +++++++++-------- + arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 2049 +++++++++++++++++ + arch/arm/boot/dts/tegra124-nyan-blaze.dts | 1334 +++++++++++ + arch/arm/boot/dts/tegra124-nyan.dtsi | 695 ++++++ + arch/arm/boot/dts/tegra124.dtsi | 19 + + arch/arm/boot/dts/tegra30-beaver.dts | 1653 ++++++++++++- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 31 + + arch/arm/boot/dts/vf-colibri.dtsi | 15 + + arch/arm/boot/dts/vf500.dtsi | 137 +- + arch/arm/boot/dts/vfxxx.dtsi | 64 +- + arch/arm/common/mcpm_entry.c | 202 +- + arch/arm/configs/ape6evm_defconfig | 109 - + arch/arm/configs/at91_dt_defconfig | 5 +- + arch/arm/configs/exynos_defconfig | 20 +- + arch/arm/configs/imx_v4_v5_defconfig | 4 +- + arch/arm/configs/imx_v6_v7_defconfig | 4 + + arch/arm/configs/mackerel_defconfig | 157 -- + arch/arm/configs/msm_defconfig | 121 - + arch/arm/configs/multi_v5_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 14 +- + arch/arm/configs/mvebu_v7_defconfig | 2 + + arch/arm/configs/mxs_defconfig | 1 + + arch/arm/configs/omap1_defconfig | 16 - + arch/arm/configs/omap2plus_defconfig | 27 + + arch/arm/configs/qcom_defconfig | 9 +- + arch/arm/configs/shmobile_defconfig | 9 +- + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/include/asm/arm-cci.h | 42 + + arch/arm/include/asm/mcpm.h | 65 +- + arch/arm/include/debug/msm.S | 14 - + arch/arm/mach-alpine/Kconfig | 12 + + arch/arm/mach-alpine/Makefile | 2 + + arch/arm/mach-alpine/alpine_cpu_pm.c | 70 + + .../mach/io.h => mach-alpine/alpine_cpu_pm.h} | 21 +- + arch/arm/mach-alpine/alpine_cpu_resume.h | 38 + + arch/arm/mach-alpine/alpine_machine.c | 28 + + arch/arm/mach-alpine/platsmp.c | 49 + + arch/arm/mach-at91/Kconfig | 132 +- + arch/arm/mach-at91/Makefile | 11 +- + arch/arm/mach-at91/at91rm9200.c | 46 +- + arch/arm/mach-at91/at91sam9.c | 76 +- + arch/arm/mach-at91/generic.h | 7 - + arch/arm/mach-at91/include/mach/at91_dbgu.h | 63 - + arch/arm/mach-at91/include/mach/at91_matrix.h | 23 - + arch/arm/mach-at91/include/mach/at91_ramc.h | 4 - + arch/arm/mach-at91/include/mach/at91_st.h | 61 - + arch/arm/mach-at91/include/mach/at91rm9200.h | 103 - + arch/arm/mach-at91/include/mach/at91sam9260.h | 129 -- + .../mach-at91/include/mach/at91sam9260_matrix.h | 80 - + arch/arm/mach-at91/include/mach/at91sam9261.h | 99 - + .../mach-at91/include/mach/at91sam9261_matrix.h | 64 - + arch/arm/mach-at91/include/mach/at91sam9263.h | 117 - + .../mach-at91/include/mach/at91sam9263_matrix.h | 129 -- + arch/arm/mach-at91/include/mach/at91sam9_smc.h | 2 - + arch/arm/mach-at91/include/mach/at91sam9g45.h | 143 -- + .../mach-at91/include/mach/at91sam9g45_matrix.h | 153 -- + arch/arm/mach-at91/include/mach/at91sam9n12.h | 65 - + .../mach-at91/include/mach/at91sam9n12_matrix.h | 53 - + arch/arm/mach-at91/include/mach/at91sam9rl.h | 105 - + .../arm/mach-at91/include/mach/at91sam9rl_matrix.h | 96 - + arch/arm/mach-at91/include/mach/at91sam9x5.h | 71 - + .../arm/mach-at91/include/mach/at91sam9x5_matrix.h | 53 - + arch/arm/mach-at91/include/mach/cpu.h | 216 -- + arch/arm/mach-at91/include/mach/hardware.h | 134 -- + arch/arm/mach-at91/include/mach/sama5d3.h | 86 - + arch/arm/mach-at91/include/mach/sama5d4.h | 33 - + arch/arm/mach-at91/include/mach/uncompress.h | 218 -- + arch/arm/mach-at91/pm.c | 238 +- + arch/arm/mach-at91/pm.h | 100 +- + arch/arm/mach-at91/pm_slowclock.S | 335 --- + arch/arm/mach-at91/pm_suspend.S | 337 +++ + arch/arm/mach-at91/sama5.c | 95 +- + arch/arm/mach-at91/setup.c | 330 --- + arch/arm/mach-at91/soc.c | 97 + + arch/arm/mach-at91/soc.h | 78 + + arch/arm/mach-bcm/bcm_cygnus.c | 2 +- + arch/arm/mach-cns3xxx/pm.c | 1 - + arch/arm/mach-davinci/Kconfig | 11 - + arch/arm/mach-davinci/asp.h | 7 + + arch/arm/mach-davinci/board-da850-evm.c | 112 - + arch/arm/mach-davinci/devices-da8xx.c | 80 +- + arch/arm/mach-davinci/dm646x.c | 24 +- + arch/arm/mach-davinci/include/mach/irqs.h | 2 +- + arch/arm/mach-exynos/Kconfig | 2 +- + arch/arm/mach-exynos/common.h | 6 + + arch/arm/mach-exynos/exynos.c | 3 +- + arch/arm/mach-exynos/firmware.c | 33 +- + arch/arm/mach-exynos/mcpm-exynos.c | 247 +- + arch/arm/mach-exynos/platsmp.c | 23 +- + arch/arm/mach-exynos/pm.c | 14 +- + arch/arm/mach-exynos/pm_domains.c | 29 +- + arch/arm/mach-exynos/regs-pmu.h | 3 + + arch/arm/mach-exynos/smc.h | 9 + + arch/arm/mach-exynos/suspend.c | 22 +- + arch/arm/mach-imx/Kconfig | 84 +- + arch/arm/mach-imx/Makefile | 8 +- + arch/arm/mach-imx/clk-imx25.c | 75 - + arch/arm/mach-imx/clk-imx6q.c | 8 +- + arch/arm/mach-imx/common.h | 7 +- + arch/arm/mach-imx/cpu-imx25.c | 11 +- + arch/arm/mach-imx/devices-imx25.h | 85 - + arch/arm/mach-imx/devices/Kconfig | 3 - + arch/arm/mach-imx/devices/Makefile | 1 - + arch/arm/mach-imx/devices/platform-fec.c | 5 - + arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 5 - + arch/arm/mach-imx/devices/platform-imx-fb.c | 5 - + arch/arm/mach-imx/devices/platform-imx-i2c.c | 10 - + arch/arm/mach-imx/devices/platform-imx-keypad.c | 5 - + arch/arm/mach-imx/devices/platform-imx-ssi.c | 9 - + arch/arm/mach-imx/devices/platform-imx-uart.c | 12 - + arch/arm/mach-imx/devices/platform-imx2-wdt.c | 5 - + arch/arm/mach-imx/devices/platform-imxdi_rtc.c | 42 - + arch/arm/mach-imx/devices/platform-mx2-camera.c | 5 - + arch/arm/mach-imx/devices/platform-mxc-ehci.c | 7 - + arch/arm/mach-imx/devices/platform-mxc_nand.c | 5 - + arch/arm/mach-imx/devices/platform-spi_imx.c | 11 - + arch/arm/mach-imx/ehci-imx25.c | 99 - + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 310 --- + arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 2 +- + arch/arm/mach-imx/gpc.c | 353 ++- + arch/arm/mach-imx/hardware.h | 1 - + arch/arm/mach-imx/iomux-mx25.h | 524 ----- + arch/arm/mach-imx/iomux-mx3.h | 2 +- + arch/arm/mach-imx/iomux-v3.c | 5 +- + arch/arm/mach-imx/iomux-v3.h | 5 +- + arch/arm/mach-imx/mach-cpuimx35.c | 2 +- + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 172 -- + arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} | 20 +- + arch/arm/mach-imx/mach-imx6q.c | 2 +- + arch/arm/mach-imx/mach-imx6sl.c | 2 +- + arch/arm/mach-imx/mach-imx6sx.c | 2 +- + arch/arm/mach-imx/mach-mx25_3ds.c | 270 --- + arch/arm/mach-imx/mach-mx35_3ds.c | 2 +- + arch/arm/mach-imx/mach-pcm043.c | 2 +- + arch/arm/mach-imx/mach-vpr200.c | 2 +- + arch/arm/mach-imx/mm-imx25.c | 89 - + arch/arm/mach-imx/mx25.h | 117 - + arch/arm/mach-imx/pm-imx6.c | 6 +- + arch/arm/mach-mediatek/Kconfig | 1 + + arch/arm/mach-meson/Kconfig | 3 + + arch/arm/mach-msm/Kconfig | 109 - + arch/arm/mach-msm/Makefile | 23 - + arch/arm/mach-msm/Makefile.boot | 3 - + arch/arm/mach-msm/board-halibut.c | 110 - + arch/arm/mach-msm/board-msm7x30.c | 191 -- + arch/arm/mach-msm/board-qsd8x50.c | 254 -- + arch/arm/mach-msm/board-sapphire.c | 114 - + arch/arm/mach-msm/board-trout-gpio.c | 233 -- + arch/arm/mach-msm/board-trout-mmc.c | 185 -- + arch/arm/mach-msm/board-trout-panel.c | 292 --- + arch/arm/mach-msm/board-trout.c | 111 - + arch/arm/mach-msm/board-trout.h | 162 -- + arch/arm/mach-msm/clock-pcom.c | 176 -- + arch/arm/mach-msm/clock-pcom.h | 145 -- + arch/arm/mach-msm/clock.c | 28 - + arch/arm/mach-msm/clock.h | 43 - + arch/arm/mach-msm/common.h | 41 - + arch/arm/mach-msm/devices-msm7x00.c | 480 ---- + arch/arm/mach-msm/devices-msm7x30.c | 246 -- + arch/arm/mach-msm/devices-qsd8x50.c | 388 ---- + arch/arm/mach-msm/devices.h | 53 - + arch/arm/mach-msm/dma.c | 298 --- + arch/arm/mach-msm/gpiomux-8x50.c | 51 - + arch/arm/mach-msm/gpiomux-v1.h | 67 - + arch/arm/mach-msm/gpiomux.c | 111 - + arch/arm/mach-msm/gpiomux.h | 84 - + arch/arm/mach-msm/include/mach/clk.h | 31 - + arch/arm/mach-msm/include/mach/dma.h | 151 -- + arch/arm/mach-msm/include/mach/entry-macro.S | 36 - + arch/arm/mach-msm/include/mach/hardware.h | 18 - + arch/arm/mach-msm/include/mach/irqs-7x00.h | 75 - + arch/arm/mach-msm/include/mach/irqs-7x30.h | 153 -- + arch/arm/mach-msm/include/mach/irqs-8x50.h | 88 - + arch/arm/mach-msm/include/mach/irqs.h | 37 - + arch/arm/mach-msm/include/mach/msm_gpiomux.h | 38 - + arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 108 - + arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 103 - + arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 125 - + arch/arm/mach-msm/include/mach/msm_iomap.h | 53 - + arch/arm/mach-msm/include/mach/msm_smd.h | 109 - + arch/arm/mach-msm/include/mach/sirc.h | 98 - + arch/arm/mach-msm/include/mach/vreg.h | 29 - + arch/arm/mach-msm/io.c | 161 -- + arch/arm/mach-msm/irq-vic.c | 363 --- + arch/arm/mach-msm/irq.c | 151 -- + arch/arm/mach-msm/last_radio_log.c | 71 - + arch/arm/mach-msm/proc_comm.c | 129 -- + arch/arm/mach-msm/proc_comm.h | 258 --- + arch/arm/mach-msm/sirc.c | 172 -- + arch/arm/mach-msm/smd.c | 1034 --------- + arch/arm/mach-msm/smd_debug.c | 311 --- + arch/arm/mach-msm/smd_private.h | 403 ---- + arch/arm/mach-msm/vreg.c | 220 -- + arch/arm/mach-mvebu/Kconfig | 14 + + arch/arm/mach-mvebu/board-v7.c | 20 +- + arch/arm/mach-mvebu/dove.c | 2 +- + arch/arm/mach-mvebu/kirkwood.c | 2 +- + arch/arm/mach-mvebu/platsmp-a9.c | 2 + + arch/arm/mach-mvebu/pmsu.c | 16 +- + arch/arm/mach-omap1/pm.c | 51 +- + arch/arm/mach-omap2/Kconfig | 41 +- + arch/arm/mach-omap2/Makefile | 4 - + arch/arm/mach-omap2/board-devkit8000.c | 654 ------ + arch/arm/mach-omap2/board-omap3stalker.c | 433 ---- + arch/arm/mach-omap2/board-omap3touchbook.c | 395 ---- + arch/arm/mach-omap2/clock.c | 111 +- + arch/arm/mach-omap2/clock.h | 8 +- + arch/arm/mach-omap2/cm.h | 2 + + arch/arm/mach-omap2/cm2xxx.c | 2 +- + arch/arm/mach-omap2/cm2xxx.h | 2 +- + arch/arm/mach-omap2/cm33xx.c | 2 +- + arch/arm/mach-omap2/cm33xx.h | 3 +- + arch/arm/mach-omap2/cm3xxx.c | 3 +- + arch/arm/mach-omap2/cm3xxx.h | 2 +- + arch/arm/mach-omap2/cm44xx.h | 3 +- + arch/arm/mach-omap2/cm_common.c | 156 ++ + arch/arm/mach-omap2/cminst44xx.c | 6 +- + arch/arm/mach-omap2/common.c | 1 - + arch/arm/mach-omap2/common.h | 3 - + arch/arm/mach-omap2/control.c | 201 +- + arch/arm/mach-omap2/control.h | 10 +- + arch/arm/mach-omap2/display.c | 15 +- + arch/arm/mach-omap2/gpmc-nand.c | 18 +- + arch/arm/mach-omap2/gpmc-onenand.c | 4 +- + arch/arm/mach-omap2/id.c | 5 +- + arch/arm/mach-omap2/io.c | 114 +- + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/omap-secure.h | 7 - + arch/arm/mach-omap2/omap4-common.c | 69 - + arch/arm/mach-omap2/omap_device.c | 3 + + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 36 + + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 113 +- + arch/arm/mach-omap2/pdata-quirks.c | 74 - + arch/arm/mach-omap2/pm24xx.c | 24 +- + arch/arm/mach-omap2/pm34xx.c | 18 +- + arch/arm/mach-omap2/prcm-common.h | 20 + + arch/arm/mach-omap2/prcm43xx.h | 1 + + arch/arm/mach-omap2/prm.h | 27 +- + arch/arm/mach-omap2/prm2xxx.c | 6 +- + arch/arm/mach-omap2/prm2xxx.h | 4 +- + arch/arm/mach-omap2/prm33xx.c | 2 +- + arch/arm/mach-omap2/prm33xx.h | 2 +- + arch/arm/mach-omap2/prm3xxx.c | 20 +- + arch/arm/mach-omap2/prm3xxx.h | 7 +- + arch/arm/mach-omap2/prm44xx.c | 70 +- + arch/arm/mach-omap2/prm44xx.h | 1 - + arch/arm/mach-omap2/prm44xx_54xx.h | 8 +- + arch/arm/mach-omap2/prm54xx.h | 1 - + arch/arm/mach-omap2/prm7xx.h | 2 +- + arch/arm/mach-omap2/prm_common.c | 258 ++- + arch/arm/mach-omap2/prminst44xx.c | 18 +- + arch/arm/mach-omap2/prminst44xx.h | 1 + + arch/arm/mach-omap2/sleep44xx.S | 2 - + arch/arm/mach-omap2/usb-tusb6010.c | 4 +- + arch/arm/mach-omap2/vp.h | 9 - + arch/arm/mach-omap2/vp3xxx_data.c | 4 +- + arch/arm/mach-omap2/vp44xx_data.c | 4 +- + arch/arm/mach-qcom/Kconfig | 3 - + arch/arm/mach-qcom/Makefile | 3 - + arch/arm/mach-qcom/platsmp.c | 23 +- + arch/arm/mach-qcom/scm-boot.c | 39 - + arch/arm/mach-qcom/scm.c | 326 --- + arch/arm/mach-rockchip/platsmp.c | 4 +- + arch/arm/mach-rockchip/pm.c | 14 +- + arch/arm/mach-rockchip/pm.h | 6 + + arch/arm/mach-s3c24xx/Kconfig | 19 +- + arch/arm/mach-s3c24xx/Makefile | 3 +- + arch/arm/mach-s3c24xx/include/mach/pm-core.h | 24 +- + arch/arm/mach-s3c24xx/pm-s3c2416.c | 3 +- + arch/arm/mach-s3c24xx/pm.c | 6 +- + arch/arm/mach-s3c24xx/s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/s3c2412.c | 2 +- + arch/arm/mach-s3c24xx/s3c2416.c | 2 +- + arch/arm/mach-s3c24xx/s3c2440.c | 4 +- + arch/arm/mach-s3c24xx/s3c2442.c | 4 +- + arch/arm/mach-s3c24xx/s3c244x.c | 7 +- + arch/arm/mach-s3c64xx/Kconfig | 4 +- + arch/arm/mach-s3c64xx/Makefile | 3 +- + arch/arm/mach-s3c64xx/crag6410.h | 1 + + arch/arm/mach-s3c64xx/mach-crag6410.c | 1 + + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- + arch/arm/mach-s3c64xx/pm.c | 2 + + arch/arm/mach-shmobile/Kconfig | 66 +- + arch/arm/mach-shmobile/Makefile | 22 +- + arch/arm/mach-shmobile/Makefile.boot | 4 - + arch/arm/mach-shmobile/board-ape6evm-reference.c | 60 - + arch/arm/mach-shmobile/board-ape6evm.c | 306 --- + arch/arm/mach-shmobile/board-bockw-reference.c | 2 + + arch/arm/mach-shmobile/board-kzm9g-reference.c | 62 - + arch/arm/mach-shmobile/board-mackerel.c | 1522 ------------ + arch/arm/mach-shmobile/clock-r8a73a4.c | 659 ------ + arch/arm/mach-shmobile/clock-sh7372.c | 620 ----- + arch/arm/mach-shmobile/clock.c | 11 - + arch/arm/mach-shmobile/common.h | 10 - + arch/arm/mach-shmobile/cpuidle.c | 37 - + arch/arm/mach-shmobile/entry-intc.S | 54 - + arch/arm/mach-shmobile/include/mach/clkdev.h | 7 - + .../mach-shmobile/include/mach/head-mackerel.txt | 93 - + arch/arm/mach-shmobile/include/mach/mmc-mackerel.h | 38 - + arch/arm/mach-shmobile/include/mach/mmc.h | 16 - + arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h | 21 - + arch/arm/mach-shmobile/include/mach/sdhi.h | 16 - + arch/arm/mach-shmobile/include/mach/system.h | 11 - + arch/arm/mach-shmobile/include/mach/uncompress.h | 19 - + arch/arm/mach-shmobile/include/mach/zboot.h | 5 +- + arch/arm/mach-shmobile/intc-sh7372.c | 672 ------ + arch/arm/mach-shmobile/pm-r8a7790.c | 82 - + arch/arm/mach-shmobile/pm-r8a7791.c | 73 - + arch/arm/mach-shmobile/pm-rcar-gen2.c | 115 + + arch/arm/mach-shmobile/pm-sh7372.c | 549 ----- + arch/arm/mach-shmobile/r8a73a4.h | 17 - + arch/arm/mach-shmobile/r8a7790.h | 1 - + arch/arm/mach-shmobile/r8a7791.h | 1 - + arch/arm/mach-shmobile/rcar-gen2.h | 1 + + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 147 ++ + arch/arm/mach-shmobile/setup-r8a73a4.c | 273 +-- + arch/arm/mach-shmobile/setup-r8a7740.c | 8 - + arch/arm/mach-shmobile/setup-r8a7778.c | 19 + + arch/arm/mach-shmobile/setup-rcar-gen2.c | 7 +- + arch/arm/mach-shmobile/setup-sh7372.c | 1016 -------- + arch/arm/mach-shmobile/setup-sh73a0.c | 19 +- + arch/arm/mach-shmobile/sh7372.h | 84 - + arch/arm/mach-shmobile/sh73a0.h | 1 - + arch/arm/mach-shmobile/sleep-sh7372.S | 98 - + arch/arm/mach-shmobile/smp-r8a7779.c | 7 - + arch/arm/mach-shmobile/smp-r8a7790.c | 7 +- + arch/arm/mach-shmobile/smp-r8a7791.c | 4 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- + arch/arm/mach-vexpress/Kconfig | 4 +- + arch/arm/mach-vexpress/dcscb.c | 197 +- + arch/arm/mach-vexpress/tc2_pm.c | 291 +-- + arch/arm/plat-samsung/include/plat/pm.h | 14 +- + arch/arm/plat-samsung/pm-debug.c | 1 + + arch/arm/plat-samsung/pm.c | 20 - + arch/arm/tools/mach-types | 1 - + arch/arm64/Kconfig | 17 + + arch/arm64/boot/dts/Makefile | 3 + + arch/arm64/boot/dts/arm/juno.dts | 14 +- + arch/arm64/boot/dts/mediatek/mt8173-pinfunc.h | 682 ++++++ + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 20 + + arch/arm64/boot/dts/qcom/Makefile | 5 + + .../boot/dts/qcom/apq8016-sbc.dts} | 21 +- + .../scm.h => arm64/boot/dts/qcom/apq8016-sbc.dtsi} | 30 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 22 + + arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 33 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 196 ++ + arch/arm64/boot/dts/sprd/Makefile | 5 + + arch/arm64/boot/dts/sprd/sc9836-openphone.dts | 49 + + arch/arm64/boot/dts/sprd/sc9836.dtsi | 129 ++ + arch/arm64/boot/dts/sprd/sharkl64.dtsi | 65 + + arch/arm64/boot/dts/xilinx/Makefile | 5 + + arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 47 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 305 +++ + arch/arm64/configs/defconfig | 10 + + arch/arm64/include/asm/arm-cci.h | 27 + + arch/ia64/pci/pci.c | 5 +- + arch/parisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/pgalloc.h | 6 +- + arch/parisc/include/asm/scatterlist.h | 10 - + arch/parisc/kernel/pci-dma.c | 8 +- + arch/sparc/kernel/ldc.c | 2 +- + arch/sparc/kernel/perf_event.c | 35 +- + arch/x86/include/asm/lguest.h | 7 +- + arch/x86/lguest/boot.c | 7 +- + arch/x86/lguest/head_32.S | 30 +- + drivers/block/rbd.c | 26 +- + drivers/bus/Kconfig | 73 +- + drivers/bus/Makefile | 17 +- + drivers/bus/arm-cci.c | 517 +++-- + drivers/bus/imx-weim.c | 13 +- + drivers/bus/omap-ocp2scp.c | 34 + + drivers/bus/simple-pm-bus.c | 58 + + drivers/clk/shmobile/Makefile | 1 + + drivers/clk/shmobile/clk-r8a7778.c | 143 ++ + drivers/clocksource/Kconfig | 5 + + drivers/clocksource/Makefile | 1 + + .../clocksource/timer-atmel-st.c | 117 +- + drivers/cpuidle/cpuidle-exynos.c | 3 +- + drivers/dma/hsu/Kconfig | 2 +- + drivers/firmware/Kconfig | 4 + + drivers/firmware/Makefile | 2 + + drivers/firmware/qcom_scm.c | 494 ++++ + drivers/gpio/Kconfig | 8 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-msm-v1.c | 714 ------ + drivers/infiniband/core/umem.c | 7 +- + drivers/infiniband/core/uverbs_main.c | 22 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 457 +++- + drivers/infiniband/hw/mlx4/mad.c | 9 + + drivers/infiniband/hw/mlx4/main.c | 26 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 14 +- + drivers/infiniband/hw/mlx4/qp.c | 7 +- + drivers/infiniband/hw/mlx4/sysfs.c | 44 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 31 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 18 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 195 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 73 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 520 +++-- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 44 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 66 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 66 +- + drivers/infiniband/ulp/iser/iser_memory.c | 523 +++-- + drivers/infiniband/ulp/iser/iser_verbs.c | 220 +- + drivers/infiniband/ulp/srp/ib_srp.c | 9 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 188 +- + drivers/lguest/hypercalls.c | 5 +- + drivers/lguest/interrupts_and_traps.c | 105 +- + drivers/lguest/lg.h | 2 +- + drivers/lguest/lguest_user.c | 8 + + drivers/memory/omap-gpmc.c | 358 ++- + drivers/mmc/card/block.c | 34 +- + drivers/mmc/card/mmc_test.c | 18 +- + drivers/mmc/core/bus.c | 41 +- + drivers/mmc/core/pwrseq.c | 2 +- + drivers/mmc/host/Kconfig | 8 - + drivers/mmc/host/Makefile | 1 - + drivers/mmc/host/msm_sdcc.c | 1474 ------------ + drivers/mmc/host/msm_sdcc.h | 256 --- + drivers/mtd/Kconfig | 13 + + drivers/mtd/chips/cfi_cmdset_0020.c | 30 +- + drivers/mtd/devices/block2mtd.c | 58 +- + drivers/mtd/devices/docg3.c | 11 +- + drivers/mtd/devices/m25p80.c | 21 +- + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/maps/sa1100-flash.c | 4 +- + drivers/mtd/maps/ts5500_flash.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 3 - + drivers/mtd/mtdcore.c | 52 +- + drivers/mtd/mtdpart.c | 68 +- + drivers/mtd/nand/atmel_nand.c | 26 +- + drivers/mtd/nand/atmel_nand_ecc.h | 3 + + drivers/mtd/nand/atmel_nand_nfc.h | 1 + + drivers/mtd/nand/denali.c | 6 +- + drivers/mtd/nand/fsl_ifc_nand.c | 4 +- + drivers/mtd/nand/fsmc_nand.c | 7 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 16 +- + drivers/mtd/nand/mxc_nand.c | 146 +- + drivers/mtd/nand/nand_base.c | 41 +- + drivers/mtd/nand/pxa3xx_nand.c | 48 +- + drivers/mtd/nand/s3c2410.c | 3 - + drivers/mtd/onenand/onenand_base.c | 12 +- + drivers/mtd/spi-nor/fsl-quadspi.c | 11 +- + drivers/mtd/spi-nor/spi-nor.c | 61 +- + drivers/mtd/tests/mtd_nandecctest.c | 6 + + drivers/mtd/tests/mtd_test.h | 12 + + drivers/mtd/tests/nandbiterrs.c | 4 + + drivers/mtd/tests/oobtest.c | 90 +- + drivers/mtd/tests/pagetest.c | 10 +- + drivers/mtd/tests/readtest.c | 5 +- + drivers/mtd/tests/speedtest.c | 38 +- + drivers/mtd/tests/stresstest.c | 9 +- + drivers/mtd/tests/subpagetest.c | 29 +- + drivers/mtd/tests/torturetest.c | 23 +- + drivers/net/dsa/mv88e6xxx.c | 6 +- + drivers/net/ethernet/altera/altera_msgdmahw.h | 1 - + drivers/net/ethernet/mellanox/mlx4/cmd.c | 42 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 2 + + drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 31 + + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 1 + + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 10 +- + drivers/net/ppp/ppp_generic.c | 1 + + drivers/net/ppp/pppoe.c | 3 + + drivers/net/wireless/ti/wilink_platform_data.c | 25 - + drivers/net/wireless/ti/wl12xx/main.c | 63 +- + drivers/net/wireless/ti/wl12xx/wl12xx.h | 28 + + drivers/net/wireless/ti/wlcore/boot.c | 1 - + drivers/net/wireless/ti/wlcore/debugfs.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 31 +- + drivers/net/wireless/ti/wlcore/sdio.c | 63 +- + drivers/net/wireless/ti/wlcore/spi.c | 6 +- + drivers/net/wireless/ti/wlcore/wlcore.h | 5 +- + drivers/net/wireless/ti/wlcore/wlcore_i.h | 6 +- + drivers/parisc/ccio-dma.c | 6 +- + drivers/parisc/iommu-helpers.h | 26 +- + drivers/parisc/sba_iommu.c | 7 +- + drivers/pcmcia/Kconfig | 1 + + drivers/pcmcia/at91_cf.c | 13 +- + drivers/s390/kvm/virtio_ccw.c | 10 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/mediatek/Kconfig | 11 + + drivers/soc/mediatek/Makefile | 1 + + drivers/soc/mediatek/mtk-pmic-wrap.c | 975 ++++++++ + drivers/soc/qcom/Kconfig | 1 + + drivers/soc/qcom/qcom_gsbi.c | 152 ++ + drivers/virtio/Kconfig | 10 + + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio.c | 6 - + drivers/virtio/virtio_balloon.c | 21 +- + drivers/virtio/virtio_input.c | 384 ++++ + drivers/virtio/virtio_mmio.c | 8 - + drivers/virtio/virtio_pci_modern.c | 123 +- + drivers/watchdog/Kconfig | 4 +- + drivers/watchdog/at91rm9200_wdt.c | 61 +- + drivers/watchdog/bcm_kona_wdt.c | 27 +- + drivers/watchdog/octeon-wdt-main.c | 201 +- + drivers/watchdog/pnx4008_wdt.c | 2 +- + drivers/watchdog/qcom-wdt.c | 21 +- + drivers/watchdog/stmp3xxx_rtc_wdt.c | 4 +- + fs/ceph/addr.c | 38 +- + fs/ceph/caps.c | 51 +- + fs/ceph/dir.c | 48 +- + fs/ceph/mds_client.c | 61 +- + fs/ceph/strings.c | 1 + + fs/ceph/super.c | 56 +- + fs/ceph/super.h | 4 +- + fs/ceph/xattr.c | 23 +- + fs/jffs2/xattr.c | 1 - + include/dt-bindings/clock/imx6qdl-clock.h | 5 +- + include/dt-bindings/clock/r8a73a4-clock.h | 62 + + include/dt-bindings/clock/r8a7778-clock.h | 71 + + include/dt-bindings/clock/r8a7790-clock.h | 3 + + include/dt-bindings/clock/r8a7791-clock.h | 3 + + include/dt-bindings/clock/sh73a0-clock.h | 3 + + include/dt-bindings/media/omap3-isp.h | 22 + + include/linux/arm-cci.h | 9 +- + include/linux/ceph/ceph_features.h | 16 +- + include/linux/ceph/ceph_fs.h | 1 + + include/linux/ceph/debugfs.h | 8 +- + include/linux/ceph/libceph.h | 2 + + include/linux/ceph/osdmap.h | 5 +- + include/linux/clk/shmobile.h | 1 + + include/linux/clk/ti.h | 6 +- + include/linux/crush/crush.h | 12 +- + include/linux/lguest.h | 4 +- + include/linux/mfd/syscon/atmel-st.h | 49 + + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 + + include/linux/mlx4/device.h | 4 + + include/linux/mm.h | 2 +- + include/linux/mmc/card.h | 14 +- + include/linux/mtd/map.h | 54 +- + include/linux/mtd/spi-nor.h | 5 + + include/linux/omap-gpmc.h | 3 +- + include/linux/platform_data/mmc-msm_sdcc.h | 27 - + include/linux/qcom_scm.h | 28 + + include/linux/skbuff.h | 12 + + include/linux/virtio.h | 2 - + include/linux/virtio_config.h | 16 +- + include/linux/virtio_ring.h | 23 +- + include/linux/wl12xx.h | 49 - + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/virtio_balloon.h | 32 +- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_input.h | 76 + + kernel/audit.c | 47 +- + kernel/audit.h | 3 + + kernel/audit_tree.c | 88 +- + kernel/auditsc.c | 9 +- + kernel/module.c | 9 +- + kernel/params.c | 4 +- + kernel/trace/trace_events.c | 15 +- + kernel/trace/trace_functions_graph.c | 8 +- + lib/iommu-common.c | 20 +- + net/ceph/ceph_common.c | 37 + + net/ceph/crush/crush.c | 14 + + net/ceph/crush/crush_ln_table.h | 166 ++ + net/ceph/crush/mapper.c | 118 +- + net/ceph/debugfs.c | 24 + + net/ceph/messenger.c | 25 +- + net/ceph/osdmap.c | 25 + + net/ipv4/ip_forward.c | 3 + + net/ipv4/tcp.c | 4 +- + net/ipv4/tcp_input.c | 2 + + scripts/Makefile.lib | 3 +- + scripts/check_extable.sh | 146 ++ + scripts/mod/modpost.c | 341 ++- + 852 files changed, 36202 insertions(+), 34093 deletions(-) + delete mode 100644 Documentation/arm/Makefile + delete mode 100644 Documentation/arm/SH-Mobile/Makefile + delete mode 100644 Documentation/arm/SH-Mobile/vrl4.c + delete mode 100644 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt + delete mode 100644 Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt + delete mode 100644 Documentation/arm/msm/gpiomux.txt + create mode 100644 Documentation/devicetree/bindings/arm/al,alpine.txt + create mode 100644 Documentation/devicetree/bindings/arm/armada-39x.txt + create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/al,alpine-smp + delete mode 100644 Documentation/devicetree/bindings/arm/geniatech.txt + create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txt + create mode 100644 Documentation/devicetree/bindings/arm/omap/ctrl.txt + create mode 100644 Documentation/devicetree/bindings/arm/omap/l4.txt + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-actmon.txt + create mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.txt + create mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.txt + create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7778-cpg-clocks.txt + create mode 100644 Documentation/devicetree/bindings/media/ti,omap3isp.txt + create mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt + create mode 100644 Documentation/devicetree/bindings/power/fsl,imx-gpc.txt + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/pwrap.txt + delete mode 100644 arch/arm/boot/compressed/mmcif-sh7372.c + delete mode 100644 arch/arm/boot/compressed/sdhi-sh7372.c + delete mode 100644 arch/arm/boot/compressed/sdhi-shmobile.c + delete mode 100644 arch/arm/boot/compressed/sdhi-shmobile.h + create mode 100644 arch/arm/boot/dts/alpine-db.dts + create mode 100644 arch/arm/boot/dts/alpine.dtsi + create mode 100644 arch/arm/boot/dts/am335x-chiliboard.dts + create mode 100644 arch/arm/boot/dts/am335x-chilisom.dtsi + create mode 100644 arch/arm/boot/dts/armada-390.dtsi + create mode 100644 arch/arm/boot/dts/armada-398-db.dts + create mode 100644 arch/arm/boot/dts/armada-398.dtsi + create mode 100644 arch/arm/boot/dts/armada-39x.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-linksys-mamba.dts + create mode 100644 arch/arm/boot/dts/at91-sama5d4_xplained.dts + create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r8000.dts + create mode 100644 arch/arm/boot/dts/bcm958305k.dts + create mode 100644 arch/arm/boot/dts/imx6sl-warp.dts + create mode 100644 arch/arm/boot/dts/imx6sx-sdb-reva.dts + create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-nas2big.dts + create mode 100644 arch/arm/boot/dts/meson8-minix-neo-x8.dts + create mode 100644 arch/arm/boot/dts/omap3-pandora-1ghz.dts + create mode 100644 arch/arm/boot/dts/omap3-pandora-600mhz.dts + create mode 100644 arch/arm/boot/dts/omap3-pandora-common.dtsi + delete mode 100644 arch/arm/boot/dts/omap34xx-hs.dtsi + delete mode 100644 arch/arm/boot/dts/omap36xx-hs.dtsi + create mode 100644 arch/arm/boot/dts/qcom-pm8841.dtsi + create mode 100644 arch/arm/boot/dts/qcom-pm8941.dtsi + create mode 100644 arch/arm/boot/dts/qcom-pma8084.dtsi + delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts + create mode 100644 arch/arm/boot/dts/rk3288-popmetal.dts + delete mode 100644 arch/arm/boot/dts/sh7372-mackerel.dts + delete mode 100644 arch/arm/boot/dts/sh7372.dtsi + delete mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts + create mode 100644 arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi + create mode 100644 arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi + create mode 100644 arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi + create mode 100644 arch/arm/boot/dts/tegra124-nyan-blaze.dts + create mode 100644 arch/arm/boot/dts/tegra124-nyan.dtsi + delete mode 100644 arch/arm/configs/ape6evm_defconfig + delete mode 100644 arch/arm/configs/mackerel_defconfig + delete mode 100644 arch/arm/configs/msm_defconfig + create mode 100644 arch/arm/include/asm/arm-cci.h + create mode 100644 arch/arm/mach-alpine/Kconfig + create mode 100644 arch/arm/mach-alpine/Makefile + create mode 100644 arch/arm/mach-alpine/alpine_cpu_pm.c + rename arch/arm/{mach-at91/include/mach/io.h => mach-alpine/alpine_cpu_pm.h} (55%) + create mode 100644 arch/arm/mach-alpine/alpine_cpu_resume.h + create mode 100644 arch/arm/mach-alpine/alpine_machine.c + create mode 100644 arch/arm/mach-alpine/platsmp.c + delete mode 100644 arch/arm/mach-at91/include/mach/at91_dbgu.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91_st.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9260.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9260_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9261.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9261_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9263.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9263_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9n12.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9n12_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9rl.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/cpu.h + delete mode 100644 arch/arm/mach-at91/include/mach/hardware.h + delete mode 100644 arch/arm/mach-at91/include/mach/sama5d3.h + delete mode 100644 arch/arm/mach-at91/include/mach/sama5d4.h + delete mode 100644 arch/arm/mach-at91/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-at91/pm_slowclock.S + create mode 100644 arch/arm/mach-at91/pm_suspend.S + delete mode 100644 arch/arm/mach-at91/setup.c + create mode 100644 arch/arm/mach-at91/soc.c + create mode 100644 arch/arm/mach-at91/soc.h + delete mode 100644 arch/arm/mach-imx/devices-imx25.h + delete mode 100644 arch/arm/mach-imx/devices/platform-imxdi_rtc.c + delete mode 100644 arch/arm/mach-imx/ehci-imx25.c + delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c + delete mode 100644 arch/arm/mach-imx/iomux-mx25.h + delete mode 100644 arch/arm/mach-imx/mach-eukrea_cpuimx25.c + rename arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} (68%) + delete mode 100644 arch/arm/mach-imx/mach-mx25_3ds.c + delete mode 100644 arch/arm/mach-imx/mm-imx25.c + delete mode 100644 arch/arm/mach-imx/mx25.h + delete mode 100644 arch/arm/mach-msm/Kconfig + delete mode 100644 arch/arm/mach-msm/Makefile + delete mode 100644 arch/arm/mach-msm/Makefile.boot + delete mode 100644 arch/arm/mach-msm/board-halibut.c + delete mode 100644 arch/arm/mach-msm/board-msm7x30.c + delete mode 100644 arch/arm/mach-msm/board-qsd8x50.c + delete mode 100644 arch/arm/mach-msm/board-sapphire.c + delete mode 100644 arch/arm/mach-msm/board-trout-gpio.c + delete mode 100644 arch/arm/mach-msm/board-trout-mmc.c + delete mode 100644 arch/arm/mach-msm/board-trout-panel.c + delete mode 100644 arch/arm/mach-msm/board-trout.c + delete mode 100644 arch/arm/mach-msm/board-trout.h + delete mode 100644 arch/arm/mach-msm/clock-pcom.c + delete mode 100644 arch/arm/mach-msm/clock-pcom.h + delete mode 100644 arch/arm/mach-msm/clock.c + delete mode 100644 arch/arm/mach-msm/clock.h + delete mode 100644 arch/arm/mach-msm/common.h + delete mode 100644 arch/arm/mach-msm/devices-msm7x00.c + delete mode 100644 arch/arm/mach-msm/devices-msm7x30.c + delete mode 100644 arch/arm/mach-msm/devices-qsd8x50.c + delete mode 100644 arch/arm/mach-msm/devices.h + delete mode 100644 arch/arm/mach-msm/dma.c + delete mode 100644 arch/arm/mach-msm/gpiomux-8x50.c + delete mode 100644 arch/arm/mach-msm/gpiomux-v1.h + delete mode 100644 arch/arm/mach-msm/gpiomux.c + delete mode 100644 arch/arm/mach-msm/gpiomux.h + delete mode 100644 arch/arm/mach-msm/include/mach/clk.h + delete mode 100644 arch/arm/mach-msm/include/mach/dma.h + delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-msm/include/mach/hardware.h + delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x00.h + delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h + delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x50.h + delete mode 100644 arch/arm/mach-msm/include/mach/irqs.h + delete mode 100644 arch/arm/mach-msm/include/mach/msm_gpiomux.h + delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h + delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h + delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h + delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap.h + delete mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h + delete mode 100644 arch/arm/mach-msm/include/mach/sirc.h + delete mode 100644 arch/arm/mach-msm/include/mach/vreg.h + delete mode 100644 arch/arm/mach-msm/io.c + delete mode 100644 arch/arm/mach-msm/irq-vic.c + delete mode 100644 arch/arm/mach-msm/irq.c + delete mode 100644 arch/arm/mach-msm/last_radio_log.c + delete mode 100644 arch/arm/mach-msm/proc_comm.c + delete mode 100644 arch/arm/mach-msm/proc_comm.h + delete mode 100644 arch/arm/mach-msm/sirc.c + delete mode 100644 arch/arm/mach-msm/smd.c + delete mode 100644 arch/arm/mach-msm/smd_debug.c + delete mode 100644 arch/arm/mach-msm/smd_private.h + delete mode 100644 arch/arm/mach-msm/vreg.c + delete mode 100644 arch/arm/mach-omap2/board-devkit8000.c + delete mode 100644 arch/arm/mach-omap2/board-omap3stalker.c + delete mode 100644 arch/arm/mach-omap2/board-omap3touchbook.c + delete mode 100644 arch/arm/mach-qcom/scm-boot.c + delete mode 100644 arch/arm/mach-qcom/scm.c + delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c + delete mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-mackerel.c + delete mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c + delete mode 100644 arch/arm/mach-shmobile/clock-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/cpuidle.c + delete mode 100644 arch/arm/mach-shmobile/entry-intc.S + delete mode 100644 arch/arm/mach-shmobile/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/head-mackerel.txt + delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-mackerel.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/sdhi.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/system.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-shmobile/intc-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/pm-r8a7790.c + delete mode 100644 arch/arm/mach-shmobile/pm-r8a7791.c + create mode 100644 arch/arm/mach-shmobile/pm-rcar-gen2.c + delete mode 100644 arch/arm/mach-shmobile/pm-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/r8a73a4.h + create mode 100644 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c + delete mode 100644 arch/arm/mach-shmobile/setup-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/sh7372.h + delete mode 100644 arch/arm/mach-shmobile/sleep-sh7372.S + create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-pinfunc.h + create mode 100644 arch/arm64/boot/dts/qcom/Makefile + rename arch/{arm/mach-qcom/scm-boot.h => arm64/boot/dts/qcom/apq8016-sbc.dts} (50%) + rename arch/{arm/mach-qcom/scm.h => arm64/boot/dts/qcom/apq8016-sbc.dtsi} (54%) + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916.dtsi + create mode 100644 arch/arm64/boot/dts/sprd/Makefile + create mode 100644 arch/arm64/boot/dts/sprd/sc9836-openphone.dts + create mode 100644 arch/arm64/boot/dts/sprd/sc9836.dtsi + create mode 100644 arch/arm64/boot/dts/sprd/sharkl64.dtsi + create mode 100644 arch/arm64/boot/dts/xilinx/Makefile + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp.dtsi + create mode 100644 arch/arm64/include/asm/arm-cci.h + delete mode 100644 arch/parisc/include/asm/scatterlist.h + create mode 100644 drivers/bus/simple-pm-bus.c + create mode 100644 drivers/clk/shmobile/clk-r8a7778.c + rename arch/arm/mach-at91/at91rm9200_time.c => drivers/clocksource/timer-atmel-st.c (73%) + create mode 100644 drivers/firmware/qcom_scm.c + delete mode 100644 drivers/gpio/gpio-msm-v1.c + delete mode 100644 drivers/mmc/host/msm_sdcc.c + delete mode 100644 drivers/mmc/host/msm_sdcc.h + create mode 100644 drivers/soc/mediatek/Kconfig + create mode 100644 drivers/soc/mediatek/Makefile + create mode 100644 drivers/soc/mediatek/mtk-pmic-wrap.c + create mode 100644 drivers/virtio/virtio_input.c + create mode 100644 include/dt-bindings/clock/r8a73a4-clock.h + create mode 100644 include/dt-bindings/clock/r8a7778-clock.h + create mode 100644 include/dt-bindings/media/omap3-isp.h + create mode 100644 include/linux/mfd/syscon/atmel-st.h + delete mode 100644 include/linux/platform_data/mmc-msm_sdcc.h + create mode 100644 include/linux/qcom_scm.h + create mode 100644 include/uapi/linux/virtio_input.h + create mode 100644 net/ceph/crush/crush_ln_table.h + create mode 100755 scripts/check_extable.sh +Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (6c5c2a01fcfd ARM: proc-arm94*.S: fix setup function) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) +$ git merge mips-fixes/mips-fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (a7e73e711e48 powerpc/kvm: Fix ppc64_defconfig + PPC_POWERNV=n build error) +$ git merge powerpc-merge-mpe/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/kvm_book3s_64.h | 17 +++---- + arch/powerpc/include/asm/pgtable.h | 28 +++-------- + arch/powerpc/kernel/eeh.c | 6 ++- + arch/powerpc/kernel/io-workarounds.c | 10 ++-- + arch/powerpc/kvm/Kconfig | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 14 +++--- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 86 +++++++++++++++++--------------- + arch/powerpc/kvm/e500_mmu_host.c | 32 ++++++++---- + arch/powerpc/mm/hash_utils_64.c | 2 +- + arch/powerpc/mm/hugetlbpage.c | 32 ++++++++---- + arch/powerpc/perf/callchain.c | 24 +++++---- + 11 files changed, 136 insertions(+), 117 deletions(-) +Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (acc455cffa75 sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/cpudata_64.h | 3 +- + arch/sparc/include/asm/topology_64.h | 3 +- + arch/sparc/kernel/mdesc.c | 136 ++++++++++++++++++++++++++++------- + arch/sparc/kernel/smp_64.c | 13 ++++ + 4 files changed, 127 insertions(+), 28 deletions(-) +Merging net/master (608404290e2d vxlan: remove the unnecessary codes) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/mpls-sysctl.txt | 9 ++ + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 43 +++++-- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 17 +++ + drivers/net/ethernet/cadence/macb.c | 4 +- + drivers/net/vxlan.c | 6 +- + include/linux/netdevice.h | 4 + + lib/rhashtable.c | 11 +- + net/core/skbuff.c | 9 +- + net/ipv4/tcp_output.c | 20 +++- + net/ipv6/ip6_gre.c | 9 +- + net/mpls/af_mpls.c | 125 ++++++++++++++++++++- + net/mpls/internal.h | 6 + + 12 files changed, 230 insertions(+), 33 deletions(-) +Merging ipsec/master (092a29a40bab vti6: fix uninit when using x-netns) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (7d1b6e293274 ALSA: hda - fix "num_steps = 0" error on ALC256) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/uapi/sound/asound.h | 2 +- + sound/oss/sequencer.c | 12 ++---------- + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_controller.h | 2 +- + sound/pci/hda/hda_i915.c | 6 ++++++ + sound/pci/hda/hda_intel.c | 5 ++++- + sound/pci/hda/hda_proc.c | 4 ++-- + sound/pci/hda/patch_realtek.c | 22 ++++++++++------------ + sound/pci/intel8x0.c | 4 ++-- + sound/usb/format.c | 5 ++++- + sound/usb/quirks-table.h | 30 ++---------------------------- + 11 files changed, 35 insertions(+), 59 deletions(-) +Merging pci-current/for-linus (9fbbda5c8e0a ia64/PCI: Treat all host bridge Address Space Descriptors (even consumers) as windows) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-drivers/master (69628cd0652a Merge tag 'iwlwifi-for-kalle-2015-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (bc465aa9d045 Linux 4.0-rc5) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (f22e6e847115 Linux 4.0-rc7) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (f22e6e847115 Linux 4.0-rc7) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (65582a7f4ce5 usb: isp1760: fix spin unlock in the error path of isp1760_udc_start) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (39a8804455fb Linux 4.0) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (f22e6e847115 Linux 4.0-rc7) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (bc465aa9d045 Linux 4.0-rc5) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (48853389f206 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (3abafaf2192b crypto: arm - workaround for building with old binutils) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (41d9489319f2 drivers/of: Add empty ranges quirk for PA-Semi) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (f47689345931 lguest: update help text.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (ec76f4007079 vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (67d8712dcc70 selftests: Fix build failures when invoked from kselftest target) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (39a8804455fb Linux 4.0) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (d8f6ad85cbb7 ARC: perf: don't add code for impossible case) +$ git merge arc/for-next +Auto-merging arch/arc/kernel/process.c +Removing Documentation/devicetree/bindings/arc/pmu.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arc/pct.txt | 20 ++++++++ + Documentation/devicetree/bindings/arc/pmu.txt | 24 --------- + arch/arc/boot/dts/angel4.dts | 2 +- + arch/arc/configs/nsimosci_defconfig | 19 ++++--- + arch/arc/include/asm/arcregs.h | 14 +++-- + arch/arc/include/asm/bitops.h | 31 +++++++----- + arch/arc/include/asm/perf_event.h | 70 ++++++++++++------------- + arch/arc/kernel/perf_event.c | 73 +++++++++++++++++++++------ + arch/arc/kernel/process.c | 9 ++-- + arch/arc/kernel/setup.c | 5 +- + arch/arc/kernel/traps.c | 4 +- + arch/arc/mm/init.c | 9 ++-- + 12 files changed, 164 insertions(+), 116 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arc/pct.txt + delete mode 100644 Documentation/devicetree/bindings/arc/pmu.txt +Merging arm/for-next (ddb4404765c8 Merge branches 'misc' and 'vdso' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/kernel/head-nommu.S | 12 ++++++------ + arch/arm/mm/Kconfig | 2 +- + arch/arm/vdso/.gitignore | 2 ++ + arch/arm/vdso/Makefile | 4 ++-- + 4 files changed, 11 insertions(+), 9 deletions(-) +Merging arm-perf/for-next/perf (39a8804455fb Linux 4.0) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (0f0175702e2e arm-soc: document merges) +$ git merge arm-soc/for-next +Recorded preimage for 'MAINTAINERS' +Recorded preimage for 'drivers/bus/Makefile' +Auto-merging drivers/bus/Makefile +CONFLICT (content): Merge conflict in drivers/bus/Makefile +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'MAINTAINERS'. +Recorded resolution for 'drivers/bus/Makefile'. +[master 01144fba6781] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/arm-soc-for-next-contents.txt | 243 +++++++++++++++++++++++++++++++++ + 1 file changed, 243 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging at91/at91-next (d8a291a11778 Merge tag 'at91-dt2' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging rpi/for-rpi-next (9a5a3543e168 ARM: bcm2835: Fix i2c0 node name) +$ git merge rpi/for-rpi-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 31 ++++++++++++++++++++-- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +-- + arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 +-- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +++--- + arch/arm/boot/dts/bcm2835.dtsi | 5 ++-- + include/dt-bindings/pinctrl/bcm2835.h | 27 +++++++++++++++++++ + 7 files changed, 68 insertions(+), 12 deletions(-) + create mode 100644 include/dt-bindings/pinctrl/bcm2835.h +Merging berlin/berlin/for-next (c517d838eb7d Linux 4.0-rc1) +$ git merge berlin/berlin/for-next +Already up-to-date. +Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) +$ git merge cortex-m/for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (33e156f34c26 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (02577ca1b7e4 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (23aa6c6f4bed Merge branch 'omap-for-v4.0/fixes' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/omap3-n900.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap3-n900.dts | 4 ++++ + 1 file changed, 4 insertions(+) +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 37ab233d7d0e] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging renesas/next (53a6e5250291 Merge branch 'heads/soc-cleanup-for-v4.1' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. +Merging samsung/for-next (5d5443b9c3ba Merge branch 'v4.1-next/mach-samsung' into for-next) +$ git merge samsung/for-next +Resolved 'arch/arm/mach-exynos/platsmp.c' using previous resolution. +Auto-merging arch/arm/mach-exynos/platsmp.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/platsmp.c +Auto-merging Documentation/devicetree/bindings/arm/samsung/pmu.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a62fbaa4d597] Merge remote-tracking branch 'samsung/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/samsung/pmu.txt | 1 + + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 698 +++++++++++++++ + .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 + + arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 231 +++++ + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 931 +++++++++++++++++++++ + 5 files changed, 1883 insertions(+) + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi +Merging sunxi/sunxi/for-next (5a04c6a64b01 Merge branches 'sunxi/clocks-for-4.1', 'sunxi/dt-for-4.1', 'sunxi/core-for-4.1' and 'sunxi/drivers-for-4.1', tag 'sunxi-defconfig-for-4.1' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/soc/Makefile +Auto-merging drivers/soc/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../devicetree/bindings/soc/sunxi/sram.txt | 64 +++ + .../devicetree/bindings/vendor-prefixes.txt | 2 + + arch/arm/boot/dts/Makefile | 21 +- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 202 +++---- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 176 +++--- + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 35 ++ + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 216 +++---- + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 176 ++++++ + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 191 +++---- + arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 8 + + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 118 ++-- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 8 + + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 144 ++--- + arch/arm/boot/dts/sun4i-a10-mk802.dts | 8 + + arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 8 + + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 219 ++++---- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 180 +++--- + arch/arm/boot/dts/sun4i-a10.dtsi | 88 ++- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 159 ++++++ + arch/arm/boot/dts/sun5i-a10s-mk802.dts | 8 + + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 319 +++++------ + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 134 ++--- + arch/arm/boot/dts/sun5i-a10s.dtsi | 620 +++------------------ + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 138 ++--- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 150 ++--- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 240 ++++---- + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 209 +++++++ + arch/arm/boot/dts/sun5i-a13.dtsi | 594 +++----------------- + arch/arm/boot/dts/sun5i.dtsi | 611 ++++++++++++++++++++ + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 58 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 140 ++--- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 103 +++- + arch/arm/boot/dts/sun6i-a31-i7.dts | 154 +++++ + arch/arm/boot/dts/sun6i-a31-m9.dts | 154 ++--- + arch/arm/boot/dts/sun6i-a31.dtsi | 84 ++- + arch/arm/boot/dts/sun6i-a31s-cs908.dts | 43 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 264 ++++----- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 10 + + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 200 +++---- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 326 +++++------ + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 430 +++++++------- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 262 ++++----- + arch/arm/boot/dts/sun7i-a20-m3.dts | 186 ++++--- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 192 +++---- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 296 +++++----- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 414 +++++++------- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 255 +++++++++ + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 233 ++++++++ + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 199 +++++++ + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 212 +++---- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 188 +++++++ + arch/arm/boot/dts/sun7i-a20.dtsi | 44 +- + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 112 ++-- + arch/arm/boot/dts/sun8i-a23.dtsi | 22 + + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 99 ++++ + arch/arm/boot/dts/sun9i-a80-optimus.dts | 67 ++- + arch/arm/boot/dts/sun9i-a80.dtsi | 132 +++++ + arch/arm/mach-sunxi/platsmp.c | 69 +++ + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/sunxi/Kconfig | 10 + + drivers/soc/sunxi/Makefile | 1 + + drivers/soc/sunxi/sunxi_sram.c | 235 ++++++++ + include/linux/soc/sunxi/sunxi_sram.h | 24 + + 65 files changed, 6421 insertions(+), 3846 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/sunxi/sram.txt + create mode 100644 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts + create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-utoo-p66.dts + create mode 100644 arch/arm/boot/dts/sun5i.dtsi + create mode 100644 arch/arm/boot/dts/sun6i-a31-i7.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-orangepi.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts + create mode 100644 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts + create mode 100644 drivers/soc/sunxi/Kconfig + create mode 100644 drivers/soc/sunxi/Makefile + create mode 100644 drivers/soc/sunxi/sunxi_sram.c + create mode 100644 include/linux/soc/sunxi/sunxi_sram.h +Merging tegra/for-next (47ee17a644f4 Merge branch for-4.1/dt into for-next) +$ git merge tegra/for-next +Auto-merging include/linux/clk-provider.h +Auto-merging drivers/clk/tegra/clk.h +Auto-merging drivers/clk/tegra/clk-tegra124.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clk/Kconfig +Auto-merging arch/arm/mach-tegra/tegra.c +Auto-merging arch/arm/mach-tegra/cpuidle-tegra20.c +Merge made by the 'recursive' strategy. + .../bindings/clock/nvidia,tegra124-car.txt | 44 +- + .../memory-controllers/nvidia,tegra-mc.txt | 84 +- + .../bindings/memory-controllers/tegra-emc.txt | 374 +++++++ + .../bindings/misc/nvidia,tegra20-apbmisc.txt | 2 + + arch/arm/mach-tegra/cpuidle-tegra20.c | 5 +- + arch/arm/mach-tegra/reset-handler.S | 10 +- + arch/arm/mach-tegra/reset.h | 4 + + arch/arm/mach-tegra/sleep-tegra20.S | 37 +- + arch/arm/mach-tegra/sleep.h | 4 + + arch/arm/mach-tegra/tegra.c | 1 - + drivers/clk/Kconfig | 1 + + drivers/clk/clk.c | 8 + + drivers/clk/tegra/Kconfig | 3 + + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-emc.c | 539 ++++++++++ + drivers/clk/tegra/clk-tegra124.c | 18 +- + drivers/clk/tegra/clk.h | 12 + + drivers/gpio/gpio-tegra.c | 4 +- + drivers/memory/tegra/Kconfig | 10 + + drivers/memory/tegra/Makefile | 2 + + drivers/memory/tegra/mc.c | 140 ++- + drivers/memory/tegra/tegra114.c | 32 +- + drivers/memory/tegra/tegra124-emc.c | 1137 ++++++++++++++++++++ + drivers/memory/tegra/tegra124.c | 90 +- + drivers/memory/tegra/tegra30.c | 32 +- + drivers/soc/tegra/fuse/fuse-tegra20.c | 6 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 21 + + drivers/soc/tegra/pmc.c | 23 +- + include/linux/clk-provider.h | 1 + + include/soc/tegra/emc.h | 19 + + include/soc/tegra/fuse.h | 1 + + include/soc/tegra/mc.h | 15 +- + include/soc/tegra/pmc.h | 2 - + 33 files changed, 2572 insertions(+), 110 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/tegra-emc.txt + create mode 100644 drivers/clk/tegra/Kconfig + create mode 100644 drivers/clk/tegra/clk-emc.c + create mode 100644 drivers/memory/tegra/tegra124-emc.c + create mode 100644 include/soc/tegra/emc.h +Merging arm64/for-next/core (6d1966dfd6e0 arm64: fix midr range for Cortex-A57 erratum 832075) +$ git merge arm64/for-next/core +Already up-to-date. +Merging arm64-acpi/for-next/acpi (7676fa70feb2 ARM64 / ACPI: make acpi_map_gic_cpu_interface() as void function) +$ git merge arm64-acpi/for-next/acpi +Resolved 'arch/arm64/Kconfig' using previous resolution. +Resolved 'drivers/xen/Kconfig' using previous resolution. +Auto-merging include/linux/clocksource.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/xen/Makefile +Auto-merging drivers/xen/Kconfig +CONFLICT (content): Merge conflict in drivers/xen/Kconfig +Auto-merging drivers/irqchip/irq-gic.c +Auto-merging drivers/clocksource/arm_arch_timer.c +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/ia64/kernel/acpi.c +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm64/kernel/smp.c +Auto-merging arch/arm64/kernel/setup.c +Auto-merging arch/arm64/kernel/Makefile +Auto-merging arch/arm64/include/asm/fixmap.h +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 300283b85475] Merge remote-tracking branch 'arm64-acpi/for-next/acpi' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm64/acpi_object_usage.txt | 593 ++++++++++++++++++++++++++++++ + Documentation/arm64/arm-acpi.txt | 505 +++++++++++++++++++++++++ + Documentation/kernel-parameters.txt | 3 +- + arch/arm64/Kconfig | 4 + + arch/arm64/include/asm/acenv.h | 18 + + arch/arm64/include/asm/acpi.h | 96 +++++ + arch/arm64/include/asm/cpu_ops.h | 1 + + arch/arm64/include/asm/fixmap.h | 3 + + arch/arm64/include/asm/irq.h | 13 + + arch/arm64/include/asm/pci.h | 6 + + arch/arm64/include/asm/psci.h | 3 +- + arch/arm64/include/asm/smp.h | 5 +- + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/acpi.c | 345 +++++++++++++++++ + arch/arm64/kernel/cpu_ops.c | 2 +- + arch/arm64/kernel/pci.c | 25 ++ + arch/arm64/kernel/psci.c | 112 ++++-- + arch/arm64/kernel/setup.c | 21 +- + arch/arm64/kernel/smp.c | 2 +- + arch/arm64/kernel/time.c | 7 + + arch/ia64/Kconfig | 1 + + arch/ia64/kernel/acpi.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/acpi/boot.c | 2 +- + drivers/acpi/Kconfig | 10 +- + drivers/acpi/Makefile | 3 +- + drivers/acpi/acpi_processor.c | 7 +- + drivers/acpi/bus.c | 3 + + drivers/acpi/gsi.c | 105 ++++++ + drivers/acpi/internal.h | 4 + + drivers/acpi/osl.c | 6 +- + drivers/acpi/processor_core.c | 60 ++- + drivers/acpi/tables.c | 52 ++- + drivers/clocksource/arm_arch_timer.c | 132 +++++-- + drivers/irqchip/irq-gic.c | 104 ++++++ + drivers/irqchip/irqchip.c | 3 + + drivers/xen/Kconfig | 4 + + drivers/xen/Makefile | 2 +- + include/acpi/acpi_io.h | 4 + + include/acpi/processor.h | 6 +- + include/linux/acpi.h | 8 +- + include/linux/acpi_irq.h | 10 + + include/linux/clocksource.h | 6 + + include/linux/irqchip/arm-gic-acpi.h | 31 ++ + 44 files changed, 2216 insertions(+), 115 deletions(-) + create mode 100644 Documentation/arm64/acpi_object_usage.txt + create mode 100644 Documentation/arm64/arm-acpi.txt + create mode 100644 arch/arm64/include/asm/acenv.h + create mode 100644 arch/arm64/include/asm/acpi.h + create mode 100644 arch/arm64/kernel/acpi.c + create mode 100644 drivers/acpi/gsi.c + create mode 100644 include/linux/acpi_irq.h + create mode 100644 include/linux/irqchip/arm-gic-acpi.h +Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) +$ git merge blackfin/for-linus +Auto-merging arch/blackfin/mach-bf609/boards/ezkit.c +Merge made by the 'recursive' strategy. + arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 - + arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 - + arch/blackfin/configs/BF533-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF533-STAMP_defconfig | 1 - + arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++- + arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT_defconfig | 1 - + arch/blackfin/configs/CM-BF527_defconfig | 1 - + arch/blackfin/configs/CM-BF533_defconfig | 1 - + arch/blackfin/configs/CM-BF537E_defconfig | 1 - + arch/blackfin/configs/CM-BF537U_defconfig | 1 - + arch/blackfin/configs/CM-BF548_defconfig | 1 - + arch/blackfin/configs/CM-BF561_defconfig | 1 - + arch/blackfin/configs/DNP5370_defconfig | 1 - + arch/blackfin/configs/IP0X_defconfig | 1 - + arch/blackfin/configs/PNAV-10_defconfig | 1 - + arch/blackfin/configs/SRV1_defconfig | 1 - + arch/blackfin/configs/TCM-BF518_defconfig | 1 - + arch/blackfin/configs/TCM-BF537_defconfig | 1 - + arch/blackfin/kernel/kgdb.c | 12 ++++-------- + arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- + 23 files changed, 10 insertions(+), 33 deletions(-) +Merging c6x/for-linux-next (3083ca2376a7 c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (d939b52abe0c cris: fix integer overflow in ELF_ET_DYN_BASE) +$ git merge cris/for-next +Removing arch/cris/include/asm/topology.h +Removing arch/cris/include/asm/spinlock.h +Removing arch/cris/include/asm/smp.h +Removing arch/cris/include/asm/percpu.h +Removing arch/cris/include/asm/local64.h +Removing arch/cris/include/asm/local.h +Removing arch/cris/include/asm/kmap_types.h +Removing arch/cris/include/asm/kdebug.h +Removing arch/cris/include/asm/irq_regs.h +Removing arch/cris/include/asm/hardirq.h +Removing arch/cris/include/asm/futex.h +Removing arch/cris/include/asm/emergency-restart.h +Removing arch/cris/include/asm/div64.h +Removing arch/cris/include/asm/device.h +Removing arch/cris/include/asm/cmpxchg.h +Removing arch/cris/include/asm/atomic.h +Removing arch/cris/include/arch-v32/arch/spinlock.h +Removing arch/cris/include/arch-v32/arch/atomic.h +Removing arch/cris/include/arch-v10/arch/atomic.h +Removing arch/cris/arch-v32/lib/spinlock.S +Removing arch/cris/arch-v32/kernel/smp.c +Auto-merging arch/cris/arch-v32/kernel/signal.c +Auto-merging arch/cris/arch-v32/kernel/setup.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/cris/axis.txt | 9 + + Documentation/devicetree/bindings/cris/boards.txt | 8 + + .../devicetree/bindings/cris/interrupts.txt | 23 ++ + arch/cris/Kconfig | 12 +- + arch/cris/Makefile | 4 + + arch/cris/arch-v32/kernel/Makefile | 1 - + arch/cris/arch-v32/kernel/entry.S | 42 +-- + arch/cris/arch-v32/kernel/head.S | 32 -- + arch/cris/arch-v32/kernel/irq.c | 31 +- + arch/cris/arch-v32/kernel/setup.c | 5 - + arch/cris/arch-v32/kernel/signal.c | 5 + + arch/cris/arch-v32/kernel/smp.c | 358 --------------------- + arch/cris/arch-v32/kernel/time.c | 180 ++++++----- + arch/cris/arch-v32/lib/Makefile | 2 +- + arch/cris/arch-v32/lib/spinlock.S | 40 --- + arch/cris/arch-v32/mm/init.c | 11 - + arch/cris/arch-v32/mm/mmu.S | 4 - + arch/cris/boot/dts/Makefile | 6 + + arch/cris/boot/dts/dev88.dts | 18 ++ + arch/cris/boot/dts/etraxfs.dtsi | 38 +++ + arch/cris/include/arch-v10/arch/atomic.h | 7 - + arch/cris/include/arch-v10/arch/system.h | 8 - + arch/cris/include/arch-v32/arch/atomic.h | 36 --- + arch/cris/include/arch-v32/arch/processor.h | 3 +- + arch/cris/include/arch-v32/arch/spinlock.h | 131 -------- + arch/cris/include/asm/Kbuild | 15 +- + arch/cris/include/asm/atomic.h | 149 --------- + arch/cris/include/asm/bitops.h | 111 +------ + arch/cris/include/asm/cmpxchg.h | 53 --- + arch/cris/include/asm/device.h | 7 - + arch/cris/include/asm/div64.h | 1 - + arch/cris/include/asm/elf.h | 2 +- + arch/cris/include/asm/emergency-restart.h | 6 - + arch/cris/include/asm/futex.h | 6 - + arch/cris/include/asm/hardirq.h | 7 - + arch/cris/include/asm/irq_regs.h | 1 - + arch/cris/include/asm/kdebug.h | 1 - + arch/cris/include/asm/kmap_types.h | 10 - + arch/cris/include/asm/local.h | 1 - + arch/cris/include/asm/local64.h | 1 - + arch/cris/include/asm/percpu.h | 6 - + arch/cris/include/asm/smp.h | 10 - + arch/cris/include/asm/spinlock.h | 1 - + arch/cris/include/asm/tlbflush.h | 7 - + arch/cris/include/asm/topology.h | 6 - + arch/cris/kernel/Makefile | 1 + + arch/cris/kernel/devicetree.c | 14 + + arch/cris/kernel/ptrace.c | 23 ++ + arch/cris/kernel/setup.c | 15 + + arch/cris/kernel/time.c | 2 + + 50 files changed, 325 insertions(+), 1145 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cris/axis.txt + create mode 100644 Documentation/devicetree/bindings/cris/boards.txt + create mode 100644 Documentation/devicetree/bindings/cris/interrupts.txt + delete mode 100644 arch/cris/arch-v32/kernel/smp.c + delete mode 100644 arch/cris/arch-v32/lib/spinlock.S + create mode 100644 arch/cris/boot/dts/Makefile + create mode 100644 arch/cris/boot/dts/dev88.dts + create mode 100644 arch/cris/boot/dts/etraxfs.dtsi + delete mode 100644 arch/cris/include/arch-v10/arch/atomic.h + delete mode 100644 arch/cris/include/arch-v32/arch/atomic.h + delete mode 100644 arch/cris/include/arch-v32/arch/spinlock.h + delete mode 100644 arch/cris/include/asm/atomic.h + delete mode 100644 arch/cris/include/asm/cmpxchg.h + delete mode 100644 arch/cris/include/asm/device.h + delete mode 100644 arch/cris/include/asm/div64.h + delete mode 100644 arch/cris/include/asm/emergency-restart.h + delete mode 100644 arch/cris/include/asm/futex.h + delete mode 100644 arch/cris/include/asm/hardirq.h + delete mode 100644 arch/cris/include/asm/irq_regs.h + delete mode 100644 arch/cris/include/asm/kdebug.h + delete mode 100644 arch/cris/include/asm/kmap_types.h + delete mode 100644 arch/cris/include/asm/local.h + delete mode 100644 arch/cris/include/asm/local64.h + delete mode 100644 arch/cris/include/asm/percpu.h + delete mode 100644 arch/cris/include/asm/smp.h + delete mode 100644 arch/cris/include/asm/spinlock.h + delete mode 100644 arch/cris/include/asm/topology.h + create mode 100644 arch/cris/kernel/devicetree.c +Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (62f269ef8191 pstore: Fix the ramoops module parameters update) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (6e4206136faa m68knommu: fix fec setup warning for ColdFire 5271 builds) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (40346a0327fe metag: copy_thread(): rename 'arg' argument to 'kthread_arg') +$ git merge metag/for-next +Merge made by the 'recursive' strategy. + arch/metag/kernel/process.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) +Merging microblaze/next (c2219eda5478 microblaze: Fix syscall error recovery for invalid syscall IDs) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (3e20a26b02bd Merge branch '4.0-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging nios2/nios2-next (4a89c3088ff6 nios2: fix cache coherency issue when debug with gdb) +$ git merge nios2/nios2-next +Already up-to-date. +Merging parisc-hd/for-next (db4fd9c5d072 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc-mpe/next (2fe0753d4940 powerpc/powermac: Fix build error seen with powermac smp builds) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging powerpc/next (65e7bb2a34fe Merge branch 'next-sriov' into next) +$ git merge powerpc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fsl/next (d41444daba1f powerpc/corenet: enable CONFIG_I2C_MUX and CONFIG_I2C_MUX_PCA954x) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (db86b54acc93 s390/mm: change swap pte encoding and pgtable cleanup) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/kexec.h | 3 + + arch/s390/include/asm/mmu.h | 4 +- + arch/s390/include/asm/mmu_context.h | 3 + + arch/s390/include/asm/pgalloc.h | 1 + + arch/s390/include/asm/pgtable.h | 167 ++++++++++++++++-------------------- + arch/s390/kvm/Kconfig | 16 ++++ + arch/s390/mm/hugetlbpage.c | 66 +++++++------- + arch/s390/mm/pgtable.c | 142 ++++++++++-------------------- + drivers/s390/char/con3215.c | 2 + + include/linux/kexec.h | 4 + + kernel/kexec.c | 2 +- + 12 files changed, 185 insertions(+), 227 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (128f3cb9398b tile: nohz: warn if nohz_full uses hypervisor shared cores) +$ git merge tile/master +Already up-to-date. +Merging uml/linux-next (fe205bdd1321 um: Print minimum physical memory requirement) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (2ba9268dd603 Merge tag 'xtensa-for-next-20150413' of git://github.com/jcmvbkbc/linux-xtensa into for_next) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (e082f56313f3 btrfs: quota: Update quota tree after qgroup relationship change.) +$ git merge btrfs/next +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Merge made by the 'recursive' strategy. + fs/btrfs/async-thread.c | 4 +- + fs/btrfs/async-thread.h | 2 +- + fs/btrfs/backref.c | 4 +- + fs/btrfs/btrfs_inode.h | 14 +- + fs/btrfs/check-integrity.c | 9 +- + fs/btrfs/compression.c | 4 +- + fs/btrfs/compression.h | 4 +- + fs/btrfs/ctree.c | 62 ++--- + fs/btrfs/ctree.h | 46 +++- + fs/btrfs/delayed-inode.c | 9 +- + fs/btrfs/delayed-ref.c | 22 +- + fs/btrfs/delayed-ref.h | 10 + + fs/btrfs/dev-replace.c | 6 +- + fs/btrfs/disk-io.c | 570 +++++++++++++++++++++++------------------- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 476 ++++++++++++++++++++++++++++------- + fs/btrfs/extent_io.c | 5 +- + fs/btrfs/extent_io.h | 2 +- + fs/btrfs/file-item.c | 6 +- + fs/btrfs/file.c | 65 ++--- + fs/btrfs/free-space-cache.c | 301 +++++++++++++++------- + fs/btrfs/free-space-cache.h | 9 +- + fs/btrfs/inode-map.c | 2 +- + fs/btrfs/inode.c | 146 ++++++++++- + fs/btrfs/ioctl.c | 33 ++- + fs/btrfs/lzo.c | 2 +- + fs/btrfs/math.h | 6 +- + fs/btrfs/props.c | 2 + + fs/btrfs/qgroup.c | 348 ++++++++++++++++++-------- + fs/btrfs/qgroup.h | 3 +- + fs/btrfs/raid56.c | 16 +- + fs/btrfs/relocation.c | 11 +- + fs/btrfs/scrub.c | 25 +- + fs/btrfs/send.c | 83 ++---- + fs/btrfs/super.c | 23 +- + fs/btrfs/sysfs.c | 2 +- + fs/btrfs/sysfs.h | 22 +- + fs/btrfs/tests/qgroup-tests.c | 4 +- + fs/btrfs/transaction.c | 54 +++- + fs/btrfs/transaction.h | 12 + + fs/btrfs/tree-log.c | 382 ++++++++++++++++++++++++++-- + fs/btrfs/tree-log.h | 2 + + fs/btrfs/volumes.c | 140 +++++------ + fs/btrfs/volumes.h | 3 +- + fs/btrfs/xattr.c | 53 ++-- + fs/btrfs/zlib.c | 2 +- + 46 files changed, 2113 insertions(+), 897 deletions(-) +Merging ceph/master (84b54fefaa05 libceph: announce support for straw2 buckets) +$ git merge ceph/master +Merge made by the 'recursive' strategy. +Merging cifs/for-next (be4a8e38d68f Update negotiate protocol for SMB3.1 dialect) +$ git merge cifs/for-next +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 9 +++++++ + fs/cifs/cifs_dfs_ref.c | 3 ++- + fs/cifs/cifsfs.c | 2 ++ + fs/cifs/cifsglob.h | 7 ++++++ + fs/cifs/cifsproto.h | 4 ++-- + fs/cifs/cifssmb.c | 21 +++++++++-------- + fs/cifs/connect.c | 10 ++++++++ + fs/cifs/dir.c | 3 +-- + fs/cifs/file.c | 3 +-- + fs/cifs/inode.c | 6 ++--- + fs/cifs/link.c | 3 ++- + fs/cifs/readdir.c | 2 ++ + fs/cifs/smb1ops.c | 3 ++- + fs/cifs/smb2ops.c | 22 +++++++++++++++++ + fs/cifs/smb2pdu.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++--- + fs/cifs/smb2pdu.h | 50 ++++++++++++++++++++++++++++++++------- + 16 files changed, 178 insertions(+), 34 deletions(-) +Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (3adc12e96482 udf: Update ctime and mtime when directory is modified) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (6ddb2447846a ext4 crypto: enable encryption feature flag) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (10027551ccf5 f2fs: pass checkpoint reason on roll-forward recovery) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Auto-merging fs/cachefiles/namei.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/caching/backend-api.txt | 23 ++ + Documentation/filesystems/caching/fscache.txt | 7 +- + fs/cachefiles/internal.h | 1 - + fs/cachefiles/namei.c | 33 ++- + fs/fscache/cookie.c | 8 +- + fs/fscache/internal.h | 12 +- + fs/fscache/netfs.c | 38 ++-- + fs/fscache/object.c | 69 +++++- + fs/fscache/operation.c | 254 ++++++++++++++-------- + fs/fscache/page.c | 86 ++++---- + fs/fscache/stats.c | 14 +- + include/linux/fscache-cache.h | 55 +++-- + 12 files changed, 396 insertions(+), 204 deletions(-) +Merging fuse/for-next (94e4fe2cab3d fuse: explicitly set /dev/fuse file's private_data) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (a31a0529efad GFS2: Use average srttb value in congestion calculations) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/rgrp.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) +Merging jfs/jfs-next (7d2ac45611b0 jfs: %pf is only for function pointers) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (9eccca084320 Linux 4.0-rc3) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (bff175238a24 uapi: Remove kernel internal declaration) +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/Kconfig +Merge made by the 'recursive' strategy. + fs/lockd/svcsubs.c | 2 +- + fs/nfsd/Kconfig | 2 +- + fs/nfsd/export.c | 4 ++-- + fs/nfsd/nfs4acl.c | 50 +--------------------------------------- + fs/nfsd/nfs4proc.c | 12 ++++++---- + fs/nfsd/nfs4state.c | 5 ++-- + fs/nfsd/nfs4xdr.c | 16 ++++++++----- + fs/nfsd/nfsctl.c | 16 ++++++------- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/xdr4.h | 3 +-- + include/linux/nfs4.h | 7 ++++++ + include/uapi/linux/nfs4.h | 7 ------ + include/uapi/linux/nfsd/debug.h | 8 ------- + include/uapi/linux/nfsd/export.h | 3 +++ + 14 files changed, 45 insertions(+), 92 deletions(-) +Merging overlayfs/overlayfs-next (71cbad7e694e ovl: upper fs should not be R/O) +$ git merge overlayfs/overlayfs-next +Already up-to-date. +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (f569d3ef8254 net/9p: add a privport option for RDMA transport.) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (502690674281 UBI: power cut emulation for testing) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (542c311813d5 Merge branch 'xfs-dio-extend-fix' into for-next) +$ git merge xfs/for-next +Resolved 'fs/xfs/xfs_file.c' using previous resolution. +Auto-merging fs/xfs/xfs_file.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/open.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0510b6056854] Merge remote-tracking branch 'xfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/xfs.txt | 29 +- + fs/open.c | 8 +- + fs/xfs/libxfs/xfs_alloc.c | 104 +++-- + fs/xfs/libxfs/xfs_attr_leaf.c | 150 +++++-- + fs/xfs/libxfs/xfs_attr_leaf.h | 6 +- + fs/xfs/libxfs/xfs_bmap.c | 554 ++++++++++++++++------- + fs/xfs/libxfs/xfs_bmap.h | 13 +- + fs/xfs/libxfs/xfs_btree.c | 24 +- + fs/xfs/libxfs/xfs_da_btree.c | 8 +- + fs/xfs/libxfs/xfs_da_format.h | 14 +- + fs/xfs/libxfs/xfs_dir2_data.c | 39 +- + fs/xfs/libxfs/xfs_format.h | 62 --- + fs/xfs/libxfs/xfs_ialloc.c | 48 +- + fs/xfs/libxfs/xfs_sb.c | 20 +- + fs/xfs/xfs_aops.c | 270 +++++++---- + fs/xfs/xfs_attr_inactive.c | 3 +- + fs/xfs/xfs_attr_list.c | 9 +- + fs/xfs/xfs_bmap_util.c | 164 ++++--- + fs/xfs/xfs_bmap_util.h | 2 + + fs/xfs/xfs_buf_item.c | 4 +- + fs/xfs/xfs_discard.c | 2 +- + fs/xfs/xfs_error.c | 2 +- + fs/xfs/xfs_error.h | 8 +- + fs/xfs/xfs_file.c | 161 ++++++- + fs/xfs/xfs_filestream.c | 2 +- + fs/xfs/xfs_fsops.c | 20 +- + fs/xfs/xfs_icache.c | 4 +- + fs/xfs/xfs_inode.c | 558 ++++++++++++++--------- + fs/xfs/xfs_inode.h | 49 +- + fs/xfs/xfs_ioctl.c | 7 +- + fs/xfs/xfs_iomap.c | 3 +- + fs/xfs/xfs_iops.c | 91 ++-- + fs/xfs/xfs_iops.h | 2 - + fs/xfs/xfs_itable.c | 2 +- + fs/xfs/xfs_linux.h | 9 - + fs/xfs/xfs_log_recover.c | 4 +- + fs/xfs/xfs_mount.c | 918 +++++--------------------------------- + fs/xfs/xfs_mount.h | 95 +--- + fs/xfs/xfs_mru_cache.c | 2 +- + fs/xfs/xfs_pnfs.c | 7 +- + fs/xfs/xfs_pnfs.h | 5 +- + fs/xfs/xfs_qm.c | 13 +- + fs/xfs/xfs_super.c | 132 ++++-- + fs/xfs/xfs_super.h | 2 + + fs/xfs/xfs_symlink.c | 58 ++- + fs/xfs/xfs_trace.h | 29 +- + fs/xfs/xfs_trans.c | 234 ++++++---- + include/linux/falloc.h | 6 + + include/uapi/linux/falloc.h | 17 + + 49 files changed, 2024 insertions(+), 1949 deletions(-) +$ git am -3 ../patches/0001-xfs-fix-up-for-direct_IO-API-change.patch +Applying: xfs: fix up for direct_IO API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/xfs/xfs_file.c +$ git add -A . +$ git commit -v -a --amend +[master 7606e70f21af] Merge remote-tracking branch 'xfs/for-next' + Date: Thu Apr 23 11:57:39 2015 +1000 +Merging file-locks/linux-next (7505256626b0 Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux) +$ git merge file-locks/linux-next +Already up-to-date. +Merging net-next/master (04b7fe6a4a23 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge net-next/master +Already up-to-date. +Merging vfs/for-next (6d3b3d3367cb direct-io: only inc/dec inode->i_dio_count for file systems) +$ git merge vfs/for-next +Resolved 'fs/affs/amigaffs.c' using previous resolution. +Resolved 'fs/befs/linuxvfs.c' using previous resolution. +Resolved 'fs/btrfs/xattr.c' using previous resolution. +Resolved 'fs/ext4/namei.c' using previous resolution. +Resolved 'fs/ext4/symlink.c' using previous resolution. +Resolved 'fs/f2fs/f2fs.h' using previous resolution. +Resolved 'fs/hfsplus/xattr.h' using previous resolution. +Resolved 'fs/xfs/xfs_iops.c' using previous resolution. +Resolved 'kernel/trace/trace.c' using previous resolution. +Auto-merging security/smack/smackfs.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/lsm_audit.c +Auto-merging kernel/trace/trace_uprobe.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace.c +CONFLICT (content): Merge conflict in kernel/trace/trace.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit_tree.c +Auto-merging kernel/audit.c +Auto-merging ipc/shm.c +Auto-merging include/trace/events/ext4.h +Auto-merging include/trace/events/ext3.h +Auto-merging include/trace/events/btrfs.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_iops.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_ioctl.c +Auto-merging fs/xfs/xfs_filestream.c +Auto-merging fs/udf/namei.c +Auto-merging fs/udf/file.c +Auto-merging fs/ubifs/xattr.c +Auto-merging fs/ubifs/journal.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/ubifs/dir.c +Auto-merging fs/reiserfs/super.c +Auto-merging fs/quota/dquot.c +Auto-merging fs/pstore/inode.c +Auto-merging fs/proc/fd.c +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/xattr.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/ocfs2/inode.c +Auto-merging fs/ocfs2/export.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/nilfs2/inode.c +Auto-merging fs/nfsd/xdr4.h +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging fs/nfsd/nfs4acl.c +Auto-merging fs/nfsd/export.c +Auto-merging fs/nfs/write.c +Auto-merging fs/jffs2/xattr.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/hfsplus/xattr.h +CONFLICT (content): Merge conflict in fs/hfsplus/xattr.h +Auto-merging fs/hfsplus/xattr.c +Auto-merging fs/hfsplus/ioctl.c +Auto-merging fs/hfsplus/inode.c +Auto-merging fs/hfsplus/dir.c +Auto-merging fs/hfs/dir.c +Auto-merging fs/gfs2/xattr.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging fs/fat/namei_msdos.c +Auto-merging fs/fat/file.c +Auto-merging fs/f2fs/xattr.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h +Auto-merging fs/ext4/xattr.c +Auto-merging fs/ext4/symlink.c +CONFLICT (content): Merge conflict in fs/ext4/symlink.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/namei.c +CONFLICT (content): Merge conflict in fs/ext4/namei.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/inline.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/fsync.c +Auto-merging fs/ext3/xattr.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext2/namei.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/dax.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/cifs/smb1ops.c +Auto-merging fs/cifs/readdir.c +Auto-merging fs/cifs/link.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/dir.c +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifs_dfs_ref.c +Auto-merging fs/ceph/xattr.c +Auto-merging fs/ceph/super.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/ceph/caps.c +Auto-merging fs/cachefiles/namei.c +Auto-merging fs/btrfs/xattr.c +CONFLICT (content): Merge conflict in fs/btrfs/xattr.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/binfmt_misc.c +Auto-merging fs/bfs/dir.c +Auto-merging fs/befs/linuxvfs.c +CONFLICT (content): Merge conflict in fs/befs/linuxvfs.c +Auto-merging fs/affs/namei.c +Auto-merging fs/affs/inode.c +Auto-merging fs/affs/amigaffs.c +CONFLICT (content): Merge conflict in fs/affs/amigaffs.c +Auto-merging fs/9p/v9fs.h +Auto-merging drivers/staging/lustre/lustre/llite/statahead.c +Auto-merging drivers/staging/lustre/lustre/llite/namei.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c +Auto-merging drivers/staging/lustre/lustre/llite/file.c +Auto-merging drivers/staging/lustre/lustre/llite/dcache.c +Auto-merging drivers/mtd/ubi/build.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3aec1f6b5531] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/kernel/perfmon.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 22 +-- + arch/s390/hypfs/inode.c | 18 +-- + arch/x86/kvm/assigned-dev.c | 2 +- + drivers/base/devtmpfs.c | 32 ++-- + drivers/block/drbd/drbd_debugfs.c | 8 +- + drivers/infiniband/hw/ipath/ipath_fs.c | 16 +- + drivers/infiniband/hw/qib/qib_fs.c | 20 +-- + drivers/mtd/ubi/build.c | 6 +- + drivers/mtd/ubi/kapi.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 21 +-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 2 - + drivers/oprofile/oprofilefs.c | 16 +- + drivers/staging/lustre/lustre/llite/dcache.c | 14 +- + drivers/staging/lustre/lustre/llite/file.c | 16 +- + .../staging/lustre/lustre/llite/llite_internal.h | 2 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 6 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 6 +- + drivers/staging/lustre/lustre/llite/namei.c | 20 +-- + drivers/staging/lustre/lustre/llite/statahead.c | 28 ++-- + drivers/staging/lustre/lustre/llite/symlink.c | 2 +- + drivers/staging/lustre/lustre/llite/xattr.c | 8 +- + drivers/usb/gadget/legacy/inode.c | 2 +- + fs/9p/acl.c | 4 +- + fs/9p/v9fs.h | 2 - + fs/9p/vfs_dentry.c | 4 +- + fs/9p/vfs_inode.c | 153 +++++-------------- + fs/9p/vfs_inode_dotl.c | 47 ++---- + fs/9p/vfs_super.c | 8 +- + fs/adfs/inode.c | 2 +- + fs/affs/amigaffs.c | 8 +- + fs/affs/inode.c | 2 +- + fs/affs/namei.c | 10 +- + fs/afs/dir.c | 42 +++--- + fs/afs/inode.c | 4 +- + fs/afs/mntpt.c | 8 +- + fs/afs/super.c | 2 +- + fs/autofs4/autofs_i.h | 4 +- + fs/autofs4/expire.c | 2 +- + fs/autofs4/inode.c | 6 +- + fs/autofs4/root.c | 18 +-- + fs/autofs4/symlink.c | 2 +- + fs/autofs4/waitq.c | 4 +- + fs/befs/linuxvfs.c | 4 +- + fs/bfs/dir.c | 8 +- + fs/binfmt_misc.c | 16 +- + fs/block_dev.c | 5 +- + fs/btrfs/export.c | 6 +- + fs/btrfs/file.c | 2 +- + fs/btrfs/inode.c | 36 ++--- + fs/btrfs/ioctl.c | 22 +-- + fs/btrfs/super.c | 8 +- + fs/btrfs/tree-log.c | 14 +- + fs/btrfs/xattr.c | 16 +- + fs/cachefiles/bind.c | 10 +- + fs/cachefiles/interface.c | 6 +- + fs/cachefiles/namei.c | 122 +++++++-------- + fs/cachefiles/rdwr.c | 14 +- + fs/cachefiles/security.c | 6 +- + fs/cachefiles/xattr.c | 22 +-- + fs/ceph/caps.c | 2 +- + fs/ceph/debugfs.c | 2 +- + fs/ceph/dir.c | 60 ++++---- + fs/ceph/export.c | 28 ++-- + fs/ceph/file.c | 4 +- + fs/ceph/inode.c | 52 +++---- + fs/ceph/mds_client.c | 24 +-- + fs/ceph/super.c | 4 +- + fs/ceph/xattr.c | 16 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifssmb.c | 4 +- + fs/cifs/dir.c | 8 +- + fs/cifs/file.c | 48 +++--- + fs/cifs/inode.c | 32 ++-- + fs/cifs/link.c | 12 +- + fs/cifs/misc.c | 2 +- + fs/cifs/readdir.c | 4 +- + fs/cifs/smb1ops.c | 2 +- + fs/cifs/smb2file.c | 4 +- + fs/cifs/smb2misc.c | 4 +- + fs/cifs/smb2ops.c | 10 +- + fs/cifs/xattr.c | 22 +-- + fs/coda/cache.c | 4 +- + fs/coda/dir.c | 22 +-- + fs/coda/inode.c | 6 +- + fs/coda/pioctl.c | 2 +- + fs/coda/upcall.c | 4 +- + fs/configfs/dir.c | 70 ++++----- + fs/configfs/file.c | 4 +- + fs/configfs/inode.c | 16 +- + fs/dax.c | 4 +- + fs/debugfs/file.c | 2 +- + fs/debugfs/inode.c | 56 +++---- + fs/devpts/inode.c | 16 +- + fs/direct-io.c | 7 +- + fs/ecryptfs/crypto.c | 4 +- + fs/ecryptfs/dentry.c | 6 +- + fs/ecryptfs/file.c | 2 +- + fs/ecryptfs/inode.c | 164 ++++++++++----------- + fs/ecryptfs/kthread.c | 2 +- + fs/ecryptfs/main.c | 6 +- + fs/ecryptfs/mmap.c | 2 +- + fs/efivarfs/inode.c | 4 +- + fs/efivarfs/super.c | 2 +- + fs/efs/namei.c | 4 +- + fs/exofs/dir.c | 4 +- + fs/exofs/inode.c | 2 +- + fs/exofs/namei.c | 10 +- + fs/exofs/super.c | 2 +- + fs/exofs/symlink.c | 2 +- + fs/ext2/dir.c | 2 +- + fs/ext2/ialloc.c | 2 +- + fs/ext2/inode.c | 2 +- + fs/ext2/namei.c | 14 +- + fs/ext2/symlink.c | 2 +- + fs/ext2/xattr.c | 4 +- + fs/ext2/xattr_security.c | 4 +- + fs/ext2/xattr_trusted.c | 4 +- + fs/ext2/xattr_user.c | 4 +- + fs/ext3/ialloc.c | 2 +- + fs/ext3/inode.c | 2 +- + fs/ext3/namei.c | 34 ++--- + fs/ext3/super.c | 6 +- + fs/ext3/symlink.c | 2 +- + fs/ext3/xattr.c | 10 +- + fs/ext3/xattr_security.c | 4 +- + fs/ext3/xattr_trusted.c | 4 +- + fs/ext3/xattr_user.c | 4 +- + fs/ext4/fsync.c | 2 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/indirect.c | 6 +- + fs/ext4/inline.c | 4 +- + fs/ext4/inode.c | 8 +- + fs/ext4/migrate.c | 2 +- + fs/ext4/namei.c | 34 ++--- + fs/ext4/super.c | 6 +- + fs/ext4/symlink.c | 8 +- + fs/ext4/xattr.c | 10 +- + fs/ext4/xattr_security.c | 4 +- + fs/ext4/xattr_trusted.c | 4 +- + fs/ext4/xattr_user.c | 4 +- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/file.c | 4 +- + fs/f2fs/namei.c | 18 +-- + fs/f2fs/xattr.c | 10 +- + fs/fat/file.c | 4 +- + fs/fat/namei_msdos.c | 8 +- + fs/fat/namei_vfat.c | 14 +- + fs/fat/nfs.c | 4 +- + fs/freevxfs/vxfs_immed.c | 2 +- + fs/fuse/control.c | 6 +- + fs/fuse/dir.c | 60 ++++---- + fs/fuse/inode.c | 4 +- + fs/gfs2/dentry.c | 12 +- + fs/gfs2/export.c | 8 +- + fs/gfs2/inode.c | 34 ++--- + fs/gfs2/ops_fstype.c | 8 +- + fs/gfs2/super.c | 2 +- + fs/gfs2/xattr.c | 6 +- + fs/hfs/attr.c | 6 +- + fs/hfs/dir.c | 8 +- + fs/hfs/inode.c | 2 +- + fs/hfs/sysdep.c | 2 +- + fs/hfsplus/dir.c | 12 +- + fs/hfsplus/inode.c | 2 +- + fs/hfsplus/ioctl.c | 2 +- + fs/hfsplus/xattr.c | 4 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/inode.c | 2 +- + fs/hpfs/namei.c | 8 +- + fs/hppfs/hppfs.c | 20 +-- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 20 +-- + fs/isofs/export.c | 2 +- + fs/jffs2/dir.c | 40 ++--- + fs/jffs2/fs.c | 2 +- + fs/jffs2/security.c | 4 +- + fs/jffs2/super.c | 4 +- + fs/jffs2/symlink.c | 2 +- + fs/jffs2/xattr.c | 2 +- + fs/jffs2/xattr_trusted.c | 4 +- + fs/jffs2/xattr_user.c | 4 +- + fs/jfs/file.c | 2 +- + fs/jfs/namei.c | 18 +-- + fs/jfs/symlink.c | 2 +- + fs/jfs/xattr.c | 12 +- + fs/kernfs/dir.c | 2 +- + fs/kernfs/inode.c | 8 +- + fs/libfs.c | 26 ++-- + fs/logfs/dir.c | 14 +- + fs/logfs/file.c | 2 +- + fs/minix/dir.c | 4 +- + fs/minix/file.c | 2 +- + fs/minix/inode.c | 4 +- + fs/minix/namei.c | 10 +- + fs/ncpfs/dir.c | 48 +++--- + fs/ncpfs/inode.c | 6 +- + fs/ncpfs/ioctl.c | 8 +- + fs/ncpfs/ncplib_kernel.c | 2 +- + fs/ncpfs/symlink.c | 2 +- + fs/nfs/dir.c | 59 ++++---- + fs/nfs/direct.c | 14 +- + fs/nfs/getroot.c | 4 +- + fs/nfs/inode.c | 18 +-- + fs/nfs/namespace.c | 10 +- + fs/nfs/nfs3acl.c | 2 +- + fs/nfs/nfs3proc.c | 12 +- + fs/nfs/nfs4client.c | 2 +- + fs/nfs/nfs4file.c | 4 +- + fs/nfs/nfs4namespace.c | 4 +- + fs/nfs/nfs4proc.c | 60 ++++---- + fs/nfs/nfs4state.c | 4 +- + fs/nfs/nfs4trace.h | 4 +- + fs/nfs/pagelist.c | 2 +- + fs/nfs/pnfs.h | 4 +- + fs/nfs/proc.c | 4 +- + fs/nfs/read.c | 2 +- + fs/nfs/super.c | 6 +- + fs/nfs/symlink.c | 2 +- + fs/nfs/unlink.c | 20 +-- + fs/nfs/write.c | 8 +- + fs/nfsd/export.c | 4 +- + fs/nfsd/nfs2acl.c | 8 +- + fs/nfsd/nfs3acl.c | 8 +- + fs/nfsd/nfs3proc.c | 6 +- + fs/nfsd/nfs3xdr.c | 16 +- + fs/nfsd/nfs4acl.c | 4 +- + fs/nfsd/nfs4proc.c | 12 +- + fs/nfsd/nfs4recover.c | 22 +-- + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfs4xdr.c | 10 +- + fs/nfsd/nfsfh.c | 20 +-- + fs/nfsd/nfsfh.h | 6 +- + fs/nfsd/nfsproc.c | 4 +- + fs/nfsd/nfsxdr.c | 2 +- + fs/nfsd/vfs.c | 62 ++++---- + fs/nfsd/xdr4.h | 2 +- + fs/nilfs2/dir.c | 2 +- + fs/nilfs2/inode.c | 2 +- + fs/nilfs2/namei.c | 18 +-- + fs/nilfs2/super.c | 6 +- + fs/nsfs.c | 4 +- + fs/ntfs/inode.c | 2 +- + fs/ntfs/namei.c | 4 +- + fs/ocfs2/dcache.c | 14 +- + fs/ocfs2/dir.h | 2 +- + fs/ocfs2/dlmfs/dlmfs.c | 4 +- + fs/ocfs2/export.c | 2 +- + fs/ocfs2/file.c | 8 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/namei.c | 14 +- + fs/ocfs2/refcounttree.c | 10 +- + fs/ocfs2/xattr.c | 22 +-- + fs/omfs/dir.c | 10 +- + fs/omfs/file.c | 2 +- + fs/pipe.c | 2 +- + fs/posix_acl.c | 8 +- + fs/proc/base.c | 32 ++-- + fs/proc/fd.c | 6 +- + fs/proc/generic.c | 4 +- + fs/proc/inode.c | 2 +- + fs/proc/namespaces.c | 4 +- + fs/proc/proc_net.c | 2 +- + fs/proc/proc_sysctl.c | 12 +- + fs/proc/root.c | 2 +- + fs/proc/self.c | 2 +- + fs/proc/thread_self.c | 2 +- + fs/pstore/inode.c | 10 +- + fs/qnx6/inode.c | 2 +- + fs/quota/dquot.c | 10 +- + fs/ramfs/file-nommu.c | 2 +- + fs/reiserfs/dir.c | 4 +- + fs/reiserfs/inode.c | 2 +- + fs/reiserfs/namei.c | 12 +- + fs/reiserfs/super.c | 4 +- + fs/reiserfs/xattr.c | 126 ++++++++-------- + fs/reiserfs/xattr.h | 2 +- + fs/reiserfs/xattr_security.c | 10 +- + fs/reiserfs/xattr_trusted.c | 10 +- + fs/reiserfs/xattr_user.c | 4 +- + fs/squashfs/export.c | 2 +- + fs/squashfs/xattr.c | 8 +- + fs/stat.c | 4 +- + fs/sysv/dir.c | 4 +- + fs/sysv/file.c | 2 +- + fs/sysv/itree.c | 2 +- + fs/sysv/namei.c | 10 +- + fs/sysv/symlink.c | 2 +- + fs/ubifs/dir.c | 14 +- + fs/ubifs/file.c | 4 +- + fs/ubifs/journal.c | 4 +- + fs/ubifs/xattr.c | 10 +- + fs/udf/file.c | 2 +- + fs/udf/namei.c | 16 +- + fs/ufs/dir.c | 2 +- + fs/ufs/namei.c | 10 +- + fs/ufs/super.c | 4 +- + fs/ufs/symlink.c | 2 +- + fs/ufs/truncate.c | 2 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_filestream.c | 2 +- + fs/xfs/xfs_ioctl.c | 18 +-- + fs/xfs/xfs_ioctl32.c | 12 +- + fs/xfs/xfs_iops.c | 20 +-- + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_xattr.c | 6 +- + include/linux/fs.h | 29 +++- + include/trace/events/btrfs.h | 4 +- + include/trace/events/ext3.h | 16 +- + include/trace/events/ext4.h | 16 +- + ipc/mqueue.c | 22 +-- + ipc/shm.c | 2 +- + kernel/audit.c | 2 +- + kernel/audit_tree.c | 4 +- + kernel/audit_watch.c | 14 +- + kernel/auditsc.c | 6 +- + kernel/relay.c | 4 +- + kernel/trace/trace.c | 2 +- + kernel/trace/trace_events.c | 4 +- + kernel/trace/trace_uprobe.c | 2 +- + mm/shmem.c | 30 ++-- + net/socket.c | 6 +- + net/sunrpc/rpc_pipe.c | 32 ++-- + net/unix/af_unix.c | 8 +- + net/unix/diag.c | 2 +- + security/apparmor/apparmorfs.c | 2 +- + security/apparmor/file.c | 6 +- + security/apparmor/lsm.c | 18 +-- + security/commoncap.c | 6 +- + security/inode.c | 18 +-- + security/integrity/evm/evm_crypto.c | 4 +- + security/integrity/evm/evm_main.c | 18 +-- + security/integrity/ima/ima_appraise.c | 10 +- + security/lsm_audit.c | 4 +- + security/security.c | 50 +++---- + security/selinux/hooks.c | 36 ++--- + security/selinux/selinuxfs.c | 2 +- + security/smack/smack_lsm.c | 46 +++--- + security/smack/smackfs.c | 2 +- + security/tomoyo/condition.c | 2 +- + security/tomoyo/realpath.c | 10 +- + 342 files changed, 1897 insertions(+), 1980 deletions(-) +$ git am -3 ../patches/0001-fs-hfsplus-merge-fix-for-d_inode-annotation.patch +Applying: fs/hfsplus: merge fix for d_inode() annotation +$ git reset HEAD^ +Unstaged changes after reset: +M fs/hfsplus/xattr.c +$ git add -A . +$ git commit -v -a --amend +[master 471dc98f7a76] Merge remote-tracking branch 'vfs/for-next' + Date: Thu Apr 23 11:59:34 2015 +1000 +Merging pci/next (5468d5a64bf1 Merge branch 'pci/misc' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (e7f236eb0af9 Merge branch 'for-4.1/sensor-hub' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (64fb1d0e975e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (f354169e0f7d hwmon: (pwm-fan) Update the duty cycle inorder to control the pwm-fan) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (bfb4e26f2532 Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (1be735fc0329 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 19 +++++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + 9 files changed, 356 insertions(+), 8 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (bfa76d495765 Linux 3.19) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (e0e2674b9205 ata: ahci_st: fixup layering violations / drvdata errors) +$ git merge libata/for-next +Removing drivers/ide/scc_pata.c +Removing drivers/ata/pata_scc.c +Merge made by the 'recursive' strategy. + drivers/ata/Kconfig | 9 - + drivers/ata/Makefile | 1 - + drivers/ata/ahci_st.c | 49 ++- + drivers/ata/pata_scc.c | 1110 ------------------------------------------------ + drivers/ide/Kconfig | 9 - + drivers/ide/Makefile | 1 - + drivers/ide/scc_pata.c | 887 -------------------------------------- + 7 files changed, 24 insertions(+), 2042 deletions(-) + delete mode 100644 drivers/ata/pata_scc.c + delete mode 100644 drivers/ide/scc_pata.c +Merging pm/linux-next (c72c2c92ac29 Merge branch 'acpi-ec') +$ git merge pm/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 ----- + drivers/acpi/ec.c | 2 +- + drivers/acpi/scan.c | 40 +++++++++++++++++++++++++++----- + drivers/cpufreq/intel_pstate.c | 14 +++++------ + drivers/powercap/intel_rapl.c | 1 + + tools/power/cpupower/utils/helpers/pci.c | 11 +++++++-- + 6 files changed, 52 insertions(+), 22 deletions(-) +Merging idle/next (9d72137b1930 Merge branch 'cpu-online-next' into next) +$ git merge idle/next +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 7 +++++++ + arch/x86/Kconfig | 16 ++++++++++++++++ + arch/x86/kernel/smpboot.c | 16 +++++++++++++++- + 3 files changed, 38 insertions(+), 1 deletion(-) +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (75229df63655 Merge branches 'thermal-fix', 'thermal-intel' and 'thermal-soc' of .git into next) +$ git merge thermal/next +Auto-merging drivers/thermal/thermal_core.c +Merge made by the 'recursive' strategy. + .../bindings/thermal/qcom-spmi-temp-alarm.txt | 57 ++ + .../devicetree/bindings/thermal/thermal.txt | 9 + + Documentation/thermal/cpu-cooling-api.txt | 156 +++++- + Documentation/thermal/power_allocator.txt | 247 +++++++++ + Documentation/thermal/sysfs-api.txt | 83 ++- + drivers/acpi/thermal.c | 9 +- + drivers/platform/x86/acerhdf.c | 3 +- + drivers/thermal/Kconfig | 60 ++- + drivers/thermal/Makefile | 4 + + drivers/thermal/cpu_cooling.c | 585 ++++++++++++++++++++- + drivers/thermal/db8500_thermal.c | 2 +- + drivers/thermal/fair_share.c | 41 +- + drivers/thermal/imx_thermal.c | 3 +- + .../int340x_thermal/processor_thermal_device.c | 55 +- + drivers/thermal/intel_powerclamp.c | 9 +- + drivers/thermal/intel_quark_dts_thermal.c | 473 +++++++++++++++++ + drivers/thermal/intel_soc_dts_iosf.c | 483 +++++++++++++++++ + drivers/thermal/intel_soc_dts_iosf.h | 62 +++ + drivers/thermal/intel_soc_dts_thermal.c | 430 +-------------- + drivers/thermal/of-thermal.c | 15 +- + drivers/thermal/power_allocator.c | 538 +++++++++++++++++++ + drivers/thermal/qcom-spmi-temp-alarm.c | 309 +++++++++++ + drivers/thermal/samsung/exynos_tmu.c | 187 ++++++- + drivers/thermal/samsung/exynos_tmu.h | 1 + + drivers/thermal/thermal_core.c | 310 ++++++++++- + drivers/thermal/thermal_core.h | 13 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 104 ++-- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +- + drivers/thermal/user_space.c | 13 +- + drivers/thermal/x86_pkg_temp_thermal.c | 2 +- + include/linux/cpu_cooling.h | 39 ++ + include/linux/thermal.h | 86 ++- + include/trace/events/thermal.h | 58 ++ + include/trace/events/thermal_power_allocator.h | 87 +++ + 34 files changed, 3986 insertions(+), 552 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt + create mode 100644 Documentation/thermal/power_allocator.txt + create mode 100644 drivers/thermal/intel_quark_dts_thermal.c + create mode 100644 drivers/thermal/intel_soc_dts_iosf.c + create mode 100644 drivers/thermal/intel_soc_dts_iosf.h + create mode 100644 drivers/thermal/power_allocator.c + create mode 100644 drivers/thermal/qcom-spmi-temp-alarm.c + create mode 100644 include/trace/events/thermal_power_allocator.h +Merging thermal-soc/next (62d0817a0aca Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (a49d0296b726 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Resolved 'drivers/dma/Kconfig' using previous resolution. +Auto-merging sound/soc/sh/fsi.c +Auto-merging drivers/spi/spi-rspi.c +Auto-merging drivers/mmc/host/sh_mmcif.c +Auto-merging drivers/dma/ste_dma40.c +Removing drivers/dma/sh/rcar-audmapp.c +CONFLICT (modify/delete): drivers/dma/intel_mid_dma_regs.h deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of drivers/dma/intel_mid_dma_regs.h left in tree. +CONFLICT (modify/delete): drivers/dma/intel_mid_dma.c deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of drivers/dma/intel_mid_dma.c left in tree. +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/Makefile +Auto-merging drivers/dma/Kconfig +CONFLICT (content): Merge conflict in drivers/dma/Kconfig +Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi +CONFLICT (modify/delete): arch/arm/mach-shmobile/board-mackerel.c deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of arch/arm/mach-shmobile/board-mackerel.c left in tree. +Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c +CONFLICT (modify/delete): arch/arm/mach-shmobile/board-ape6evm.c deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of arch/arm/mach-shmobile/board-ape6evm.c left in tree. +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/dma/rcar-audmapp.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-shmobile/board-mackerel.c arch/arm/mach-shmobile/board-ape6evm.c +arch/arm/mach-shmobile/board-ape6evm.c: needs merge +arch/arm/mach-shmobile/board-mackerel.c: needs merge +rm 'arch/arm/mach-shmobile/board-ape6evm.c' +rm 'arch/arm/mach-shmobile/board-mackerel.c' +$ git rm -f drivers/dma/intel_mid_dma_regs.h drivers/dma/intel_mid_dma.c +drivers/dma/intel_mid_dma.c: needs merge +drivers/dma/intel_mid_dma_regs.h: needs merge +rm 'drivers/dma/intel_mid_dma.c' +rm 'drivers/dma/intel_mid_dma_regs.h' +$ git commit -v -a +[master 7b62680a13e2] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/apm-xgene-dma.txt | 47 + + .../devicetree/bindings/dma/jz4780-dma.txt | 56 + + .../devicetree/bindings/dma/qcom_bam_dma.txt | 1 + + .../devicetree/bindings/dma/rcar-audmapp.txt | 29 - + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 37 + + MAINTAINERS | 5 + + arch/arm/mach-shmobile/board-armadillo800eva.c | 20 +- + arch/arm/mach-shmobile/board-bockw.c | 14 +- + arch/arm/mach-shmobile/board-kzm9g.c | 20 +- + arch/arm/mach-shmobile/board-marzen.c | 10 +- + arch/arm64/boot/dts/apm/apm-storm.dtsi | 26 + + arch/sh/boards/board-sh7757lcr.c | 9 +- + arch/sh/boards/mach-ap325rxa/setup.c | 9 +- + arch/sh/boards/mach-ecovec24/setup.c | 20 +- + arch/sh/boards/mach-kfr2r09/setup.c | 10 +- + arch/sh/boards/mach-migor/setup.c | 9 +- + arch/sh/boards/mach-se/7724/setup.c | 17 +- + drivers/dma/Kconfig | 29 + + drivers/dma/Makefile | 3 + + drivers/dma/amba-pl08x.c | 11 - + drivers/dma/at_hdmac.c | 175 +- + drivers/dma/at_xdmac.c | 4 +- + drivers/dma/bestcomm/bestcomm.c | 4 +- + drivers/dma/dma-jz4740.c | 12 +- + drivers/dma/dma-jz4780.c | 877 ++++++++ + drivers/dma/dmaengine.c | 18 - + drivers/dma/dw/Kconfig | 2 +- + drivers/dma/dw/core.c | 18 +- + drivers/dma/edma.c | 2 +- + drivers/dma/fsl_raid.c | 904 +++++++++ + drivers/dma/fsl_raid.h | 306 +++ + drivers/dma/img-mdc-dma.c | 6 - + drivers/dma/imx-sdma.c | 4 + + drivers/dma/ioat/dca.c | 4 - + drivers/dma/ioat/dma.c | 4 - + drivers/dma/ioat/dma.h | 4 - + drivers/dma/ioat/dma_v2.c | 4 - + drivers/dma/ioat/dma_v2.h | 4 - + drivers/dma/ioat/dma_v3.c | 4 - + drivers/dma/ioat/hw.h | 4 - + drivers/dma/ioat/pci.c | 4 - + drivers/dma/ioat/registers.h | 4 - + drivers/dma/iop-adma.c | 4 - + drivers/dma/k3dma.c | 8 +- + drivers/dma/mmp_pdma.c | 2 +- + drivers/dma/mmp_tdma.c | 2 +- + drivers/dma/mpc512x_dma.c | 6 +- + drivers/dma/mv_xor.c | 6 +- + drivers/dma/mv_xor.h | 4 - + drivers/dma/pch_dma.c | 1 + + drivers/dma/pl330.c | 26 +- + drivers/dma/ppc4xx/adma.c | 4 - + drivers/dma/qcom_bam_dma.c | 44 +- + drivers/dma/s3c24xx-dma.c | 13 +- + drivers/dma/sa11x0-dma.c | 12 +- + drivers/dma/sh/Kconfig | 15 +- + drivers/dma/sh/Makefile | 2 +- + drivers/dma/sh/rcar-audmapp.c | 376 ---- + drivers/dma/sh/shdma-base.c | 73 +- + drivers/dma/sh/shdmac.c | 4 +- + drivers/dma/sh/usb-dmac.c | 910 +++++++++ + drivers/dma/sirf-dma.c | 2 +- + drivers/dma/ste_dma40.c | 6 +- + drivers/dma/sun6i-dma.c | 8 +- + drivers/dma/xgene-dma.c | 2089 ++++++++++++++++++++ + drivers/dma/xilinx/xilinx_vdma.c | 2 +- + drivers/mmc/host/sh_mmcif.c | 13 +- + drivers/mmc/host/sh_mobile_sdhi.c | 26 +- + drivers/mmc/host/tmio_mmc.h | 4 - + drivers/mmc/host/tmio_mmc_dma.c | 10 +- + drivers/mtd/nand/sh_flctl.c | 2 - + drivers/spi/spi-rspi.c | 1 - + drivers/spi/spi-sh-msiof.c | 1 - + include/dt-bindings/dma/jz4780-dma.h | 49 + + include/linux/{amba => dma}/xilinx_dma.h | 0 + include/linux/dmaengine.h | 36 - + include/linux/mfd/tmio.h | 2 + + include/linux/mmc/sh_mobile_sdhi.h | 10 - + include/linux/platform_data/dma-imx-sdma.h | 3 + + include/linux/shdma-base.h | 1 + + sound/soc/sh/fsi.c | 18 +- + 81 files changed, 5770 insertions(+), 775 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/apm-xgene-dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/jz4780-dma.txt + delete mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt + create mode 100644 Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt + create mode 100644 drivers/dma/dma-jz4780.c + create mode 100644 drivers/dma/fsl_raid.c + create mode 100644 drivers/dma/fsl_raid.h + delete mode 100644 drivers/dma/sh/rcar-audmapp.c + create mode 100644 drivers/dma/sh/usb-dmac.c + create mode 100755 drivers/dma/xgene-dma.c + create mode 100644 include/dt-bindings/dma/jz4780-dma.h + rename include/linux/{amba => dma}/xilinx_dma.h (100%) +$ git am -3 ../patches/0001-v4l-xilinx-fix-for-include-file-movement.patch +Applying: v4l: xilinx: fix for include file movement +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/media/platform/xilinx/xilinx-dma.c +$ git add -A . +$ git commit -v -a --amend +[master 84d74ac409ce] Merge remote-tracking branch 'slave-dma/next' + Date: Thu Apr 23 12:56:50 2015 +1000 +Merging ipsec-next/master (74005991b78a xfrm: Do not parse 32bits compiled xfrm netlink msg on 64bits host) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-drivers-next/master (f56d9e23b78e ssb: add delay after PCI reset to fix SoC reboots) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (35ef6e90d198 Bluetooth: btusb: off by one in rtl8723b_parse_firmware()) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/bt3c_cs.c | 3 - + drivers/bluetooth/btbcm.c | 148 ++++++++-------- + drivers/bluetooth/btbcm.h | 6 + + drivers/bluetooth/btusb.c | 403 +++++++++++++++++++++++++++++++++++++++++++- + drivers/bluetooth/hci_ath.c | 98 +++++++---- + 5 files changed, 549 insertions(+), 109 deletions(-) +Merging infiniband/for-next (c1c2fef6cfb0 Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into for-4.1) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (3e550d2396d9 Merge MTD fixes from 4.0 into -next) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (81a1209c9091 mtd: spi-nor: Add support for Macronix mx25u6435f serial flash) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (b617b702da4e crypto: rng - Zero seed in crypto_rng_reset) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/fsl-sec2.txt | 6 +- + crypto/algapi.c | 6 + + crypto/algif_rng.c | 2 +- + crypto/ansi_cprng.c | 88 ++- + crypto/drbg.c | 376 ++++------- + crypto/internal.h | 2 + + crypto/krng.c | 33 +- + crypto/pcompress.c | 7 +- + crypto/rng.c | 105 ++- + crypto/shash.c | 7 +- + drivers/crypto/Kconfig | 18 + + drivers/crypto/mv_cesa.c | 2 +- + drivers/crypto/talitos.c | 727 +++++++++++++++------ + drivers/crypto/talitos.h | 153 +++-- + include/crypto/drbg.h | 54 +- + include/crypto/internal/rng.h | 12 +- + include/crypto/rng.h | 100 ++- + include/linux/crypto.h | 42 -- + 18 files changed, 1029 insertions(+), 711 deletions(-) +Merging drm/drm-next (cec32a470106 media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (1c550fa193d0 drm/panel: Add support for Ampire AM-800480R3TMQW-A1H 800x480 7" panel) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (37ef01ab5d24 drm/i915: Dont enable CS_PARSER_ERROR interrupts at all) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (535a65db484f drm/tegra: sor: Reset during initialization) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (a3c6d686443e DRM: Don't re-poll connector for disconnect) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/drm_probe_helper.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic_helper.c | 3 ++- + drivers/gpu/drm/drm_dp_helper.c | 12 +++++++++--- + drivers/gpu/drm/drm_probe_helper.c | 4 ++-- + drivers/gpu/drm/i915/intel_atomic_plane.c | 4 ---- + 4 files changed, 13 insertions(+), 10 deletions(-) +Merging drm-exynos/exynos-drm/for-next (3cf711584d3e drm/exynos: Fix FIMD buffer size calculation) +$ git merge drm-exynos/exynos-drm/for-next +Merge made by the 'recursive' strategy. +Merging drm-msm/msm-next (d5af49c92a8a drm/msm/mdp5: Enable DSI connector in msm drm driver) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging sound/for-next (7d1b6e293274 ALSA: hda - fix "num_steps = 0" error on ALC256) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (1702c59fa76a Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging include/sound/soc.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/adi,adau1701.txt | 4 + + include/sound/soc-dapm.h | 2 +- + include/sound/soc.h | 12 + + sound/soc/atmel/sam9g20_wm8731.c | 10 +- + sound/soc/codecs/adau1701.c | 125 ++- + sound/soc/codecs/cs35l32.c | 1 - + sound/soc/codecs/sgtl5000.c | 53 +- + sound/soc/codecs/tfa9879.c | 4 +- + sound/soc/codecs/wm_adsp.c | 1132 ++++++++++++-------- + sound/soc/codecs/wm_adsp.h | 6 +- + sound/soc/codecs/wmfw.h | 44 +- + sound/soc/fsl/fsl_ssi.c | 2 +- + sound/soc/intel/atom/sst-atom-controls.h | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 2 + + sound/soc/intel/baytrail/sst-baytrail-ipc.c | 1 - + sound/soc/intel/haswell/sst-haswell-ipc.c | 1 - + sound/soc/qcom/lpass-cpu.c | 2 +- + sound/soc/samsung/s3c24xx-i2s.c | 4 +- + sound/soc/sh/rcar/dma.c | 1 + + 19 files changed, 922 insertions(+), 486 deletions(-) +Merging modules/modules-next (4a3893d069b7 modpost: don't emit section mismatch warnings for compiler optimizations) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (9abbfb486f5c virtio: drop virtio_device_is_legacy_only) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (c9eeb5084b27 Input: lm8333 - fix broken email address) +$ git merge input/next +Already up-to-date. +Merging block/for-next (889fa31f00b2 blk-mq: reduce unnecessary software queue looping) +$ git merge block/for-next +Already up-to-date. +Merging device-mapper/for-next (44c144f9c8e8 dm crypt: fix missing error code return from crypt_ctr error path) +$ git merge device-mapper/for-next +Already up-to-date. +Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (96541bac0b4e Revert "mmc: core: Convert mmc_driver to device_driver") +$ git merge mmc-uh/next +Already up-to-date. +Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (9ffc8f7cb964 md/raid5: don't do chunk aligned read on degraded array.) +$ git merge md/for-next +Auto-merging drivers/md/Makefile +Auto-merging drivers/md/Kconfig +Merge made by the 'recursive' strategy. + Documentation/md-cluster.txt | 176 ++++++++ + crypto/async_tx/async_pq.c | 19 +- + drivers/md/Kconfig | 16 + + drivers/md/Makefile | 1 + + drivers/md/bitmap.c | 189 +++++++- + drivers/md/bitmap.h | 10 +- + drivers/md/md-cluster.c | 965 +++++++++++++++++++++++++++++++++++++++++ + drivers/md/md-cluster.h | 29 ++ + drivers/md/md.c | 382 +++++++++++++--- + drivers/md/md.h | 26 +- + drivers/md/raid0.c | 48 +- + drivers/md/raid1.c | 29 +- + drivers/md/raid10.c | 8 +- + drivers/md/raid5.c | 826 +++++++++++++++++++++++++++++------ + drivers/md/raid5.h | 59 ++- + include/linux/async_tx.h | 3 + + include/linux/raid/pq.h | 1 + + include/uapi/linux/raid/md_p.h | 7 + + include/uapi/linux/raid/md_u.h | 1 + + lib/raid6/algos.c | 41 +- + lib/raid6/altivec.uc | 1 + + lib/raid6/avx2.c | 3 + + lib/raid6/int.uc | 41 +- + lib/raid6/mmx.c | 2 + + lib/raid6/neon.c | 1 + + lib/raid6/sse1.c | 2 + + lib/raid6/sse2.c | 227 ++++++++++ + lib/raid6/test/test.c | 51 ++- + lib/raid6/tilegx.uc | 1 + + 29 files changed, 2860 insertions(+), 305 deletions(-) + create mode 100644 Documentation/md-cluster.txt + create mode 100644 drivers/md/md-cluster.c + create mode 100644 drivers/md/md-cluster.h +Merging mfd/for-mfd-next (e554a99ee8d0 mfd: sec: Fix RTC alarm interrupt number on S2MPS11) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (b1f85c0fec20 backlight: da9052_bl: Terminate da9052_wled_ids array with empty element) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (5939d9dfe440 power: twl4030_madc_battery: Add missing MODULE_ALIAS) +$ git merge battery/master +Already up-to-date. +Merging omap_dss2/for-next (72fc8b7187cd Merge branches '4.1/fbdev' and '4.1/omapdss' into for-next) +$ git merge omap_dss2/for-next +Merge made by the 'recursive' strategy. + drivers/video/fbdev/omap2/dss/hdmi4.c | 50 +++++++++++++++++++++++++++++++++++ + drivers/video/fbdev/omap2/dss/hdmi5.c | 50 +++++++++++++++++++++++++++++++++++ + 2 files changed, 100 insertions(+) +Merging regulator/for-next (3c24567c65bf Merge remote-tracking branches 'regulator/topic/max14577' and 'regulator/topic/max77843' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/helpers.c | 2 +- + drivers/regulator/max14577.c | 128 ++++++++++++++++--------------------------- + drivers/regulator/max77843.c | 48 ++++++---------- + 3 files changed, 67 insertions(+), 111 deletions(-) +Merging security/next (5deeb5cece3f lsm: copy comm before calling audit_log to avoid race in string printing) +$ git merge security/next +Already up-to-date. +Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory) +$ git merge integrity/next +Merge made by the 'recursive' strategy. +Merging selinux/next (cf7b6c0205f1 selinux: increase avtab max buckets) +$ git merge selinux/next +Already up-to-date. +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (fe92a2e35727 watchdog: octeon: use fixed length string for register names) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. +Merging iommu/next (7f65ef01e131 Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (03ecc32c5274 iommu/vt-d: support extended root and context entries) +$ git merge dwmw2-iommu/master +Auto-merging drivers/iommu/intel_irq_remapping.c +Auto-merging drivers/iommu/intel-iommu.c +Merge made by the 'recursive' strategy. + drivers/iommu/intel-iommu.c | 142 +++++++++++++++++------------------- + drivers/iommu/intel_irq_remapping.c | 5 +- + include/linux/intel-iommu.h | 18 ++++- + 3 files changed, 82 insertions(+), 83 deletions(-) +Merging vfio/next (5a0ff17741c1 vfio-pci: Fix use after free) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (197175427a22 Documentation/memcg: update memcg/kmem status) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (0e4f93e5017d goldfish: goldfish_tty_probe() is not using 'i' any more) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (724e7bfcc566 audit: Remove condition which always evaluates to false) +$ git merge audit/next +Already up-to-date. +Merging devicetree/devicetree/next (a2166ca5f320 Merge remote-tracking branch 'robh/for-next' into devicetree/next) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (648082735792 of: base: improve of_get_next_child() kernel-doc) +$ git merge dt-rh/for-next +Auto-merging include/linux/of.h +Auto-merging drivers/tty/serial/of_serial.c +Auto-merging drivers/tty/serial/8250/8250_early.c +Auto-merging drivers/tty/serial/8250/8250_core.c +Auto-merging drivers/of/unittest.c +Auto-merging drivers/of/base.c +Auto-merging drivers/of/Kconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/arch_timer.txt | 8 ++- + .../devicetree/bindings/common-properties.txt | 60 +++++++++++++++++++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/of/Kconfig | 2 +- + drivers/of/base.c | 28 +++++++++- + drivers/of/fdt.c | 24 +++++++-- + drivers/of/unittest.c | 62 ++++++++++++++++++++++ + drivers/tty/serial/8250/8250_core.c | 20 +++++++ + drivers/tty/serial/8250/8250_early.c | 5 ++ + drivers/tty/serial/of_serial.c | 3 +- + include/linux/of.h | 6 +++ + include/linux/of_fdt.h | 2 + + include/linux/of_irq.h | 9 +++- + 13 files changed, 219 insertions(+), 11 deletions(-) + create mode 100644 Documentation/devicetree/bindings/common-properties.txt +Merging mailbox/mailbox-for-next (ee23d66af921 mailbox: arm_mhu: add driver for ARM MHU controller) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (9331bf51ea99 Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm2835-code' and 'spi/fix/bitbang' into spi-linus) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/Kconfig | 1 + + drivers/spi/spi-bcm2835.c | 5 ++--- + drivers/spi/spi-bitbang.c | 17 ++++++++++------- + drivers/spi/spi.c | 9 +++++++++ + 4 files changed, 22 insertions(+), 10 deletions(-) +Merging tip/auto-latest (88256d924879 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + arch/x86/include/asm/uaccess_32.h | 4 ++++ + arch/x86/kernel/acpi/wakeup_64.S | 6 +++--- + arch/x86/kernel/asm-offsets.c | 19 +++++++++++++++++++ + arch/x86/kernel/asm-offsets_32.c | 18 ------------------ + arch/x86/kernel/asm-offsets_64.c | 21 --------------------- + arch/x86/mm/ioremap.c | 14 ++++++++------ + arch/x86/power/hibernate_asm_64.S | 8 ++++---- + kernel/rcu/tree.c | 16 +++++++++------- + kernel/sched/auto_group.c | 4 ---- + lib/Kconfig.debug | 1 + + 10 files changed, 48 insertions(+), 63 deletions(-) +Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer) +$ git merge clockevents/clockevents/next +Resolved 'arch/arm/mach-rockchip/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/rockchip_timer.c' using previous resolution. +Auto-merging drivers/clocksource/rockchip_timer.c +CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Auto-merging arch/arm/mach-rockchip/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3a1fc06f5466] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (1afaa0551521 EDAC: Constify of_device_id array) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (c4b00d27e405 Merge branch 'for-next/ftrace/core' into trace/for-next) +$ git merge ftrace/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rcu/rcu/next (8d7dc9283f39 rcu: Control grace-period delays directly from value) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (fd1d0ddf2ae9 KVM: arm/arm64: check IRQ number on userland injection) +$ git merge kvm-arm/next +Merge made by the 'recursive' strategy. + arch/arm/include/uapi/asm/kvm.h | 8 +++++++- + arch/arm/kvm/arm.c | 3 +-- + arch/arm64/include/uapi/asm/kvm.h | 8 +++++++- + virt/kvm/arm/vgic.c | 5 ++++- + 4 files changed, 19 insertions(+), 5 deletions(-) +Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (816c7667ea97 KVM: s390: migrate vcpu interrupt state) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (0b97b03d88b4 xen/pci: Try harder to get PXM information for Xen) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (6ba94429c8e7 workqueue: Reorder sysfs code) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (cdbff6119408 MAINTAINERS: Add me on list of Dell laptop drivers) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/apple-gmux.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-toshiba_acpi | 93 +- + .../ABI/testing/sysfs-platform-dell-laptop | 69 ++ + Documentation/laptops/thinkpad-acpi.txt | 18 + + MAINTAINERS | 22 +- + drivers/platform/x86/apple-gmux.c | 48 +- + drivers/platform/x86/dell-laptop.c | 1089 +++++++++++++++++++- + drivers/platform/x86/intel_oaktrail.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 320 ++++-- + drivers/platform/x86/toshiba_acpi.c | 234 +++-- + drivers/platform/x86/toshiba_bluetooth.c | 133 ++- + drivers/platform/x86/wmi.c | 5 +- + 11 files changed, 1814 insertions(+), 219 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-dell-laptop +Merging chrome-platform/for-next (8ce580932f8e platform/chrome: cros_ec_lpc - Depend on X86 || COMPILE_TEST) +$ git merge chrome-platform/for-next +Auto-merging drivers/input/keyboard/cros_ec_keyb.c +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 1 + + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 51 +--- + drivers/input/keyboard/cros_ec_keyb.c | 13 +- + drivers/mfd/cros_ec.c | 19 +- + drivers/platform/chrome/Kconfig | 26 +- + drivers/platform/chrome/Makefile | 3 + + drivers/platform/chrome/cros_ec_dev.c | 274 +++++++++++++++++++++ + drivers/platform/chrome/cros_ec_dev.h | 53 +++++ + drivers/platform/chrome/cros_ec_lightbar.c | 367 +++++++++++++++++++++++++++++ + drivers/platform/chrome/cros_ec_lpc.c | 319 +++++++++++++++++++++++++ + drivers/platform/chrome/cros_ec_sysfs.c | 271 +++++++++++++++++++++ + include/linux/mfd/cros_ec.h | 23 +- + 12 files changed, 1358 insertions(+), 62 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_dev.c + create mode 100644 drivers/platform/chrome/cros_ec_dev.h + create mode 100644 drivers/platform/chrome/cros_ec_lightbar.c + create mode 100644 drivers/platform/chrome/cros_ec_lpc.c + create mode 100644 drivers/platform/chrome/cros_ec_sysfs.c +Merging regmap/for-next (04b7fe6a4a23 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge regmap/for-next +Already up-to-date. +Merging hsi/for-next (265ef3ee9575 HSI: cmt_speech: fix error return code) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (1fbaf327b79c leds: gpio: Fix error handling for led name null pointer case) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-tlc591xx.txt | 40 +++ + drivers/leds/Kconfig | 8 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-gpio.c | 11 +- + drivers/leds/leds-tlc591xx.c | 300 +++++++++++++++++++++ + 5 files changed, 356 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-tlc591xx.txt + create mode 100644 drivers/leds/leds-tlc591xx.c +Merging ipmi/for-next (d0acf734d886 ipmi_ssif: Use interruptible completion for waiting in the thread) +$ git merge ipmi/for-next +Already up-to-date. +Merging driver-core/driver-core-next (c9e15f25f514 debugfs: allow bad parent pointers to be passed in) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (5dbc32a88f1e n_gsm: Drop unneeded cast on netdev_priv) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (00fe52deb45b drivers/usb/core: devio.c: Removed an uneeded space before tab) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (bbc78c07a51f usb: core: hub: use new USB_RESUME_TIMEOUT) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (65dd82ae453f USB: f81232: fix some minor style issues) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (c610f7f772aa Merge 4.0-rc7 into staging-next) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (ea5505fabd3b mei: trace: remove unused TRACE_SYSTEM_STRING) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (66bee35f2968 extcon: Fix missing locking when [un]registering notifiers) +$ git merge extcon/extcon-next +Already up-to-date. +Merging kdbus/kdbus (9fb9cd0f4434 kdbus: avoid the use of struct timespec) +$ git merge kdbus/kdbus +Resolved 'Documentation/Makefile' using previous resolution. +Auto-merging tools/testing/selftests/Makefile +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/magic.h +Auto-merging include/uapi/linux/Kbuild +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging Documentation/Makefile +CONFLICT (content): Merge conflict in Documentation/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master db526877f57d] Merge remote-tracking branch 'kdbus/kdbus' +$ git diff -M --stat --summary HEAD^.. + Documentation/Makefile | 2 +- + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/kdbus/.gitignore | 2 + + Documentation/kdbus/Makefile | 40 + + Documentation/kdbus/kdbus.bus.xml | 359 ++++ + Documentation/kdbus/kdbus.connection.xml | 1250 ++++++++++++ + Documentation/kdbus/kdbus.endpoint.xml | 429 ++++ + Documentation/kdbus/kdbus.fs.xml | 124 ++ + Documentation/kdbus/kdbus.item.xml | 839 ++++++++ + Documentation/kdbus/kdbus.match.xml | 555 ++++++ + Documentation/kdbus/kdbus.message.xml | 1276 ++++++++++++ + Documentation/kdbus/kdbus.name.xml | 711 +++++++ + Documentation/kdbus/kdbus.policy.xml | 406 ++++ + Documentation/kdbus/kdbus.pool.xml | 326 +++ + Documentation/kdbus/kdbus.xml | 1012 ++++++++++ + Documentation/kdbus/stylesheet.xsl | 16 + + MAINTAINERS | 13 + + Makefile | 1 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/kdbus.h | 979 +++++++++ + include/uapi/linux/magic.h | 2 + + init/Kconfig | 13 + + ipc/Makefile | 2 +- + ipc/kdbus/Makefile | 22 + + ipc/kdbus/bus.c | 560 ++++++ + ipc/kdbus/bus.h | 101 + + ipc/kdbus/connection.c | 2214 +++++++++++++++++++++ + ipc/kdbus/connection.h | 257 +++ + ipc/kdbus/domain.c | 296 +++ + ipc/kdbus/domain.h | 77 + + ipc/kdbus/endpoint.c | 275 +++ + ipc/kdbus/endpoint.h | 67 + + ipc/kdbus/fs.c | 510 +++++ + ipc/kdbus/fs.h | 28 + + ipc/kdbus/handle.c | 617 ++++++ + ipc/kdbus/handle.h | 85 + + ipc/kdbus/item.c | 339 ++++ + ipc/kdbus/item.h | 64 + + ipc/kdbus/limits.h | 64 + + ipc/kdbus/main.c | 125 ++ + ipc/kdbus/match.c | 559 ++++++ + ipc/kdbus/match.h | 35 + + ipc/kdbus/message.c | 616 ++++++ + ipc/kdbus/message.h | 133 ++ + ipc/kdbus/metadata.c | 1159 +++++++++++ + ipc/kdbus/metadata.h | 57 + + ipc/kdbus/names.c | 772 +++++++ + ipc/kdbus/names.h | 74 + + ipc/kdbus/node.c | 910 +++++++++ + ipc/kdbus/node.h | 84 + + ipc/kdbus/notify.c | 248 +++ + ipc/kdbus/notify.h | 30 + + ipc/kdbus/policy.c | 489 +++++ + ipc/kdbus/policy.h | 51 + + ipc/kdbus/pool.c | 728 +++++++ + ipc/kdbus/pool.h | 46 + + ipc/kdbus/queue.c | 678 +++++++ + ipc/kdbus/queue.h | 92 + + ipc/kdbus/reply.c | 257 +++ + ipc/kdbus/reply.h | 68 + + ipc/kdbus/util.c | 201 ++ + ipc/kdbus/util.h | 74 + + samples/Kconfig | 7 + + samples/Makefile | 3 +- + samples/kdbus/.gitignore | 1 + + samples/kdbus/Makefile | 9 + + samples/kdbus/kdbus-api.h | 114 ++ + samples/kdbus/kdbus-workers.c | 1326 ++++++++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/kdbus/.gitignore | 1 + + tools/testing/selftests/kdbus/Makefile | 48 + + tools/testing/selftests/kdbus/kdbus-enum.c | 94 + + tools/testing/selftests/kdbus/kdbus-enum.h | 14 + + tools/testing/selftests/kdbus/kdbus-test.c | 923 +++++++++ + tools/testing/selftests/kdbus/kdbus-test.h | 85 + + tools/testing/selftests/kdbus/kdbus-util.c | 1615 +++++++++++++++ + tools/testing/selftests/kdbus/kdbus-util.h | 222 +++ + tools/testing/selftests/kdbus/test-activator.c | 318 +++ + tools/testing/selftests/kdbus/test-attach-flags.c | 750 +++++++ + tools/testing/selftests/kdbus/test-benchmark.c | 451 +++++ + tools/testing/selftests/kdbus/test-bus.c | 175 ++ + tools/testing/selftests/kdbus/test-chat.c | 122 ++ + tools/testing/selftests/kdbus/test-connection.c | 616 ++++++ + tools/testing/selftests/kdbus/test-daemon.c | 65 + + tools/testing/selftests/kdbus/test-endpoint.c | 341 ++++ + tools/testing/selftests/kdbus/test-fd.c | 789 ++++++++ + tools/testing/selftests/kdbus/test-free.c | 64 + + tools/testing/selftests/kdbus/test-match.c | 441 ++++ + tools/testing/selftests/kdbus/test-message.c | 731 +++++++ + tools/testing/selftests/kdbus/test-metadata-ns.c | 506 +++++ + tools/testing/selftests/kdbus/test-monitor.c | 176 ++ + tools/testing/selftests/kdbus/test-names.c | 194 ++ + tools/testing/selftests/kdbus/test-policy-ns.c | 632 ++++++ + tools/testing/selftests/kdbus/test-policy-priv.c | 1269 ++++++++++++ + tools/testing/selftests/kdbus/test-policy.c | 80 + + tools/testing/selftests/kdbus/test-sync.c | 369 ++++ + tools/testing/selftests/kdbus/test-timeout.c | 99 + + 97 files changed, 34069 insertions(+), 3 deletions(-) + create mode 100644 Documentation/kdbus/.gitignore + create mode 100644 Documentation/kdbus/Makefile + create mode 100644 Documentation/kdbus/kdbus.bus.xml + create mode 100644 Documentation/kdbus/kdbus.connection.xml + create mode 100644 Documentation/kdbus/kdbus.endpoint.xml + create mode 100644 Documentation/kdbus/kdbus.fs.xml + create mode 100644 Documentation/kdbus/kdbus.item.xml + create mode 100644 Documentation/kdbus/kdbus.match.xml + create mode 100644 Documentation/kdbus/kdbus.message.xml + create mode 100644 Documentation/kdbus/kdbus.name.xml + create mode 100644 Documentation/kdbus/kdbus.policy.xml + create mode 100644 Documentation/kdbus/kdbus.pool.xml + create mode 100644 Documentation/kdbus/kdbus.xml + create mode 100644 Documentation/kdbus/stylesheet.xsl + create mode 100644 include/uapi/linux/kdbus.h + create mode 100644 ipc/kdbus/Makefile + create mode 100644 ipc/kdbus/bus.c + create mode 100644 ipc/kdbus/bus.h + create mode 100644 ipc/kdbus/connection.c + create mode 100644 ipc/kdbus/connection.h + create mode 100644 ipc/kdbus/domain.c + create mode 100644 ipc/kdbus/domain.h + create mode 100644 ipc/kdbus/endpoint.c + create mode 100644 ipc/kdbus/endpoint.h + create mode 100644 ipc/kdbus/fs.c + create mode 100644 ipc/kdbus/fs.h + create mode 100644 ipc/kdbus/handle.c + create mode 100644 ipc/kdbus/handle.h + create mode 100644 ipc/kdbus/item.c + create mode 100644 ipc/kdbus/item.h + create mode 100644 ipc/kdbus/limits.h + create mode 100644 ipc/kdbus/main.c + create mode 100644 ipc/kdbus/match.c + create mode 100644 ipc/kdbus/match.h + create mode 100644 ipc/kdbus/message.c + create mode 100644 ipc/kdbus/message.h + create mode 100644 ipc/kdbus/metadata.c + create mode 100644 ipc/kdbus/metadata.h + create mode 100644 ipc/kdbus/names.c + create mode 100644 ipc/kdbus/names.h + create mode 100644 ipc/kdbus/node.c + create mode 100644 ipc/kdbus/node.h + create mode 100644 ipc/kdbus/notify.c + create mode 100644 ipc/kdbus/notify.h + create mode 100644 ipc/kdbus/policy.c + create mode 100644 ipc/kdbus/policy.h + create mode 100644 ipc/kdbus/pool.c + create mode 100644 ipc/kdbus/pool.h + create mode 100644 ipc/kdbus/queue.c + create mode 100644 ipc/kdbus/queue.h + create mode 100644 ipc/kdbus/reply.c + create mode 100644 ipc/kdbus/reply.h + create mode 100644 ipc/kdbus/util.c + create mode 100644 ipc/kdbus/util.h + create mode 100644 samples/kdbus/.gitignore + create mode 100644 samples/kdbus/Makefile + create mode 100644 samples/kdbus/kdbus-api.h + create mode 100644 samples/kdbus/kdbus-workers.c + create mode 100644 tools/testing/selftests/kdbus/.gitignore + create mode 100644 tools/testing/selftests/kdbus/Makefile + create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h + create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h + create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h + create mode 100644 tools/testing/selftests/kdbus/test-activator.c + create mode 100644 tools/testing/selftests/kdbus/test-attach-flags.c + create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c + create mode 100644 tools/testing/selftests/kdbus/test-bus.c + create mode 100644 tools/testing/selftests/kdbus/test-chat.c + create mode 100644 tools/testing/selftests/kdbus/test-connection.c + create mode 100644 tools/testing/selftests/kdbus/test-daemon.c + create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c + create mode 100644 tools/testing/selftests/kdbus/test-fd.c + create mode 100644 tools/testing/selftests/kdbus/test-free.c + create mode 100644 tools/testing/selftests/kdbus/test-match.c + create mode 100644 tools/testing/selftests/kdbus/test-message.c + create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c + create mode 100644 tools/testing/selftests/kdbus/test-monitor.c + create mode 100644 tools/testing/selftests/kdbus/test-names.c + create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c + create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c + create mode 100644 tools/testing/selftests/kdbus/test-policy.c + create mode 100644 tools/testing/selftests/kdbus/test-sync.c + create mode 100644 tools/testing/selftests/kdbus/test-timeout.c +Merging cgroup/for-next (34ebe933417e cpuset, isolcpus: document relationship between cpusets & isolcpus) +$ git merge cgroup/for-next +Already up-to-date. +Merging scsi/for-next (694600bc1e55 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging target-updates/for-next (68d4cef3bab3 target: Put TCMU under a new config option) +$ git merge target-updates/for-next +Resolved 'drivers/infiniband/ulp/srpt/ib_srpt.c' using previous resolution. +Resolved 'drivers/xen/xen-scsiback.c' using previous resolution. +Auto-merging drivers/xen/xen-scsiback.c +CONFLICT (content): Merge conflict in drivers/xen/xen-scsiback.c +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/target/target_core_spc.c +Auto-merging drivers/target/target_core_sbc.c +Auto-merging drivers/target/loopback/tcm_loop.c +Removing drivers/target/iscsi/iscsi_target_tq.h +Removing drivers/target/iscsi/iscsi_target_tq.c +Auto-merging drivers/target/iscsi/iscsi_target_erl0.c +Removing drivers/target/iscsi/iscsi_target_configfs.h +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +CONFLICT (content): Merge conflict in drivers/infiniband/ulp/srpt/ib_srpt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4920000f64b3] Merge remote-tracking branch 'target-updates/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/target/tcm_mod_builder.py | 79 +-- + Documentation/target/tcmu-design.txt | 43 +- + drivers/infiniband/ulp/isert/ib_isert.c | 691 +++++++++++++++------------ + drivers/infiniband/ulp/isert/ib_isert.h | 37 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 49 +- + drivers/scsi/qla2xxx/qla_target.c | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 174 ++++--- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 1 + + drivers/target/Kconfig | 5 +- + drivers/target/Makefile | 2 +- + drivers/target/iscsi/Makefile | 1 - + drivers/target/iscsi/iscsi_target.c | 131 +++-- + drivers/target/iscsi/iscsi_target.h | 2 +- + drivers/target/iscsi/iscsi_target_configfs.c | 208 ++++---- + drivers/target/iscsi/iscsi_target_configfs.h | 7 - + drivers/target/iscsi/iscsi_target_erl0.c | 14 +- + drivers/target/iscsi/iscsi_target_login.c | 60 ++- + drivers/target/iscsi/iscsi_target_tpg.c | 25 +- + drivers/target/iscsi/iscsi_target_tpg.h | 1 + + drivers/target/iscsi/iscsi_target_tq.c | 495 ------------------- + drivers/target/iscsi/iscsi_target_tq.h | 84 ---- + drivers/target/iscsi/iscsi_target_util.c | 1 - + drivers/target/loopback/tcm_loop.c | 242 ++++------ + drivers/target/loopback/tcm_loop.h | 1 + + drivers/target/sbp/sbp_target.c | 68 +-- + drivers/target/target_core_configfs.c | 192 +++----- + drivers/target/target_core_fabric_configfs.c | 38 +- + drivers/target/target_core_file.c | 261 +++++----- + drivers/target/target_core_iblock.c | 4 +- + drivers/target/target_core_internal.h | 6 + + drivers/target/target_core_pr.c | 48 +- + drivers/target/target_core_rd.c | 137 ++++-- + drivers/target/target_core_sbc.c | 109 +++-- + drivers/target/target_core_spc.c | 16 +- + drivers/target/target_core_tmr.c | 4 +- + drivers/target/target_core_tpg.c | 2 +- + drivers/target/target_core_transport.c | 162 ++++++- + drivers/target/target_core_user.c | 52 +- + drivers/target/target_core_xcopy.c | 46 +- + drivers/target/tcm_fc/tcm_fc.h | 1 - + drivers/target/tcm_fc/tfc_conf.c | 89 +--- + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 57 +-- + drivers/vhost/scsi.c | 126 ++--- + drivers/xen/xen-scsiback.c | 74 +-- + include/target/iscsi/iscsi_target_core.h | 15 +- + include/target/target_core_base.h | 10 +- + include/target/target_core_configfs.h | 6 - + include/target/target_core_fabric.h | 33 +- + include/target/target_core_fabric_configfs.h | 5 + + include/uapi/linux/target_core_user.h | 44 +- + 50 files changed, 1687 insertions(+), 2273 deletions(-) + delete mode 100644 drivers/target/iscsi/iscsi_target_configfs.h + delete mode 100644 drivers/target/iscsi/iscsi_target_tq.c + delete mode 100644 drivers/target/iscsi/iscsi_target_tq.h +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (b99e6fb86541 pinctrl: fix allmodconfig noise) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (f4aaa799cf9a tun, macvtap: higher order allocations for skbs) +$ git merge vhost/linux-next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/macvtap.c +Merge made by the 'recursive' strategy. + drivers/net/macvtap.c | 2 +- + drivers/net/tun.c | 2 +- + drivers/ntb/ntb_hw.c | 2 -- + drivers/pci/msi.c | 57 ++++++++------------------------------ + drivers/pci/pci-driver.c | 2 -- + drivers/pci/pci.c | 33 ---------------------- + drivers/pci/pci.h | 21 ++++++++++++++ + drivers/pci/probe.c | 18 ++++++++++++ + drivers/pci/quirks.c | 2 -- + drivers/virtio/virtio_pci_common.c | 3 -- + include/linux/pci.h | 5 ---- + 11 files changed, 53 insertions(+), 94 deletions(-) +Merging remoteproc/for-next (315491e5d6ee remoteproc: add IOMMU hardware capability flag) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (03daa6f82f2b Revert "gpio: sch: use uapi/linux/pci_ids.h directly") +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (04abab698285 include/dma-mapping: Clarify output of dma_map_sg) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (71d54bfabb28 drivers/pwm: Remove __init initializer for pwm_add_table) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/imx-pwm.txt | 12 ++++++++- + drivers/pwm/core.c | 2 +- + drivers/pwm/pwm-atmel-hlcdc.c | 4 +++ + drivers/pwm/pwm-mxs.c | 8 ++++-- + drivers/pwm/pwm-pca9685.c | 2 +- + drivers/pwm/pwm-samsung.c | 32 ++++++++++++++++++++++- + 6 files changed, 54 insertions(+), 6 deletions(-) +Merging dma-buf/for-next (72449cb47b01 staging: android: ion: fix wrong init of dma_buf_export_info) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. + Documentation/dma-buf-sharing.txt | 23 +++++++------ + drivers/dma-buf/dma-buf.c | 47 ++++++++++++-------------- + drivers/gpu/drm/armada/armada_gem.c | 10 ++++-- + drivers/gpu/drm/drm_prime.c | 12 ++++--- + drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 9 +++-- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 10 ++++-- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 9 ++++- + drivers/gpu/drm/tegra/gem.c | 10 ++++-- + drivers/gpu/drm/ttm/ttm_object.c | 9 +++-- + drivers/gpu/drm/udl/udl_dmabuf.c | 9 ++++- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 8 ++++- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 8 ++++- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 8 ++++- + drivers/staging/android/ion/ion.c | 9 +++-- + include/linux/dma-buf.h | 34 +++++++++++++++---- + 15 files changed, 152 insertions(+), 63 deletions(-) +Merging userns/for-next (e0c9c0afd2fc mnt: Update detach_mounts to leave mounts connected) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (03bc10ab5b0f clk: check ->determine/round_rate() return value in clk_calc_new_rates) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (2bfd4d1f8c2b ftracetest: Do not use usleep directly) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution. +Auto-merging kernel/cpuset.c +Auto-merging fs/coredump.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/media/lirc/lirc_parallel.c +CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c +Auto-merging drivers/staging/gdm72xx/gdm_sdio.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f346ef14bdae] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000.h | 4 +- + drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- + drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- + fs/coredump.c | 8 ++-- + kernel/cpuset.c | 12 ++++-- + 11 files changed, 68 insertions(+), 90 deletions(-) +Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) +$ git merge luto-misc/next +Already up-to-date. +Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5) +$ git merge access_once/linux-next +Already up-to-date. +Merging livepatching/for-next (075b759be1bb Merge branch 'for-4.1/core-s390' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging akpm-current/current (5d77fd3b294b x86: switch to using asm-generic for seccomp.h) +$ git merge --no-ff akpm-current/current +Auto-merging mm/util.c +CONFLICT (content): Merge conflict in mm/util.c +Auto-merging mm/swap_state.c +Auto-merging mm/swap.c +CONFLICT (content): Merge conflict in mm/swap.c +Auto-merging mm/slub.c +Auto-merging mm/slob.c +Auto-merging mm/slab.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/migrate.c +Auto-merging mm/mempool.c +CONFLICT (content): Merge conflict in mm/mempool.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/ksm.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/cma_debug.c +CONFLICT (add/add): Merge conflict in mm/cma_debug.c +Auto-merging lib/vsprintf.c +CONFLICT (content): Merge conflict in lib/vsprintf.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging kernel/watchdog.c +CONFLICT (content): Merge conflict in kernel/watchdog.c +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging ipc/msg.c +Auto-merging include/linux/swap.h +CONFLICT (content): Merge conflict in include/linux/swap.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/rtc.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/page-flags.h +CONFLICT (content): Merge conflict in include/linux/page-flags.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/kconfig.h +CONFLICT (content): Merge conflict in include/linux/kconfig.h +Auto-merging fs/proc/array.c +CONFLICT (content): Merge conflict in fs/proc/array.c +Auto-merging fs/posix_acl.c +Auto-merging fs/ocfs2/xattr.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/ocfs2/suballoc.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/ocfs2/localalloc.c +CONFLICT (content): Merge conflict in fs/ocfs2/localalloc.c +Auto-merging fs/ocfs2/inode.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/dir.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ocfs2/alloc.c +Auto-merging fs/hfsplus/xattr.c +CONFLICT (content): Merge conflict in fs/hfsplus/xattr.c +Auto-merging fs/fat/inode.c +CONFLICT (content): Merge conflict in fs/fat/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/fat/fat.h +Auto-merging fs/fat/dir.c +Auto-merging fs/fat/cache.c +Auto-merging fs/ext4/fsync.c +Auto-merging fs/cifs/file.c +Auto-merging fs/binfmt_elf.c +CONFLICT (content): Merge conflict in fs/binfmt_elf.c +Auto-merging fs/befs/linuxvfs.c +CONFLICT (content): Merge conflict in fs/befs/linuxvfs.c +Auto-merging fs/affs/amigaffs.c +CONFLICT (content): Merge conflict in fs/affs/amigaffs.c +Auto-merging drivers/rtc/rtc-omap.c +CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c +Auto-merging drivers/rtc/rtc-mc13xxx.c +CONFLICT (content): Merge conflict in drivers/rtc/rtc-mc13xxx.c +Auto-merging drivers/rtc/interface.c +Auto-merging drivers/rtc/class.c +CONFLICT (content): Merge conflict in drivers/rtc/class.c +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/gpu/drm/i915/intel_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/block/zram/zram_drv.h +Auto-merging drivers/block/zram/zram_drv.c +CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/sparc/kernel/mdesc.c +CONFLICT (content): Merge conflict in arch/sparc/kernel/mdesc.c +Auto-merging arch/s390/pci/pci_debug.c +CONFLICT (content): Merge conflict in arch/s390/pci/pci_debug.c +Auto-merging arch/s390/mm/mmap.c +CONFLICT (content): Merge conflict in arch/s390/mm/mmap.c +Auto-merging arch/parisc/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/parisc/include/asm/Kbuild +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging Documentation/printk-formats.txt +CONFLICT (content): Merge conflict in Documentation/printk-formats.txt +Auto-merging Documentation/blockdev/zram.txt +CONFLICT (content): Merge conflict in Documentation/blockdev/zram.txt +error: Could not parse conflict hunks in Documentation/blockdev/zram.txt +Recorded preimage for 'arch/sparc/kernel/mdesc.c' +Resolved 'Documentation/printk-formats.txt' using previous resolution. +Resolved 'arch/arm64/Kconfig' using previous resolution. +Resolved 'arch/parisc/include/asm/Kbuild' using previous resolution. +Resolved 'arch/s390/mm/mmap.c' using previous resolution. +Resolved 'arch/s390/pci/pci_debug.c' using previous resolution. +Resolved 'drivers/block/zram/zram_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_drv.h' using previous resolution. +Resolved 'drivers/rtc/class.c' using previous resolution. +Resolved 'drivers/rtc/rtc-mc13xxx.c' using previous resolution. +Resolved 'drivers/rtc/rtc-omap.c' using previous resolution. +Resolved 'fs/affs/amigaffs.c' using previous resolution. +Resolved 'fs/befs/linuxvfs.c' using previous resolution. +Resolved 'fs/binfmt_elf.c' using previous resolution. +Resolved 'fs/fat/inode.c' using previous resolution. +Resolved 'fs/hfsplus/xattr.c' using previous resolution. +Resolved 'fs/ocfs2/localalloc.c' using previous resolution. +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'fs/proc/array.c' using previous resolution. +Resolved 'include/linux/kconfig.h' using previous resolution. +Resolved 'include/linux/page-flags.h' using previous resolution. +Resolved 'include/linux/swap.h' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Resolved 'kernel/watchdog.c' using previous resolution. +Resolved 'lib/vsprintf.c' using previous resolution. +Resolved 'mm/cma_debug.c' using previous resolution. +Resolved 'mm/mempool.c' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Resolved 'mm/swap.c' using previous resolution. +Resolved 'mm/util.c' using previous resolution. +Auto-merging Documentation/CodingStyle +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/sparc/kernel/mdesc.c'. +[master ed5a4769ae09] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-zram | 24 + + Documentation/CodingStyle | 13 + + Documentation/blockdev/zram.txt | 31 +- + .../devicetree/bindings/rtc/abracon,abx80x.txt | 32 + + Documentation/filesystems/vfat.txt | 10 + + Documentation/printk-formats.txt | 8 + + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm64/include/asm/pgtable.h | 2 + + arch/mips/include/uapi/asm/mman.h | 1 + + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/powerpc/include/asm/pgtable-ppc64.h | 2 + + arch/sparc/include/asm/pgtable_64.h | 9 + + arch/x86/include/asm/pgtable.h | 5 + + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/xtensa/include/uapi/asm/mman.h | 1 + + block/genhd.c | 2 +- + drivers/block/zram/zram_drv.c | 929 ++++++++++++--------- + drivers/block/zram/zram_drv.h | 6 - + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/class.c | 24 + + drivers/rtc/interface.c | 13 +- + drivers/rtc/rtc-abx80x.c | 307 +++++++ + drivers/rtc/rtc-mc13xxx.c | 2 +- + drivers/rtc/rtc-omap.c | 14 +- + fs/cifs/file.c | 8 +- + fs/ext4/fsync.c | 5 +- + fs/fat/cache.c | 79 +- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 61 ++ + fs/fat/inode.c | 75 +- + fs/jbd2/journal.c | 11 +- + fs/jbd2/transaction.c | 20 +- + fs/mpage.c | 23 +- + fs/ocfs2/alloc.c | 106 +-- + fs/ocfs2/aops.c | 25 +- + fs/ocfs2/buffer_head_io.c | 6 + + fs/ocfs2/cluster/heartbeat.c | 91 +- + fs/ocfs2/dir.c | 70 +- + fs/ocfs2/dlm/dlmmaster.c | 23 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/extent_map.c | 22 +- + fs/ocfs2/inode.c | 40 +- + fs/ocfs2/journal.c | 2 +- + fs/ocfs2/localalloc.c | 3 +- + fs/ocfs2/move_extents.c | 8 +- + fs/ocfs2/namei.c | 9 + + fs/ocfs2/ocfs2.h | 2 + + fs/ocfs2/quota_local.c | 3 +- + fs/ocfs2/refcounttree.c | 81 +- + fs/ocfs2/suballoc.c | 90 +- + fs/ocfs2/super.c | 76 +- + fs/ocfs2/super.h | 8 +- + fs/ocfs2/xattr.c | 51 +- + fs/posix_acl.c | 46 +- + include/linux/crc64_ecma.h | 56 ++ + include/linux/huge_mm.h | 4 + + include/linux/kexec.h | 2 + + include/linux/mm.h | 42 +- + include/linux/page-flags.h | 237 ++++-- + include/linux/pagemap.h | 25 +- + include/linux/poison.h | 4 + + include/linux/rmap.h | 9 +- + include/linux/rtc.h | 4 + + include/linux/slab.h | 10 + + include/linux/string.h | 1 + + include/linux/swap.h | 1 + + include/linux/vm_event_item.h | 1 + + include/uapi/asm-generic/mman-common.h | 1 + + ipc/msg.c | 3 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++ + lib/vsprintf.c | 20 +- + mm/filemap.c | 15 +- + mm/huge_memory.c | 37 +- + mm/ksm.c | 2 +- + mm/madvise.c | 176 ++++ + mm/memory-failure.c | 2 +- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 11 +- + mm/mempool.c | 1 - + mm/migrate.c | 2 +- + mm/page_alloc.c | 7 + + mm/page_isolation.c | 7 +- + mm/rmap.c | 46 +- + mm/shmem.c | 4 +- + mm/slab.c | 13 + + mm/slab.h | 9 + + mm/slab_common.c | 23 + + mm/slob.c | 13 + + mm/slub.c | 16 + + mm/swap.c | 44 + + mm/swap_state.c | 4 +- + mm/util.c | 32 + + mm/vmscan.c | 120 ++- + mm/vmstat.c | 1 + + mm/zswap.c | 4 +- + 101 files changed, 2789 insertions(+), 1085 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-zram + create mode 100644 Documentation/devicetree/bindings/rtc/abracon,abx80x.txt + create mode 100644 drivers/rtc/rtc-abx80x.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR +Applying: mm, x86: document return values of mapping funcs +Applying: mtrr, x86: fix MTRR lookup to handle inclusive entry +Applying: mtrr, x86: remove a wrong address check in __mtrr_type_lookup() +Applying: mtrr, x86: fix MTRR state checks in mtrr_type_lookup() +Applying: mtrr, x86: define MTRR_TYPE_INVALID for mtrr_type_lookup() +Applying: mtrr, x86: clean up mtrr_type_lookup() +Applying: mtrr, mm, x86: enhance MTRR checks for KVA huge page mapping +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + cc08b3ae885b...405a4e9f7d26 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (405a4e9f7d26 mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 ++ + arch/unicore32/kernel/fpu-ucf64.c | 4 +- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/mtrr.h | 7 +- + arch/x86/include/uapi/asm/mtrr.h | 12 +- + arch/x86/kernel/cpu/mtrr/generic.c | 192 +++++++++++++++++++----------- + arch/x86/mm/pat.c | 4 +- + arch/x86/mm/pgtable.c | 53 ++++++--- + drivers/w1/w1_int.c | 3 +- + mm/backing-dev.c | 35 ++++++ + 10 files changed, 227 insertions(+), 93 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5c79a75dfd20 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 3.19-rc6 +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..8a9084477abe --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20150423 |