diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-30 13:18:49 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-30 13:18:49 +1000 |
| commit | 421ed810bb7a8d528a00fc4bf866b0be443c8d30 (patch) | |
| tree | 62f17c6b0275aa9e23df2a7706d4ef126eccd02c | |
| parent | efe5226c12da840c037f83f62b033a15ad593f90 (diff) | |
| download | linux-421ed810bb7a8d528a00fc4bf866b0be443c8d30.tar.gz linux-421ed810bb7a8d528a00fc4bf866b0be443c8d30.tar.xz | |
Add linux-next specific files for 20160530next-20160530
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 238 | ||||
| -rw-r--r-- | Next/Trees | 240 | ||||
| -rw-r--r-- | Next/merge.log | 2138 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2621 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..95b2c94fbce0 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,238 @@ +Name SHA1 +---- ---- +origin b02b1fbdd338f70e49efa9ca9899214134526701 +fixes e0714ec4f9efe7b86828b0dcc077fd8f5d8e5e91 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current 44549e8f5eea4e0a41b487b63e616cb089922b99 +arm-current ec953b70f368330e806a94df6fe2dd1d72176b2d +m68k-current 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes b4c112114aab9aff5ed4568ca5e662bb02cdfe74 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 9ea46abe22550e3366ff7cee2f8391b35b12f730 +net b7e7ad611e24b95b0db2998428ce78370415c086 +ipsec d6af1a31cc72fbd558c7eddbc36f61bf09d1cf6a +ipvs f28f20da704d399fb1e4d8838ffd697a357d9cc8 +wireless-drivers de26859dcf363d520cc44e59f6dcaf20ebe0aadf +mac80211 e6436be21e77e3659b4ff7e357ab5a8342d132d2 +sound-current eb4606e64a7d548f5d60a9583baa8104890b2c6e +pci-current 9a2a5a638f8eb9c612a7a9af0afab93f506f6ba4 +driver-core.current 5469dc270cd44c451590d40c031e6a71c1f637e8 +tty.current 5469dc270cd44c451590d40c031e6a71c1f637e8 +usb.current 5469dc270cd44c451590d40c031e6a71c1f637e8 +usb-gadget-fixes 38740a5b87d53ceb89eb2c970150f6e94e00373a +usb-serial-fixes 74d2a91aec97ab832790c9398d320413ad185321 +usb-chipidea-fixes d144dfea8af7108f613139623e63952ed7e69c0c +staging.current 5469dc270cd44c451590d40c031e6a71c1f637e8 +char-misc.current 5469dc270cd44c451590d40c031e6a71c1f637e8 +input-current f49cf3b8b4c841457244c461c66186a719e13bcc +crypto-current ab6a11a7c8ef47f996974dd3c648c2c0b1a36ab1 +ide 1993b176a8224e371e0732ffada7ab9eb3b0912b +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes 8160c4e455820d5008a1116d2dca35f0363bb062 +kselftest-fixes 505ce68c6da3432454c62e43c24a22ea5b1d754b +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes 2dcd0af568b0cf583645c8a317dd12e344b1c72a +asm-generic b0da6d44157aa6e652de7634343708251ba64146 +arc 776d7f1694a7d678291354a05f0243965708306a +arm b6810489fa29e6fbd131051892c6e521aa712463 +arm-perf 4ba2578fa7b557012b8f59ad7a9284ff15394338 +arm-soc d6be64b09dd18ac3d22d55ae250cf839722f37e3 +at91 5a0d7c6a48ae60c41304858c6e885e3daeb8a083 +bcm2835-dt 896ad420db8d5ec4cc4727b786d15e28eb59b366 +bcm2835-soc 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-drivers 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-defconfig 3652bb35abf6ee11333cbec1d2855c1c0f9f6b27 +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 63b44471754bc0c7a1fbb6b430d0c7cdd091ee7a +keystone 02e15d23400608a9843a66c0b5fc4f3d6dd80b50 +mvebu 01316cded75be7e2ec0976179e027a3cc8c61a08 +omap 5c66191b5c76526317b70177cc09f84f8f96c066 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom eb8e0105700b78a668c38f9ec7c4b3167816cb3d +renesas e5c640c6f9cc42174510a1e5a8cd573f3fcddac1 +rockchip a108aca0c77fa96b2561da9bc31ff2bb124b9b66 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk 35e691cf516588c4bebe1a0175b3d9368987b397 +tegra 5c282bc9d0a37e247d203b515a90909c45e82547 +arm64 e6d9a52543338603e25e71e0e4942f05dae0dd8a +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 8cad489261c564d4ee1db4de4ac365af56807d8a +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 787ca32dc704bde981760de01a3a7e6ce9835fdb +m68k 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +m68knommu 1a695a905c18548062509178b98bc91e67510864 +metag 592ddeeff8cb0ba7ae11dbd08f583280bd15f865 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips b02b1fbdd338f70e49efa9ca9899214134526701 +nios2 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f +parisc-hd 57f3ea7a3d6ed784bc0675f3d9db5b3eae69a99e +powerpc 138a076496e61c68ebc1dcccc088705826bbe26d +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 1eef33bec12d7e46a58f12b3604556a80c362a0d +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 5e19a42ac6d9a57b927cd02c954d15d9dd54d484 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile bdf03e59f8c136f709dd44987ad21f6ce19dc98c +uml a78ff1112263fdd871d3506dbcff44f6f12e8423 +unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs c315ef8d9db7f1a0ebd023a395ebdfde1c68057e +btrfs-kdave 33e66059b7ad0ce031e9b06254898a7d7cbb2776 +ceph e536030934aebf049fe6aaebc58dd37aeee21840 +cifs 3bdc426e2497fb98a1051fc69f6c1709c00e377c +configfs 96c22a3293512ba684e73a981196430f524689da +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 b9d8905e4a751e2cdc0fb474856b7183c594dcc6 +ext4 12735f881952c32b31bc4e433768f18489f79ec9 +f2fs f6c658df63856db3bf8f467024b1dbee37b5399c +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 4441f63ab7e581ae460c9f7e06fba8a2be192e81 +gfs2 29567292c0b5b2fb484125c280a2175141fe2205 +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs 1a695a905c18548062509178b98bc91e67510864 +nfsd 9e62f931dd079ebbdde152d2c90a2fa9f67fb286 +orangefs 2dcd0af568b0cf583645c8a317dd12e344b1c72a +overlayfs 7d43ba76af20b8c591403fefbd2973f3c06defa0 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 1112018cefc586cba924770a2b28bff6d2f0aa5c +xfs 555b67e4e729ca544bb4028ab12e532c68b70ddb +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 1eb82bc8e71279eea0cc6a9c9d591d8f706c4206 +pci 31c4833c2879bc51f83b131c545feb1784a08ade +hid 185a9cac5b1e3914ca48848339fc4431ab3e77c7 +i2c e6be18f6d62c1d3b331ae020b76a29c2ccf6b0bf +jdelvare-hwmon 18c358ac5e32ad43e9a50b4e5f344a896b9d1dad +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging d6a442df63b2f0043c0b4fc05504ac4ded96ae80 +v4l-dvb 73dfb701d254a270984dd8658b9e008fa3ce7b0b +pm fe520bf9f15b8084656997e0025e8d7491f9cf32 +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal 88ac99063e6e38bf9577e75f0d65dd02e2326d58 +thermal-soc ddc8fdc6e2f06aabdbb9dc4a5e01ca793cd2e285 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 82c7d823cc31cf56d964eebe1f91aaf1691cddce +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 628b5139c906e1b875bc2a275288362a8e01791a +net-next 07b75260ebc2c789724c594d7eaf0194fa47b3be +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next 698e2a8dca98e4de32f3f630e6d9cd93753c52e1 +wireless-drivers-next 52776a700b53969345a3cc5daed1c797d016a188 +bluetooth 07b75260ebc2c789724c594d7eaf0194fa47b3be +mac80211-next 4f45bb3e8a8f26b683a814cb9523d5a0775de81f +rdma 7a226f9c32b0481b0744e2726cd7f8349b866af5 +rdma-leon 2dcd0af568b0cf583645c8a317dd12e344b1c72a +rdma-leon-test 2dcd0af568b0cf583645c8a317dd12e344b1c72a +mtd 507e617440d70bc4269daac1b0ee96671bf2761a +l2-mtd 4956b14738bec96db14fa2c45c4c3e25be6e65e0 +nand 666b65683dad9aa90efaa4aad24ef3710101e3aa +crypto 256b1cfb9a346bb4808cd27b7b8f9b120f96491e +drm 92181d47ee74749bdf902f080dab9fa9ef44b37f +drm-panel 227e4f4079e198695b9b5df344aa0e29676a5a29 +drm-intel 157d2c7fad0863222f6f3b11c4690f2a6e74d809 +drm-tegra 057eab2013ecbba2e772293acc177e2e3210f05d +drm-misc 14fe29e8ef44a175db2d803a0b7f0aa6c372631a +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 2b669875332fbdff0a7ad559e8662e875e7a1526 +hdlcd c466cbed691a839d885318df25b2240238ac2a59 +drm-vc4 efea172891fc32928291a633c17a146338a73ba9 +sunxi ed490b3ebfa4717e0c39f83efee069815ad9d0e6 +kbuild 0c644e04ad1b55fe5328b898c2d3a8f291a55909 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 19b79de2566023d093282bbd783e823a1f1d2f6d +sound eb4606e64a7d548f5d60a9583baa8104890b2c6e +sound-asoc 75b4622dcc183c9f66eb1bad4abdad0fe00f7b9e +modules e2d1248432c4bc8b3e4cdfc13074acbce3a749cd +input 48a2b783483b3ed9565348736a5148a11cfffad6 +block 661806a319890962aaa839dc1dbf7ea356aa6b92 +lightnvm 2a65aee4011bd3a372ce23681ceb3a6960a96c8c +device-mapper b8ef07be98b4704f30980e587461f8fc38f4f0ce +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh fc24637efecf57dd4e205481cb736987bb278efc +md 4125758074279115346c1f17c986d24cd1ab799c +mfd b52207ef4ea56f8c22288ec3387399aac72c26cf +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 4a99fa06a8ca27a5187636e630568658000af575 +omap_dss2 ab366b40b8513e7590858229ecbb5e1434a52b54 +regulator 6b3f657e5e3eb83a06a5808d69b705e7fdf0b98a +security b937190c40de0f6f07f592042e3097b16c6b0130 +integrity 05d1a717ec0430c916a749b94eb90ab74bbfa356 +keys 75aeddd12f205d07b36ed76db3426e974b8f2a21 +selinux b937190c40de0f6f07f592042e3097b16c6b0130 +tpmdd e8f2f45a4402deb715220b750d892f7a70b0f868 +watchdog 1a695a905c18548062509178b98bc91e67510864 +iommu 6c0b43df74f900e7f31a49d1844f166df0f8afc6 +dwmw2-iommu 22e2f9fa63b092923873fc8a52955151f4d83274 +vfio f70552809419cd2abc0cc6469a07c9792a3aaa6c +jc_docs 9f8036643dd9609b329aa1b89c9a95981e9ba62f +trivial 52bbe141f37f093e2c612e97c40d27422e5a1fdf +audit 188e3c5cd2b672620291e64a21f1598fe91e40b6 +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh f2c27767af0a91cbdc3d832231f953110473e853 +mailbox c430cf376fee0b03d9c9293615f9737649de1b12 +spi 0ee1b395301c45fd8f062797f716d1b31afa5e52 +tip 65fd15a016cc0c5556e16e47e90a300a8861de5a +clockevents cee77c2c5b5764f4a2a8eb14a7343e0d0376f723 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 3f37a36b6282621d7c5a99b6911275f989766996 +irqchip a66ce4b7d9d20b59afe0a898fa0b4faf0651fbcd +ftrace 97f8827a8c7963756ae7d3ee898675b4667eca73 +rcu 0e7e2457e4e4204c2ccf040ad2511a257b444918 +kvm fabc712866435660f7fa1070e1fabe29eba5bc4c +kvm-arm 35a2d58588f0992627e74b447ccab21570544c86 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus b1a4286b8f3393857a205ec89607683161b75f90 +kvms390 60a37709ce603da62d0b60699b713558b4cfd513 +xen-tip bdadcaf2a7c19d667c7c021da2ffc8fa18c44031 +percpu 6710e594f71ccaad8101bc64321152af7cd9ea28 +workqueues f1e89a8f335824eeb720701e17fdc933a40fa605 +drivers-x86 b740d2e9233cb33626d3b62210bcfc6a34baa839 +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi c2f90a465df75254fb41bf6e7975464929c21e26 +leds 87ae3810779d03b1d067a6fd85cb23e394743a81 +ipmi a1b4e31bfabb3172c78890b0a03a050fad082b1c +driver-core 5469dc270cd44c451590d40c031e6a71c1f637e8 +tty 5469dc270cd44c451590d40c031e6a71c1f637e8 +usb 5469dc270cd44c451590d40c031e6a71c1f637e8 +usb-gadget 2a58f9c12bb360f38fb39e470bb5ff94014356e6 +usb-serial b923c6c62981cec5e2d2187fd700c2fc4386fc45 +usb-chipidea-next 764763f0a0c81cbed4d2c7dc2b05e7173ff85b5b +staging 5469dc270cd44c451590d40c031e6a71c1f637e8 +char-misc 5469dc270cd44c451590d40c031e6a71c1f637e8 +extcon 453fc627c7b58b9fde0e50739f6b40bf5af20f46 +cgroup 332d8a2fd14127e82b061744ad2a7a8e877e3857 +scsi 787ab6e97024926f38773287d9f98a9b330bce23 +target-updates 8f0dfb3d8b1120c61f6e2cc3729290db10772b2d +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata 5219d6530ef0bca37bd8c4c637908638ce205ff9 +pinctrl 7639dad93a5564579987abded4ec05e3db13659d +vhost bb991288728e6a47a6f0fac6a4e9dfaeecc27956 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg da5cb422f15db65cb6c3f18e4243f573b1ce30f6 +gpio 7639dad93a5564579987abded4ec05e3db13659d +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 18c588786c08458f5d965d8735ab48f9e51e0b4b +dma-buf 12566cc35d0e68308bde7aad615743d560cb097b +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk ef56b79b66faeeb0dc14213d3cc9e0534a960dee +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 6eab37daf0ec1077fd612ff27ab513db20f33767 +y2038 4b277763c5b3ce6d60168797e6f38260416d9b13 +luto-misc afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 6d9122078097233dbfc4ad3a45512393cddf8540 +coresight c568ba901f2738c4a134d50b019a60d0fc915a86 +rtc 7af6a2e1c2565396f6b941ff2a989b989b24a97b +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 36092ee8ba695fce023b2118ececa6c2a56b1331 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current 602525d7e860c4bfbef6bf8f66283614a995417c +akpm 8261089741cd61f3a3c9f0bd2601794f197d64de diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..46698321ba58 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,240 @@ +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://git.armlinux.org.uk/~rmk/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 +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +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 +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.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 +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 +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +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 +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-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://git.armlinux.org.uk/~rmk/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-dt git git://github.com/anholt/linux.git#bcm2835-dt-next +bcm2835-soc git git://github.com/anholt/linux.git#bcm2835-soc-next +bcm2835-drivers git git://github.com/anholt/linux.git#bcm2835-drivers-next +bcm2835-defconfig git git://github.com/anholt/linux.git#bcm2835-defconfig-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 +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#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 +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-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.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.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 +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.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 +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://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 +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 +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 +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-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 +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +rdma-leon git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#rdma-next +rdma-leon-test git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#testing/rdma-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://github.com/linux-nand/linux.git#nand/next +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 +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +drm-vc4 git git://github.com/anholt/linux.git#drm-vc4-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +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 +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-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 +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#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 +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#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 +jc_docs git git://git.lwn.net/linux.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 +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 +kvm-ppc-paulus git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.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 +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/j.anaszewski/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 +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-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 +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 +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +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://github.com/andersson/remoteproc.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 +aio git git://git.kvack.org/~bcrl/aio-next.git#master +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 +borntraeger 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 +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +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..55b0af7e47f2 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2138 @@ +$ date -R +Mon, 30 May 2016 09:45:38 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a10c38a4f385 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client +Merging origin/master (b02b1fbdd338 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge origin/master +Updating a10c38a4f385..b02b1fbdd338 +Fast-forward + Documentation/ABI/stable/sysfs-class-ubi | 9 + + Documentation/DocBook/gpu.tmpl | 6 + + .../bindings/gpio/microchip,pic32-gpio.txt | 2 +- + Documentation/devicetree/bindings/mips/cpu_irq.txt | 2 +- + .../bindings/mmc/microchip,sdhci-pic32.txt | 2 +- + .../devicetree/bindings/mtd/atmel-nand.txt | 2 +- + Documentation/devicetree/bindings/mtd/nand.txt | 3 +- + .../bindings/pinctrl/microchip,pic32-pinctrl.txt | 2 +- + .../bindings/serial/microchip,pic32-uart.txt | 2 +- + .../devicetree/bindings/sound/max98371.txt | 17 + + .../bindings/sound/mt8173-rt5650-rt5676.txt | 5 +- + .../devicetree/bindings/sound/mt8173-rt5650.txt | 10 + + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 48 +- + .../devicetree/bindings/sound/tas571x.txt | 10 +- + .../devicetree/bindings/sound/tas5720.txt | 25 + + .../bindings/watchdog/microchip,pic32-dmt.txt | 4 +- + .../bindings/watchdog/microchip,pic32-wdt.txt | 4 +- + Documentation/filesystems/dax.txt | 32 + + Documentation/filesystems/directory-locking | 32 +- + Documentation/filesystems/overlayfs.txt | 9 - + Documentation/filesystems/porting | 7 + + Documentation/infiniband/sysfs.txt | 12 + + Documentation/kbuild/kconfig-language.txt | 22 +- + Documentation/scsi/tcm_qla2xxx.txt | 22 + + Documentation/target/tcm_mod_builder.py | 16 - + MAINTAINERS | 34 +- + Makefile | 72 +- + arch/Kconfig | 8 + + arch/arm/boot/Makefile | 1 - + arch/arm/boot/bootp/Makefile | 3 +- + arch/arm/include/asm/kvm_host.h | 6 + + arch/arm/include/asm/kvm_mmio.h | 3 + + arch/arm/kvm/Kconfig | 7 + + arch/arm/kvm/Makefile | 11 + + arch/arm/kvm/arm.c | 37 +- + arch/arm/kvm/mmio.c | 24 +- + arch/arm/vdso/Makefile | 2 +- + arch/arm64/include/asm/kvm_host.h | 6 + + arch/arm64/include/asm/kvm_mmio.h | 3 + + arch/arm64/kvm/Kconfig | 7 + + arch/arm64/kvm/Makefile | 12 + + arch/arm64/kvm/inject_fault.c | 2 +- + arch/h8300/Kconfig | 1 + + arch/h8300/boot/compressed/Makefile | 1 - + arch/h8300/include/asm/hash.h | 53 + + arch/ia64/Makefile | 6 +- + arch/m32r/boot/compressed/Makefile | 1 - + arch/m68k/Kconfig.cpu | 1 + + arch/m68k/include/asm/hash.h | 59 + + arch/microblaze/Kconfig | 1 + + arch/microblaze/include/asm/hash.h | 81 + + arch/mips/Kconfig | 1 + + arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- + arch/mips/boot/dts/ralink/mt7620a.dtsi | 2 +- + arch/mips/boot/dts/ralink/rt2880.dtsi | 2 +- + arch/mips/boot/dts/ralink/rt3050.dtsi | 2 +- + arch/mips/boot/dts/ralink/rt3883.dtsi | 2 +- + arch/mips/boot/dts/xilfpga/nexys4ddr.dts | 2 +- + arch/mips/cavium-octeon/smp.c | 2 +- + arch/mips/include/asm/asmmacro.h | 99 +- + arch/mips/include/asm/hazards.h | 8 +- + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 2 +- + arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 2 +- + .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h | 2 +- + arch/mips/include/asm/mach-ip27/dma-coherence.h | 2 +- + arch/mips/include/asm/mach-ip32/dma-coherence.h | 2 +- + .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 2 +- + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 2 +- + .../include/asm/mach-loongson64/loongson_hwmon.h | 2 +- + .../include/asm/mach-malta/kernel-entry-init.h | 6 +- + arch/mips/include/asm/mips_mt.h | 2 +- + arch/mips/include/asm/mipsregs.h | 188 +- + arch/mips/include/asm/msa.h | 21 +- + arch/mips/include/asm/octeon/cvmx-cmd-queue.h | 2 +- + arch/mips/include/asm/octeon/cvmx-helper-board.h | 2 +- + arch/mips/include/asm/octeon/cvmx-ipd.h | 2 +- + arch/mips/include/asm/octeon/cvmx-pow.h | 2 +- + arch/mips/include/asm/sgi/hpc3.h | 2 +- + arch/mips/kernel/branch.c | 4 +- + arch/mips/kernel/cps-vec.S | 15 + + arch/mips/kernel/cpu-probe.c | 4 +- + arch/mips/kernel/elf.c | 2 +- + arch/mips/kernel/irq.c | 3 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 2 +- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/signal.c | 8 - + arch/mips/kernel/smp-cps.c | 8 +- + arch/mips/lasat/picvue_proc.c | 4 +- + arch/mips/lib/ashldi3.c | 2 +- + arch/mips/lib/ashrdi3.c | 2 +- + arch/mips/lib/bswapdi.c | 2 +- + arch/mips/lib/bswapsi.c | 2 +- + arch/mips/lib/cmpdi2.c | 2 +- + arch/mips/lib/lshrdi3.c | 2 +- + arch/mips/lib/memcpy.S | 2 +- + arch/mips/lib/ucmpdi2.c | 2 +- + arch/mips/loongson64/loongson-3/hpet.c | 2 +- + arch/mips/math-emu/dsemul.c | 4 +- + arch/mips/mm/tlbex.c | 22 +- + arch/mips/oprofile/op_impl.h | 2 +- + arch/mips/pci/ops-bridge.c | 4 +- + arch/mips/pistachio/init.c | 8 +- + arch/mips/ralink/mt7620.c | 112 +- + arch/mips/sgi-ip27/ip27-hubio.c | 2 +- + arch/mips/sgi-ip27/ip27-nmi.c | 2 +- + arch/mips/sgi-ip27/ip27-xtalk.c | 2 +- + arch/mips/sni/rm200.c | 2 +- + arch/mips/vdso/Makefile | 4 +- + arch/mips/vr41xx/common/cmu.c | 2 +- + arch/mn10300/boot/compressed/Makefile | 1 - + arch/nios2/boot/compressed/Makefile | 1 - + arch/powerpc/sysdev/axonram.c | 2 +- + arch/s390/boot/compressed/Makefile | 1 - + arch/sh/boot/compressed/Makefile | 1 - + arch/sh/boot/romimage/Makefile | 1 - + arch/um/include/shared/registers.h | 2 + + arch/um/kernel/process.c | 2 +- + arch/um/os-Linux/signal.c | 28 +- + arch/unicore32/boot/Makefile | 2 +- + arch/unicore32/boot/compressed/Makefile | 1 - + arch/x86/boot/compressed/Makefile | 1 - + arch/x86/entry/vdso/Makefile | 4 +- + arch/x86/ia32/ia32_aout.c | 17 +- + arch/x86/include/asm/intel_telemetry.h | 2 +- + arch/x86/include/asm/pmc_core.h | 27 + + arch/x86/include/uapi/asm/svm.h | 44 +- + arch/x86/kvm/svm.c | 4 +- + arch/x86/kvm/vmx.c | 48 +- + arch/x86/purgatory/Makefile | 2 - + arch/x86/realmode/rm/Makefile | 1 - + arch/x86/um/os-Linux/registers.c | 49 +- + arch/x86/um/ptrace_32.c | 5 +- + arch/x86/um/ptrace_64.c | 16 +- + arch/x86/um/shared/sysdep/ptrace_64.h | 4 +- + arch/x86/um/signal.c | 37 +- + arch/x86/um/user-offsets.c | 2 +- + block/blk-mq.c | 4 +- + block/ioctl.c | 1 - + drivers/acpi/acpi_dbg.c | 22 +- + drivers/ata/sata_highbank.c | 2 +- + drivers/block/brd.c | 2 +- + drivers/clk/tegra/clk-tegra210.c | 2 +- + drivers/cpufreq/omap-cpufreq.c | 2 +- + drivers/crypto/caam/ctrl.c | 2 +- + drivers/dma/sun4i-dma.c | 16 +- + drivers/gpio/gpio-xlp.c | 2 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/amd/acp/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 111 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 13 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 45 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 38 + + .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 44 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 16 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 2 +- + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 366 ++++ + drivers/gpu/drm/i915/i915_dma.c | 6 + + drivers/gpu/drm/i915/i915_drv.c | 5 + + drivers/gpu/drm/i915/i915_drv.h | 1 + + drivers/gpu/drm/i915/i915_gem.c | 11 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 8 + + drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + + drivers/gpu/drm/i915/intel_bios.c | 36 + + drivers/gpu/drm/i915/intel_ddi.c | 16 +- + drivers/gpu/drm/i915/intel_display.c | 6 + + drivers/gpu/drm/i915/intel_dpll_mgr.c | 6 +- + drivers/gpu/drm/i915/intel_drv.h | 6 + + drivers/gpu/drm/i915/intel_dsi.c | 141 +- + drivers/gpu/drm/i915/intel_hdmi.c | 104 +- + drivers/gpu/drm/i915/intel_lrc.c | 146 +- + drivers/gpu/drm/i915/intel_lrc.h | 1 - + drivers/gpu/drm/i915/intel_mocs.c | 12 +- + drivers/gpu/drm/i915/intel_pm.c | 2 + + drivers/gpu/drm/i915/intel_psr.c | 55 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 207 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 6 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 12 + + drivers/gpu/drm/imx/imx-drm-core.c | 8 + + drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- + drivers/gpu/drm/radeon/kv_dpm.c | 2 +- + drivers/gpu/drm/sti/sti_vtg.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 2 +- + drivers/gpu/host1x/hw/intr_hw.c | 2 +- + drivers/gpu/ipu-v3/ipu-common.c | 5 +- + drivers/i2c/busses/Kconfig | 3 +- + drivers/i2c/busses/i2c-at91.c | 2 +- + drivers/i2c/busses/i2c-rcar.c | 2 +- + drivers/i2c/i2c-dev.c | 25 +- + drivers/infiniband/Kconfig | 2 + + drivers/infiniband/core/Makefile | 12 +- + drivers/infiniband/core/addr.c | 226 ++- + drivers/infiniband/core/core_priv.h | 16 + + drivers/infiniband/core/device.c | 58 + + drivers/infiniband/core/mad.c | 13 +- + drivers/infiniband/core/multicast.c | 23 +- + drivers/infiniband/core/sa_query.c | 211 +- + drivers/infiniband/core/sysfs.c | 366 ++-- + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/cxgb3/cxio_hal.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 147 +- + drivers/infiniband/hw/cxgb4/provider.c | 58 +- + .../{staging/rdma => infiniband/hw}/hfi1/Kconfig | 0 + .../{staging/rdma => infiniband/hw}/hfi1/Makefile | 2 +- + .../rdma => infiniband/hw}/hfi1/affinity.c | 0 + .../rdma => infiniband/hw}/hfi1/affinity.h | 0 + .../{staging/rdma => infiniband/hw}/hfi1/aspm.h | 0 + .../{staging/rdma => infiniband/hw}/hfi1/chip.c | 41 +- + .../{staging/rdma => infiniband/hw}/hfi1/chip.h | 6 + + .../rdma => infiniband/hw}/hfi1/chip_registers.h | 0 + .../{staging/rdma => infiniband/hw}/hfi1/common.h | 5 +- + .../{staging/rdma => infiniband/hw}/hfi1/debugfs.c | 0 + .../{staging/rdma => infiniband/hw}/hfi1/debugfs.h | 0 + .../{staging/rdma => infiniband/hw}/hfi1/device.c | 18 +- + .../{staging/rdma => infiniband/hw}/hfi1/device.h | 3 +- + drivers/{staging/rdma => infiniband/hw}/hfi1/dma.c | 0 + .../{staging/rdma => infiniband/hw}/hfi1/driver.c | 2 +- + .../{staging/rdma => infiniband/hw}/hfi1/efivar.c | 0 + .../{staging/rdma => infiniband/hw}/hfi1/efivar.h | 0 + drivers/infiniband/hw/hfi1/eprom.c | 102 + + .../{staging/rdma => infiniband/hw}/hfi1/eprom.h | 0 + .../rdma => infiniband/hw}/hfi1/file_ops.c | 549 ++---- + .../rdma => infiniband/hw}/hfi1/firmware.c | 0 + drivers/{staging/rdma => infiniband/hw}/hfi1/hfi.h | 7 +- + .../{staging/rdma => infiniband/hw}/hfi1/init.c | 22 +- + .../{staging/rdma => infiniband/hw}/hfi1/intr.c | 0 + .../{staging/rdma => infiniband/hw}/hfi1/iowait.h | 0 + drivers/{staging/rdma => infiniband/hw}/hfi1/mad.c | 99 +- + drivers/{staging/rdma => infiniband/hw}/hfi1/mad.h | 0 + .../{staging/rdma => infiniband/hw}/hfi1/mmu_rb.c | 22 +- + .../{staging/rdma => infiniband/hw}/hfi1/mmu_rb.h | 0 + .../rdma => infiniband/hw}/hfi1/opa_compat.h | 0 + .../{staging/rdma => infiniband/hw}/hfi1/pcie.c | 0 + drivers/{staging/rdma => infiniband/hw}/hfi1/pio.c | 3 +- + drivers/{staging/rdma => infiniband/hw}/hfi1/pio.h | 8 +- + .../rdma => infiniband/hw}/hfi1/pio_copy.c | 0 + .../rdma => infiniband/hw}/hfi1/platform.c | 27 +- + .../rdma => infiniband/hw}/hfi1/platform.h | 1 + + drivers/{staging/rdma => infiniband/hw}/hfi1/qp.c | 9 +- + drivers/{staging/rdma => infiniband/hw}/hfi1/qp.h | 0 + .../{staging/rdma => infiniband/hw}/hfi1/qsfp.c | 0 + .../{staging/rdma => infiniband/hw}/hfi1/qsfp.h | 0 + drivers/{staging/rdma => infiniband/hw}/hfi1/rc.c | 0 + drivers/{staging/rdma => infiniband/hw}/hfi1/ruc.c | 0 + .../{staging/rdma => infiniband/hw}/hfi1/sdma.c | 4 +- + .../{staging/rdma => infiniband/hw}/hfi1/sdma.h | 0 + .../rdma => infiniband/hw}/hfi1/sdma_txreq.h | 0 + .../{staging/rdma => infiniband/hw}/hfi1/sysfs.c | 4 +- + .../{staging/rdma => infiniband/hw}/hfi1/trace.c | 8 + + .../{staging/rdma => infiniband/hw}/hfi1/trace.h | 5 +- + .../{staging/rdma => infiniband/hw}/hfi1/twsi.c | 0 + .../{staging/rdma => infiniband/hw}/hfi1/twsi.h | 0 + drivers/{staging/rdma => infiniband/hw}/hfi1/uc.c | 0 + drivers/{staging/rdma => infiniband/hw}/hfi1/ud.c | 0 + .../rdma => infiniband/hw}/hfi1/user_exp_rcv.c | 0 + .../rdma => infiniband/hw}/hfi1/user_exp_rcv.h | 0 + .../rdma => infiniband/hw}/hfi1/user_pages.c | 0 + .../rdma => infiniband/hw}/hfi1/user_sdma.c | 18 +- + .../rdma => infiniband/hw}/hfi1/user_sdma.h | 0 + .../{staging/rdma => infiniband/hw}/hfi1/verbs.c | 4 +- + .../{staging/rdma => infiniband/hw}/hfi1/verbs.h | 1 + + .../rdma => infiniband/hw}/hfi1/verbs_txreq.c | 0 + .../rdma => infiniband/hw}/hfi1/verbs_txreq.h | 0 + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 145 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 15 - + drivers/infiniband/hw/qib/qib_mad.c | 6 +- + drivers/infiniband/hw/qib/qib_verbs.h | 1 + + drivers/infiniband/sw/rdmavt/cq.c | 1 + + drivers/infiniband/sw/rdmavt/mr.c | 4 +- + drivers/infiniband/sw/rdmavt/qp.c | 30 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 4 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 109 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 140 ++ + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 48 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 + + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 + + drivers/infiniband/ulp/isert/ib_isert.c | 11 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 11 +- + drivers/input/joystick/xpad.c | 18 +- + drivers/input/misc/pwm-beeper.c | 69 +- + drivers/input/misc/uinput.c | 6 + + drivers/iommu/arm-smmu-v3.c | 18 +- + drivers/iommu/arm-smmu.c | 8 +- + drivers/iommu/intel-iommu.c | 318 ++- + drivers/iommu/iova.c | 417 +++- + drivers/irqchip/irq-clps711x.c | 2 +- + drivers/irqchip/irq-gic.c | 2 +- + drivers/irqchip/irq-hip04.c | 2 +- + drivers/irqchip/irq-mips-gic.c | 10 +- + drivers/irqchip/spear-shirq.c | 2 +- + drivers/md/bcache/alloc.c | 2 - + drivers/md/bcache/btree.c | 2 - + drivers/md/bcache/writeback.c | 3 - + drivers/media/i2c/adp1653.c | 10 +- + drivers/media/platform/s5p-tv/mixer_drv.c | 2 +- + drivers/media/usb/dvb-usb-v2/af9015.c | 2 + + drivers/mfd/twl4030-irq.c | 2 +- + drivers/mmc/core/mmc.c | 4 +- + drivers/mmc/host/dw_mmc.c | 6 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- + drivers/mmc/host/sdhci-of-at91.c | 2 +- + drivers/mmc/host/sdhci.c | 4 +- + drivers/mtd/nand/atmel_nand.c | 35 +- + drivers/mtd/nand/atmel_nand_nfc.h | 3 +- + drivers/mtd/ubi/build.c | 5 + + drivers/mtd/ubi/debug.c | 3 +- + drivers/mtd/ubi/eba.c | 47 +- + drivers/mtd/ubi/fastmap.c | 1 + + drivers/mtd/ubi/kapi.c | 2 +- + drivers/mtd/ubi/ubi.h | 2 + + drivers/mtd/ubi/vmt.c | 2 +- + drivers/mtd/ubi/wl.c | 2 +- + drivers/net/ethernet/freescale/fman/fman.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_muram.c | 4 +- + drivers/net/ethernet/freescale/fman/fman_muram.h | 4 +- + drivers/net/wireless/ti/wlcore/spi.c | 4 +- + drivers/nvdimm/pmem.c | 10 +- + drivers/nvme/host/core.c | 37 + + drivers/nvme/host/nvme.h | 1 + + drivers/nvme/host/pci.c | 23 +- + drivers/nvmem/core.c | 22 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 10 +- + drivers/platform/chrome/Kconfig | 10 + + drivers/platform/chrome/Makefile | 15 +- + drivers/platform/chrome/chromeos_laptop.c | 22 +- + drivers/platform/chrome/chromeos_pstore.c | 55 +- + drivers/platform/chrome/cros_ec_dev.c | 7 + + drivers/platform/chrome/cros_ec_lightbar.c | 10 +- + drivers/platform/chrome/cros_ec_proto.c | 4 +- + drivers/platform/chrome/cros_kbd_led_backlight.c | 122 ++ + drivers/platform/x86/Kconfig | 12 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/asus-laptop.c | 15 +- + drivers/platform/x86/asus-wmi.c | 5 + + drivers/platform/x86/dell-rbtn.c | 56 + + drivers/platform/x86/fujitsu-laptop.c | 63 +- + drivers/platform/x86/ideapad-laptop.c | 19 +- + drivers/platform/x86/intel_menlow.c | 49 +- + drivers/platform/x86/intel_pmc_core.c | 200 ++ + drivers/platform/x86/intel_pmc_core.h | 51 + + drivers/platform/x86/intel_telemetry_core.c | 6 +- + drivers/platform/x86/intel_telemetry_pltdrv.c | 2 +- + drivers/platform/x86/sony-laptop.c | 3 + + drivers/platform/x86/surfacepro3_button.c | 9 +- + drivers/platform/x86/thinkpad_acpi.c | 43 +- + drivers/s390/block/dcssblk.c | 4 +- + drivers/scsi/aacraid/aacraid.h | 5 + + drivers/scsi/aacraid/linit.c | 11 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +- + drivers/scsi/qla2xxx/Kconfig | 9 + + drivers/scsi/qla2xxx/qla_target.c | 56 +- + drivers/scsi/qla2xxx/qla_target.h | 4 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 59 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 1 + + drivers/scsi/scsi_lib.c | 7 +- + drivers/scsi/sd.c | 9 +- + drivers/spi/spi-ep93xx.c | 2 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + .../staging/lustre/lustre/llite/llite_internal.h | 4 +- + drivers/staging/lustre/lustre/llite/xattr.c | 6 +- + drivers/staging/rdma/Kconfig | 27 - + drivers/staging/rdma/Makefile | 2 - + drivers/staging/rdma/hfi1/TODO | 6 - + drivers/staging/rdma/hfi1/diag.c | 1925 ------------------ + drivers/staging/rdma/hfi1/eprom.c | 471 ----- + drivers/target/iscsi/Kconfig | 2 + + drivers/target/iscsi/Makefile | 1 + + drivers/target/iscsi/cxgbit/Kconfig | 7 + + drivers/target/iscsi/cxgbit/Makefile | 6 + + drivers/target/iscsi/cxgbit/cxgbit.h | 353 ++++ + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 2086 ++++++++++++++++++++ + drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 325 +++ + drivers/target/iscsi/cxgbit/cxgbit_lro.h | 72 + + drivers/target/iscsi/cxgbit/cxgbit_main.c | 702 +++++++ + drivers/target/iscsi/cxgbit/cxgbit_target.c | 1561 +++++++++++++++ + drivers/target/iscsi/iscsi_target.c | 701 +++---- + drivers/target/iscsi/iscsi_target_configfs.c | 158 +- + drivers/target/iscsi/iscsi_target_datain_values.c | 1 + + drivers/target/iscsi/iscsi_target_erl0.c | 2 +- + drivers/target/iscsi/iscsi_target_login.c | 17 +- + drivers/target/iscsi/iscsi_target_nego.c | 19 +- + drivers/target/iscsi/iscsi_target_parameters.c | 1 + + drivers/target/iscsi/iscsi_target_util.c | 5 + + drivers/target/loopback/tcm_loop.c | 12 - + drivers/target/sbp/sbp_target.c | 12 - + drivers/target/target_core_alua.c | 6 +- + drivers/target/target_core_configfs.c | 70 +- + drivers/target/target_core_internal.h | 6 + + drivers/target/target_core_pr.c | 2 +- + drivers/target/target_core_rd.c | 4 - + drivers/target/target_core_tpg.c | 83 +- + drivers/target/target_core_transport.c | 26 +- + drivers/target/tcm_fc/tcm_fc.h | 1 - + drivers/target/tcm_fc/tfc_conf.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 12 - + drivers/tty/serial/amba-pl011.c | 2 +- + drivers/tty/serial/sprd_serial.c | 2 +- + drivers/usb/gadget/function/f_tcm.c | 11 - + drivers/vhost/scsi.c | 12 - + drivers/video/fbdev/da8xx-fb.c | 4 +- + drivers/xen/xen-scsiback.c | 11 - + fs/9p/acl.c | 6 +- + fs/9p/xattr.c | 5 +- + fs/Kconfig | 1 + + fs/affs/super.c | 5 +- + fs/afs/write.c | 4 - + fs/bad_inode.c | 4 +- + fs/binfmt_aout.c | 19 +- + fs/binfmt_elf.c | 11 +- + fs/binfmt_flat.c | 6 +- + fs/block_dev.c | 114 +- + fs/btrfs/backref.c | 2 +- + fs/btrfs/btrfs_inode.h | 2 +- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/ctree.c | 14 +- + fs/btrfs/ctree.h | 6 +- + fs/btrfs/delayed-ref.h | 2 +- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/disk-io.c | 14 +- + fs/btrfs/extent-tree.c | 48 +- + fs/btrfs/extent_io.c | 94 +- + fs/btrfs/extent_io.h | 34 +- + fs/btrfs/extent_map.c | 2 +- + fs/btrfs/file-item.c | 2 +- + fs/btrfs/file.c | 31 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/free-space-cache.h | 2 +- + fs/btrfs/inode.c | 27 +- + fs/btrfs/ioctl.c | 30 +- + fs/btrfs/ordered-data.h | 2 +- + fs/btrfs/qgroup.c | 24 +- + fs/btrfs/raid56.c | 6 +- + fs/btrfs/relocation.c | 19 +- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/scrub.c | 11 +- + fs/btrfs/send.c | 6 +- + fs/btrfs/struct-funcs.c | 2 +- + fs/btrfs/super.c | 8 +- + fs/btrfs/tests/extent-io-tests.c | 10 +- + fs/btrfs/tests/free-space-tests.c | 7 +- + fs/btrfs/tests/inode-tests.c | 2 +- + fs/btrfs/tests/qgroup-tests.c | 2 +- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/transaction.h | 2 +- + fs/btrfs/tree-log.c | 10 +- + fs/btrfs/ulist.c | 2 +- + fs/btrfs/volumes.c | 12 +- + fs/btrfs/xattr.c | 12 +- + fs/ceph/xattr.c | 7 +- + fs/cifs/xattr.c | 9 +- + fs/dax.c | 845 ++++---- + fs/dcache.c | 3 +- + fs/direct-io.c | 14 +- + fs/ecryptfs/crypto.c | 9 +- + fs/ecryptfs/ecryptfs_kernel.h | 4 +- + fs/ecryptfs/inode.c | 7 +- + fs/ecryptfs/mmap.c | 3 +- + fs/ext2/file.c | 4 +- + fs/ext2/inode.c | 12 +- + fs/ext2/super.c | 11 +- + fs/ext2/xattr_security.c | 7 +- + fs/ext2/xattr_trusted.c | 7 +- + fs/ext2/xattr_user.c | 9 +- + fs/ext4/file.c | 4 +- + fs/ext4/super.c | 11 +- + fs/ext4/xattr_security.c | 7 +- + fs/ext4/xattr_trusted.c | 7 +- + fs/ext4/xattr_user.c | 9 +- + fs/f2fs/xattr.c | 12 +- + fs/fuse/dir.c | 6 +- + fs/gfs2/dir.c | 15 +- + fs/gfs2/xattr.c | 6 +- + fs/hfs/attr.c | 6 +- + fs/hfs/hfs_fs.h | 2 +- + fs/hfsplus/xattr.c | 12 +- + fs/hfsplus/xattr.h | 2 +- + fs/hfsplus/xattr_security.c | 7 +- + fs/hfsplus/xattr_trusted.c | 7 +- + fs/hfsplus/xattr_user.c | 7 +- + fs/hpfs/super.c | 42 +- + fs/jffs2/security.c | 7 +- + fs/jffs2/xattr_trusted.c | 7 +- + fs/jffs2/xattr_user.c | 7 +- + fs/jfs/xattr.c | 14 +- + fs/kernfs/inode.c | 11 +- + fs/kernfs/kernfs-internal.h | 3 +- + fs/libfs.c | 5 +- + fs/namei.c | 162 +- + fs/nfs/nfs4proc.c | 19 +- + fs/nfs/nfs4state.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 180 +- + fs/ocfs2/cluster/tcp_internal.h | 5 +- + fs/ocfs2/inode.c | 7 +- + fs/ocfs2/xattr.c | 23 +- + fs/orangefs/xattr.c | 10 +- + fs/overlayfs/copy_up.c | 26 +- + fs/overlayfs/dir.c | 67 +- + fs/overlayfs/inode.c | 5 +- + fs/overlayfs/overlayfs.h | 6 +- + fs/overlayfs/readdir.c | 18 +- + fs/overlayfs/super.c | 37 +- + fs/posix_acl.c | 6 +- + fs/readdir.c | 12 +- + fs/reiserfs/xattr_security.c | 9 +- + fs/reiserfs/xattr_trusted.c | 9 +- + fs/reiserfs/xattr_user.c | 9 +- + fs/ubifs/debug.c | 2 +- + fs/ubifs/xattr.c | 7 +- + fs/xattr.c | 10 +- + fs/xfs/xfs_bmap_util.c | 15 +- + fs/xfs/xfs_file.c | 7 +- + fs/xfs/xfs_super.c | 12 +- + fs/xfs/xfs_xattr.c | 9 +- + include/drm/drm_dp_dual_mode_helper.h | 92 + + include/kvm/arm_arch_timer.h | 11 +- + include/kvm/arm_vgic.h | 20 +- + include/kvm/vgic/vgic.h | 246 +++ + include/linux/blkdev.h | 15 +- + include/linux/dax.h | 41 +- + include/linux/dcache.h | 27 +- + include/linux/err.h | 2 +- + include/linux/export.h | 33 +- + include/linux/fs.h | 4 +- + include/linux/hash.h | 108 +- + include/linux/iova.h | 23 +- + include/linux/irqchip/arm-gic-v3.h | 6 + + include/linux/irqchip/arm-gic.h | 2 + + include/linux/kvm_host.h | 7 + + include/linux/memory_hotplug.h | 2 +- + include/linux/mfd/cros_ec.h | 6 +- + include/linux/mfd/twl6040.h | 1 + + include/linux/mm.h | 9 +- + include/linux/mm_types.h | 2 + + include/linux/platform_data/at24.h | 2 +- + include/linux/rwsem.h | 2 + + include/linux/sched.h | 4 +- + include/linux/seqlock.h | 4 +- + include/linux/slub_def.h | 16 - + include/linux/stringhash.h | 76 + + include/linux/sunrpc/svcauth.h | 40 +- + include/linux/xattr.h | 7 +- + include/rdma/ib_mad.h | 60 +- + include/rdma/ib_pack.h | 5 + + include/rdma/ib_sa.h | 12 + + include/rdma/ib_verbs.h | 126 +- + include/rdma/rdma_vt.h | 13 +- + include/rdma/rdmavt_qp.h | 5 +- + include/target/iscsi/iscsi_target_core.h | 27 + + include/target/iscsi/iscsi_transport.h | 41 + + include/target/target_core_base.h | 2 - + include/target/target_core_fabric.h | 6 - + include/trace/events/kvm.h | 6 +- + include/uapi/linux/nvme_ioctl.h | 1 + + include/uapi/rdma/hfi/hfi1_user.h | 80 +- + include/uapi/rdma/rdma_netlink.h | 10 + + include/uapi/sound/asoc.h | 44 +- + include/video/imx-ipu-v3.h | 2 + + init/Kconfig | 29 + + init/main.c | 3 +- + kernel/fork.c | 2 + + kernel/gcov/Kconfig | 1 + + kernel/locking/rwsem.c | 16 + + kernel/pid.c | 2 +- + lib/Kconfig.debug | 11 + + lib/Makefile | 1 + + lib/dma-debug.c | 2 +- + lib/test_hash.c | 250 +++ + mm/Kconfig | 3 +- + mm/cma.c | 7 +- + mm/filemap.c | 30 +- + mm/kasan/kasan.h | 1 - + mm/memcontrol.c | 41 +- + mm/memory.c | 40 +- + mm/memory_hotplug.c | 4 +- + mm/mmap.c | 16 +- + mm/nommu.c | 2 +- + mm/oom_kill.c | 32 +- + mm/page_ext.c | 4 +- + mm/rmap.c | 2 + + mm/shmem.c | 7 +- + mm/truncate.c | 62 +- + mm/zsmalloc.c | 35 +- + net/9p/client.c | 8 +- + scripts/Kbuild.include | 45 +- + scripts/Makefile.build | 44 +- + scripts/Makefile.extrawarn | 1 + + scripts/Makefile.lib | 8 +- + scripts/adjust_autoksyms.sh | 101 + + scripts/basic/fixdep.c | 61 +- + scripts/coccicheck | 2 +- + scripts/coccinelle/api/setup_timer.cocci | 4 +- + scripts/coccinelle/misc/compare_const_fl.cocci | 171 -- + scripts/genksyms/genksyms.c | 3 + + scripts/kconfig/confdata.c | 4 +- + scripts/kconfig/symbol.c | 14 + + scripts/package/Makefile | 4 +- + scripts/package/builddeb | 5 +- + scripts/package/mkspec | 5 + + security/smack/smack_lsm.c | 2 +- + sound/pci/hda/patch_realtek.c | 16 +- + sound/soc/codecs/Kconfig | 38 +- + sound/soc/codecs/Makefile | 11 +- + sound/soc/codecs/ak4642.c | 3 + + sound/soc/codecs/max98371.c | 441 +++++ + sound/soc/codecs/max98371.h | 67 + + sound/soc/codecs/rt298.c | 51 +- + sound/soc/codecs/rt298.h | 2 + + sound/soc/codecs/rt5677.c | 24 +- + sound/soc/codecs/tas571x.c | 141 +- + sound/soc/codecs/tas571x.h | 22 + + sound/soc/codecs/tas5720.c | 620 ++++++ + sound/soc/codecs/tas5720.h | 90 + + sound/soc/codecs/tlv320aic31xx.c | 10 + + sound/soc/codecs/tlv320aic32x4-i2c.c | 74 + + sound/soc/codecs/tlv320aic32x4-spi.c | 76 + + sound/soc/codecs/tlv320aic32x4.c | 279 ++- + sound/soc/codecs/tlv320aic32x4.h | 7 + + sound/soc/codecs/twl6040.c | 16 +- + sound/soc/codecs/wm8962.c | 9 +- + sound/soc/codecs/wm8962.h | 6 +- + sound/soc/generic/simple-card.c | 1 + + sound/soc/kirkwood/Kconfig | 1 + + sound/soc/mediatek/Kconfig | 1 + + sound/soc/mediatek/mt8173-rt5650-rt5676.c | 27 + + sound/soc/mediatek/mt8173-rt5650.c | 50 +- + sound/soc/mediatek/mtk-afe-pcm.c | 2 + + sound/soc/omap/mcbsp.c | 8 + + sound/soc/omap/omap-pcm.c | 2 + + sound/soc/pxa/brownstone.c | 1 + + sound/soc/pxa/mioa701_wm9713.c | 1 + + sound/soc/pxa/mmp-pcm.c | 1 + + sound/soc/pxa/mmp-sspa.c | 1 + + sound/soc/pxa/palm27x.c | 1 + + sound/soc/pxa/pxa-ssp.c | 1 + + sound/soc/pxa/pxa2xx-ac97.c | 1 + + sound/soc/pxa/pxa2xx-pcm.c | 1 + + sound/soc/qcom/lpass-platform.c | 8 +- + sound/soc/sh/rcar/adg.c | 8 +- + sound/soc/sh/rcar/dma.c | 12 +- + sound/soc/sh/rcar/rsnd.h | 13 +- + sound/soc/sh/rcar/src.c | 4 + + sound/soc/soc-topology.c | 48 +- + sound/soc/sti/sti_uniperif.c | 144 +- + sound/soc/sti/uniperif.h | 220 ++- + sound/soc/sti/uniperif_player.c | 182 +- + sound/soc/sti/uniperif_reader.c | 229 ++- + tools/Makefile | 6 +- + tools/build/Makefile.build | 8 +- + tools/kvm/kvm_stat/Makefile | 41 + + tools/kvm/kvm_stat/kvm_stat | 1127 +++++++++++ + tools/kvm/kvm_stat/kvm_stat.txt | 63 + + virt/kvm/arm/arch_timer.c | 68 +- + virt/kvm/arm/hyp/timer-sr.c | 5 +- + virt/kvm/arm/hyp/vgic-v2-sr.c | 17 +- + virt/kvm/arm/pmu.c | 25 +- + virt/kvm/arm/vgic-v2.c | 4 +- + virt/kvm/arm/vgic-v3.c | 8 +- + virt/kvm/arm/vgic.c | 86 +- + virt/kvm/arm/vgic/vgic-init.c | 452 +++++ + virt/kvm/arm/vgic/vgic-irqfd.c | 52 + + virt/kvm/arm/vgic/vgic-kvm-device.c | 431 ++++ + virt/kvm/arm/vgic/vgic-mmio-v2.c | 446 +++++ + virt/kvm/arm/vgic/vgic-mmio-v3.c | 455 +++++ + virt/kvm/arm/vgic/vgic-mmio.c | 526 +++++ + virt/kvm/arm/vgic/vgic-mmio.h | 150 ++ + virt/kvm/arm/vgic/vgic-v2.c | 352 ++++ + virt/kvm/arm/vgic/vgic-v3.c | 330 ++++ + virt/kvm/arm/vgic/vgic.c | 619 ++++++ + virt/kvm/arm/vgic/vgic.h | 131 ++ + virt/kvm/kvm_main.c | 187 +- + 683 files changed, 22507 insertions(+), 7601 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/max98371.txt + create mode 100644 Documentation/devicetree/bindings/sound/tas5720.txt + create mode 100644 Documentation/scsi/tcm_qla2xxx.txt + create mode 100644 arch/h8300/include/asm/hash.h + create mode 100644 arch/m68k/include/asm/hash.h + create mode 100644 arch/microblaze/include/asm/hash.h + create mode 100644 arch/x86/include/asm/pmc_core.h + create mode 100644 drivers/gpu/drm/drm_dp_dual_mode_helper.c + rename drivers/{staging/rdma => infiniband/hw}/hfi1/Kconfig (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/Makefile (88%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/affinity.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/affinity.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/aspm.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/chip.c (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/chip.h (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/chip_registers.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/common.h (98%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/debugfs.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/debugfs.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/device.c (94%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/device.h (97%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/dma.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/driver.c (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/efivar.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/efivar.h (100%) + create mode 100644 drivers/infiniband/hw/hfi1/eprom.c + rename drivers/{staging/rdma => infiniband/hw}/hfi1/eprom.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/file_ops.c (78%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/firmware.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/hfi.h (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/init.c (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/intr.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/iowait.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/mad.c (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/mad.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/mmu_rb.c (95%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/mmu_rb.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/opa_compat.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/pcie.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/pio.c (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/pio.h (98%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/pio_copy.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/platform.c (98%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/platform.h (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/qp.c (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/qp.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/qsfp.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/qsfp.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/rc.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/ruc.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/sdma.c (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/sdma.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/sdma_txreq.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/sysfs.c (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/trace.c (97%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/trace.h (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/twsi.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/twsi.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/uc.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/ud.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/user_exp_rcv.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/user_exp_rcv.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/user_pages.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/user_sdma.c (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/user_sdma.h (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/verbs.c (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/verbs.h (99%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/verbs_txreq.c (100%) + rename drivers/{staging/rdma => infiniband/hw}/hfi1/verbs_txreq.h (100%) + create mode 100644 drivers/platform/chrome/cros_kbd_led_backlight.c + create mode 100644 drivers/platform/x86/intel_pmc_core.c + create mode 100644 drivers/platform/x86/intel_pmc_core.h + delete mode 100644 drivers/staging/rdma/Kconfig + delete mode 100644 drivers/staging/rdma/Makefile + delete mode 100644 drivers/staging/rdma/hfi1/TODO + delete mode 100644 drivers/staging/rdma/hfi1/diag.c + delete mode 100644 drivers/staging/rdma/hfi1/eprom.c + create mode 100644 drivers/target/iscsi/cxgbit/Kconfig + create mode 100644 drivers/target/iscsi/cxgbit/Makefile + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit.h + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_cm.c + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_ddp.c + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_lro.h + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_main.c + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_target.c + create mode 100644 include/drm/drm_dp_dual_mode_helper.h + create mode 100644 include/kvm/vgic/vgic.h + create mode 100644 include/linux/stringhash.h + create mode 100644 lib/test_hash.c + create mode 100755 scripts/adjust_autoksyms.sh + delete mode 100644 scripts/coccinelle/misc/compare_const_fl.cocci + create mode 100644 sound/soc/codecs/max98371.c + create mode 100644 sound/soc/codecs/max98371.h + create mode 100644 sound/soc/codecs/tas5720.c + create mode 100644 sound/soc/codecs/tas5720.h + create mode 100644 sound/soc/codecs/tlv320aic32x4-i2c.c + create mode 100644 sound/soc/codecs/tlv320aic32x4-spi.c + create mode 100644 tools/kvm/kvm_stat/Makefile + create mode 100755 tools/kvm/kvm_stat/kvm_stat + create mode 100644 tools/kvm/kvm_stat/kvm_stat.txt + create mode 100644 virt/kvm/arm/vgic/vgic-init.c + create mode 100644 virt/kvm/arm/vgic/vgic-irqfd.c + create mode 100644 virt/kvm/arm/vgic/vgic-kvm-device.c + create mode 100644 virt/kvm/arm/vgic/vgic-mmio-v2.c + create mode 100644 virt/kvm/arm/vgic/vgic-mmio-v3.c + create mode 100644 virt/kvm/arm/vgic/vgic-mmio.c + create mode 100644 virt/kvm/arm/vgic/vgic-mmio.h + create mode 100644 virt/kvm/arm/vgic/vgic-v2.c + create mode 100644 virt/kvm/arm/vgic/vgic-v3.c + create mode 100644 virt/kvm/arm/vgic/vgic.c + create mode 100644 virt/kvm/arm/vgic/vgic.h +Merging fixes/master (e0714ec4f9ef nfs: fix anonymous member initializer build failure with older compilers) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>) +$ 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 powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask()) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (9ea46abe2255 sparc64: Take ctx_alloc_lock properly in hugetlb_setup().) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/mm/init_64.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) +Merging net/master (b7e7ad611e24 Merge branch 'qed-fixes') +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/dsa/dsa.txt | 17 ++-- + MAINTAINERS | 1 + + drivers/net/ethernet/arc/emac_mdio.c | 2 +- + drivers/net/ethernet/atheros/alx/alx.h | 4 + + drivers/net/ethernet/atheros/alx/main.c | 48 +++++++++- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 11 --- + drivers/net/ethernet/marvell/mvneta_bm.c | 1 + + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 17 ++-- + drivers/net/ethernet/mellanox/mlx4/en_port.c | 18 ++-- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 52 +++++++--- + drivers/net/ethernet/qlogic/qed/qed_main.c | 18 ++-- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 5 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 26 ++++- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 3 +- + drivers/net/ethernet/sfc/ef10.c | 16 ++++ + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- + drivers/net/team/team.c | 9 +- + drivers/net/usb/pegasus.c | 2 +- + drivers/ptp/ptp_chardev.c | 11 +-- + include/net/pkt_sched.h | 1 + + include/uapi/linux/ethtool.h | 11 ++- + include/uapi/linux/pkt_cls.h | 4 +- + kernel/bpf/inode.c | 1 - + net/atm/signaling.c | 2 +- + net/atm/svc.c | 4 +- + net/core/hwbm.c | 3 + + net/ipv4/af_inet.c | 8 ++ + net/ipv4/sysctl_net_ipv4.c | 4 - + net/ipv6/ip6_gre.c | 3 + + net/sched/act_police.c | 11 +++ + net/sched/sch_api.c | 4 + + net/sched/sch_htb.c | 13 +-- + net/sctp/sctp_diag.c | 3 + + net/tipc/netlink_compat.c | 111 ++++++++++++++++++---- + 38 files changed, 343 insertions(+), 121 deletions(-) +Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) +$ git merge ipsec/master +Already up-to-date. +Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (de26859dcf36 rtlwifi: Fix scheduling while atomic error from commit 49f86ec21c01) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 16 ++++++++++++++++ + drivers/net/wireless/realtek/rtlwifi/core.c | 6 +++--- + 2 files changed, 19 insertions(+), 3 deletions(-) +Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (eb4606e64a7d Merge tag 'asoc-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew)) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew)) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew)) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew)) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (f49cf3b8b4c8 Input: pwm-beeper - fix - scheduling while atomic) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (ab6a11a7c8ef crypto: ccp - Fix AES XTS error for request sizes above 4096) +$ git merge crypto-current/master +Auto-merging crypto/asymmetric_keys/Kconfig +Merge made by the 'recursive' strategy. + crypto/asymmetric_keys/Kconfig | 1 + + drivers/crypto/ccp/ccp-crypto-aes-xts.c | 17 ++++++++++++----- + drivers/crypto/omap-sham.c | 2 +- + 3 files changed, 14 insertions(+), 6 deletions(-) +Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (2dcd0af568b0 Linux 4.6) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (776d7f1694a7 arc: axs103_smp: Fix CPU frequency to 100MHz for dual-core) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (d6be64b09dd1 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int) +$ git merge bcm2835-dt/bcm2835-dt-next +Already up-to-date. +Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-soc/bcm2835-soc-next +Already up-to-date. +Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-drivers/bcm2835-drivers-next +Already up-to-date. +Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Already up-to-date. +Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (63b44471754b Merge branch 'imx/defconfig64' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/dm814x-clocks.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am57xx-idk-common.dtsi | 32 ++++++++++--------- + arch/arm/boot/dts/dm8148-evm.dts | 8 +++++ + arch/arm/boot/dts/dm8148-t410.dts | 9 ++++++ + arch/arm/boot/dts/dm814x-clocks.dtsi | 4 +-- + arch/arm/boot/dts/dra7.dtsi | 2 ++ + arch/arm/boot/dts/omap3-evm-37xx.dts | 2 +- + arch/arm/boot/dts/omap3-igep.dtsi | 1 + + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 11 +++++++ + arch/arm/boot/dts/omap3-n900.dts | 4 +-- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 6 ++-- + arch/arm/boot/dts/omap3-zoom3.dts | 6 ++-- + arch/arm/boot/dts/omap5-board-common.dtsi | 48 ++++++++++++++++++++++++++-- + arch/arm/boot/dts/omap5-igep0050.dts | 26 +++++++++++++++ + arch/arm/boot/dts/omap5-uevm.dts | 10 ++++++ + arch/arm/mach-omap2/Kconfig | 10 ++++++ + arch/arm/mach-omap2/omap-secure.h | 1 + + arch/arm/mach-omap2/omap-smp.c | 48 +++++++++++++++++++++++++--- + 17 files changed, 195 insertions(+), 33 deletions(-) +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (eb8e0105700b firmware: qcom_scm: Make core clock optional) +$ git merge qcom/for-next +Auto-merging arch/arm/boot/dts/qcom-apq8064.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 28 ++ + arch/arm/boot/dts/qcom-apq8064.dtsi | 6 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 8 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 8 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 8 + + drivers/firmware/qcom_scm-32.c | 360 +++++++++++---------- + drivers/firmware/qcom_scm-64.c | 291 ++++++++++++++++- + drivers/firmware/qcom_scm.c | 307 +++++++++++++++++- + drivers/firmware/qcom_scm.h | 45 ++- + include/linux/qcom_scm.h | 8 + + 10 files changed, 876 insertions(+), 193 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt +Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (a108aca0c77f Merge branch 'v4.7-clk/fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + drivers/clk/rockchip/clk-mmc-phase.c | 12 +----------- + drivers/clk/rockchip/clk-rk3399.c | 6 ++++-- + 2 files changed, 5 insertions(+), 13 deletions(-) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (35e691cf5165 Merge branch 'fixes-v4.7' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/plat-samsung/devs.c | 2 +- + 4 files changed, 3 insertions(+), 2 deletions(-) +Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra30-beaver.dts | 39 ++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 15 deletions(-) +Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 84bf4911d073] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON) +$ git merge h8300/h8300-next +Already up-to-date. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (1a695a905c18 Linux 4.7-rc1) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (592ddeeff8cb metag: Fix typos) +$ git merge metag/for-next +Auto-merging arch/metag/include/asm/metag_regs.h +Merge made by the 'recursive' strategy. + arch/metag/include/asm/metag_mem.h | 2 +- + arch/metag/include/asm/metag_regs.h | 2 +- + arch/metag/kernel/cachepart.c | 2 +- + arch/metag/lib/divsi3.S | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (b02b1fbdd338 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (57f3ea7a3d6e parisc: Fix backtrace on PA-RISC) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/kernel/unwind.c | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) +Merging powerpc/next (138a076496e6 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (5e19a42ac6d9 s390/cpuinfo: show dynamic and static cpu mhz) +$ git merge s390/features +Auto-merging arch/s390/include/asm/pgtable.h +Merge made by the 'recursive' strategy. + arch/s390/configs/default_defconfig | 44 ++++-- + arch/s390/configs/gcov_defconfig | 34 +++-- + arch/s390/configs/performance_defconfig | 36 +++-- + arch/s390/configs/zfcpdump_defconfig | 4 +- + arch/s390/defconfig | 44 +++--- + arch/s390/include/asm/jump_label.h | 1 + + arch/s390/include/asm/pgtable.h | 199 ++++++++++++++++++++---- + arch/s390/include/asm/processor.h | 17 ++- + arch/s390/include/asm/tlbflush.h | 15 +- + arch/s390/kernel/cache.c | 7 +- + arch/s390/kernel/processor.c | 113 ++++++++++---- + arch/s390/kernel/setup.c | 1 + + arch/s390/mm/dump_pagetables.c | 2 +- + arch/s390/mm/pageattr.c | 263 ++++++++++++++++++++++++++++---- + arch/s390/mm/vmem.c | 68 ++++----- + arch/s390/net/bpf_jit.h | 4 +- + arch/s390/net/bpf_jit_comp.c | 4 +- + drivers/s390/char/keyboard.c | 15 +- + drivers/s390/char/sclp_config.c | 2 +- + 19 files changed, 647 insertions(+), 226 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 (bdf03e59f8c1 Fix typo) +$ git merge tile/master +Already up-to-date. +Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/include/asm/mmu_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (33e66059b7ad Merge branch 'for-next-next-4.7-20160527' into for-next-20160527) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 15 +- + fs/btrfs/delayed-inode.c | 95 +++--- + fs/btrfs/delayed-inode.h | 10 +- + fs/btrfs/extent-tree.c | 726 +++++++++++++++++++++++++++---------------- + fs/btrfs/file.c | 48 +-- + fs/btrfs/inode.c | 26 +- + fs/btrfs/relocation.c | 45 +-- + include/trace/events/btrfs.h | 139 ++++++++- + 8 files changed, 732 insertions(+), 372 deletions(-) +Merging ceph/master (e536030934ae ceph: fix wake_up_session_cb()) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (3bdc426e2497 cifs: dynamic allocation of ntlmssp blob) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 3 +++ + fs/cifs/cifsglob.h | 1 + + fs/cifs/file.c | 14 +++++++--- + fs/cifs/ntlmssp.h | 2 +- + fs/cifs/sess.c | 78 ++++++++++++++++++++++++++++++------------------------ + fs/cifs/smb2pdu.c | 10 ++----- + 6 files changed, 61 insertions(+), 47 deletions(-) +Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (b9d8905e4a75 reiserfs: check kstrdup failure) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/reiserfs/super.c | 9 +++++++-- + fs/udf/partition.c | 13 +++++++++---- + fs/udf/super.c | 22 ++++++++++++---------- + fs/udf/udf_sb.h | 5 +++++ + 4 files changed, 33 insertions(+), 16 deletions(-) +Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (f6c658df6385 Merge tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (29567292c0b5 Merge tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip) +$ git merge gfs2/for-next +Already up-to-date. +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (1a695a905c18 Linux 4.7-rc1) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (9e62f931dd07 rpc: share one xps between all backchannels) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/clnt.c +Auto-merging include/linux/sunrpc/xprt.h +Auto-merging include/linux/sunrpc/clnt.h +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4callback.c | 18 +----------------- + include/linux/sunrpc/clnt.h | 2 -- + include/linux/sunrpc/svc_xprt.h | 1 + + include/linux/sunrpc/xprt.h | 1 + + net/sunrpc/clnt.c | 31 +++++++++++++++++++++++++------ + net/sunrpc/svc_xprt.c | 2 ++ + net/sunrpc/xprtsock.c | 1 + + 7 files changed, 31 insertions(+), 25 deletions(-) +Merging orangefs/for-next (2dcd0af568b0 Linux 4.6) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (7d43ba76af20 ovl: store ovl_entry in inode->i_private for all inodes) +$ git merge overlayfs/overlayfs-next +Auto-merging net/unix/af_unix.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/open.c +Auto-merging fs/namei.c +Auto-merging fs/dcache.c +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 4 +-- + Documentation/filesystems/vfs.txt | 39 +++++++++++++++--------- + fs/dcache.c | 3 -- + fs/namei.c | 2 +- + fs/open.c | 17 ++++++++--- + fs/overlayfs/inode.c | 63 ++++++++++----------------------------- + fs/overlayfs/overlayfs.h | 2 +- + fs/overlayfs/super.c | 18 ++++++++--- + include/linux/dcache.h | 35 ++++++++++++---------- + include/linux/fs.h | 2 +- + net/unix/af_unix.c | 6 ++-- + 11 files changed, 95 insertions(+), 96 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (1112018cefc5 ubifs: ubifs_dump_inode: Fix dumping field bulk_read) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (555b67e4e729 Merge branch 'xfs-4.7-inode-reclaim' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/inode.c | 2 +- + fs/orangefs/namei.c | 2 +- + fs/orangefs/orangefs-kernel.h | 6 +++--- + fs/orangefs/symlink.c | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) +Merging pci/next (31c4833c2879 Merge branch 'pci/pm' into next) +$ git merge pci/next +Auto-merging include/linux/pci.h +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/pci/bus.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 4 + + drivers/pci/bus.c | 1 + + drivers/pci/pci-driver.c | 5 +- + drivers/pci/pci-sysfs.c | 5 ++ + drivers/pci/pci.c | 175 ++++++++++++++++++++++++++++++++++++ + drivers/pci/pci.h | 11 +++ + drivers/pci/pcie/portdrv_core.c | 3 + + drivers/pci/pcie/portdrv_pci.c | 51 ++++++++++- + drivers/pci/probe.c | 9 ++ + drivers/pci/remove.c | 2 + + drivers/usb/host/xhci-pci.c | 2 +- + include/linux/pci.h | 3 + + 12 files changed, 263 insertions(+), 8 deletions(-) +Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (e6be18f6d62c i2c: dev: use after free in detach) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. +Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (d6a442df63b2 hwmon: (sch5636) trivial fix of spelling mistake on revision) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (fe520bf9f15b Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-core' and 'acpi-battery' into linux-next) +$ git merge pm/linux-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (88ac99063e6e Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Resolved 'drivers/thermal/rockchip_thermal.c' using previous resolution. +Resolved 'drivers/thermal/tango_thermal.c' using previous resolution. +Auto-merging drivers/thermal/tango_thermal.c +CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c +Auto-merging drivers/thermal/rockchip_thermal.c +CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5695ee69d3cb] Merge remote-tracking branch 'thermal-soc/next' +$ git diff -M --stat --summary HEAD^.. +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster()) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (628b5139c906 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. +Merging net-next/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus) +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (4f45bb3e8a8f mac80211_hwsim: Allow managing radios from non-initial namespaces) +$ git merge mac80211-next/master +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 97 +++++++++++++++++++++- + net/wireless/nl80211.c | 152 +++++++++++++++++----------------- + 2 files changed, 170 insertions(+), 79 deletions(-) +Merging rdma/for-next (7a226f9c32b0 staging/rdma: Remove the entire rdma subdirectory of staging) +$ git merge rdma/for-next +Already up-to-date. +Merging rdma-leon/rdma-next (2dcd0af568b0 Linux 4.6) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (2dcd0af568b0 Linux 4.6) +$ git merge rdma-leon-test/testing/rdma-next +Already up-to-date. +Merging mtd/master (507e617440d7 Documentation: dt: mtd: drop "soft_bch" from example) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (4956b14738be Merge v4.6 into MTD -next branch) +$ git merge l2-mtd/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem) +$ git merge nand/nand/next +Already up-to-date. +Merging crypto/master (256b1cfb9a34 crypto: qat - change the adf_ctl_stop_devices to void) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (92181d47ee74 headers_check: don't warn about c++ guards) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (157d2c7fad08 drm/i915: Stop automatically retiring requests after a GPU hang) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (14fe29e8ef44 drm/doc: Drop vblank_disable_allow wording) +$ git merge drm-misc/topic/drm-misc +Auto-merging MAINTAINERS +Auto-merging Documentation/DocBook/gpu.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 9 +---- + MAINTAINERS | 3 ++ + drivers/gpu/drm/drm_irq.c | 90 ++++++------------------------------------ + drivers/gpu/drm/drm_mm.c | 4 +- + include/drm/drmP.h | 14 +++---- + 5 files changed, 24 insertions(+), 96 deletions(-) +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (c466cbed691a drm: hdlcd: Revamp runtime power management) +$ git merge hdlcd/for-upstream/hdlcd +Auto-merging drivers/gpu/drm/arm/hdlcd_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/hdlcd_crtc.c | 23 +++++++++---------- + drivers/gpu/drm/arm/hdlcd_drv.c | 48 ++++++++++++++++++++++------------------ + drivers/gpu/drm/arm/hdlcd_drv.h | 3 +-- + 3 files changed, 39 insertions(+), 35 deletions(-) +Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.) +$ git merge drm-vc4/drm-vc4-next +Auto-merging drivers/gpu/drm/vc4/vc4_kms.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_crtc.c | 4 ++++ + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_kms.c | 16 ++++++++++++---- + 3 files changed, 17 insertions(+), 5 deletions(-) +Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/sun4i/Kconfig | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 ++-- + drivers/gpu/drm/sun4i/sun4i_dotclock.c | 8 ++++++-- + 3 files changed, 9 insertions(+), 5 deletions(-) +Merging kbuild/for-next (0c644e04ad1b Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (19b79de25660 Merge tag 'regmap-v4.7' into regmap-linus) +$ git merge regmap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (eb4606e64a7d Merge tag 'asoc-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (75b4622dcc18 Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/soc/sh/rcar/adg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging init/Kconfig +Auto-merging include/linux/module.h +Merge made by the 'recursive' strategy. + Documentation/module-signing.txt | 6 ++++++ + include/linux/module.h | 4 ++-- + init/Kconfig | 1 + + kernel/module.c | 29 +++++++++++++++++++++-------- + 4 files changed, 30 insertions(+), 10 deletions(-) +Merging input/next (48a2b783483b Input: add Raydium I2C touchscreen driver) +$ git merge input/next +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/input.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/atmel,captouch.txt | 36 + + .../devicetree/bindings/input/raydium_i2c_ts.txt | 20 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/input/input.c | 7 +- + drivers/input/keyboard/tc3589x-keypad.c | 2 +- + drivers/input/misc/Kconfig | 14 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/atmel_captouch.c | 290 +++++ + drivers/input/rmi4/rmi_f01.c | 22 +- + drivers/input/touchscreen/Kconfig | 28 +- + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/migor_ts.c | 6 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 1215 ++++++++++++++++++++ + drivers/input/touchscreen/surface3_spi.c | 427 +++++++ + 14 files changed, 2051 insertions(+), 20 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/atmel,captouch.txt + create mode 100644 Documentation/devicetree/bindings/input/raydium_i2c_ts.txt + create mode 100644 drivers/input/misc/atmel_captouch.c + create mode 100644 drivers/input/touchscreen/raydium_i2c_ts.c + create mode 100644 drivers/input/touchscreen/surface3_spi.c +Merging block/for-next (661806a31989 Merge branch 'for-4.7/core' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect) +$ git merge lightnvm/for-next +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (b8ef07be98b4 dm mpath: add optional "queue_mode" feature) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-table.c +Merge made by the 'recursive' strategy. + drivers/md/Makefile | 3 +- + drivers/md/dm-builtin.c | 2 +- + drivers/md/dm-core.h | 149 ++++++ + drivers/md/dm-crypt.c | 4 + + drivers/md/dm-io.c | 2 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-kcopyd.c | 2 +- + drivers/md/dm-log-writes.c | 6 +- + drivers/md/dm-mpath.c | 330 ++++++++++-- + drivers/md/dm-rq.c | 967 +++++++++++++++++++++++++++++++++++ + drivers/md/dm-rq.h | 64 +++ + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-sysfs.c | 3 +- + drivers/md/dm-table.c | 69 ++- + drivers/md/dm-target.c | 2 +- + drivers/md/dm.c | 1124 +---------------------------------------- + drivers/md/dm.h | 35 +- + include/linux/device-mapper.h | 16 + + 18 files changed, 1572 insertions(+), 1210 deletions(-) + create mode 100644 drivers/md/dm-core.h + create mode 100644 drivers/md/dm-rq.c + create mode 100644 drivers/md/dm-rq.h +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc-uh/next (fc24637efecf Merge branch 'fixes' into next) +$ git merge mmc-uh/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging md/for-next (412575807427 right meaning of PARITY_ENABLE_RMW and PARITY_PREFER_RMW) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/raid5.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging mfd/for-mfd-next (b52207ef4ea5 mfd: hi655x: Add MFD driver for hi655x) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry) +$ git merge battery/master +Already up-to-date. +Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (6b3f657e5e3e Merge remote-tracking branch 'regulator/fix/ccv' into regulator-linus) +$ git merge regulator/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging security/next (b937190c40de LSM: LoadPin: provide enablement CONFIG) +$ git merge security/next +Already up-to-date. +Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record) +$ git merge keys/keys-next +Already up-to-date. +Merging selinux/next (b937190c40de LSM: LoadPin: provide enablement CONFIG) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression) +$ git merge tpmdd/next +Auto-merging include/uapi/linux/Kbuild +Auto-merging Documentation/ioctl/ioctl-number.txt +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/tpm/tpm_vtpm_proxy.txt | 71 ++++ + drivers/char/tpm/Kconfig | 11 + + drivers/char/tpm/Makefile | 1 + + drivers/char/tpm/st33zp24/Kconfig | 11 +- + drivers/char/tpm/st33zp24/i2c.c | 70 +++- + drivers/char/tpm/st33zp24/spi.c | 184 ++++++---- + drivers/char/tpm/st33zp24/st33zp24.c | 125 +++---- + drivers/char/tpm/st33zp24/st33zp24.h | 14 +- + drivers/char/tpm/tpm-chip.c | 284 ++++++++++----- + drivers/char/tpm/tpm-dev.c | 15 +- + drivers/char/tpm/tpm-interface.c | 105 +++--- + drivers/char/tpm/tpm-sysfs.c | 78 ++-- + drivers/char/tpm/tpm.h | 73 ++-- + drivers/char/tpm/tpm2-cmd.c | 11 +- + drivers/char/tpm/tpm_atmel.c | 63 ++-- + drivers/char/tpm/tpm_atmel.h | 16 +- + drivers/char/tpm/tpm_crb.c | 73 ++-- + drivers/char/tpm/tpm_eventlog.c | 2 +- + drivers/char/tpm/tpm_eventlog.h | 4 +- + drivers/char/tpm/tpm_i2c_atmel.c | 39 +- + drivers/char/tpm/tpm_i2c_infineon.c | 55 ++- + drivers/char/tpm/tpm_i2c_nuvoton.c | 98 ++--- + drivers/char/tpm/tpm_ibmvtpm.c | 38 +- + drivers/char/tpm/tpm_infineon.c | 22 +- + drivers/char/tpm/tpm_nsc.c | 84 +++-- + drivers/char/tpm/tpm_tis.c | 266 +++++++------- + drivers/char/tpm/tpm_vtpm_proxy.c | 644 +++++++++++++++++++++++++++++++++ + drivers/char/tpm/xen-tpmfront.c | 36 +- + include/linux/platform_data/st33zp24.h | 2 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/vtpm_proxy.h | 36 ++ + 32 files changed, 1768 insertions(+), 765 deletions(-) + create mode 100644 Documentation/tpm/tpm_vtpm_proxy.txt + create mode 100644 drivers/char/tpm/tpm_vtpm_proxy.c + create mode 100644 include/uapi/linux/vtpm_proxy.h +Merging watchdog/master (1a695a905c18 Linux 4.7-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (9f8036643dd9 doc: self-protection: provide initial details) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (52bbe141f37f gitignore: fix wording) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY) +$ git merge audit/next +Already up-to-date. +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (f2c27767af0a devicetree: Add Creative Technology vendor id) +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (0ee1b395301c Merge remote-tracking branch 'spi/fix/ep93xx' into spi-linus) +$ git merge spi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (65fd15a016cc Merge branch 'perf/urgent') +$ git merge tip/auto-latest +Auto-merging kernel/futex.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging arch/x86/include/asm/uaccess.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/topology.h | 12 +- + arch/x86/include/asm/uaccess.h | 23 +- + arch/x86/kernel/cpu/intel.c | 7 +- + include/linux/futex.h | 12 +- + include/linux/sched.h | 2 + + include/uapi/linux/futex.h | 6 +- + kernel/fork.c | 7 + + kernel/futex.c | 557 ++++++++++++++++++++++++++++++++++++++-- + tools/perf/bench/futex-hash.c | 38 ++- + tools/perf/bench/futex.h | 14 + + 10 files changed, 628 insertions(+), 50 deletions(-) +Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test) +$ git merge clockevents/clockevents/next +Merge made by the 'recursive' strategy. +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (0e7e2457e4e4 Merge commit 'dcd36d01fb3f99d1d5df01714f6ccbe3fbbaf81f' into HEAD) +$ git merge rcu/rcu/next +Auto-merging drivers/clk/clk.c +Auto-merging drivers/base/power/runtime.c +Auto-merging arch/arm/kernel/smp.c +Merge made by the 'recursive' strategy. + arch/arm/kernel/smp.c | 2 +- + arch/arm/mach-omap2/powerdomain.c | 9 +++++---- + drivers/base/power/runtime.c | 14 +++++++------- + drivers/clk/clk.c | 8 ++++---- + 4 files changed, 17 insertions(+), 16 deletions(-) +Merging kvm/linux-next (fabc71286643 tools: kvm_stat: Add comments) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration) +$ git merge xen-tip/linux-next +Auto-merging drivers/xen/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/xen.txt | 35 +++++ + arch/arm/include/asm/xen/xen-ops.h | 6 + + arch/arm/kernel/setup.c | 2 +- + arch/arm/xen/Makefile | 1 + + arch/arm/xen/efi.c | 40 ++++++ + arch/arm/xen/enlighten.c | 125 ++++++++++++---- + arch/arm64/include/asm/xen/xen-ops.h | 6 + + arch/arm64/kernel/setup.c | 3 +- + arch/arm64/xen/Makefile | 1 + + arch/x86/xen/efi.c | 111 +++++++++++++++ + arch/x86/xen/grant-table.c | 57 +------- + drivers/acpi/scan.c | 74 ++++++++++ + drivers/firmware/efi/arm-runtime.c | 5 + + drivers/firmware/efi/efi.c | 81 ++++++++--- + drivers/of/fdt.c | 13 ++ + drivers/xen/Kconfig | 2 +- + drivers/xen/Makefile | 1 + + drivers/xen/arm-device.c | 196 ++++++++++++++++++++++++++ + drivers/xen/balloon.c | 28 ++-- + drivers/xen/efi.c | 173 +++++------------------ + drivers/xen/xlate_mmu.c | 77 ++++++++++ + include/linux/of_fdt.h | 2 + + include/xen/interface/hvm/params.h | 40 +++++- + include/xen/interface/memory.h | 1 + + include/xen/xen-ops.h | 32 +++-- + 25 files changed, 849 insertions(+), 263 deletions(-) + create mode 100644 arch/arm/include/asm/xen/xen-ops.h + create mode 100644 arch/arm/xen/efi.c + create mode 100644 arch/arm64/include/asm/xen/xen-ops.h + create mode 100644 drivers/xen/arm-device.c +Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu.c | 73 +++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 44 insertions(+), 29 deletions(-) +Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (b740d2e9233c platform/x86: Add PMC Driver for Intel Core SoC) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (87ae3810779d leds: core: Fix brightness setting upon hardware blinking enabled) +$ git merge leds/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/leds/leds-class.txt | 4 ++-- + MAINTAINERS | 1 + + drivers/leds/led-core.c | 9 ++++++--- + include/linux/leds.h | 23 ++++++++++++----------- + 4 files changed, 21 insertions(+), 16 deletions(-) +Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew)) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew)) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew)) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging staging/staging-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew)) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-usb-gpio.c | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) +Merging cgroup/for-next (332d8a2fd141 cgroup: set css->id to -1 during init) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging scsi/for-next (787ab6e97024 aacraid: do not activate events on non-SRC adapters) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging libata/for-next (5219d6530ef0 ata: Use IS_ENABLED() instead of checking for built-in or module) +$ git merge libata/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/ata/ahci.c | 2 +- + drivers/ata/pata_atiixp.c | 4 ++-- + drivers/ata/pata_marvell.c | 2 +- + 4 files changed, 5 insertions(+), 4 deletions(-) +Merging pinctrl/for-next (7639dad93a55 Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (bb991288728e ringtest: pass buf != NULL) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (da5cb422f15d Merge branches 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging gpio/for-next (7639dad93a55 Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (18c588786c08 Merge branch 'for-4.7/pwm-atomic' into for-next) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (ef56b79b66fa clk: fix critical clock locking) +$ git merge clk/clk-next +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (6eab37daf0ec tools: testing: define the _GNU_SOURCE macro) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times) +$ git merge y2038/y2038 +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/afs/main.c | 6 ++---- + include/linux/fs.h | 29 ++++++++++++++++++++++++++++- + 2 files changed, 30 insertions(+), 5 deletions(-) +Merging luto-misc/next (afd2ff9b7e1b Linux 4.4) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (b562e44f507e Linux 4.5) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (c568ba901f27 coresight: Handle build path error) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) +Merging rtc/rtc-next (7af6a2e1c256 MAINTAINERS: Add file patterns for rtc device tree bindings) +$ git merge rtc/rtc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/rtc/interface.c | 12 +++++++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging akpm-current/current (602525d7e860 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'fs/binfmt_flat.c' +Recorded preimage for 'net/9p/client.c' +Recorded preimage for 'sound/soc/qcom/lpass-platform.c' +Auto-merging sound/soc/qcom/lpass-platform.c +CONFLICT (content): Merge conflict in sound/soc/qcom/lpass-platform.c +Auto-merging net/9p/client.c +CONFLICT (content): Merge conflict in net/9p/client.c +Auto-merging mm/memory_hotplug.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/futex.c +Auto-merging include/linux/memory_hotplug.h +Auto-merging fs/binfmt_flat.c +CONFLICT (content): Merge conflict in fs/binfmt_flat.c +Auto-merging arch/s390/configs/zfcpdump_defconfig +Auto-merging arch/s390/configs/performance_defconfig +Auto-merging arch/s390/configs/gcov_defconfig +Auto-merging arch/s390/configs/default_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/binfmt_flat.c'. +Recorded resolution for 'net/9p/client.c'. +Recorded resolution for 'sound/soc/qcom/lpass-platform.c'. +[master c36cdc11c3bd] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/kdump/gdbmacros.txt | 93 +++++- + Documentation/kernel-parameters.txt | 6 +- + arch/arm/configs/axm55xx_defconfig | 2 +- + arch/arm/configs/bcm2835_defconfig | 2 +- + arch/arm/configs/bcm_defconfig | 2 +- + arch/arm/configs/colibri_pxa270_defconfig | 2 +- + arch/arm/configs/colibri_pxa300_defconfig | 2 +- + arch/arm/configs/dove_defconfig | 2 +- + arch/arm/configs/efm32_defconfig | 2 +- + arch/arm/configs/exynos_defconfig | 2 +- + arch/arm/configs/ezx_defconfig | 2 +- + arch/arm/configs/h5000_defconfig | 2 +- + arch/arm/configs/hisi_defconfig | 2 +- + arch/arm/configs/imote2_defconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/keystone_defconfig | 2 +- + arch/arm/configs/lpc18xx_defconfig | 2 +- + arch/arm/configs/magician_defconfig | 2 +- + arch/arm/configs/mmp2_defconfig | 2 +- + arch/arm/configs/moxart_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/mvebu_v7_defconfig | 2 +- + arch/arm/configs/mxs_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm/configs/pxa168_defconfig | 2 +- + arch/arm/configs/pxa3xx_defconfig | 2 +- + arch/arm/configs/pxa910_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm/configs/raumfeld_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/configs/socfpga_defconfig | 2 +- + arch/arm/configs/stm32_defconfig | 2 +- + arch/arm/configs/sunxi_defconfig | 2 +- + arch/arm/configs/tegra_defconfig | 2 +- + arch/arm/configs/u300_defconfig | 2 +- + arch/arm/configs/u8500_defconfig | 2 +- + arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- + arch/arm/configs/xcep_defconfig | 2 +- + arch/arm/configs/zx_defconfig | 2 +- + arch/arm/include/asm/page.h | 2 + + arch/arm64/configs/defconfig | 2 +- + arch/mips/configs/bcm47xx_defconfig | 2 +- + arch/mips/configs/bmips_be_defconfig | 2 +- + arch/mips/configs/bmips_stb_defconfig | 2 +- + arch/mips/configs/ci20_defconfig | 2 +- + arch/mips/configs/lemote2f_defconfig | 2 +- + arch/mips/configs/loongson3_defconfig | 2 +- + arch/mips/configs/nlm_xlp_defconfig | 2 +- + arch/mips/configs/nlm_xlr_defconfig | 2 +- + arch/mips/configs/pistachio_defconfig | 2 +- + arch/mips/configs/qi_lb60_defconfig | 2 +- + arch/mips/configs/rt305x_defconfig | 2 +- + arch/mips/configs/xway_defconfig | 2 +- + arch/parisc/configs/generic-64bit_defconfig | 2 +- + arch/powerpc/configs/40x/virtex_defconfig | 2 +- + arch/powerpc/configs/44x/virtex5_defconfig | 2 +- + arch/powerpc/configs/44x/warp_defconfig | 2 +- + arch/powerpc/configs/52xx/cm5200_defconfig | 2 +- + arch/powerpc/configs/52xx/lite5200b_defconfig | 2 +- + arch/powerpc/configs/52xx/motionpro_defconfig | 2 +- + arch/powerpc/configs/52xx/tqm5200_defconfig | 2 +- + arch/powerpc/configs/gamecube_defconfig | 2 +- + arch/powerpc/configs/mpc5200_defconfig | 2 +- + arch/powerpc/configs/pasemi_defconfig | 2 +- + arch/powerpc/configs/wii_defconfig | 2 +- + arch/s390/configs/default_defconfig | 2 +- + arch/s390/configs/gcov_defconfig | 2 +- + arch/s390/configs/performance_defconfig | 2 +- + arch/s390/configs/zfcpdump_defconfig | 2 +- + arch/sh/configs/edosk7760_defconfig | 2 +- + arch/sh/configs/sdk7786_defconfig | 2 +- + arch/sh/configs/se7722_defconfig | 2 +- + arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- + arch/sh/configs/urquell_defconfig | 2 +- + arch/sparc/configs/sparc64_defconfig | 2 +- + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/configs/x86_64_defconfig | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/xtensa/configs/audio_kc705_defconfig | 2 +- + arch/xtensa/configs/generic_kc705_defconfig | 2 +- + arch/xtensa/configs/nommu_kc705_defconfig | 2 +- + arch/xtensa/configs/smp_lx200_defconfig | 2 +- + block/genhd.c | 2 +- + drivers/base/memory.c | 28 +- + drivers/tty/sysrq.c | 1 + + fs/ext4/fsync.c | 5 +- + fs/ocfs2/stackglue.c | 2 - + fs/reiserfs/ibalance.c | 6 +- + include/linux/crc64_ecma.h | 56 ++++ + include/linux/kexec.h | 2 + + include/linux/memory_hotplug.h | 2 + + include/linux/mmzone.h | 1 - + include/linux/oom.h | 8 +- + include/linux/page_idle.h | 43 ++- + include/linux/sem.h | 1 + + include/linux/timekeeping.h | 1 + + include/linux/vmstat.h | 6 + + include/trace/events/huge_memory.h | 38 ++- + ipc/msg.c | 5 +- + ipc/sem.c | 124 ++++---- + kernel/futex.c | 2 + + kernel/kexec_core.c | 16 +- + kernel/printk/printk.c | 76 ++++- + kernel/time/timekeeping.c | 13 + + lib/Kconfig | 7 + + lib/Kconfig.debug | 19 +- + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++++++++++ + mm/huge_memory.c | 187 +++++++++-- + mm/internal.h | 4 + + mm/memblock.c | 3 + + mm/memcontrol.c | 14 +- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 70 ++++- + mm/oom_kill.c | 36 +-- + mm/page_alloc.c | 24 +- + mm/page_owner.c | 26 ++ + mm/page_poison.c | 8 +- + mm/vmalloc.c | 9 +- + mm/vmstat.c | 14 + + mm/z3fold.c | 24 +- + samples/kprobes/jprobe_example.c | 6 +- + samples/kprobes/kprobe_example.c | 29 +- + samples/kprobes/kretprobe_example.c | 14 +- + scripts/Makefile.lib | 2 +- + scripts/checkpatch.pl | 1 + + .../selftests/rcutorture/configs/lock/CFcommon | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 +- + 129 files changed, 1224 insertions(+), 319 deletions(-) + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: mm: make optimistic check for swapin readahead fix +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: drivers/fpga/Kconfig: fix build failure +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8df1a1238177...8261089741cd akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (8261089741cd drivers/fpga/Kconfig: fix build failure) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/fpga/Kconfig | 1 + + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + mm/huge_memory.c | 3 ++- + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..a0422af037bb --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.6 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..2de76cff690e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160530 |