diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-04 13:05:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-04 13:05:48 +1000 |
| commit | c9256b89d92154cffd36697b412d0a0176a8e2d2 (patch) | |
| tree | eddeab3f26e212af84d3b3f5886520c034a63014 | |
| parent | 3a2b2094d89bf9f0e7791320a9d3af552276bad3 (diff) | |
Add linux-next specific files for 20150504next-20150504
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 215 | ||||
| -rw-r--r-- | Next/Trees | 217 | ||||
| -rw-r--r-- | Next/merge.log | 2684 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3121 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..2e44e0d792f2 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,215 @@ +Name SHA1 +---- ---- +origin 61f06db00e06b436dca4725c200c891ae8a4a92d +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current c517d838eb7d07bbe9507871fab3931deccff539 +arc-current e4140819dadc3624accac8294881bca8a3cba4ed +arm-current 3b8786ff7a1b31645ae2c26a2ec32dbd42ac1094 +m68k-current b24f670b7f5b2058b95370caa9f104b3cefb9f1d +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge-mpe 0aab3747091db309b8a484cfd382a41644552aa3 +powerpc-merge c517d838eb7d07bbe9507871fab3931deccff539 +sparc acc455cffa75070d55e74fc7802b49edbc080e92 +net 6c3c1eb3c35e8856d6dcb01b412316a676f58bbe +ipsec bdddbf6996c0b9299efc97b8f66e06286f3aa8c9 +sound-current 88776f366ede7d9cdce60bd2c9753dd6d6fa8b77 +pci-current b787f68c36d49bb1d9236f403813641efa74a031 +wireless-drivers f673821864899153142365aca888435815ac93f0 +driver-core.current b787f68c36d49bb1d9236f403813641efa74a031 +tty.current 96a5d18bc1338786fecac73599f1681f59a59a8e +usb.current 0d3bba0287d4e284c3ec7d3397e81eec920d5e7e +usb-gadget-fixes c94e289f195e0e13cf34d27f9338d28221a85751 +usb-serial-fixes 82ee3aeb9295c5fc37fd2ddf20f13ac2b40ec97d +staging.current b787f68c36d49bb1d9236f403813641efa74a031 +char-misc.current f26443a8ab768e475c53843882566ad317dbc283 +input-current 48853389f206b689260ddfd3006816779ca7a52a +crypto-current 8c98ebd7a6ff6ef352bb4c5516a8849b40b5ef6b +ide d681f1166919d6829083c069a83edcd59bfd5e34 +devicetree-current 41d9489319f28f06cf51731131bc353d5a6bce59 +rr-fixes f476893459318cb2eff3ecd2a05d4ceacf82e73e +vfio-fixes 82a0eaab980a3af92d46e93eaf299d6c1428c52b +kselftest-fixes b787f68c36d49bb1d9236f403813641efa74a031 +drm-intel-fixes a04f90a33fab74789b91fc9739999012f11022d1 +asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf +arc b787f68c36d49bb1d9236f403813641efa74a031 +arm 3b8786ff7a1b31645ae2c26a2ec32dbd42ac1094 +arm-perf b787f68c36d49bb1d9236f403813641efa74a031 +arm-soc 0f0175702e2e16f05577bf71aa70cf4409d6f0b4 +at91 da80a9f204eb215f4ef5c730d07e5b421aea7353 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +rpi 31fd7fe00b0d81f0d1707d1685df4bbe1df886ee +berlin b787f68c36d49bb1d9236f403813641efa74a031 +cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290 +imx-mxs 4df4d2a00e9cfbbec9931c716e09054c8c1e2ee5 +keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917 +mvebu ae142bd9976532aa5232ab0b00e621690d8bfe6a +omap 23aa6c6f4bedf09008465638643476606f410dd1 +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +renesas 572fe7d849cecd2c2810075b606a42c5b9cd3bf6 +samsung 5d5443b9c3bac7231ae473c01bcfe4c7650b13c5 +sunxi 4ab66f83f8246aff05db3e64d2aded2687432785 +tegra 3a3027f71204a5585224ca163ed18934c4bb8391 +arm64 6d1966dfd6e0ad2f8aa4b664ae1a62e33abe1998 +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 b787f68c36d49bb1d9236f403813641efa74a031 +powerpc 65e7bb2a34fe7b5fc3ae4532308150c600188118 +fsl d41444daba1fd65e5a998c83398f44524f638d07 +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 6f469dae3aac85b337f7b54787e7f3c45be9741c +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 627ae54854edfbf29d5997015c190de22eef497f +uml fe205bdd1321f95f8f3c35d243ea7cb22af8fbe1 +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 2ba9268dd603d23e17643437b2246acb6844953b +btrfs e082f56313f374d723b0366978ddb062c8fe79ea +ceph 84b54fefaa051ac625ada7740bb260a77c35b9b7 +cifs be4a8e38d68f71c5079ffaa55f0f623e0a64f6cf +ecryptfs 6d65261a09adaa374c05de807f73a144d783669e +ext3 3adc12e9648291149a1e3f354d0ad158fc2571e7 +ext4 2c869b262a10ca99cb866d04087d75311587a30c +f2fs 68def41a3fde6248d98c509805453e630e3ff691 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 94e4fe2cab3d43b3ba7c3f721743006a8c9d913a +gfs2 86fbca4923f956dae31247e68dc73ffdfd6e5cb0 +jfs 7d2ac45611b072a24e5014a56a65e6be31c1f884 +nfs b787f68c36d49bb1d9236f403813641efa74a031 +nfsd 91d6fe24793414354f44f11da41e4cac80928b6a +overlayfs 71cbad7e694ee81233b3be3a38b81c3d5872cc6f +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs 3d99e3fe13d473ac4578c37f477a59b829530764 +ubifs 502690674281a047abd45f81e64c498bc23a8bb3 +xfs 542c311813d5cb2e6f0dfa9557f41c829b8fb6a0 +file-locks 7505256626b0b3d11ea5a3ec1a89046d07c3c366 +vfs 6d3b3d3367cb85b4b17d5bf4ae1ef13251bdc66b +pci b787f68c36d49bb1d9236f403813641efa74a031 +hid 28c1798485a3f80f8ec2b1e579bf28cf29cd6ba1 +i2c b787f68c36d49bb1d9236f403813641efa74a031 +jdelvare-hwmon 26bc420b59a38e4e6685a73345a0def461136dce +dmi 9432bf142f77c23e81298a6e9b6e663aa1e1dc41 +hwmon-staging a95d7600d9c43f4f789f1d1383fe2aee26ff6523 +v4l-dvb bfb4e26f253201aa4f63f13be9447116b3785194 +kbuild a1d375f9a7e33daa1bc6c963da81391ca1b5c798 +kconfig bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +libata 3e6f0ab1313ecd7e1988ab198370b11a6a9ca2ec +pm 55737960ba15a5d74f01c77a20d645fd5217e11a +idle 64887b6882de36069c18ef2d9623484d6db7cd3a +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal b787f68c36d49bb1d9236f403813641efa74a031 +thermal-soc 62d0817a0acaeb0ed2a412bd243f9bd9012cc06a +ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma 63f89caad0e32dcfa17b2d17919816253de48996 +net-next 4749c3ef854e3a5d3dd3cc0ccd2dcb7e05d583bd +ipsec-next dc0565ce6e34be06730312e79b226b7408a543c8 +wireless-drivers-next 73b25f66dcae45d74e1641c52a3d96d041788e4e +bluetooth 1add15646672ff4e7fe59bec2afcb5a0c80c5e49 +infiniband c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf +mtd b787f68c36d49bb1d9236f403813641efa74a031 +l2-mtd b787f68c36d49bb1d9236f403813641efa74a031 +crypto 09e217844a2e2d02a950bc9c129f6fe423e426e0 +drm cec32a47010647e8b0603726ebb75b990a4057a4 +drm-panel 1c550fa193d08920255240743f57731d4d57cd4d +drm-intel 75d04a3773ecee617847de963ae4195d6aa74c28 +drm-tegra 535a65db484ff4e4654a037f2ea7e1ff21431b77 +drm-misc a3c6d686443e912e33cebdf9cd80f94df3ded7b0 +drm-exynos 3cf711584d3ec23f86cdbfb3a0be48efd8f2bf91 +drm-msm d5af49c92a8aff8236e7b0bb35e9af364000c017 +sound bd5b2d440745707ee97159ed7a06b629760fd19b +sound-asoc bd715f24b7f68dd36eea1fd71f5ff56d42d8b775 +modules 4a3893d069b788f3570c19c12d9e986e8e15870f +input c9eeb5084b27ffede2709e8775827729d0c7c46c +block 889fa31f00b218a2cef96c32a6b3f57e6d3bf918 +device-mapper aa6df8dd28c01d9a3d2cfcfe9dd0a4a334d1cd81 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh e3207ccf7de3070d50d9285c5d2d6324edd0c7e6 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 9ffc8f7cb9647b13dfe4d1ad0d5e1427bb8b46d6 +mfd f4ed1f14b7c9114b56837124344124f3ec41d4df +backlight b1f85c0fec20e6cde2a511345f24f6133f247e70 +battery b787f68c36d49bb1d9236f403813641efa74a031 +omap_dss2 72fc8b7187cd846be08d3bc0fec9380fdad29b45 +regulator 0fd1e01014930d576848e2eb74800889af91101a +security b787f68c36d49bb1d9236f403813641efa74a031 +integrity 0ce8300ef0d45d8a6da2649097ea95e4d5256d64 +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 4760597116e34bd58f670d008ae7323653268fb4 +mailbox ee23d66af9219dfe2407a9b08ef9a165dbe6f994 +spi 5248e646ceb8a57d16ad8c5f12d156a6bf53c2bc +tip 88256d924879d9cc74adc4c49be8dd83778dc1cb +clockevents 4c8305221193e14752e0fa833a38f856bbe1d22b +edac fec53af531dd040e41fe358abe00b33747af2688 +edac-amd 1afaa05515212b136d96a48b2ba2251f40437d87 +irqchip a8bcdc32fafbeb236910e6ddc0161003a458ffc1 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace c4b00d27e405a4c421c170d322b68380737af660 +rcu 7182f6825ff274cdc9ac7a6cc33af2d4117a4384 +kvm 2fa462f826210bbec65f8ed06d5ef4e0cd4f5450 +kvm-arm fd1d0ddf2ae92fb3df42ed476939861806c5d785 +kvm-ppc b79013b2449c23f1f505bdf39c5a6c330338b244 +kvms390 816c7667ea97c61884e014cfeedaede5b67b0e58 +xen-tip 0b97b03d88b40bfbd7ff0e069186a137d9786d43 +percpu 4c907baf36d8339f393bb576d0bab29194d0e6ad +workqueues 042f7df15a4fff8eec42873f755aea848dcdedd1 +drivers-x86 b787f68c36d49bb1d9236f403813641efa74a031 +chrome-platform 96cba9b00e297303774bec59e192064d20adeb3d +regmap 77f5f3e9c86dc4604366a567819cc3ec4bdb4400 +hsi 265ef3ee9575e6d150f485d28dbe153a50d27f4c +leds 78a435c5a48401c6a99a8928e4f0eb1f865a0401 +ipmi d0acf734d886ce50bb5103cc75f7ca39f280e8a7 +driver-core b787f68c36d49bb1d9236f403813641efa74a031 +tty b787f68c36d49bb1d9236f403813641efa74a031 +usb b787f68c36d49bb1d9236f403813641efa74a031 +usb-gadget b787f68c36d49bb1d9236f403813641efa74a031 +usb-serial b787f68c36d49bb1d9236f403813641efa74a031 +staging fd5e2fd053e1042b12343fb6649449081ec1bab4 +char-misc b787f68c36d49bb1d9236f403813641efa74a031 +extcon c9ca95d470be6741e7a74d39fb3c534ec5c9ee9c +kdbus 9fb9cd0f4434a23487b6ef3237e733afae90e336 +cgroup d0f702e648dc365070f1868ec291264ad27e65d8 +scsi 118c855b5623f3e2e6204f02623d88c09e0c34de +target-updates bc018a971392a281ea0777ab1fc9aec9e47cf09e +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +pinctrl b787f68c36d49bb1d9236f403813641efa74a031 +vhost f4aaa799cf9aed1467918743ad0f0823c880ce39 +remoteproc 172e6ab1caffcd2dd2910b44d88d096f2c6985fa +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 03daa6f82f2b634019fe8261698f6af3c133497f +dma-mapping 04abab698285297115e5096b3100df1064045529 +pwm c264f1110d27185f8531602f5fce400a6bbce946 +dma-buf 72449cb47b0104c32ff8fb9380ade9113375d8d1 +userns e0c9c0afd2fc958ffa34b697972721d81df8a56f +ktest 7c2c49eceb79eb4738f38a00270830057b5bfb76 +clk c02f699e22fa6a67d794f2d4ed56e90ff4ff18d2 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 5f785de588735306ec4d7c875caf9d28481c8b21 +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest b787f68c36d49bb1d9236f403813641efa74a031 +y2038 ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d +luto-misc a6c5170d1edea97c538c81e377e56c7b5c5b7e63 +access_once bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 +livepatching fd683e86d17e498fc2104b92fab9fefdd6b0ee13 +akpm-current ca1572c6e1892e5784dc39c8d6ef5a73902129a1 +akpm 105b72ac333d9a570807b9986e61aed3a96eafd5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..489da9858b01 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,217 @@ +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 +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/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 +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..1f9ec0a89270 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2684 @@ +$ date +Monday 4 May 09:20:40 AEST 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4a152c3913fb Merge tag 'pm+acpi-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm +Merging origin/master (61f06db00e06 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge origin/master +Updating 4a152c3913fb..61f06db00e06 +Fast-forward + Documentation/powerpc/transactional_memory.txt | 32 ++++---- + MAINTAINERS | 1 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/barrier.h | 16 ++++ + arch/arm64/kernel/perf_event.c | 9 ++- + arch/arm64/mm/dma-mapping.c | 9 +-- + arch/powerpc/include/uapi/asm/tm.h | 2 +- + arch/powerpc/kernel/eeh.c | 11 ++- + arch/powerpc/kernel/entry_64.S | 19 ----- + arch/powerpc/kernel/idle_power7.S | 2 + + arch/powerpc/kvm/book3s_xics.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/pseries/dlpar.c | 10 +-- + drivers/block/rbd.c | 5 ++ + drivers/dma/Kconfig | 1 + + drivers/dma/dmaengine.c | 4 + + drivers/dma/sh/usb-dmac.c | 2 + + drivers/net/bonding/bond_main.c | 10 +++ + drivers/net/ethernet/altera/altera_tse_main.c | 6 ++ + drivers/net/ethernet/atheros/atl1e/atl1e_hw.h | 2 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 67 +++++++--------- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 17 ++-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +- + drivers/net/ethernet/cadence/macb.c | 3 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 5 +- + drivers/net/ethernet/freescale/fec_main.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 26 ++++++- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 18 ++++- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 + + .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 4 +- + drivers/net/ethernet/rocker/rocker.c | 5 +- + drivers/net/ethernet/ti/netcp_ethss.c | 8 +- + drivers/net/hyperv/hyperv_net.h | 13 +++- + drivers/net/hyperv/netvsc.c | 8 +- + drivers/net/hyperv/netvsc_drv.c | 47 +++++------ + drivers/net/hyperv/rndis_filter.c | 3 +- + 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 ++ + fs/btrfs/delayed-inode.c | 2 + + fs/btrfs/extent-tree.c | 90 ++++++++++++++-------- + fs/btrfs/extent_io.c | 54 ++++++------- + fs/btrfs/free-space-cache.c | 10 ++- + fs/btrfs/inode.c | 21 ++--- + fs/btrfs/ioctl.c | 3 +- + fs/btrfs/volumes.c | 15 +++- + include/linux/netdevice.h | 6 +- + include/linux/netfilter_bridge.h | 16 +++- + include/linux/rtnetlink.h | 2 +- + include/scsi/scsi_devinfo.h | 1 + + include/uapi/linux/virtio_ring.h | 2 +- + kernel/bpf/core.c | 12 +-- + net/bridge/br_mdb.c | 2 +- + net/bridge/br_netlink.c | 4 +- + net/bridge/br_private.h | 2 +- + net/core/rtnetlink.c | 12 +-- + net/dsa/dsa.c | 2 +- + net/ipv4/ping.c | 1 + + net/ipv4/route.c | 5 +- + net/netfilter/nf_tables_api.c | 3 +- + net/sched/act_connmark.c | 2 - + net/tipc/bearer.c | 17 ++-- + net/tipc/link.c | 15 ++-- + tools/testing/selftests/powerpc/pmu/Makefile | 2 +- + tools/testing/selftests/powerpc/tm/Makefile | 2 +- + 79 files changed, 468 insertions(+), 438 deletions(-) +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 (3b8786ff7a1b ARM: 8352/1: perf: Fix the pmu node name in warning message) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/include/asm/dma-iommu.h | 2 +- + arch/arm/kernel/perf_event_cpu.c | 9 +++++++-- + arch/arm/mm/dma-mapping.c | 13 +++++-------- + arch/arm/mm/proc-arm1020.S | 2 -- + arch/arm/mm/proc-arm1020e.S | 2 -- + arch/arm/mm/proc-arm925.S | 3 --- + arch/arm/mm/proc-feroceon.S | 1 - + 7 files changed, 13 insertions(+), 19 deletions(-) +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 (0aab3747091d powerpc/powernv: Restore non-volatile CRs after nap) +$ 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 (6c3c1eb3c35e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge net/master +Already up-to-date. +Merging ipsec/master (bdddbf6996c0 xfrm: fix a race in xfrm_state_lookup_byspi) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_state.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound-current/for-linus (88776f366ede ALSA: hda - Add headphone quirk for Lifebook E752) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) +Merging pci-current/for-linus (b787f68c36d4 Linux 4.1-rc1) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-drivers/master (f67382186489 ath9k: fix per-packet tx power configuration) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/xmit.c | 52 ++++++++++++------------ + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 41 ++++++++++++------- + drivers/net/wireless/iwlwifi/mvm/d3.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 34 ++++++++++++++++ + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 44 +------------------- + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 13 ------ + drivers/net/wireless/iwlwifi/mvm/fw.c | 54 ++++++++++--------------- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 26 ++++++++++-- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 - + drivers/net/wireless/iwlwifi/mvm/ops.c | 10 +++++ + drivers/net/wireless/iwlwifi/mvm/rx.c | 5 +++ + drivers/net/wireless/iwlwifi/mvm/scan.c | 2 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 17 ++++---- + drivers/net/wireless/rtlwifi/usb.c | 2 +- + 15 files changed, 161 insertions(+), 144 deletions(-) +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 (96a5d18bc133 serial: 8250_pci: Add support for 16 port Exar boards) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (0d3bba0287d4 cdc-acm: prevent infinite loop when parsing CDC headers.) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (c94e289f195e usb: gadget: remove incorrect __init/__exit annotations) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/usb/dwc3/dwc3-omap.c | 94 +++++++++++++++--------------- + drivers/usb/gadget/configfs.c | 1 + + drivers/usb/gadget/function/f_hid.c | 16 ++++- + drivers/usb/gadget/function/u_serial.c | 5 +- + drivers/usb/gadget/legacy/acm_ms.c | 10 ++-- + drivers/usb/gadget/legacy/audio.c | 10 ++-- + drivers/usb/gadget/legacy/cdc2.c | 10 ++-- + drivers/usb/gadget/legacy/dbgp.c | 4 +- + drivers/usb/gadget/legacy/ether.c | 12 ++-- + drivers/usb/gadget/legacy/g_ffs.c | 2 +- + drivers/usb/gadget/legacy/gmidi.c | 10 ++-- + drivers/usb/gadget/legacy/hid.c | 12 ++-- + drivers/usb/gadget/legacy/mass_storage.c | 6 +- + drivers/usb/gadget/legacy/multi.c | 10 ++-- + drivers/usb/gadget/legacy/ncm.c | 10 ++-- + drivers/usb/gadget/legacy/nokia.c | 10 ++-- + drivers/usb/gadget/legacy/printer.c | 8 +-- + drivers/usb/gadget/legacy/serial.c | 4 +- + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 2 +- + drivers/usb/gadget/legacy/webcam.c | 8 +-- + drivers/usb/gadget/legacy/zero.c | 4 +- + drivers/usb/gadget/udc/at91_udc.c | 4 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 4 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 4 +- + drivers/usb/gadget/udc/fusb300_udc.c | 4 +- + drivers/usb/gadget/udc/m66592-udc.c | 4 +- + drivers/usb/gadget/udc/r8a66597-udc.c | 4 +- + drivers/usb/gadget/udc/udc-xilinx.c | 4 +- + drivers/usb/phy/phy-isp1301-omap.c | 2 +- + 29 files changed, 147 insertions(+), 131 deletions(-) +Merging usb-serial-fixes/usb-linus (82ee3aeb9295 USB: visor: Match I330 phone more precisely) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 1 + + drivers/usb/serial/pl2303.c | 1 - + drivers/usb/serial/pl2303.h | 4 ---- + drivers/usb/serial/visor.c | 2 +- + 4 files changed, 2 insertions(+), 6 deletions(-) +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 (f26443a8ab76 Merge tag 'extcon-fixes-for-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus) +$ git merge char-misc.current/char-misc-linus +Auto-merging drivers/hwmon/dell-smm-hwmon.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + arch/x86/Kconfig | 25 ++-- + drivers/char/Makefile | 1 - + drivers/extcon/extcon-usb-gpio.c | 24 ++-- + drivers/hwmon/Kconfig | 11 ++ + drivers/hwmon/Makefile | 1 + + drivers/{char/i8k.c => hwmon/dell-smm-hwmon.c} | 156 ++++++++++++++----------- + 7 files changed, 124 insertions(+), 98 deletions(-) + rename drivers/{char/i8k.c => hwmon/dell-smm-hwmon.c} (96%) +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 (82a0eaab980a vfio-pci: Log device requests more verbosely) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 8 +++++++- + drivers/vfio/vfio.c | 13 ++++++++++--- + 2 files changed, 17 insertions(+), 4 deletions(-) +Merging kselftest-fixes/fixes (b787f68c36d4 Linux 4.1-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (a04f90a33fab drm/i915/chv: Implement WaDisableShadowRegForCpd) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_reg.h | 2 ++ + drivers/gpu/drm/i915/intel_uncore.c | 8 ++++++++ + 2 files changed, 10 insertions(+) +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 (3b8786ff7a1b ARM: 8352/1: perf: Fix the pmu node name in warning message) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (b787f68c36d4 Linux 4.1-rc1) +$ 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 22fc0a503bba] 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 (da80a9f204eb Merge branch 'at91-4.2-dt' into at91-next) +$ git merge at91/at91-next +Removing arch/arm/boot/dts/kizbox.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 +- + arch/arm/boot/dts/at91-kizbox.dts | 159 ++++++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/kizbox.dts | 150 ----------------------------------- + 3 files changed, 160 insertions(+), 151 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-kizbox.dts + delete mode 100644 arch/arm/boot/dts/kizbox.dts +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 (4df4d2a00e9c Merge branch 'imx/clk-move' 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 +Auto-merging MAINTAINERS +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 | 12 ++--- + 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/mach-imx6q.c | 1 + + arch/arm/mach-imx/mach-imx6sl.c | 1 + + arch/arm/mach-imx/mach-imx6sx.c | 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 | 38 ++++++++++----- + 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 | 35 +++++++++----- + .../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 ++++++++++++++ + 52 files changed, 345 insertions(+), 195 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 (ae142bd99765 ARM: mvebu: Fix the main PLL frequency on Armada 375, 38x and 39x SoCs) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-375.dtsi | 2 +- + arch/arm/boot/dts/armada-38x.dtsi | 2 +- + arch/arm/boot/dts/armada-39x.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 ++++ + 4 files changed, 7 insertions(+), 3 deletions(-) +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 6472ac6609d5] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging renesas/next (572fe7d849ce Merge branches 'heads/fixes-for-v4.1', 'heads/dt-for-v4.2' and 'heads/defconfig-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/emev2-kzm9d.dts | 4 ++-- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- + arch/arm/boot/dts/r8a73a4.dtsi | 11 +++++++---- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7740.dtsi | 10 +++++----- + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 4 ++-- + arch/arm/boot/dts/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 6 +++--- + arch/arm/boot/dts/r8a7779.dtsi | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 4 ++-- + arch/arm/boot/dts/r8a7790.dtsi | 19 ++++++++++++++----- + arch/arm/boot/dts/r8a7791-henninger.dts | 2 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 6 +++--- + arch/arm/boot/dts/r8a7791.dtsi | 17 +++++++++++++---- + arch/arm/boot/dts/r8a7794.dtsi | 9 +++++++++ + arch/arm/boot/dts/sh73a0.dtsi | 10 +++++----- + arch/arm/configs/shmobile_defconfig | 4 ++-- + include/dt-bindings/clock/r8a73a4-clock.h | 1 + + include/dt-bindings/clock/r8a7790-clock.h | 3 +++ + include/dt-bindings/clock/r8a7791-clock.h | 3 +++ + include/dt-bindings/clock/r8a7794-clock.h | 3 +++ + 23 files changed, 84 insertions(+), 44 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 e2726a5ed9f4] 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 arch/arm/boot/dts/Makefile +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 (3a3027f71204 Merge branch for-4.2/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra124.dtsi | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +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 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 (b787f68c36d4 Linux 4.1-rc1) +$ 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 (6f469dae3aac zcrypt: fixed ap poll timer behavior) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/net/bpf_jit_comp.c | 14 ++++++-------- + drivers/s390/crypto/ap_bus.c | 16 +++++++--------- + 2 files changed, 13 insertions(+), 17 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 (627ae54854ed tile: use READ_ONCE() in arch_spin_is_locked()) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/asm/spinlock_32.h | 6 +++++- + arch/tile/include/asm/spinlock_64.h | 5 ++++- + arch/tile/lib/spinlock_32.c | 11 ++++++++++- + arch/tile/lib/spinlock_64.c | 11 ++++++++++- + 4 files changed, 29 insertions(+), 4 deletions(-) +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 (2c869b262a10 ext4: fix growing of tiny filesystems) +$ git merge ext4/dev +Auto-merging fs/ext4/symlink.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. + fs/ext4/Kconfig | 9 +- + fs/ext4/crypto_fname.c | 280 ++++++++++++++++++++++++----------------------- + fs/ext4/crypto_key.c | 1 + + fs/ext4/crypto_policy.c | 14 ++- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4.h | 16 ++- + fs/ext4/ext4_crypto.h | 11 +- + fs/ext4/extents.c | 15 +-- + fs/ext4/extents_status.c | 8 ++ + fs/ext4/inode.c | 2 + + fs/ext4/namei.c | 72 +----------- + fs/ext4/resize.c | 7 +- + fs/ext4/symlink.c | 2 +- + 13 files changed, 210 insertions(+), 229 deletions(-) +Merging f2fs/dev (68def41a3fde f2fs: don not re-lookup nat cache with same nid) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/acl.c | 48 +++-- + fs/f2fs/checkpoint.c | 23 ++- + fs/f2fs/data.c | 431 +++++++++++++++++++++++++++++--------------- + fs/f2fs/debug.c | 2 +- + fs/f2fs/dir.c | 2 +- + fs/f2fs/f2fs.h | 109 +++++++++-- + fs/f2fs/file.c | 43 +++-- + fs/f2fs/gc.c | 33 ++-- + fs/f2fs/hash.c | 3 +- + fs/f2fs/inline.c | 17 +- + fs/f2fs/namei.c | 49 +++-- + fs/f2fs/node.c | 46 ++--- + fs/f2fs/node.h | 22 --- + fs/f2fs/recovery.c | 6 +- + fs/f2fs/segment.c | 100 ++++++---- + fs/f2fs/segment.h | 1 + + fs/f2fs/super.c | 27 ++- + fs/f2fs/trace.c | 6 +- + fs/f2fs/trace.h | 4 +- + include/linux/f2fs_fs.h | 6 + + include/trace/events/f2fs.h | 33 ++-- + 21 files changed, 652 insertions(+), 359 deletions(-) +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 (86fbca4923f9 GFS2: inode.c: indent with TABs, not spaces) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/inode.c +Merge made by the 'recursive' strategy. + fs/gfs2/inode.c | 4 ++-- + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/rgrp.c | 17 +++++++++++++---- + 3 files changed, 16 insertions(+), 6 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 (91d6fe247934 nfsd: skip CB_NULL probes for 4.1 or later) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/knfsd-stats.txt | 44 +------- + fs/nfsd/blocklayout.c | 11 ++ + fs/nfsd/nfs4callback.c | 119 ++++++++++---------- + fs/nfsd/nfs4state.c | 149 ++++++++++++++++++++++---- + fs/nfsd/state.h | 19 +++- + fs/nfsd/vfs.c | 19 +--- + fs/nfsd/vfs.h | 1 - + fs/nfsd/xdr4.h | 1 + + net/sunrpc/auth_gss/gss_rpc_xdr.c | 23 ++-- + 9 files changed, 238 insertions(+), 148 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 (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) +$ 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 (a95d7600d9c4 hwmon: Update the location of my quilt tree) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 +Auto-merging arch/x86/Kconfig +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 (3e6f0ab1313e Merge branch 'for-4.2' into for-next) +$ 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_samsung_cf.c | 2 +- + 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 + + 12 files changed, 71 insertions(+), 2045 deletions(-) + delete mode 100644 drivers/ata/pata_scc.c + delete mode 100644 drivers/ide/scc_pata.c +Merging pm/linux-next (55737960ba15 Merge branch 'acpi-resources' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + arch/x86/pci/acpi.c | 24 ++++++++++++++++++++++-- + drivers/acpi/resource.c | 2 +- + 2 files changed, 23 insertions(+), 3 deletions(-) +Merging idle/next (64887b6882de Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (b787f68c36d4 Linux 4.1-rc1) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (62d0817a0aca Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +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 | 36 ++ + drivers/thermal/Makefile | 2 + + drivers/thermal/cpu_cooling.c | 585 ++++++++++++++++++++- + drivers/thermal/db8500_thermal.c | 2 +- + drivers/thermal/fair_share.c | 41 +- + drivers/thermal/imx_thermal.c | 3 +- + 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 | 11 + + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 104 ++-- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +- + 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 +++ + 27 files changed, 2850 insertions(+), 135 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/power_allocator.c + create mode 100644 drivers/thermal/qcom-spmi-temp-alarm.c + create mode 100644 include/trace/events/thermal_power_allocator.h +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 (63f89caad0e3 dmaengine: increment privatecnt when using dma_get_any_slave_channel) +$ git merge slave-dma/next +Already up-to-date. +Merging net-next/master (4749c3ef854e net: sched: remove TC_MUNGED bits) +$ git merge net-next/master +Merge made by the 'recursive' strategy. + Documentation/networking/tc-actions-env-rules.txt | 2 - + drivers/net/ethernet/apm/xgene/Makefile | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 36 +++- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 8 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 207 ++++++++++++++++------ + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 30 +++- + drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c | 200 +++++++++++++++++++++ + drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h | 49 +++++ + drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 62 +++++-- + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 1 - + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 20 +++ + drivers/net/ethernet/emulex/benet/be_main.c | 2 + + drivers/net/ethernet/ibm/ibmveth.c | 41 ++++- + drivers/net/ethernet/ibm/ibmveth.h | 5 +- + drivers/net/ethernet/rocker/rocker.c | 4 +- + include/linux/tcp.h | 8 + + include/net/dst.h | 6 - + include/net/ip6_fib.h | 41 +---- + include/net/sch_generic.h | 2 - + include/net/tcp.h | 7 +- + include/uapi/linux/inet_diag.h | 4 + + include/uapi/linux/pkt_cls.h | 3 + + include/uapi/linux/tcp.h | 3 + + lib/test_bpf.c | 12 +- + net/ipv4/fib_semantics.c | 4 - + net/ipv4/inet_diag.c | 8 +- + net/ipv4/route.c | 20 ++- + net/ipv4/tcp.c | 28 ++- + net/ipv4/tcp_dctcp.c | 20 +-- + net/ipv4/tcp_fastopen.c | 1 + + net/ipv4/tcp_illinois.c | 21 +-- + net/ipv4/tcp_input.c | 36 ++-- + net/ipv4/tcp_vegas.c | 19 +- + net/ipv4/tcp_vegas.h | 3 +- + net/ipv4/tcp_westwood.c | 15 +- + net/ipv6/addrconf.c | 2 + + net/ipv6/route.c | 176 +++++++++--------- + net/ipv6/xfrm6_policy.c | 14 -- + net/sched/act_api.c | 5 - + net/sched/act_pedit.c | 5 +- + 40 files changed, 819 insertions(+), 313 deletions(-) + create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c + create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h +Merging ipsec-next/master (dc0565ce6e34 xfrm: slightly optimise xfrm_input) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_state.c +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 (73b25f66dcae Merge ath-next from ath.git) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/Makefile | 4 +- + drivers/net/wireless/ath/ath10k/core.c | 161 +- + drivers/net/wireless/ath/ath10k/core.h | 48 +- + drivers/net/wireless/ath/ath10k/debug.c | 127 +- + drivers/net/wireless/ath/ath10k/htc.c | 50 +- + drivers/net/wireless/ath/ath10k/htt.c | 98 + + drivers/net/wireless/ath/ath10k/htt.h | 132 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 194 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 34 +- + drivers/net/wireless/ath/ath10k/hw.h | 53 +- + drivers/net/wireless/ath/ath10k/mac.c | 2826 +++++++++++++++++------ + drivers/net/wireless/ath/ath10k/mac.h | 29 + + drivers/net/wireless/ath/ath10k/p2p.c | 156 ++ + drivers/net/wireless/ath/ath10k/p2p.h | 28 + + drivers/net/wireless/ath/ath10k/pci.c | 101 +- + drivers/net/wireless/ath/ath10k/rx_desc.h | 22 + + drivers/net/wireless/ath/ath10k/thermal.c | 134 +- + drivers/net/wireless/ath/ath10k/thermal.h | 10 +- + drivers/net/wireless/ath/ath10k/trace.h | 22 +- + drivers/net/wireless/ath/ath10k/txrx.c | 9 +- + drivers/net/wireless/ath/ath10k/wmi-ops.h | 194 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 579 ++++- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 168 ++ + drivers/net/wireless/ath/ath10k/wmi.c | 272 +-- + drivers/net/wireless/ath/ath10k/wmi.h | 230 +- + drivers/net/wireless/ath/ath10k/wow.c | 321 +++ + drivers/net/wireless/ath/ath10k/wow.h | 40 + + drivers/net/wireless/ath/dfs_pattern_detector.c | 72 +- + drivers/net/wireless/ath/dfs_pattern_detector.h | 4 + + drivers/net/wireless/ath/dfs_pri_detector.c | 4 + + 30 files changed, 4884 insertions(+), 1238 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath10k/p2p.c + create mode 100644 drivers/net/wireless/ath/ath10k/p2p.h + create mode 100644 drivers/net/wireless/ath/ath10k/wow.c + create mode 100644 drivers/net/wireless/ath/ath10k/wow.h +Merging bluetooth/master (1add15646672 ieee802154: trace: fix endian convertion) +$ 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 +++++---- + drivers/net/ieee802154/at86rf230.c | 390 ++++++++++++++++++----------------- + include/net/cfg802154.h | 2 + + include/net/mac802154.h | 94 ++++++++- + net/ieee802154/Makefile | 4 +- + net/ieee802154/nl-phy.c | 5 +- + net/ieee802154/nl802154.c | 2 +- + net/ieee802154/rdev-ops.h | 85 ++++++-- + net/ieee802154/trace.c | 7 + + net/ieee802154/trace.h | 247 +++++++++++++++++++++++ + net/mac802154/cfg.c | 9 +- + net/mac802154/ieee802154_i.h | 3 +- + net/mac802154/iface.c | 5 +- + net/mac802154/main.c | 3 +- + 18 files changed, 1196 insertions(+), 318 deletions(-) + create mode 100644 net/ieee802154/trace.c + create mode 100644 net/ieee802154/trace.h +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 (b787f68c36d4 Linux 4.1-rc1) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (b787f68c36d4 Linux 4.1-rc1) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (09e217844a2e crypto: testmgr - Wrap the LHS in expressions of the form !x == y) +$ 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 + + crypto/testmgr.h | 8 +- + crypto/zlib.c | 4 +- + 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/qat/qat_dh895xcc/adf_drv.c | 2 +- + drivers/crypto/talitos.c | 727 +++++++++++++++------ + drivers/crypto/talitos.h | 153 +++-- + include/crypto/compress.h | 8 +- + 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 +- + 41 files changed, 1245 insertions(+), 912 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 (75d04a3773ec drm/i915/gtt: Allocate va range only if vma is not bound) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/i915_drv.c' using previous resolution. +Auto-merging include/drm/drm_crtc.h +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_i2c.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_dvo.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/i915_trace.h +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging Documentation/DocBook/drm.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master baff9f393df0] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 4 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/drm_crtc.c | 23 + + drivers/gpu/drm/i915/dvo_ivch.c | 21 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 670 +++++++------- + drivers/gpu/drm/i915/i915_cmd_parser.c | 12 +- + drivers/gpu/drm/i915/i915_debugfs.c | 460 +++++++--- + drivers/gpu/drm/i915/i915_dma.c | 270 +++--- + drivers/gpu/drm/i915/i915_drv.c | 54 +- + drivers/gpu/drm/i915/i915_drv.h | 171 ++-- + drivers/gpu/drm/i915/i915_gem.c | 236 ++--- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 84 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 42 + + drivers/gpu/drm/i915/i915_gem_context.c | 37 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 50 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 1046 +++++++++++----------- + drivers/gpu/drm/i915/i915_gem_gtt.h | 101 ++- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 8 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 10 +- + drivers/gpu/drm/i915/i915_irq.c | 282 +++--- + drivers/gpu/drm/i915/i915_reg.h | 489 ++++++++++- + drivers/gpu/drm/i915/i915_trace.h | 44 +- + drivers/gpu/drm/i915/intel_atomic.c | 173 ++++ + drivers/gpu/drm/i915/intel_atomic_plane.c | 24 + + drivers/gpu/drm/i915/intel_audio.c | 4 +- + drivers/gpu/drm/i915/intel_bios.c | 30 +- + drivers/gpu/drm/i915/intel_bios.h | 4 +- + drivers/gpu/drm/i915/intel_crt.c | 2 +- + drivers/gpu/drm/i915/intel_ddi.c | 763 +++++++++++++--- + drivers/gpu/drm/i915/intel_display.c | 1295 ++++++++++++++++++++++------ + drivers/gpu/drm/i915/intel_dp.c | 215 ++++- + drivers/gpu/drm/i915/intel_dp_mst.c | 14 +- + drivers/gpu/drm/i915/intel_drv.h | 105 ++- + drivers/gpu/drm/i915/intel_dvo.c | 27 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/intel_hdmi.c | 30 +- + drivers/gpu/drm/i915/intel_i2c.c | 97 ++- + drivers/gpu/drm/i915/intel_lrc.c | 502 +++++------ + drivers/gpu/drm/i915/intel_lrc.h | 5 +- + drivers/gpu/drm/i915/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/intel_overlay.c | 66 +- + drivers/gpu/drm/i915/intel_pm.c | 115 ++- + drivers/gpu/drm/i915/intel_psr.c | 118 ++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 121 +-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 10 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 121 +++ + drivers/gpu/drm/i915/intel_sdvo.c | 5 +- + drivers/gpu/drm/i915/intel_sprite.c | 80 +- + drivers/gpu/drm/i915/intel_uncore.c | 98 ++- + include/drm/drm_crtc.h | 1 + + include/drm/i915_pciids.h | 6 + + include/uapi/drm/i915_drm.h | 1 + + 54 files changed, 5708 insertions(+), 2449 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.h +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/i915/intel_atomic_plane.c +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 (bd5b2d440745 Merge branch 'topic/jack' into for-next) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + Documentation/sound/alsa/Jack-Controls.txt | 43 + + include/sound/control.h | 2 +- + include/sound/core.h | 4 - + include/sound/hda_register.h | 152 ++++ + include/sound/hdaudio.h | 290 +++++- + include/sound/info.h | 29 +- + include/sound/jack.h | 13 +- + include/sound/pcm.h | 5 +- + sound/core/Kconfig | 3 - + sound/core/Makefile | 11 +- + sound/core/ctljack.c | 41 +- + sound/core/info.c | 779 +++++++--------- + sound/core/info_oss.c | 29 +- + sound/core/init.c | 33 +- + sound/core/jack.c | 142 ++- + 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 | 315 +++++++ + 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 | 13 +- + sound/pci/hda/Makefile | 3 +- + sound/pci/hda/hda_codec.c | 425 +-------- + sound/pci/hda/hda_codec.h | 82 +- + sound/pci/hda/hda_controller.c | 1341 ++++++---------------------- + sound/pci/hda/hda_controller.h | 272 +----- + sound/pci/hda/hda_i915.c | 18 +- + sound/pci/hda/hda_intel.c | 289 +++--- + sound/pci/hda/hda_intel.h | 5 +- + sound/pci/hda/hda_intel_trace.h | 4 +- + sound/pci/hda/hda_jack.c | 90 +- + sound/pci/hda/hda_jack.h | 5 +- + sound/pci/hda/hda_tegra.c | 76 +- + sound/pci/hda/patch_ca0132.c | 7 +- + sound/pci/hda/patch_hdmi.c | 13 +- + 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/oxygen/xonar_wm87x6.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 +- + sound/soc/soc-jack.c | 3 +- + 64 files changed, 3232 insertions(+), 2689 deletions(-) + create mode 100644 Documentation/sound/alsa/Jack-Controls.txt + 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 (bd715f24b7f6 Merge remote-tracking branches 'asoc/topic/rt5677', 'asoc/topic/samsung' and '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 | 34 + + include/sound/soc.h | 90 +- + sound/soc/atmel/atmel-pcm-dma.c | 3 +- + sound/soc/atmel/sam9g20_wm8731.c | 10 +- + sound/soc/au1x/db1200.c | 2 +- + 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 | 9 +- + 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/bt-sco.c | 2 +- + 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/mc13783.c | 4 +- + 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 | 692 ++++++++++-- + sound/soc/codecs/rt5645.h | 28 +- + sound/soc/codecs/rt5651.c | 3 +- + sound/soc/codecs/rt5670.c | 1 - + sound/soc/codecs/rt5677.c | 33 +- + sound/soc/codecs/rt5677.h | 14 + + sound/soc/codecs/sgtl5000.c | 54 +- + sound/soc/codecs/sn95031.c | 1 - + sound/soc/codecs/ssm2518.c | 7 +- + 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/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/davinci/davinci-mcasp.c | 169 +-- + sound/soc/fsl/fsl_sai.c | 3 +- + sound/soc/fsl/imx-audmux.c | 2 +- + sound/soc/intel/atom/sst-atom-controls.h | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 2 + + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/samsung/i2s.c | 2 +- + sound/soc/sh/rcar/core.c | 34 +- + 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 - + 125 files changed, 1901 insertions(+), 901 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 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 (aa6df8dd28c0 dm: fix free_rq_clone() NULL pointer when requeueing unmapped request) +$ 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 (f4ed1f14b7c9 mfd: documentation: dt: max77686: Fix typo) +$ git merge mfd/for-mfd-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/max77686.txt | 2 +- + Documentation/devicetree/bindings/mfd/max77693.txt | 67 ++++ + .../devicetree/bindings/rtc/rtc-st-lpc.txt | 25 ++ + .../devicetree/bindings/watchdog/st_lpc_wdt.txt | 38 +++ + MAINTAINERS | 2 + + drivers/mfd/88pm860x-core.c | 2 +- + drivers/mfd/ab8500-core.c | 2 +- + drivers/mfd/arizona-core.c | 8 - + drivers/mfd/arizona-irq.c | 2 +- + drivers/mfd/da9052-irq.c | 4 +- + drivers/mfd/da9055-core.c | 6 +- + drivers/mfd/da9063-irq.c | 4 +- + drivers/mfd/da9150-core.c | 4 +- + drivers/mfd/db8500-prcmu.c | 2 +- + drivers/mfd/intel_soc_pmic_core.h | 2 +- + drivers/mfd/intel_soc_pmic_crc.c | 2 +- + drivers/mfd/lp8788-irq.c | 2 +- + drivers/mfd/max8925-core.c | 2 +- + drivers/mfd/max8997-irq.c | 2 +- + drivers/mfd/max8998-irq.c | 2 +- + drivers/mfd/mt6397-core.c | 2 +- + drivers/mfd/stmpe.c | 2 +- + drivers/mfd/tc3589x.c | 2 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/mfd/twl6030-irq.c | 2 +- + drivers/mfd/wm831x-irq.c | 2 +- + drivers/mfd/wm8994-irq.c | 6 +- + drivers/rtc/Kconfig | 11 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-st-lpc.c | 354 +++++++++++++++++++++ + drivers/watchdog/Kconfig | 12 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/st_lpc_wdt.c | 344 ++++++++++++++++++++ + include/dt-bindings/mfd/st-lpc.h | 15 + + include/linux/mfd/da9055/core.h | 2 +- + 35 files changed, 900 insertions(+), 38 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt + create mode 100644 drivers/rtc/rtc-st-lpc.c + create mode 100644 drivers/watchdog/st_lpc_wdt.c + create mode 100644 include/dt-bindings/mfd/st-lpc.h +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 (b787f68c36d4 Linux 4.1-rc1) +$ 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 (0fd1e0101493 Merge remote-tracking branches 'regulator/topic/max77843' and 'regulator/topic/max8973' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/regulator.txt | 2 +- + drivers/regulator/88pm8607.c | 2 +- + drivers/regulator/helpers.c | 2 +- + drivers/regulator/max14577.c | 128 ++++++++------------- + drivers/regulator/max77686.c | 2 +- + drivers/regulator/max77693.c | 17 +-- + drivers/regulator/max77843.c | 48 +++----- + drivers/regulator/max8973-regulator.c | 6 +- + drivers/regulator/of_regulator.c | 2 +- + drivers/regulator/s2mps11.c | 10 +- + 10 files changed, 83 insertions(+), 136 deletions(-) +Merging security/next (b787f68c36d4 Linux 4.1-rc1) +$ git merge security/next +Already up-to-date. +Merging integrity/next (0ce8300ef0d4 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 | 27 +++++++++++++++++++++++---- + security/integrity/evm/evm_main.c | 11 +++++++++++ + security/integrity/ima/ima_policy.c | 16 +++++++--------- + 6 files changed, 61 insertions(+), 19 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 (4760597116e3 scripts/dtc: Update to upstream version 9d3649bd3be245c9) +$ git merge dt-rh/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/libfdt_env.h | 4 + + arch/powerpc/boot/libfdt_env.h | 4 + + arch/powerpc/boot/of.h | 2 + + include/linux/libfdt_env.h | 4 + + scripts/dtc/checks.c | 31 +- + scripts/dtc/data.c | 12 +- + scripts/dtc/dtc-lexer.l | 65 +- + scripts/dtc/dtc-lexer.lex.c_shipped | 516 +++++----- + scripts/dtc/dtc-parser.tab.c_shipped | 1773 ++++++++++++++++----------------- + scripts/dtc/dtc-parser.tab.h_shipped | 114 +-- + scripts/dtc/dtc-parser.y | 147 +-- + scripts/dtc/dtc.c | 14 +- + scripts/dtc/dtc.h | 18 +- + scripts/dtc/flattree.c | 4 +- + scripts/dtc/fstree.c | 17 +- + scripts/dtc/libfdt/Makefile.libfdt | 3 +- + scripts/dtc/libfdt/fdt.c | 30 +- + scripts/dtc/libfdt/fdt.h | 93 +- + scripts/dtc/libfdt/fdt_empty_tree.c | 1 + + scripts/dtc/libfdt/fdt_ro.c | 29 +- + scripts/dtc/libfdt/fdt_rw.c | 10 +- + scripts/dtc/libfdt/fdt_sw.c | 36 +- + scripts/dtc/libfdt/fdt_wip.c | 2 +- + scripts/dtc/libfdt/libfdt.h | 148 ++- + scripts/dtc/libfdt/libfdt_env.h | 104 +- + scripts/dtc/libfdt/libfdt_internal.h | 6 +- + scripts/dtc/livetree.c | 4 +- + scripts/dtc/srcpos.c | 49 +- + scripts/dtc/srcpos.h | 15 +- + scripts/dtc/treesource.c | 15 +- + scripts/dtc/update-dtc-source.sh | 9 + + scripts/dtc/util.c | 18 +- + scripts/dtc/util.h | 4 +- + scripts/dtc/version_gen.h | 2 +- + 34 files changed, 1768 insertions(+), 1535 deletions(-) +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 (5248e646ceb8 Merge remote-tracking branches 'spi/topic/rspi', 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', '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-imx.c | 2 +- + drivers/spi/spi-omap2-mcspi.c | 16 +- + drivers/spi/spi-rb4xx.c | 210 +++++++++++++++++++++ + drivers/spi/spi-rspi.c | 2 +- + drivers/spi/spi-s3c64xx.c | 2 +- + drivers/spi/spi-sh-msiof.c | 2 +- + drivers/spi/spi-sirf.c | 3 +- + drivers/spi/spi.c | 9 + + drivers/spi/spidev.c | 30 +-- + 19 files changed, 416 insertions(+), 124 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 b6bb912ea70e] 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 (7182f6825ff2 netfilter: Fix list_entry_rcu usage.) +$ git merge rcu/rcu/next +Recorded preimage for 'kernel/rcu/tree.c' +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/tree.c +CONFLICT (content): Merge conflict in kernel/rcu/tree.c +Auto-merging init/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/rcu/tree.c'. +[master 2417010d164d] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/arrayRCU.txt | 20 +- + Documentation/RCU/lockdep.txt | 10 - + Documentation/RCU/rcu_dereference.txt | 38 +- + Documentation/RCU/whatisRCU.txt | 6 +- + Documentation/kernel-parameters.txt | 27 +- + Documentation/memory-barriers.txt | 62 +-- + arch/arm/kernel/smp.c | 6 +- + arch/arm64/kernel/smp.c | 6 +- + arch/powerpc/include/asm/barrier.h | 1 + + arch/x86/kernel/cpu/mcheck/mce.c | 15 +- + drivers/md/bitmap.c | 2 +- + include/linux/compiler.h | 16 + + include/linux/rculist.h | 15 +- + include/linux/rcupdate.h | 70 +--- + include/linux/rcutiny.h | 16 + + include/linux/rcutree.h | 7 +- + include/linux/spinlock.h | 2 +- + init/Kconfig | 72 ++-- + kernel/cpu.c | 4 +- + kernel/events/ring_buffer.c | 2 +- + kernel/locking/locktorture.c | 14 +- + kernel/rcu/rcutorture.c | 103 +++-- + kernel/rcu/srcu.c | 10 +- + kernel/rcu/tiny.c | 33 -- + kernel/rcu/tiny_plugin.h | 12 +- + kernel/rcu/tree.c | 431 +++++++++++---------- + kernel/rcu/tree.h | 63 +-- + kernel/rcu/tree_plugin.h | 220 ++++++----- + kernel/rcu/tree_trace.c | 6 +- + kernel/rcu/update.c | 30 +- + kernel/torture.c | 26 +- + lib/Kconfig.debug | 55 ++- + net/netfilter/core.c | 2 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 4 + + .../selftests/rcutorture/configs/rcu/CFcommon | 2 + + .../selftests/rcutorture/configs/rcu/SRCU-N | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-P | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-P.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TASKS01 | 5 +- + .../selftests/rcutorture/configs/rcu/TASKS02 | 1 - + .../selftests/rcutorture/configs/rcu/TASKS03 | 2 +- + .../selftests/rcutorture/configs/rcu/TINY02 | 2 +- + .../selftests/rcutorture/configs/rcu/TINY02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE01 | 1 + + .../selftests/rcutorture/configs/rcu/TREE02 | 2 +- + .../selftests/rcutorture/configs/rcu/TREE02-T | 1 - + .../selftests/rcutorture/configs/rcu/TREE03 | 8 +- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE04 | 8 +- + .../selftests/rcutorture/configs/rcu/TREE05 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE06 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE06.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE07 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE08 | 6 +- + .../selftests/rcutorture/configs/rcu/TREE08-T | 1 - + .../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE08.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE09 | 1 + + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 36 +- + 60 files changed, 816 insertions(+), 689 deletions(-) + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE03.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +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 (042f7df15a4f workqueue: Allow modifying low level unbound workqueue cpumask) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 1 + + kernel/workqueue.c | 351 ++++++++++++++++++++++++++++++++++------------ + 2 files changed, 259 insertions(+), 93 deletions(-) +Merging drivers-x86/for-next (b787f68c36d4 Linux 4.1-rc1) +$ 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 (78a435c5a484 leds: add BCM6328 LED driver) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-aat1290.txt | 41 + + .../devicetree/bindings/leds/leds-bcm6328.txt | 309 +++++++ + .../devicetree/bindings/leds/leds-tlc591xx.txt | 40 + + drivers/leds/Kconfig | 34 + + drivers/leds/Makefile | 4 + + drivers/leds/leds-aat1290.c | 452 ++++++++++ + drivers/leds/leds-bcm6328.c | 413 +++++++++ + drivers/leds/leds-gpio.c | 11 +- + drivers/leds/leds-max77693.c | 988 +++++++++++++++++++++ + drivers/leds/leds-tlc591xx.c | 300 +++++++ + drivers/leds/leds.h | 24 - + include/linux/leds.h | 25 + + 12 files changed, 2613 insertions(+), 28 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-aat1290.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-tlc591xx.txt + create mode 100644 drivers/leds/leds-aat1290.c + create mode 100644 drivers/leds/leds-bcm6328.c + create mode 100644 drivers/leds/leds-max77693.c + 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 (b787f68c36d4 Linux 4.1-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (fd5e2fd053e1 staging: lustre: llite: fix ifnullfree.cocci warnings) +$ git merge staging/staging-next +Removing drivers/staging/unisys/virtpci/virtpci.h +Removing drivers/staging/unisys/virtpci/virtpci.c +Removing drivers/staging/unisys/virtpci/Makefile +Removing drivers/staging/unisys/virtpci/Kconfig +Removing drivers/staging/unisys/virthba/virthba.h +Removing drivers/staging/unisys/virthba/virthba.c +Removing drivers/staging/unisys/virthba/Makefile +Removing drivers/staging/unisys/virthba/Kconfig +Removing drivers/staging/unisys/uislib/uisutils.c +Removing drivers/staging/unisys/uislib/uisthread.c +Removing drivers/staging/unisys/uislib/uisqueue.c +Removing drivers/staging/unisys/uislib/uislib.c +Removing drivers/staging/unisys/uislib/Makefile +Removing drivers/staging/unisys/uislib/Kconfig +Merge made by the 'recursive' strategy. + drivers/staging/comedi/comedi_fops.c | 41 +- + drivers/staging/comedi/comedi_internal.h | 1 + + drivers/staging/comedi/comedidev.h | 18 +- + drivers/staging/comedi/drivers.c | 2 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 6 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 6 +- + drivers/staging/comedi/drivers/comedi_bond.c | 3 +- + drivers/staging/comedi/drivers/daqboard2000.c | 58 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 4 + + drivers/staging/comedi/drivers/serial2002.c | 2 +- + drivers/staging/emxx_udc/emxx_udc.c | 37 +- + drivers/staging/fbtft/fb_st7735r.c | 8 +- + drivers/staging/fbtft/fb_tls8204.c | 1 + + drivers/staging/fbtft/fbtft-core.c | 7 +- + drivers/staging/fbtft/internal.h | 2 +- + drivers/staging/i2o/iop.c | 59 +- + drivers/staging/iio/iio_simple_dummy_events.c | 2 + + drivers/staging/lustre/lustre/llite/dcache.c | 6 +- + drivers/staging/lustre/lustre/llite/dir.c | 35 +- + drivers/staging/lustre/lustre/llite/file.c | 36 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 6 +- + .../staging/lustre/lustre/llite/llite_internal.h | 4 - + drivers/staging/lustre/lustre/llite/llite_lib.c | 41 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +- + drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 4 +- + drivers/staging/lustre/lustre/llite/lloop.c | 8 +- + drivers/staging/lustre/lustre/llite/namei.c | 2 +- + drivers/staging/lustre/lustre/llite/rw26.c | 20 - + drivers/staging/lustre/lustre/llite/statahead.c | 20 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 18 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 5 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 22 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 18 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 35 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 4 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 2 +- + drivers/staging/octeon-usb/octeon-hcd.c | 12 +- + drivers/staging/octeon/ethernet-defines.h | 62 +- + drivers/staging/octeon/ethernet-mdio.c | 48 +- + drivers/staging/octeon/ethernet-mdio.h | 24 +- + drivers/staging/octeon/ethernet-mem.c | 30 +- + drivers/staging/octeon/ethernet-mem.h | 23 +- + drivers/staging/octeon/ethernet-rgmii.c | 306 ++-- + drivers/staging/octeon/ethernet-rx.c | 38 +- + drivers/staging/octeon/ethernet-rx.h | 24 +- + drivers/staging/octeon/ethernet-sgmii.c | 112 +- + drivers/staging/octeon/ethernet-spi.c | 237 ++- + drivers/staging/octeon/ethernet-tx.c | 28 +- + drivers/staging/octeon/ethernet-tx.h | 23 +- + drivers/staging/octeon/ethernet-util.h | 23 +- + drivers/staging/octeon/ethernet-xaui.c | 114 +- + drivers/staging/octeon/ethernet.c | 115 +- + drivers/staging/octeon/octeon-ethernet.h | 35 +- + drivers/staging/panel/panel.c | 14 - + drivers/staging/unisys/Kconfig | 3 - + drivers/staging/unisys/Makefile | 3 - + drivers/staging/unisys/uislib/Kconfig | 10 - + drivers/staging/unisys/uislib/Makefile | 12 - + drivers/staging/unisys/uislib/uislib.c | 1372 ----------------- + drivers/staging/unisys/uislib/uisqueue.c | 322 ---- + drivers/staging/unisys/uislib/uisthread.c | 69 - + drivers/staging/unisys/uislib/uisutils.c | 137 -- + drivers/staging/unisys/virthba/Kconfig | 13 - + drivers/staging/unisys/virthba/Makefile | 12 - + drivers/staging/unisys/virthba/virthba.c | 1572 -------------------- + drivers/staging/unisys/virthba/virthba.h | 27 - + drivers/staging/unisys/virtpci/Kconfig | 10 - + drivers/staging/unisys/virtpci/Makefile | 10 - + drivers/staging/unisys/virtpci/virtpci.c | 1394 ----------------- + drivers/staging/unisys/virtpci/virtpci.h | 103 -- + .../unisys/visorchannel/visorchannel_funcs.c | 6 +- + drivers/staging/unisys/visorchipset/file.c | 6 +- + drivers/staging/unisys/visorchipset/globals.h | 1 - + drivers/staging/unisys/visorchipset/parser.c | 40 +- + drivers/staging/unisys/visorchipset/parser.h | 10 +- + drivers/staging/unisys/visorchipset/visorchipset.h | 42 +- + .../unisys/visorchipset/visorchipset_main.c | 200 ++- + drivers/staging/vt6655/device_main.c | 21 +- + 79 files changed, 753 insertions(+), 6461 deletions(-) + delete mode 100644 drivers/staging/unisys/uislib/Kconfig + delete mode 100644 drivers/staging/unisys/uislib/Makefile + delete mode 100644 drivers/staging/unisys/uislib/uislib.c + delete mode 100644 drivers/staging/unisys/uislib/uisqueue.c + delete mode 100644 drivers/staging/unisys/uislib/uisthread.c + delete mode 100644 drivers/staging/unisys/uislib/uisutils.c + delete mode 100644 drivers/staging/unisys/virthba/Kconfig + delete mode 100644 drivers/staging/unisys/virthba/Makefile + delete mode 100644 drivers/staging/unisys/virthba/virthba.c + delete mode 100644 drivers/staging/unisys/virthba/virthba.h + delete mode 100644 drivers/staging/unisys/virtpci/Kconfig + delete mode 100644 drivers/staging/unisys/virtpci/Makefile + delete mode 100644 drivers/staging/unisys/virtpci/virtpci.c + delete mode 100644 drivers/staging/unisys/virtpci/virtpci.h +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 (c9ca95d470be extcon: arizona: Apply HP clamps correctly for WM8280) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/Kconfig | 21 ++- + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-arizona.c | 12 +- + drivers/extcon/extcon-axp288.c | 385 ++++++++++++++++++++++++++++++++++++++++ + drivers/extcon/extcon.c | 27 ++- + include/linux/extcon.h | 11 +- + include/linux/mfd/axp20x.h | 5 + + 7 files changed, 438 insertions(+), 24 deletions(-) + create mode 100644 drivers/extcon/extcon-axp288.c +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 ecf38a63f943] 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 +Already up-to-date. +Merging target-updates/for-next (bc018a971392 target: Remove set-but-not-used-variables) +$ git merge target-updates/for-next +Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c +Merge made by the 'recursive' strategy. + Documentation/target/tcm_mod_builder.py | 275 +----------------------- + Documentation/target/tcm_mod_builder.txt | 4 +- + Documentation/target/tcmu-design.txt | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 6 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 180 +++------------- + drivers/infiniband/ulp/srpt/ib_srpt.h | 23 +- + drivers/scsi/qla2xxx/qla_target.c | 52 ++--- + drivers/scsi/qla2xxx/qla_target.h | 1 - + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 212 ++----------------- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 6 +- + drivers/target/iscsi/iscsi_target.c | 36 ++-- + drivers/target/iscsi/iscsi_target_configfs.c | 135 +++--------- + drivers/target/iscsi/iscsi_target_erl0.c | 53 ----- + drivers/target/iscsi/iscsi_target_erl0.h | 1 - + drivers/target/iscsi/iscsi_target_login.c | 58 +---- + drivers/target/iscsi/iscsi_target_login.h | 1 - + drivers/target/iscsi/iscsi_target_parameters.c | 267 +---------------------- + drivers/target/iscsi/iscsi_target_parameters.h | 11 +- + drivers/target/iscsi/iscsi_target_tpg.c | 3 +- + drivers/target/iscsi/iscsi_target_util.c | 52 +---- + drivers/target/iscsi/iscsi_target_util.h | 1 - + drivers/target/loopback/tcm_loop.c | 176 +-------------- + drivers/target/loopback/tcm_loop.h | 9 - + drivers/target/sbp/sbp_target.c | 172 +-------------- + drivers/target/sbp/sbp_target.h | 9 - + drivers/target/target_core_configfs.c | 34 +-- + drivers/target/target_core_device.c | 30 +-- + drivers/target/target_core_fabric_configfs.c | 22 +- + drivers/target/target_core_fabric_lib.c | 282 ++++++++++++------------- + drivers/target/target_core_file.c | 136 +++--------- + drivers/target/target_core_file.h | 6 - + drivers/target/target_core_internal.h | 14 ++ + drivers/target/target_core_pr.c | 57 +++-- + drivers/target/target_core_rd.c | 20 +- + drivers/target/target_core_sbc.c | 230 +++++++++----------- + drivers/target/target_core_spc.c | 24 +-- + drivers/target/target_core_tmr.c | 23 +- + drivers/target/target_core_tpg.c | 206 +++++++----------- + drivers/target/target_core_transport.c | 132 +++++++----- + drivers/target/target_core_user.c | 221 +++++++++++-------- + drivers/target/target_core_xcopy.c | 7 +- + drivers/target/tcm_fc/tcm_fc.h | 3 +- + drivers/target/tcm_fc/tfc_cmd.c | 10 +- + drivers/target/tcm_fc/tfc_conf.c | 104 ++------- + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 211 ++---------------- + drivers/usb/gadget/legacy/tcm_usb_gadget.h | 12 -- + drivers/vhost/scsi.c | 218 +------------------ + drivers/xen/xen-scsiback.c | 158 +------------- + include/linux/crc-t10dif.h | 1 + + include/target/iscsi/iscsi_target_core.h | 12 +- + include/target/target_core_backend.h | 8 +- + include/target/target_core_base.h | 26 +-- + include/target/target_core_fabric.h | 58 +---- + lib/crc-t10dif.c | 13 +- + 54 files changed, 875 insertions(+), 3148 deletions(-) +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 (172e6ab1caff remoteproc: fix various checkpatch warnings) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/da8xx_remoteproc.c | 3 +-- + drivers/remoteproc/remoteproc_core.c | 27 +++++++++------------------ + drivers/remoteproc/remoteproc_internal.h | 2 +- + drivers/remoteproc/ste_modem_rproc.c | 4 ++-- + 4 files changed, 13 insertions(+), 23 deletions(-) +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 (c02f699e22fa Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/at91/pmc.c | 2 +- + drivers/clk/clk.c | 1993 ++++++++++++++++++++-------------------- + drivers/clk/qcom/gcc-msm8916.c | 4 +- + 3 files changed, 989 insertions(+), 1010 deletions(-) +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 (b787f68c36d4 Linux 4.1-rc1) +$ 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 59ee78472a03] 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 (fd683e86d17e Merge branch 'for-4.2/kaslr' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + arch/x86/include/asm/livepatch.h | 1 + + arch/x86/include/asm/setup.h | 7 +++++++ + arch/x86/kernel/machine_kexec_64.c | 3 ++- + arch/x86/kernel/setup.c | 2 +- + kernel/livepatch/core.c | 5 +++-- + 5 files changed, 14 insertions(+), 4 deletions(-) +Merging akpm-current/current (ca1572c6e189 mm: meminit: Reduce number of times pageblocks are set during struct page init -fix) +$ git merge --no-ff akpm-current/current +Resolved 'arch/x86/kernel/machine_kexec_64.c' using previous resolution. +Removing lib/find_last_bit.c +Removing include/linux/compiler-gcc5.h +Removing include/linux/compiler-gcc4.h +Removing include/linux/compiler-gcc3.h +Auto-merging fs/cifs/file.c +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/rtc/Kconfig +Auto-merging arch/x86/kernel/machine_kexec_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 54fb77751c95] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/rtc/abracon,abx80x.txt | 32 ++ + Documentation/filesystems/vfat.txt | 10 + + Documentation/kasan.txt | 8 +- + Documentation/lockup-watchdogs.txt | 18 + + Documentation/printk-formats.txt | 8 + + Documentation/sysctl/kernel.txt | 21 ++ + MAINTAINERS | 3 +- + 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/hugetlb.h | 4 - + 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/hugetlb.h | 4 - + 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/hugetlb.h | 4 - + arch/ia64/include/asm/mm-arch-hooks.h | 15 + + arch/ia64/mm/hugetlbpage.c | 5 - + arch/ia64/mm/numa.c | 19 +- + arch/m32r/include/asm/mm-arch-hooks.h | 15 + + arch/m68k/include/asm/mm-arch-hooks.h | 15 + + arch/metag/include/asm/hugetlb.h | 4 - + 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/hugetlb.h | 4 - + 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/hugetlb.h | 5 - + 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/hugetlb.h | 1 - + 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/hugetlb.h | 3 - + arch/sh/include/asm/mm-arch-hooks.h | 15 + + arch/sh/mm/hugetlbpage.c | 5 - + arch/sparc/include/asm/hugetlb.h | 4 - + 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/hugetlb.h | 4 - + 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 | 3 +- + arch/x86/include/asm/hugetlb.h | 3 - + 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/base/node.c | 6 +- + 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/affs/amigaffs.c | 2 +- + fs/affs/inode.c | 2 +- + fs/befs/btree.c | 6 +- + fs/cifs/file.c | 8 +- + fs/configfs/mount.c | 2 +- + 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/hugetlbfs/inode.c | 1 - + fs/jbd2/journal.c | 11 +- + fs/jbd2/transaction.c | 20 +- + fs/minix/inode.c | 2 +- + fs/mpage.c | 23 +- + fs/nilfs2/btree.c | 2 +- + fs/notify/fanotify/fanotify_user.c | 25 +- + fs/ocfs2/alloc.c | 282 ++++++++------ + 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 | 90 ++--- + fs/ocfs2/dlm/dlmcommon.h | 3 +- + fs/ocfs2/dlm/dlmmaster.c | 36 +- + fs/ocfs2/dlm/dlmthread.c | 33 ++ + 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 | 46 ++- + 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/proc/array.c | 8 + + 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/memblock.h | 18 + + include/linux/mm-arch-hooks.h | 25 ++ + include/linux/mm.h | 48 +-- + include/linux/mmzone.h | 23 +- + include/linux/nilfs2_fs.h | 2 +- + include/linux/nmi.h | 3 + + 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/scatterlist.h | 4 +- + include/linux/slab.h | 36 +- + include/linux/smpboot.h | 5 + + include/linux/string.h | 1 + + include/linux/swap.h | 1 + + include/linux/util_macros.h | 2 +- + include/linux/vm_event_item.h | 1 + + include/uapi/asm-generic/mman-common.h | 1 + + ipc/msg.c | 3 +- + kernel/exit.c | 2 +- + kernel/smpboot.c | 55 ++- + kernel/sysctl.c | 7 + + kernel/watchdog.c | 66 +++- + lib/Kconfig | 7 + + lib/Kconfig.kasan | 8 +- + lib/Makefile | 1 + + lib/bitmap.c | 32 +- + lib/crc64_ecma.c | 341 +++++++++++++++++ + lib/find_last_bit.c | 41 -- + lib/scatterlist.c | 12 +- + lib/sort.c | 21 +- + lib/test-hexdump.c | 6 +- + lib/vsprintf.c | 20 +- + mm/Kconfig | 18 + + mm/bootmem.c | 13 +- + mm/compaction.c | 25 +- + mm/filemap.c | 15 +- + mm/huge_memory.c | 41 +- + mm/hugetlb.c | 5 + + mm/hwpoison-inject.c | 13 +- + mm/internal.h | 29 +- + mm/kasan/kasan.h | 1 - + mm/ksm.c | 2 +- + mm/madvise.c | 176 +++++++++ + mm/memblock.c | 34 +- + mm/memory-failure.c | 33 +- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 11 +- + mm/migrate.c | 2 +- + mm/mm_init.c | 9 +- + mm/mprotect.c | 11 + + mm/mremap.c | 17 +- + mm/nobootmem.c | 7 +- + mm/page_alloc.c | 416 ++++++++++++++++++--- + 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 | 126 +++++-- + mm/vmstat.c | 1 + + mm/zsmalloc.c | 4 - + mm/zswap.c | 4 +- + 214 files changed, 4271 insertions(+), 1562 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: printk: improve the description of /dev/kmsg line format +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 7a1d2a9b29b8...105b72ac333d akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (105b72ac333d drivers/w1/w1_int.c: call put_device if device_register fails) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/unicore32/kernel/fpu-ucf64.c | 4 ++-- + drivers/w1/w1_int.c | 3 +-- + kernel/printk/printk.c | 8 ++++---- + 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..6fd5257e61a5 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 3.19-rc6 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.1-rc1 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..922500cd5702 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20150504 |