diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-04-28 13:08:25 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-04-28 13:08:25 +1000 |
commit | 63382678150626a85e694031769496d58245d430 (patch) | |
tree | 2e662587cb1bea52bac4e6581f69d89c55a8779e | |
parent | 50e3ba5575fc29e746d1c75c3101116f4b0ea699 (diff) | |
download | linux-next-20150428.tar.gz linux-next-20150428.tar.xz |
Add linux-next specific files for 20150428next-20150428
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | Next/SHA1s | 217 | ||||
-rw-r--r-- | Next/Trees | 219 | ||||
-rw-r--r-- | Next/merge.log | 2405 | ||||
-rw-r--r-- | Next/quilt-import.log | 25 | ||||
-rw-r--r-- | localversion-next | 1 |
5 files changed, 2867 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..106ab74774fb --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,217 @@ +Name SHA1 +---- ---- +origin 2decb2682f80759f631c8332f9a2a34a02150a03 +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current c517d838eb7d07bbe9507871fab3931deccff539 +arc-current e4140819dadc3624accac8294881bca8a3cba4ed +arm-current 6c5c2a01fcfdb70f2e95e30e96ccf53b88e81023 +m68k-current b24f670b7f5b2058b95370caa9f104b3cefb9f1d +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge-mpe 2e826695d87c2d213def07bc344ae97d88384f62 +powerpc-merge c517d838eb7d07bbe9507871fab3931deccff539 +sparc acc455cffa75070d55e74fc7802b49edbc080e92 +net 22a8f237c0551bae95ffcd2a7ff17d6f5fcce7e7 +ipsec 092a29a40bab8bb4530bb3e58a0597001cdecdef +sound-current 30e5f003ff4b2be86f71733b6c9b11355d66584c +pci-current b787f68c36d49bb1d9236f403813641efa74a031 +wireless-drivers 69628cd0652a091591ef44ac07c150063b789c4a +driver-core.current b787f68c36d49bb1d9236f403813641efa74a031 +tty.current b787f68c36d49bb1d9236f403813641efa74a031 +usb.current b787f68c36d49bb1d9236f403813641efa74a031 +usb-gadget-fixes b787f68c36d49bb1d9236f403813641efa74a031 +usb-serial-fixes 39a8804455fb23f09157341d3ba7db6d7ae6ee76 +staging.current b787f68c36d49bb1d9236f403813641efa74a031 +char-misc.current b787f68c36d49bb1d9236f403813641efa74a031 +input-current 48853389f206b689260ddfd3006816779ca7a52a +crypto-current 8c98ebd7a6ff6ef352bb4c5516a8849b40b5ef6b +ide d681f1166919d6829083c069a83edcd59bfd5e34 +devicetree-current 41d9489319f28f06cf51731131bc353d5a6bce59 +rr-fixes f476893459318cb2eff3ecd2a05d4ceacf82e73e +vfio-fixes ec76f4007079469e86e2e44c3e5d1d11086de9d6 +kselftest-fixes 67d8712dcc70aa16d8e14a52eb73870e3cbddfc2 +drm-intel-fixes 39a8804455fb23f09157341d3ba7db6d7ae6ee76 +asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf +arc b787f68c36d49bb1d9236f403813641efa74a031 +arm 6b7acae74fc2ffe6cfd7592e95ca933cadb31219 +arm-perf 39a8804455fb23f09157341d3ba7db6d7ae6ee76 +arm-soc 0f0175702e2e16f05577bf71aa70cf4409d6f0b4 +at91 d8a291a1177804af4ed05c790c02f228b8fbc23a +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +rpi 31fd7fe00b0d81f0d1707d1685df4bbe1df886ee +berlin b787f68c36d49bb1d9236f403813641efa74a031 +cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290 +imx-mxs add3c7901a552b5dea76c9765fdc87ef20b403dc +keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917 +mvebu 750e30d4076ae5e02ad13a376e96c95a2627742c +omap 23aa6c6f4bedf09008465638643476606f410dd1 +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +renesas b036267ee5141ca9c617c4a96fe250fd75d28d66 +samsung 5d5443b9c3bac7231ae473c01bcfe4c7650b13c5 +sunxi 4ab66f83f8246aff05db3e64d2aded2687432785 +tegra 47ee17a644f4a12af7620c4c14e3874476e4253c +arm64 6d1966dfd6e0ad2f8aa4b664ae1a62e33abe1998 +arm64-acpi 7676fa70feb2f3bcdd4b854a553a57d8ef8505aa +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x 3083ca2376a76072dc0071fb211de80b0ac44bd1 +cris d939b52abe0cee9cc3167f554da6b864db86d3f2 +hexagon 8914d7e857807e1e60975000cba3750c9b2643e8 +ia64 62f269ef819156889b121ae27998e928b784c219 +m68k b24f670b7f5b2058b95370caa9f104b3cefb9f1d +m68knommu b787f68c36d49bb1d9236f403813641efa74a031 +metag 40346a0327fed526baeea701a707b65ceeea71ed +microblaze c2219eda547813c0c50dba90d9e989ae36cc3ab8 +mips 3e20a26b02bd4f24945c87407df51948dd488620 +nios2 1a70db49a735350f221959bf26e9a12f63a743bc +parisc-hd 5fec97d0e3d93717f1d6a958a03e579078088861 +powerpc-mpe 2fe0753d49402aee325cc39c476b46fd51a8afec +powerpc 65e7bb2a34fe7b5fc3ae4532308150c600188118 +fsl d41444daba1fd65e5a998c83398f44524f638d07 +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 57127645d79d2e83e801f141f7d03f64accf28aa +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 0166b197c2ed2327bb7761ded8cba2cfd371a425 +jfs 7d2ac45611b072a24e5014a56a65e6be31c1f884 +nfs b787f68c36d49bb1d9236f403813641efa74a031 +nfsd 65b1a389986e84eb9353c17bbca50b006b285dad +overlayfs 71cbad7e694ee81233b3be3a38b81c3d5872cc6f +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs f569d3ef8254d4b3b8daa4f131f9397d48bf296c +ubifs 502690674281a047abd45f81e64c498bc23a8bb3 +xfs 542c311813d5cb2e6f0dfa9557f41c829b8fb6a0 +file-locks 7505256626b0b3d11ea5a3ec1a89046d07c3c366 +vfs 6d3b3d3367cb85b4b17d5bf4ae1ef13251bdc66b +pci b787f68c36d49bb1d9236f403813641efa74a031 +hid 28c1798485a3f80f8ec2b1e579bf28cf29cd6ba1 +i2c b787f68c36d49bb1d9236f403813641efa74a031 +jdelvare-hwmon 26bc420b59a38e4e6685a73345a0def461136dce +dmi 9432bf142f77c23e81298a6e9b6e663aa1e1dc41 +hwmon-staging f354169e0f7dcd1b2c82cf1f98f6d976e85f74c3 +v4l-dvb bfb4e26f253201aa4f63f13be9447116b3785194 +kbuild a1d375f9a7e33daa1bc6c963da81391ca1b5c798 +kconfig bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +libata 09c5b4803a80a5451d950d6a539d2eb311dc0fb1 +pm b787f68c36d49bb1d9236f403813641efa74a031 +idle 9d72137b19300c9a322282f079beb85d2e6d2597 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 75229df63655fefc8e970c4017ba4db0174ab000 +thermal-soc 62d0817a0acaeb0ed2a412bd243f9bd9012cc06a +ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma b787f68c36d49bb1d9236f403813641efa74a031 +net-next 04b7fe6a4a231871ef681bc95e08fe66992f7b1f +ipsec-next dc0565ce6e34be06730312e79b226b7408a543c8 +wireless-drivers-next f56d9e23b78e311fbd992a1bd80b8bf2adaee29b +bluetooth 35ef6e90d198628c8b863e3693a08a54f0b3685e +infiniband c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf +mtd 3e550d2396d9deef77328237ed992e19dcfefca5 +l2-mtd 3e550d2396d9deef77328237ed992e19dcfefca5 +crypto 10d87b730e1d9f1442cae6487bb3aef8632bed23 +drm cec32a47010647e8b0603726ebb75b990a4057a4 +drm-panel 1c550fa193d08920255240743f57731d4d57cd4d +drm-intel b5f1c97f944482e98e6e39208af356630389d1ea +drm-tegra 535a65db484ff4e4654a037f2ea7e1ff21431b77 +drm-misc a3c6d686443e912e33cebdf9cd80f94df3ded7b0 +drm-exynos 3cf711584d3ec23f86cdbfb3a0be48efd8f2bf91 +drm-msm d5af49c92a8aff8236e7b0bb35e9af364000c017 +sound f1a77547c21fe942e95ebaadbc9200f26d138574 +sound-asoc f4d16a37a08ca9a72d3200ca219f5da476b44af8 +modules 4a3893d069b788f3570c19c12d9e986e8e15870f +virtio 9abbfb486f5c254805bb6a3f263bc14d989eb90b +input c9eeb5084b27ffede2709e8775827729d0c7c46c +block 889fa31f00b218a2cef96c32a6b3f57e6d3bf918 +device-mapper 44c144f9c8e8fbd73ede2848da8253b3aae42ec2 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh e3207ccf7de3070d50d9285c5d2d6324edd0c7e6 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 9ffc8f7cb9647b13dfe4d1ad0d5e1427bb8b46d6 +mfd e554a99ee8d09132e80dc467433c9a4df9054645 +backlight b1f85c0fec20e6cde2a511345f24f6133f247e70 +battery 5939d9dfe4406a49d8688eb827d88abcaf233c42 +omap_dss2 72fc8b7187cd846be08d3bc0fec9380fdad29b45 +regulator e2a4e9538fe66168e9e5ba6695452d11550d1b7d +security 5deeb5cece3f9b30c8129786726b9d02c412c8ca +integrity f46131eeef79208c7dfb02247e19668e3db1f3d4 +selinux cf7b6c0205f11cdb015384244c0b423b00e35c69 +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog fe92a2e3572742e6ff24bae0db00ccdc9bcff30f +iommu 7f65ef01e131650d455875598099cd06fea6096b +dwmw2-iommu 03ecc32c5274962b9b1904d7a730e71c95bac05f +vfio 5a0ff17741c1785b27229a16b5ab77470d71b170 +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs 197175427a221fe3200f7727ea35e261727e7228 +trivial 0e4f93e5017d9d8080bbd34db17836e090eb46fe +audit 39a8804455fb23f09157341d3ba7db6d7ae6ee76 +devicetree a2166ca5f3204794e8b59f01c93a0f1564e3e138 +dt-rh 04fca0e390e80d88c2f959aef86e0bb7f26fea01 +mailbox ee23d66af9219dfe2407a9b08ef9a165dbe6f994 +spi d2b5d42b04f710e135e75ac5b24d65f7bf4de5dd +tip 88256d924879d9cc74adc4c49be8dd83778dc1cb +clockevents 4c8305221193e14752e0fa833a38f856bbe1d22b +edac fec53af531dd040e41fe358abe00b33747af2688 +edac-amd 1afaa05515212b136d96a48b2ba2251f40437d87 +irqchip a8bcdc32fafbeb236910e6ddc0161003a458ffc1 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace c4b00d27e405a4c421c170d322b68380737af660 +rcu 8d7dc9283f399e1fda4e48a1c453f689326d9396 +kvm 2fa462f826210bbec65f8ed06d5ef4e0cd4f5450 +kvm-arm fd1d0ddf2ae92fb3df42ed476939861806c5d785 +kvm-ppc b79013b2449c23f1f505bdf39c5a6c330338b244 +kvms390 816c7667ea97c61884e014cfeedaede5b67b0e58 +xen-tip 0b97b03d88b40bfbd7ff0e069186a137d9786d43 +percpu 4c907baf36d8339f393bb576d0bab29194d0e6ad +workqueues b05a79280b346eb24ddb73b39988398015291075 +drivers-x86 358d6a2c3ecae2b22c7d7e61f9d5672557446dfb +chrome-platform 96cba9b00e297303774bec59e192064d20adeb3d +regmap 77f5f3e9c86dc4604366a567819cc3ec4bdb4400 +hsi 265ef3ee9575e6d150f485d28dbe153a50d27f4c +leds 1fbaf327b79c1de49efd2a4d5a651f119c106c44 +ipmi d0acf734d886ce50bb5103cc75f7ca39f280e8a7 +driver-core b787f68c36d49bb1d9236f403813641efa74a031 +tty b787f68c36d49bb1d9236f403813641efa74a031 +usb b787f68c36d49bb1d9236f403813641efa74a031 +usb-gadget b787f68c36d49bb1d9236f403813641efa74a031 +usb-serial 65dd82ae453f5290be0ea83ed0f23163ea49c0eb +staging b787f68c36d49bb1d9236f403813641efa74a031 +char-misc b787f68c36d49bb1d9236f403813641efa74a031 +extcon 561f26521360bc11ab6a2f91610b71c2d380851c +kdbus 9fb9cd0f4434a23487b6ef3237e733afae90e336 +cgroup d0f702e648dc365070f1868ec291264ad27e65d8 +scsi 118c855b5623f3e2e6204f02623d88c09e0c34de +target-updates b787f68c36d49bb1d9236f403813641efa74a031 +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +pinctrl b787f68c36d49bb1d9236f403813641efa74a031 +vhost f4aaa799cf9aed1467918743ad0f0823c880ce39 +remoteproc 315491e5d6ee66838a18a8ca0c14e6ffb376e48c +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 03daa6f82f2b634019fe8261698f6af3c133497f +dma-mapping 04abab698285297115e5096b3100df1064045529 +pwm c264f1110d27185f8531602f5fce400a6bbce946 +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 f4b4acce5fb24299b388af15d9b04b8dc076a101 +akpm 7ade6658c74a05cd8a256dac4e5cdac831c20670 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..ccb9f6e6d428 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,219 @@ +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 +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/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +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 +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +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..a9adc9756aa4 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2405 @@ +$ date +Tuesday 28 April 10:04:16 AEST 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c8b3fd0ce313 Merge tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm +Merging origin/master (2decb2682f80 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge origin/master +Updating c8b3fd0ce313..2decb2682f80 +Fast-forward + Documentation/networking/mpls-sysctl.txt | 9 + + Documentation/networking/scaling.txt | 2 +- + Makefile | 4 +- + arch/ia64/kernel/perfmon.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 22 +- + arch/s390/hypfs/inode.c | 18 +- + arch/x86/ia32/ia32entry.S | 7 + + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/kernel/cpu/amd.c | 3 + + arch/x86/kernel/entry_64.S | 9 + + arch/x86/kernel/process_64.c | 28 + + arch/x86/kvm/assigned-dev.c | 2 +- + drivers/base/devtmpfs.c | 32 +- + drivers/block/drbd/drbd_debugfs.c | 8 +- + drivers/gpu/drm/i915/i915_drv.c | 4 +- + drivers/gpu/drm/i915/i915_gem.c | 3 +- + drivers/gpu/drm/i915/i915_reg.h | 1 + + drivers/gpu/drm/i915/intel_i2c.c | 66 +- + drivers/gpu/drm/i915/intel_lrc.c | 35 +- + drivers/i2c/busses/i2c-digicolor.c | 3 +- + drivers/i2c/busses/i2c-mxs.c | 2 +- + drivers/i2c/busses/i2c-pca-platform.c | 2 +- + drivers/i2c/busses/i2c-rk3x.c | 2 +- + drivers/i2c/busses/i2c-st.c | 13 +- + drivers/i2c/i2c-core.c | 2 + + drivers/i2c/i2c-mux.c | 8 +- + drivers/infiniband/hw/ipath/ipath_fs.c | 16 +- + drivers/infiniband/hw/qib/qib_fs.c | 20 +- + drivers/iommu/intel-iommu.c | 142 ++--- + drivers/iommu/intel_irq_remapping.c | 5 +- + drivers/mtd/ubi/build.c | 6 +- + drivers/mtd/ubi/kapi.c | 2 +- + drivers/net/bonding/bond_main.c | 2 + + drivers/net/bonding/bond_procfs.c | 1 + + drivers/net/bonding/bonding_priv.h | 25 + + drivers/net/can/Kconfig | 2 +- + drivers/net/can/usb/kvaser_usb.c | 2 +- + drivers/net/ethernet/8390/etherh.c | 2 +- + drivers/net/ethernet/altera/altera_msgdmahw.h | 5 +- + drivers/net/ethernet/altera/altera_tse_main.c | 37 +- + drivers/net/ethernet/amd/Kconfig | 2 +- + drivers/net/ethernet/arc/Kconfig | 5 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 49 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 17 + + drivers/net/ethernet/broadcom/tg3.c | 4 +- + drivers/net/ethernet/cadence/macb.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 21 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 2 - + drivers/net/ethernet/ibm/ehea/ehea_main.c | 6 +- + drivers/net/ethernet/ibm/ibmveth.c | 4 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 16 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 29 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 38 +- + drivers/net/phy/mdio-gpio.c | 14 +- + drivers/net/phy/mdio-mux-gpio.c | 60 +- + drivers/net/ppp/ppp_mppe.c | 36 +- + drivers/net/vxlan.c | 6 +- + 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/vfs_dentry.c | 4 +- + fs/9p/vfs_dir.c | 2 + + fs/9p/vfs_inode.c | 34 +- + fs/9p/vfs_inode_dotl.c | 16 +- + fs/9p/vfs_super.c | 8 +- + fs/adfs/inode.c | 2 +- + fs/affs/amigaffs.c | 9 +- + 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/free-space-cache.c | 42 +- + 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 | 12 +- + 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/namei.c | 6 +- + 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/Makefile | 2 +- + fs/nfs/blocklayout/blocklayout.c | 1 + + fs/nfs/blocklayout/dev.c | 2 +- + fs/nfs/callback.c | 6 +- + fs/nfs/client.c | 1 - + fs/nfs/delegation.c | 4 +- + fs/nfs/dir.c | 63 +- + fs/nfs/direct.c | 53 +- + fs/nfs/file.c | 3 +- + fs/nfs/filelayout/filelayout.c | 10 +- + fs/nfs/filelayout/filelayoutdev.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 12 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 2 +- + fs/nfs/getroot.c | 4 +- + fs/nfs/inode.c | 54 +- + fs/nfs/namespace.c | 10 +- + fs/nfs/nfs3acl.c | 2 +- + fs/nfs/nfs3proc.c | 12 +- + fs/nfs/nfs42proc.c | 31 +- + fs/nfs/nfs42xdr.c | 20 +- + fs/nfs/nfs4client.c | 4 +- + fs/nfs/nfs4file.c | 24 +- + fs/nfs/{idmap.c => nfs4idmap.c} | 2 +- + include/linux/nfs_idmap.h => fs/nfs/nfs4idmap.h | 13 +- + fs/nfs/nfs4namespace.c | 4 +- + fs/nfs/nfs4proc.c | 83 +-- + fs/nfs/nfs4state.c | 6 +- + fs/nfs/nfs4super.c | 7 +- + fs/nfs/nfs4sysctl.c | 2 +- + fs/nfs/nfs4trace.h | 4 +- + fs/nfs/nfs4xdr.c | 22 +- + fs/nfs/nfstrace.c | 3 + + fs/nfs/objlayout/objio_osd.c | 4 +- + fs/nfs/pagelist.c | 2 +- + fs/nfs/pnfs.c | 68 +- + fs/nfs/pnfs.h | 28 +- + fs/nfs/pnfs_dev.c | 21 +- + fs/nfs/pnfs_nfs.c | 12 +- + fs/nfs/proc.c | 4 +- + fs/nfs/read.c | 4 +- + fs/nfs/super.c | 10 +- + fs/nfs/symlink.c | 2 +- + fs/nfs/unlink.c | 20 +- + fs/nfs/write.c | 23 +- + 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 | 31 +- + include/linux/intel-iommu.h | 18 +- + include/linux/netdevice.h | 10 +- + include/linux/nfs_fs.h | 1 + + include/linux/nfs_xdr.h | 6 + + include/linux/rhashtable.h | 3 +- + include/linux/skbuff.h | 1 + + include/linux/sunrpc/msg_prot.h | 8 +- + include/linux/sunrpc/xprtrdma.h | 5 - + include/net/bonding.h | 7 - + include/net/inet_connection_sock.h | 20 +- + include/net/request_sock.h | 18 - + include/trace/events/btrfs.h | 4 +- + include/trace/events/ext3.h | 16 +- + include/trace/events/ext4.h | 16 +- + include/uapi/linux/nfs_idmap.h | 2 +- + 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 +- + lib/rhashtable.c | 11 +- + mm/shmem.c | 30 +- + net/core/dev.c | 12 +- + net/core/skbuff.c | 30 +- + net/dccp/ipv4.c | 3 +- + net/dccp/ipv6.c | 3 +- + net/dccp/minisocks.c | 3 +- + net/ipv4/inet_connection_sock.c | 34 + + net/ipv4/tcp_ipv4.c | 3 +- + net/ipv4/tcp_minisocks.c | 7 +- + net/ipv4/tcp_output.c | 64 +- + net/ipv6/ip6_gre.c | 9 +- + net/ipv6/tcp_ipv6.c | 3 +- + net/mpls/af_mpls.c | 125 +++- + net/mpls/internal.h | 6 + + net/netfilter/nft_reject.c | 2 + + net/netfilter/nft_reject_inet.c | 2 + + net/netlink/af_netlink.c | 6 +- + net/socket.c | 6 +- + net/sunrpc/rpc_pipe.c | 32 +- + net/sunrpc/sched.c | 4 +- + net/sunrpc/xprt.c | 22 +- + net/sunrpc/xprtrdma/Makefile | 3 +- + net/sunrpc/xprtrdma/fmr_ops.c | 208 ++++++ + net/sunrpc/xprtrdma/frwr_ops.c | 353 +++++++++++ + net/sunrpc/xprtrdma/physical_ops.c | 94 +++ + net/sunrpc/xprtrdma/rpc_rdma.c | 87 ++- + net/sunrpc/xprtrdma/transport.c | 61 +- + net/sunrpc/xprtrdma/verbs.c | 699 ++------------------- + net/sunrpc/xprtrdma/xprt_rdma.h | 90 ++- + net/tipc/link.c | 1 - + net/tipc/server.c | 9 +- + net/tipc/socket.c | 3 +- + net/unix/af_unix.c | 8 +- + net/unix/diag.c | 2 +- + net/unix/garbage.c | 70 +-- + 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 +- + 456 files changed, 3824 insertions(+), 3228 deletions(-) + create mode 100644 drivers/net/bonding/bonding_priv.h + rename fs/nfs/{idmap.c => nfs4idmap.c} (99%) + rename include/linux/nfs_idmap.h => fs/nfs/nfs4idmap.h (94%) + create mode 100644 net/sunrpc/xprtrdma/fmr_ops.c + create mode 100644 net/sunrpc/xprtrdma/frwr_ops.c + create mode 100644 net/sunrpc/xprtrdma/physical_ops.c +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 (2e826695d87c powerpc/mm: Fix build error with CONFIG_PPC_TRANSACTIONAL_MEM disabled) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +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 (22a8f237c055 bnx2x: really disable TPA if 'disable_tpa' option is set) +$ git merge net/master +Already up-to-date. +Merging ipsec/master (092a29a40bab vti6: fix uninit when using x-netns) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (30e5f003ff4b ALSA: hda - Fix missing va_end() call in snd_hda_codec_pcm_new()) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/emu10k1/emu10k1.c | 6 ++++-- + sound/pci/emu10k1/emu10k1_main.c | 4 ++-- + sound/pci/hda/hda_codec.c | 24 ++++++++++++++---------- + sound/pci/hda/hda_generic.c | 3 ++- + sound/pci/hda/patch_realtek.c | 16 ++++++++++++---- + sound/pci/hda/thinkpad_helper.c | 1 + + sound/synth/emux/emux_seq.c | 2 -- + 7 files changed, 35 insertions(+), 21 deletions(-) +Merging pci-current/for-linus (b787f68c36d4 Linux 4.1-rc1) +$ 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 (b787f68c36d4 Linux 4.1-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (b787f68c36d4 Linux 4.1-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (b787f68c36d4 Linux 4.1-rc1) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (b787f68c36d4 Linux 4.1-rc1) +$ 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 (b787f68c36d4 Linux 4.1-rc1) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (b787f68c36d4 Linux 4.1-rc1) +$ 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 (8c98ebd7a6ff crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA) +$ 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 (b787f68c36d4 Linux 4.1-rc1) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (6b7acae74fc2 Merge branches 'misc' and 'vdso' into for-next) +$ git merge arm/for-next +Already up-to-date. +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 +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/bus/Makefile' using previous resolution. +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 +[master 22935657f549] 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 (31fd7fe00b0d ARM: bcm2835: Drop the init_irq() hook) +$ git merge rpi/for-rpi-next +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 ++-- + arch/arm/mach-bcm/board_bcm2835.c | 18 ------------- + include/dt-bindings/pinctrl/bcm2835.h | 27 +++++++++++++++++++ + 8 files changed, 68 insertions(+), 30 deletions(-) + create mode 100644 include/dt-bindings/pinctrl/bcm2835.h +Merging berlin/berlin/for-next (b787f68c36d4 Linux 4.1-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 (add3c7901a55 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Auto-merging drivers/clk/imx/clk.h +Auto-merging drivers/clk/imx/clk-pllv1.c +Auto-merging drivers/clk/imx/clk-imx6sx.c +Auto-merging drivers/clk/imx/clk-imx6sl.c +Auto-merging drivers/clk/imx/clk-imx6q.c +Auto-merging drivers/clk/imx/clk-imx51-imx53.c +Auto-merging drivers/clk/imx/clk-imx35.c +Auto-merging drivers/clk/imx/clk-imx31.c +Auto-merging drivers/clk/imx/clk-imx27.c +Auto-merging drivers/clk/imx/clk-imx25.c +Auto-merging drivers/clk/imx/clk-imx21.c +Auto-merging drivers/clk/imx/clk-imx1.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/fsl-mxs-dma.txt | 2 +- + MAINTAINERS | 2 + + arch/arm/boot/dts/imx23-olinuxino.dts | 10 +++- + arch/arm/boot/dts/imx23.dtsi | 40 +++++++++++++++- + arch/arm/boot/dts/imx25.dtsi | 1 + + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 + + arch/arm/boot/dts/imx6qdl.dtsi | 56 +++++++++++----------- + arch/arm/mach-imx/Makefile | 27 +++++------ + arch/arm/mach-imx/common.h | 11 +---- + arch/arm/mach-imx/cpuidle-imx6q.c | 4 +- + arch/arm/mach-imx/cpuidle-imx6sl.c | 4 +- + arch/arm/mach-imx/cpuidle-imx6sx.c | 4 +- + .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 2 +- + arch/arm/mach-imx/hardware.h | 1 + + arch/arm/mach-imx/mmdc.c | 2 + + arch/arm/mach-imx/mx27.h | 4 -- + arch/arm/mach-imx/mx3x.h | 7 --- + arch/arm/mach-imx/mxc.h | 16 ------- + arch/arm/mach-imx/pm-imx5.c | 9 ++-- + arch/arm/mach-imx/pm-imx6.c | 30 +++++++----- + arch/arm/mach-imx/time.c | 5 +- + drivers/clk/Makefile | 1 + + drivers/clk/imx/Makefile | 25 ++++++++++ + {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c | 0 + .../mach-imx => drivers/clk/imx}/clk-fixup-div.c | 0 + .../mach-imx => drivers/clk/imx}/clk-fixup-mux.c | 0 + .../clk/imx}/clk-gate-exclusive.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c | 16 ++++--- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c | 13 +++-- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c | 6 +-- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c | 14 ++++-- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c | 34 +++++++++---- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c | 31 +++++++++--- + .../mach-imx => drivers/clk/imx}/clk-imx51-imx53.c | 5 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c | 34 +++++++------ + .../arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c | 7 --- + .../arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c | 6 --- + {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c | 33 +++++++++---- + {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk.h | 20 +++++++- + include/soc/imx/revision.h | 37 ++++++++++++++ + 49 files changed, 333 insertions(+), 191 deletions(-) + create mode 100644 drivers/clk/imx/Makefile + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-div.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-mux.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate-exclusive.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c (92%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c (96%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c (98%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c (97%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c (92%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c (94%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx51-imx53.c (99%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c (98%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c (99%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c (99%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c (75%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk.h (89%) + create mode 100644 include/soc/imx/revision.h +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 (750e30d4076a ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 ++++ + 1 file changed, 4 insertions(+) +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 47c2985e0f83] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging renesas/next (b036267ee514 Merge branches 'heads/sh-drivers-for-v4.1' and 'heads/dt-for-v4.2' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +- + arch/arm/boot/dts/r8a7790.dtsi | 8 ++++---- + arch/arm/boot/dts/r8a7791.dtsi | 6 +++--- + drivers/sh/pm_runtime.c | 7 +++---- + 4 files changed, 11 insertions(+), 12 deletions(-) +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 aa000887dec6] 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 (4ab66f83f824 Merge branch 'sunxi/defconfig-for-4.2' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.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 | 22 +- + 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-jesurun-q5.dts | 194 +++++++ + 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 | 231 ++++++++ + arch/arm/boot/dts/sun5i-a13.dtsi | 594 +++----------------- + arch/arm/boot/dts/sun5i.dtsi | 617 ++++++++++++++++++++ + 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 | 96 +++- + 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 | 57 +- + 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/configs/multi_v7_defconfig | 1 - + arch/arm/configs/sunxi_defconfig | 6 +- + 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 + + 68 files changed, 6667 insertions(+), 3855 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/sun4i-a10-jesurun-q5.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 +Already up-to-date. +Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Already up-to-date. +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 +Already up-to-date. +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 (b787f68c36d4 Linux 4.1-rc1) +$ 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 +Already up-to-date. +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 (1a70db49a735 nios2: rework cache) +$ git merge nios2/nios2-next +Already up-to-date. +Merging parisc-hd/for-next (5fec97d0e3d9 parisc: copy_thread(): rename 'arg' argument to 'kthread_arg') +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/kernel/process.c | 10 ++++++---- + drivers/parisc/superio.c | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) +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 (57127645d79d s390/zcrypt: Introduce new SHA-512 based Pseudo Random Generator.) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 2 +- + arch/s390/crypto/crypt_s390.h | 122 ++++-- + arch/s390/crypto/prng.c | 850 +++++++++++++++++++++++++++++++++--- + 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/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 +- + 13 files changed, 1039 insertions(+), 329 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 +Already up-to-date. +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/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/connect.c +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifs_dfs_ref.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 (0166b197c2ed GFS2: Average in only non-zero round-trip times for congestion stats) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/rgrp.c | 17 +++++++++++++---- + 1 file changed, 13 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 (b787f68c36d4 Linux 4.1-rc1) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (65b1a389986e nfsd: fix pNFS return on close semantics) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/blocklayout.c | 11 +++++ + fs/nfsd/nfs4state.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++--- + fs/nfsd/state.h | 14 ++++++ + fs/nfsd/xdr4.h | 1 + + 4 files changed, 136 insertions(+), 7 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 +Already up-to-date. +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 vfs/for-next (6d3b3d3367cb direct-io: only inc/dec inode->i_dio_count for file systems) +$ git merge vfs/for-next +Auto-merging fs/9p/v9fs.h +Merge made by the 'recursive' strategy. + fs/9p/v9fs.h | 2 - + fs/9p/vfs_inode.c | 119 ++++++++++--------------------------------------- + fs/9p/vfs_inode_dotl.c | 31 ++++--------- + 3 files changed, 31 insertions(+), 121 deletions(-) +Merging pci/next (b787f68c36d4 Linux 4.1-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (28c1798485a3 Merge branch 'for-4.2/wacom' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-ids.h | 7 +++ + drivers/hid/hid-lenovo.c | 19 +++++++ + drivers/hid/i2c-hid/i2c-hid.c | 5 +- + drivers/hid/usbhid/hid-quirks.c | 3 ++ + drivers/hid/wacom.h | 2 +- + drivers/hid/wacom_sys.c | 109 ++++++++++++++++++++-------------------- + drivers/hid/wacom_wac.c | 39 ++++++++++++-- + drivers/hid/wacom_wac.h | 6 --- + 8 files changed, 123 insertions(+), 67 deletions(-) +Merging i2c/i2c/for-next (b787f68c36d4 Linux 4.1-rc1) +$ 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 dmi/master (9432bf142f77 firmware: dmi: List my quilt tree) +$ git merge dmi/master +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/testing/sysfs-firmware-dmi-entries +Merge made by the 'recursive' strategy. + ...sfs-firmware-dmi => sysfs-firmware-dmi-entries} | 2 +- + .../ABI/testing/sysfs-firmware-dmi-tables | 22 ++++ + MAINTAINERS | 2 + + drivers/firmware/dmi-sysfs.c | 17 ++- + drivers/firmware/dmi_scan.c | 115 ++++++++++++++++++--- + include/linux/dmi.h | 2 + + 6 files changed, 134 insertions(+), 26 deletions(-) + rename Documentation/ABI/testing/{sysfs-firmware-dmi => sysfs-firmware-dmi-entries} (99%) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-dmi-tables +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 (a1d375f9a7e3 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 35 +++++++--- + 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 +- + scripts/package/builddeb | 18 +++-- + scripts/package/mkspec | 4 +- + 11 files changed, 375 insertions(+), 27 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 (09c5b4803a80 libata: Ignore spurious PHY event on LPM policy change) +$ 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/libahci.c | 3 +- + drivers/ata/libata-core.c | 32 ++ + drivers/ata/libata-eh.c | 3 + + drivers/ata/pata_scc.c | 1110 --------------------------------------------- + drivers/ide/Kconfig | 9 - + drivers/ide/Makefile | 1 - + drivers/ide/scc_pata.c | 887 ------------------------------------ + include/linux/libata.h | 10 + + 11 files changed, 70 insertions(+), 2044 deletions(-) + delete mode 100644 drivers/ata/pata_scc.c + delete mode 100644 drivers/ide/scc_pata.c +Merging pm/linux-next (b787f68c36d4 Linux 4.1-rc1) +$ git merge pm/linux-next +Already up-to-date. +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 (b787f68c36d4 Linux 4.1-rc1) +$ git merge slave-dma/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 ipsec-next/master (dc0565ce6e34 xfrm: slightly optimise xfrm_input) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_input.c | 12 ++++++------ + net/xfrm/xfrm_policy.c | 18 ++++++------------ + net/xfrm/xfrm_state.c | 4 ++-- + 3 files changed, 14 insertions(+), 20 deletions(-) +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 (3e550d2396d9 Merge MTD fixes from 4.0 into -next) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (10d87b730e1d crypto: nx - Fixing SHA update bug) +$ git merge crypto/master +Auto-merging drivers/crypto/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/fsl-sec2.txt | 6 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 2 +- + arch/x86/crypto/sha-mb/sha1_mb.c | 3 +- + crypto/ablkcipher.c | 2 +- + crypto/aead.c | 2 +- + crypto/algapi.c | 14 +- + crypto/algif_aead.c | 1 + + crypto/algif_rng.c | 2 +- + crypto/ansi_cprng.c | 88 ++- + crypto/drbg.c | 380 ++++------- + crypto/fips.c | 53 +- + crypto/internal.h | 3 +- + crypto/krng.c | 33 +- + crypto/pcompress.c | 7 +- + crypto/proc.c | 41 -- + crypto/rng.c | 105 ++- + crypto/shash.c | 7 +- + crypto/tcrypt.c | 9 +- + crypto/testmgr.c | 2 + + drivers/crypto/Kconfig | 18 + + drivers/crypto/caam/caamalg.c | 4 - + drivers/crypto/mv_cesa.c | 2 +- + drivers/crypto/nx/nx-sha256.c | 84 ++- + drivers/crypto/nx/nx-sha512.c | 85 ++- + drivers/crypto/nx/nx.c | 69 +- + drivers/crypto/nx/nx.h | 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 -- + include/linux/module.h | 12 + + net/mac80211/aes_ccm.c | 3 +- + net/mac80211/aes_gcm.c | 3 +- + net/mac80211/aes_gmac.c | 2 +- + net/mac802154/llsec.c | 3 +- + 37 files changed, 1234 insertions(+), 901 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 (b5f1c97f9444 drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg) +$ 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 (f1a77547c21f Merge branch 'for-4.2' into for-next) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/core.h | 4 - + include/sound/hda_register.h | 152 ++++ + include/sound/hdaudio.h | 286 +++++++- + include/sound/info.h | 29 +- + include/sound/pcm.h | 5 +- + sound/core/Makefile | 8 +- + sound/core/info.c | 779 ++++++++------------ + sound/core/info_oss.c | 29 +- + sound/core/init.c | 33 +- + sound/core/seq/Makefile | 3 +- + sound/core/seq/seq_info.c | 19 +- + sound/core/sound.c | 24 +- + sound/core/sound_oss.c | 30 +- + sound/hda/Kconfig | 3 + + sound/hda/Makefile | 2 +- + sound/hda/hdac_bus.c | 20 +- + sound/hda/hdac_controller.c | 507 +++++++++++++ + sound/hda/hdac_device.c | 300 ++++++++ + sound/hda/hdac_stream.c | 686 ++++++++++++++++++ + sound/pci/ad1889.c | 4 +- + sound/pci/ali5451/ali5451.c | 4 +- + sound/pci/als300.c | 4 +- + sound/pci/als4000.c | 4 +- + sound/pci/au88x0/au88x0.c | 4 +- + sound/pci/aw2/aw2-alsa.c | 4 +- + sound/pci/azt3328.c | 4 +- + sound/pci/ca0106/ca0106_main.c | 4 +- + sound/pci/cs5535audio/cs5535audio.c | 4 +- + sound/pci/ctxfi/cthw20k1.c | 4 +- + sound/pci/ctxfi/cthw20k2.c | 4 +- + sound/pci/emu10k1/emu10k1_main.c | 4 +- + sound/pci/es1938.c | 4 +- + sound/pci/es1968.c | 4 +- + sound/pci/hda/Kconfig | 3 - + sound/pci/hda/Makefile | 3 +- + sound/pci/hda/hda_codec.c | 421 +---------- + sound/pci/hda/hda_codec.h | 80 +-- + sound/pci/hda/hda_controller.c | 1330 +++++++---------------------------- + sound/pci/hda/hda_controller.h | 270 +------ + sound/pci/hda/hda_intel.c | 242 ++++--- + sound/pci/hda/hda_intel.h | 1 + + sound/pci/hda/hda_intel_trace.h | 4 +- + sound/pci/hda/hda_tegra.c | 76 +- + sound/pci/hda/patch_ca0132.c | 7 +- + sound/pci/hda/patch_hdmi.c | 2 +- + sound/pci/ice1712/ice1712.c | 4 +- + sound/pci/lx6464es/lx6464es.c | 2 +- + sound/pci/maestro3.c | 4 +- + sound/pci/mixart/mixart.c | 2 +- + sound/pci/pcxhr/pcxhr.c | 2 +- + sound/pci/sis7019.c | 10 +- + sound/pci/sonicvibes.c | 4 +- + sound/pci/trident/trident_main.c | 4 +- + 53 files changed, 2882 insertions(+), 2564 deletions(-) + create mode 100644 include/sound/hda_register.h + create mode 100644 sound/hda/hdac_controller.c + create mode 100644 sound/hda/hdac_stream.c +Merging sound-asoc/for-next (f4d16a37a08c Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/adi,adau1701.txt | 4 + + include/sound/dmaengine_pcm.h | 5 - + include/sound/soc-dapm.h | 36 +- + include/sound/soc.h | 102 +- + sound/soc/atmel/atmel-pcm-dma.c | 3 +- + sound/soc/atmel/sam9g20_wm8731.c | 10 +- + sound/soc/cirrus/ep93xx-pcm.c | 1 - + sound/soc/codecs/88pm860x-codec.c | 1 - + sound/soc/codecs/adau1373.c | 1 - + sound/soc/codecs/adau1701.c | 126 ++- + sound/soc/codecs/adau1761.c | 1 - + sound/soc/codecs/adau1781.c | 1 - + sound/soc/codecs/adau1977.c | 2 - + sound/soc/codecs/adav80x.c | 1 - + sound/soc/codecs/ak4535.c | 1 - + sound/soc/codecs/ak4641.c | 1 - + sound/soc/codecs/ak4642.c | 1 - + sound/soc/codecs/ak4671.c | 1 - + sound/soc/codecs/alc5623.c | 1 - + sound/soc/codecs/alc5632.c | 1 - + sound/soc/codecs/cq93vc.c | 1 - + sound/soc/codecs/cs35l32.c | 1 - + sound/soc/codecs/cs4265.c | 1 - + sound/soc/codecs/cs42l52.c | 1 - + sound/soc/codecs/cs42l56.c | 1 - + sound/soc/codecs/cs42l73.c | 1 - + sound/soc/codecs/cx20442.c | 2 - + sound/soc/codecs/da7213.c | 1 - + sound/soc/codecs/da732x.c | 2 - + sound/soc/codecs/da9055.c | 1 - + sound/soc/codecs/es8328.c | 1 - + sound/soc/codecs/isabelle.c | 2 - + sound/soc/codecs/jz4740.c | 2 - + sound/soc/codecs/lm4857.c | 2 - + sound/soc/codecs/lm49453.c | 2 - + sound/soc/codecs/max98088.c | 1 - + sound/soc/codecs/max98090.c | 1 - + sound/soc/codecs/max98095.c | 5 +- + sound/soc/codecs/max9850.c | 1 - + sound/soc/codecs/ml26124.c | 1 - + sound/soc/codecs/pcm512x.c | 2 - + sound/soc/codecs/rt286.c | 1 - + sound/soc/codecs/rt5631.c | 1 - + sound/soc/codecs/rt5640.c | 5 +- + sound/soc/codecs/rt5645.c | 64 +- + sound/soc/codecs/rt5651.c | 3 +- + sound/soc/codecs/rt5670.c | 1 - + sound/soc/codecs/rt5677.c | 6 +- + sound/soc/codecs/sgtl5000.c | 54 +- + sound/soc/codecs/sn95031.c | 1 - + sound/soc/codecs/ssm2518.c | 2 - + sound/soc/codecs/ssm2602.c | 1 - + sound/soc/codecs/ssm4567.c | 7 +- + sound/soc/codecs/sta32x.c | 3 +- + sound/soc/codecs/sta350.c | 3 +- + sound/soc/codecs/sta529.c | 6 - + sound/soc/codecs/stac9766.c | 1 - + sound/soc/codecs/tfa9879.c | 4 +- + sound/soc/codecs/tlv320aic23.c | 1 - + sound/soc/codecs/tlv320aic31xx.c | 1 - + sound/soc/codecs/tlv320aic32x4.c | 1 - + sound/soc/codecs/tlv320aic3x.c | 1 - + sound/soc/codecs/tlv320dac33.c | 1 - + sound/soc/codecs/twl4030.c | 1 - + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/codecs/uda134x.c | 1 - + sound/soc/codecs/uda1380.c | 1 - + sound/soc/codecs/wm0010.c | 2 - + sound/soc/codecs/wm1250-ev1.c | 2 - + sound/soc/codecs/wm8350.c | 1 - + sound/soc/codecs/wm8400.c | 1 - + sound/soc/codecs/wm8510.c | 1 - + sound/soc/codecs/wm8523.c | 1 - + sound/soc/codecs/wm8580.c | 1 - + sound/soc/codecs/wm8711.c | 1 - + sound/soc/codecs/wm8728.c | 1 - + sound/soc/codecs/wm8731.c | 3 +- + sound/soc/codecs/wm8737.c | 3 +- + sound/soc/codecs/wm8750.c | 1 - + sound/soc/codecs/wm8753.c | 1 - + sound/soc/codecs/wm8770.c | 1 - + sound/soc/codecs/wm8776.c | 1 - + sound/soc/codecs/wm8900.c | 7 +- + sound/soc/codecs/wm8903.c | 2 - + sound/soc/codecs/wm8904.c | 1 - + sound/soc/codecs/wm8940.c | 4 +- + sound/soc/codecs/wm8955.c | 3 +- + sound/soc/codecs/wm8960.c | 4 - + sound/soc/codecs/wm8961.c | 2 - + sound/soc/codecs/wm8962.c | 1 - + sound/soc/codecs/wm8971.c | 1 - + sound/soc/codecs/wm8974.c | 1 - + sound/soc/codecs/wm8978.c | 5 +- + sound/soc/codecs/wm8983.c | 1 - + sound/soc/codecs/wm8985.c | 1 - + sound/soc/codecs/wm8988.c | 1 - + sound/soc/codecs/wm8990.c | 3 +- + sound/soc/codecs/wm8991.c | 1 - + sound/soc/codecs/wm8993.c | 6 +- + sound/soc/codecs/wm8994.c | 4 +- + sound/soc/codecs/wm8995.c | 1 - + sound/soc/codecs/wm8996.c | 2 - + sound/soc/codecs/wm9081.c | 2 - + sound/soc/codecs/wm9090.c | 2 - + sound/soc/codecs/wm9712.c | 3 +- + sound/soc/codecs/wm9713.c | 3 +- + sound/soc/codecs/wm_adsp.c | 1132 ++++++++++++-------- + sound/soc/codecs/wm_adsp.h | 6 +- + sound/soc/codecs/wmfw.h | 44 +- + sound/soc/fsl/fsl_sai.c | 3 +- + sound/soc/fsl/fsl_ssi.c | 2 +- + sound/soc/intel/Makefile | 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/core.c | 34 +- + sound/soc/sh/rcar/dma.c | 1 + + sound/soc/sh/rcar/ssi.c | 52 +- + sound/soc/soc-dapm.c | 38 +- + sound/soc/soc-generic-dmaengine-pcm.c | 25 +- + sound/soc/ux500/ux500_pcm.c | 1 - + 124 files changed, 1238 insertions(+), 703 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 (e3207ccf7de3 mmc: core: add missing pm event in mmc_pm_notify to fix hib restore) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + drivers/mmc/core/core.c | 1 + + 1 file changed, 1 insertion(+) +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 +Already up-to-date. +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 (e2a4e9538fe6 Merge remote-tracking branches 'regulator/topic/cleanup', 'regulator/topic/max14577', 'regulator/topic/max77843' and 'regulator/topic/max8973' 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/max77686.c | 2 +- + drivers/regulator/max77843.c | 48 +++++-------- + drivers/regulator/max8973-regulator.c | 6 +- + drivers/regulator/of_regulator.c | 2 +- + drivers/regulator/s2mps11.c | 10 +-- + 7 files changed, 79 insertions(+), 119 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 (f46131eeef79 KEYS: fix "ca_keys=" partial key matching) +$ git merge integrity/next +Auto-merging security/integrity/evm/evm_main.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 3 +++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 +++ + crypto/asymmetric_keys/asymmetric_type.c | 20 ++++++++++++++------ + crypto/asymmetric_keys/x509_public_key.c | 29 +++++++++++++++++++++++------ + security/integrity/evm/evm_main.c | 11 +++++++++++ + security/integrity/ima/ima_policy.c | 16 +++++++--------- + 6 files changed, 61 insertions(+), 21 deletions(-) +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 +Already up-to-date. +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 (39a8804455fb Linux 4.0) +$ 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 (04fca0e390e8 frv: add io{read,write}{16,32}be functions) +$ git merge dt-rh/for-next +Already up-to-date. +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 (d2b5d42b04f7 Merge remote-tracking branches 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-ath79.txt | 24 +++ + .../include/asm/mach-ath79/ath79_spi_platform.h | 4 - + drivers/spi/Kconfig | 9 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-ath79.c | 34 ++-- + drivers/spi/spi-bcm2835.c | 88 +++++---- + drivers/spi/spi-bitbang.c | 17 +- + drivers/spi/spi-fsl-cpm.c | 40 ++-- + drivers/spi/spi-fsl-dspi.c | 2 +- + drivers/spi/spi-fsl-espi.c | 45 +++-- + drivers/spi/spi-omap2-mcspi.c | 16 +- + drivers/spi/spi-rb4xx.c | 210 +++++++++++++++++++++ + drivers/spi/spi-sirf.c | 3 +- + drivers/spi/spi.c | 9 + + drivers/spi/spidev.c | 30 +-- + 15 files changed, 412 insertions(+), 120 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-ath79.txt + create mode 100644 drivers/spi/spi-rb4xx.c +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 b8f0a314bbb8] 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 (2fa462f82621 Merge tag 'kvm-arm-for-4.1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master) +$ 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 +Already up-to-date. +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 (b05a79280b34 workqueue: Create low-level unbound workqueues cpumask) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 228 +++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 142 insertions(+), 86 deletions(-) +Merging drivers-x86/for-next (358d6a2c3eca toshiba_acpi: Do not register vendor backlight when acpi_video bl is available) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging regmap/for-next (77f5f3e9c86d regmap: Constify irq_domain_ops) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (b787f68c36d4 Linux 4.1-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (b787f68c36d4 Linux 4.1-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (b787f68c36d4 Linux 4.1-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (b787f68c36d4 Linux 4.1-rc1) +$ 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 (b787f68c36d4 Linux 4.1-rc1) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (b787f68c36d4 Linux 4.1-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (561f26521360 extcon: Add manufactor name of each extcon device) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/Kconfig | 14 +++++++------- + drivers/extcon/extcon-usb-gpio.c | 24 ++++++++++++------------ + 2 files changed, 19 insertions(+), 19 deletions(-) +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 8c77c3bf9a01] 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 (d0f702e648dc cgroup: fix some comment typos) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging scsi/for-next (118c855b5623 3w-9xxx: fix command completion race) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/3w-9xxx.c | 57 +++++++++++---------------------------------- + drivers/scsi/3w-9xxx.h | 5 ---- + drivers/scsi/3w-sas.c | 50 ++++++++------------------------------- + drivers/scsi/3w-sas.h | 4 ---- + drivers/scsi/3w-xxxx.c | 42 +++++---------------------------- + drivers/scsi/3w-xxxx.h | 5 ---- + drivers/scsi/aha1542.c | 23 +++++++++--------- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/scsi_scan.c | 6 +++++ + include/scsi/scsi_devinfo.h | 1 + + 10 files changed, 48 insertions(+), 146 deletions(-) +Merging target-updates/for-next (b787f68c36d4 Linux 4.1-rc1) +$ git merge target-updates/for-next +Already up-to-date. +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 (b787f68c36d4 Linux 4.1-rc1) +$ 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 (c264f1110d27 pwm: Remove __init initializer for pwm_add_table()) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (72449cb47b01 staging: android: ion: fix wrong init of dma_buf_export_info) +$ git merge dma-buf/for-next +Already up-to-date. +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 a04742d445a1] 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 (f4b4acce5fb2 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Auto-merging mm/shmem.c +Removing lib/find_last_bit.c +Auto-merging include/linux/kexec.h +Removing include/linux/compiler-gcc5.h +Removing include/linux/compiler-gcc4.h +Removing include/linux/compiler-gcc3.h +Auto-merging fs/reiserfs/super.c +Auto-merging fs/posix_acl.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/minix/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/ext4/fsync.c +Auto-merging fs/cifs/file.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/mm/hugetlbpage.c +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/abracon,abx80x.txt | 32 ++ + Documentation/filesystems/vfat.txt | 10 + + Documentation/kasan.txt | 8 +- + Documentation/printk-formats.txt | 8 + + MAINTAINERS | 1 + + arch/alpha/include/asm/mm-arch-hooks.h | 15 + + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arc/include/asm/mm-arch-hooks.h | 15 + + arch/arm/include/asm/mm-arch-hooks.h | 15 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/mm/hugetlbpage.c | 5 - + arch/arm64/include/asm/mm-arch-hooks.h | 15 + + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/mm/hugetlbpage.c | 7 - + arch/avr32/include/asm/mm-arch-hooks.h | 15 + + arch/blackfin/include/asm/mm-arch-hooks.h | 15 + + arch/c6x/include/asm/mm-arch-hooks.h | 15 + + arch/cris/include/asm/mm-arch-hooks.h | 15 + + arch/frv/include/asm/mm-arch-hooks.h | 15 + + arch/frv/include/asm/sections.h | 6 - + arch/hexagon/include/asm/mm-arch-hooks.h | 15 + + arch/ia64/include/asm/mm-arch-hooks.h | 15 + + arch/ia64/mm/hugetlbpage.c | 5 - + arch/m32r/include/asm/mm-arch-hooks.h | 15 + + arch/m68k/include/asm/mm-arch-hooks.h | 15 + + arch/metag/include/asm/mm-arch-hooks.h | 15 + + arch/metag/mm/hugetlbpage.c | 5 - + arch/microblaze/include/asm/mm-arch-hooks.h | 15 + + arch/mips/include/asm/mm-arch-hooks.h | 15 + + arch/mips/include/uapi/asm/mman.h | 1 + + arch/mips/mm/hugetlbpage.c | 5 - + arch/mn10300/include/asm/mm-arch-hooks.h | 15 + + arch/nios2/include/asm/mm-arch-hooks.h | 15 + + arch/openrisc/include/asm/mm-arch-hooks.h | 15 + + arch/parisc/include/asm/mm-arch-hooks.h | 15 + + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/powerpc/include/asm/mm-arch-hooks.h | 28 ++ + arch/powerpc/include/asm/mmu_context.h | 23 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 2 + + arch/powerpc/mm/hugetlbpage.c | 5 - + arch/s390/include/asm/mm-arch-hooks.h | 15 + + arch/s390/mm/hugetlbpage.c | 5 - + arch/score/include/asm/mm-arch-hooks.h | 15 + + arch/sh/include/asm/mm-arch-hooks.h | 15 + + arch/sh/mm/hugetlbpage.c | 5 - + arch/sparc/include/asm/mm-arch-hooks.h | 15 + + arch/sparc/include/asm/pgtable_64.h | 9 + + arch/sparc/mm/hugetlbpage.c | 5 - + arch/tile/include/asm/mm-arch-hooks.h | 15 + + arch/tile/mm/hugetlbpage.c | 5 - + arch/um/include/asm/mm-arch-hooks.h | 15 + + arch/unicore32/include/asm/mm-arch-hooks.h | 15 + + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/mm-arch-hooks.h | 15 + + arch/x86/include/asm/mtrr.h | 7 +- + arch/x86/include/asm/pgtable.h | 5 + + arch/x86/include/uapi/asm/mtrr.h | 12 +- + arch/x86/kernel/cpu/mtrr/generic.c | 192 ++++++++---- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/mm/pat.c | 4 +- + arch/x86/mm/pgtable.c | 53 +++- + arch/xtensa/include/asm/mm-arch-hooks.h | 15 + + arch/xtensa/include/uapi/asm/mman.h | 1 + + block/genhd.c | 2 +- + drivers/block/zram/Kconfig | 10 +- + drivers/block/zram/zram_drv.c | 27 +- + drivers/memstick/host/jmb38x_ms.c | 12 +- + drivers/memstick/host/r592.c | 10 +- + 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-ds1307.c | 12 +- + drivers/rtc/rtc-omap.c | 14 +- + fs/adfs/super.c | 2 +- + fs/cifs/file.c | 8 +- + fs/efs/super.c | 2 +- + 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/minix/inode.c | 2 +- + fs/mpage.c | 23 +- + fs/ocfs2/alloc.c | 106 +++---- + fs/ocfs2/aops.c | 37 ++- + fs/ocfs2/buffer_head_io.c | 6 + + fs/ocfs2/cluster/heartbeat.c | 49 +-- + fs/ocfs2/cluster/masklog.c | 34 ++ + fs/ocfs2/cluster/masklog.h | 42 +-- + fs/ocfs2/dir.c | 70 ++--- + fs/ocfs2/dlm/dlmmaster.c | 23 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/extent_map.c | 22 +- + fs/ocfs2/inode.c | 40 +-- + fs/ocfs2/journal.c | 49 ++- + fs/ocfs2/localalloc.c | 3 +- + fs/ocfs2/move_extents.c | 8 +- + fs/ocfs2/namei.c | 42 +-- + fs/ocfs2/namei.h | 4 +- + 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 | 67 ++-- + fs/ocfs2/super.h | 8 +- + fs/ocfs2/xattr.c | 51 ++- + fs/posix_acl.c | 46 ++- + fs/reiserfs/super.c | 3 +- + include/linux/compiler-gcc.h | 207 ++++++++++--- + include/linux/compiler-gcc3.h | 23 -- + include/linux/compiler-gcc4.h | 91 ------ + include/linux/compiler-gcc5.h | 67 ---- + include/linux/crc64_ecma.h | 56 ++++ + include/linux/huge_mm.h | 4 + + include/linux/kexec.h | 2 + + include/linux/mm-arch-hooks.h | 25 ++ + include/linux/mm.h | 40 --- + 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 | 36 ++- + 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 +- + kernel/exit.c | 2 +- + kernel/watchdog.c | 2 +- + lib/Kconfig | 7 + + lib/Kconfig.kasan | 8 +- + lib/Makefile | 1 + + lib/bitmap.c | 17 +- + lib/crc64_ecma.c | 341 +++++++++++++++++++++ + lib/find_last_bit.c | 41 --- + lib/test-hexdump.c | 6 +- + lib/vsprintf.c | 20 +- + mm/filemap.c | 15 +- + mm/huge_memory.c | 41 ++- + mm/hugetlb.c | 5 + + mm/hwpoison-inject.c | 13 +- + mm/kasan/kasan.h | 1 - + mm/ksm.c | 2 +- + mm/madvise.c | 176 +++++++++++ + mm/memory-failure.c | 33 +- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 11 +- + mm/migrate.c | 2 +- + mm/mprotect.c | 11 + + mm/mremap.c | 17 +- + mm/page_alloc.c | 7 + + mm/page_isolation.c | 7 +- + mm/rmap.c | 46 ++- + mm/shmem.c | 4 +- + mm/slab.c | 14 + + mm/slab.h | 10 + + mm/slab_common.c | 121 +++++--- + mm/slob.c | 13 + + mm/slub.c | 69 +++++ + mm/swap.c | 44 +++ + mm/swap_state.c | 4 +- + mm/util.c | 40 ++- + mm/vmscan.c | 120 +++++--- + mm/vmstat.c | 1 + + mm/zsmalloc.c | 4 - + mm/zswap.c | 4 +- + 172 files changed, 3361 insertions(+), 1289 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/abracon,abx80x.txt + create mode 100644 arch/alpha/include/asm/mm-arch-hooks.h + create mode 100644 arch/arc/include/asm/mm-arch-hooks.h + create mode 100644 arch/arm/include/asm/mm-arch-hooks.h + create mode 100644 arch/arm64/include/asm/mm-arch-hooks.h + create mode 100644 arch/avr32/include/asm/mm-arch-hooks.h + create mode 100644 arch/blackfin/include/asm/mm-arch-hooks.h + create mode 100644 arch/c6x/include/asm/mm-arch-hooks.h + create mode 100644 arch/cris/include/asm/mm-arch-hooks.h + create mode 100644 arch/frv/include/asm/mm-arch-hooks.h + create mode 100644 arch/hexagon/include/asm/mm-arch-hooks.h + create mode 100644 arch/ia64/include/asm/mm-arch-hooks.h + create mode 100644 arch/m32r/include/asm/mm-arch-hooks.h + create mode 100644 arch/m68k/include/asm/mm-arch-hooks.h + create mode 100644 arch/metag/include/asm/mm-arch-hooks.h + create mode 100644 arch/microblaze/include/asm/mm-arch-hooks.h + create mode 100644 arch/mips/include/asm/mm-arch-hooks.h + create mode 100644 arch/mn10300/include/asm/mm-arch-hooks.h + create mode 100644 arch/nios2/include/asm/mm-arch-hooks.h + create mode 100644 arch/openrisc/include/asm/mm-arch-hooks.h + create mode 100644 arch/parisc/include/asm/mm-arch-hooks.h + create mode 100644 arch/powerpc/include/asm/mm-arch-hooks.h + create mode 100644 arch/s390/include/asm/mm-arch-hooks.h + create mode 100644 arch/score/include/asm/mm-arch-hooks.h + create mode 100644 arch/sh/include/asm/mm-arch-hooks.h + create mode 100644 arch/sparc/include/asm/mm-arch-hooks.h + create mode 100644 arch/tile/include/asm/mm-arch-hooks.h + create mode 100644 arch/um/include/asm/mm-arch-hooks.h + create mode 100644 arch/unicore32/include/asm/mm-arch-hooks.h + create mode 100644 arch/x86/include/asm/mm-arch-hooks.h + create mode 100644 arch/xtensa/include/asm/mm-arch-hooks.h + create mode 100644 drivers/rtc/rtc-abx80x.c + delete mode 100644 include/linux/compiler-gcc3.h + delete mode 100644 include/linux/compiler-gcc4.h + delete mode 100644 include/linux/compiler-gcc5.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/mm-arch-hooks.h + create mode 100644 lib/crc64_ecma.c + delete mode 100644 lib/find_last_bit.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: 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 + + 51786edb8c15...7ade6658c74a akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (7ade6658c74a 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 ++-- + drivers/w1/w1_int.c | 3 +-- + mm/backing-dev.c | 35 +++++++++++++++++++++++++++++++ + 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..deebea52bd69 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,25 @@ +Importing jdelvare-hwmon based on 3.19-rc6 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.1-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard b787f68c36d49bb1d9236f403813641efa74a031 +HEAD is now at b787f68c36d4 Linux 4.1-rc1 +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi-03-simplify-displayed-version.patch +Applying: firmware: dmi_scan: Simplified displayed version +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi-04-fix-product-uuid.patch +Applying: firmware: dmi_scan: Fix ordering of product_uuid +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi-05-rename-dmi_table-to-dmi_decode_table.patch +Applying: firmware: dmi_scan: Rename dmi_table to dmi_decode_table +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi-06-trim-DMI-table-length.patch +Applying: firmware: dmi_scan: Trim DMI table length before exporting it +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi-07-add-sbmios-entry-and-dmi-tables.patch +Applying: firmware: dmi_scan: add SBMIOS entry and DMI tables +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi-08-abi-sysfs-firmware-dmi-add-entries-suffix-to-file-name.patch +Applying: Documentation: ABI: sysfs-firmware-dmi: add -entries suffix to file name +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi-09-list-the-quilt-tree.patch +Applying: firmware: dmi: List my quilt tree +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:dmi/master +From ../quilt-tmp + + a3d5ac9a4dd3...9432bf142f77 master -> dmi/master (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..69302168776e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20150428 |