diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-06-07 14:54:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-06-07 14:54:22 +1000 |
| commit | 7b95734f9076fc1cbda1b5f4b127434e57b5516c (patch) | |
| tree | 35c2f0d1682052350f3fb21879b789637ab0aec8 | |
| parent | 52c8d6a6e81eb505c63cd5f41678664450489a9b (diff) | |
| download | linux-next-7b95734f9076fc1cbda1b5f4b127434e57b5516c.tar.gz | |
Add linux-next specific files for 20160607next-20160607
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 235 | ||||
| -rw-r--r-- | Next/Trees | 237 | ||||
| -rw-r--r-- | Next/merge.log | 3002 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3479 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..204af80857eb --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,235 @@ +Name SHA1 +---- ---- +origin 3613a6245b9fb5091724961e502fd1228de40f32 +fixes b31033aacbd04d952ad645313ddb1e836145f997 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current ed6aefed726a305bd36344e230d2a9e9301226fc +arm-current e2dfb4b880146bfd4b6aa8e138c0205407cebbaf +m68k-current 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes 8a934efe94347eee843aeea65bdec8077a79e259 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 6b15d6650c5301ce023d8df0cc3a60b1a76d377e +net 1957598840f47d42bb0b7f8a871717a780708686 +ipsec d6af1a31cc72fbd558c7eddbc36f61bf09d1cf6a +ipvs 3ec10d3a2ba591c87da94219c1e46b02ae97757a +wireless-drivers 182fd9eecb287e696c82b30d06c6150d80a49c5b +mac80211 6fe04128f158c5ad27e7504bfdf1b12e63331bc9 +sound-current 0358ccc8ffd8d9b76992b8deab58fb9a721fb18a +pci-current 1a695a905c18548062509178b98bc91e67510864 +driver-core.current 1a695a905c18548062509178b98bc91e67510864 +tty.current 1a695a905c18548062509178b98bc91e67510864 +usb.current 7b2c17f829545df27a910e8d82e133c21c9a8c9c +usb-gadget-fixes 50c763f8c1bac0dc00f7788a75f227276c0efd54 +usb-serial-fixes 74d2a91aec97ab832790c9398d320413ad185321 +usb-chipidea-fixes d144dfea8af7108f613139623e63952ed7e69c0c +staging.current 1a695a905c18548062509178b98bc91e67510864 +char-misc.current 1a695a905c18548062509178b98bc91e67510864 +input-current 540c26087bfbad6ea72758b76b16ae6282a73fea +crypto-current ab6a11a7c8ef47f996974dd3c648c2c0b1a36ab1 +ide 1993b176a8224e371e0732ffada7ab9eb3b0912b +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes ce7585f3c4d76bca1dff4b66ae1ea32552954f9e +kselftest-fixes 1a77e2bd8c89a37703dc9de18a7b552ad76e1c12 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes af8c34ce6ae32addda3788d54a7e340cad22516b +asm-generic b0da6d44157aa6e652de7634343708251ba64146 +arc ed6aefed726a305bd36344e230d2a9e9301226fc +arm 9d1f948e628589058f19d164f3e0e56bd4d84802 +arm-perf 4ba2578fa7b557012b8f59ad7a9284ff15394338 +arm-soc 813f80af1dc9d56d6b6810c17f561b76013faacb +amlogic 71e9a3a9b76a151c3beffd10059720be00ee9236 +at91 5a0d7c6a48ae60c41304858c6e885e3daeb8a083 +bcm2835 911242a292e93dc0947fbc0f0b10a51b5b74e588 +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 63b44471754bc0c7a1fbb6b430d0c7cdd091ee7a +keystone 02e15d23400608a9843a66c0b5fc4f3d6dd80b50 +mvebu 01316cded75be7e2ec0976179e027a3cc8c61a08 +omap 5c66191b5c76526317b70177cc09f84f8f96c066 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom eb8e0105700b78a668c38f9ec7c4b3167816cb3d +renesas 1a65133b27b883b509fe4d7d4f986febfe438f54 +rockchip 5e46e8d66d01057fd62ff94490d33b53c6514f14 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk 0bf0477568b7068c20d6eb463492de69642c7014 +tegra 5c282bc9d0a37e247d203b515a90909c45e82547 +arm64 e6d9a52543338603e25e71e0e4942f05dae0dd8a +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 8cad489261c564d4ee1db4de4ac365af56807d8a +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 787ca32dc704bde981760de01a3a7e6ce9835fdb +m68k 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +m68knommu af8c34ce6ae32addda3788d54a7e340cad22516b +metag 592ddeeff8cb0ba7ae11dbd08f583280bd15f865 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 847e858f3d0eb4c3c29c046dc6aa82d3334a0917 +nios2 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f +parisc-hd 5975b2c0c10adbc7894a54ab7b30db4fbcdd8c41 +powerpc 138a076496e61c68ebc1dcccc088705826bbe26d +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 1eef33bec12d7e46a58f12b3604556a80c362a0d +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 73be43b48fecbfcd3061e95e7c826fc06bcf5153 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile bdf03e59f8c136f709dd44987ad21f6ce19dc98c +uml a78ff1112263fdd871d3506dbcff44f6f12e8423 +unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs c315ef8d9db7f1a0ebd023a395ebdfde1c68057e +btrfs-kdave 77bddea4cbbdceb4538eb3afa6a1d771695e2200 +ceph f6973c09490c919398fc87d9c6bec9c0b670c4c4 +cifs 3bdc426e2497fb98a1051fc69f6c1709c00e377c +configfs 96c22a3293512ba684e73a981196430f524689da +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 b9d8905e4a751e2cdc0fb474856b7183c594dcc6 +ext4 12735f881952c32b31bc4e433768f18489f79ec9 +f2fs 120212ac703c01e4814b72c685d2a0173d1e7ffd +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 4441f63ab7e581ae460c9f7e06fba8a2be192e81 +gfs2 29567292c0b5b2fb484125c280a2175141fe2205 +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs af8c34ce6ae32addda3788d54a7e340cad22516b +nfsd 9e62f931dd079ebbdde152d2c90a2fa9f67fb286 +orangefs 2dcd0af568b0cf583645c8a317dd12e344b1c72a +overlayfs 6510690149a9e9259a63234131dffed109e7220c +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 1112018cefc586cba924770a2b28bff6d2f0aa5c +xfs 26f1fe858f2744edfc75e92d34a6be0af5e8b45d +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 1eb82bc8e71279eea0cc6a9c9d591d8f706c4206 +pci 1a695a905c18548062509178b98bc91e67510864 +pstore cae7316708c45e4cfdc586c2e0a02eaea398e246 +hid 9037766900ffa4d6192e7bf598768d60e43c6396 +i2c 1a695a905c18548062509178b98bc91e67510864 +jdelvare-hwmon 18c358ac5e32ad43e9a50b4e5f344a896b9d1dad +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging 0ca4576988240603df6d5e7aa36c22bf30eea09d +v4l-dvb 73dfb701d254a270984dd8658b9e008fa3ce7b0b +pm 2f9b4c17dbca6df4b66fce22b2811bfcebb4388b +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal 546afd1a3678829f0904a91bc14a09964e04ca19 +thermal-soc ddc8fdc6e2f06aabdbb9dc4a5e01ca793cd2e285 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 82c7d823cc31cf56d964eebe1f91aaf1691cddce +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 4f0382030b6dec4a4aaf9e0dd2b0e0d3bbe71c76 +net-next 3d9dc408fa6abf8dd1ea39e243e565891004a6f9 +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next ed7cbbce544856b20e5811de373cf92e92499771 +wireless-drivers-next 47ce90f9f08ae282dee4beecc5c736a1e41f61c1 +bluetooth 6b15d6650c5301ce023d8df0cc3a60b1a76d377e +mac80211-next 019ae3a918811715192b22c400ac78d54acc26a9 +rdma 7a226f9c32b0481b0744e2726cd7f8349b866af5 +rdma-leon af8c34ce6ae32addda3788d54a7e340cad22516b +rdma-leon-test c666253347a6707f6f30c431de5bad9ae0264f86 +mtd becc7ae544c61395b5eba7b9913e14aa567ca07a +l2-mtd 95193796256cfce16e5d881318e15b6b04062c15 +nand 5c72ae1dbb5348fd465a472a67d170ea5416fe4f +crypto 0a7f330c12f2b3cab53b396d4dc369c2dcf272eb +drm 66fd7a66e8b9e11e49f46ea77910f935c4dee5c3 +drm-panel 227e4f4079e198695b9b5df344aa0e29676a5a29 +drm-intel 6bb6285582e0cf9b3a8440e0e714aae5f66d9ce2 +drm-tegra 057eab2013ecbba2e772293acc177e2e3210f05d +drm-misc ddac4b5a6c08f8800002517ea5352b3eb9451cfc +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 2b669875332fbdff0a7ad559e8662e875e7a1526 +hdlcd f6c68b4bd4a98033d1e79479212bbd376e145728 +drm-vc4 a9402dfe17bddeee5c72943385eaa13c39f106f7 +sunxi 30ce0df9ee51b9d30762ad724e2947e45f23d568 +kbuild 0c644e04ad1b55fe5328b898c2d3a8f291a55909 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 545c89f170463dfa4fea8298cc0d5f12d1a58126 +sound 1524c7191be24288ac097c7c3c1bc411f36c1fa4 +sound-asoc 86bb716e9d4da997f990d106f9e9dac5c84c547b +modules e2d1248432c4bc8b3e4cdfc13074acbce3a749cd +input 1afca2b66aac7ac262d3511c68725e9e7053b40f +block 661806a319890962aaa839dc1dbf7ea356aa6b92 +lightnvm 2a65aee4011bd3a372ce23681ceb3a6960a96c8c +device-mapper 29565b2a733e60511fc55f9a964d18d750c86751 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh ba965b4ebd3157ec04f2e660a51f0e2ca1a2c21d +md db76767213be6c6db1b1344621511e27e9984fbb +mfd b52207ef4ea56f8c22288ec3387399aac72c26cf +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 4a99fa06a8ca27a5187636e630568658000af575 +omap_dss2 ab366b40b8513e7590858229ecbb5e1434a52b54 +regulator e9f5a58b63ab0b2fe08efe59318d592eea16e2e4 +security 40d273782ff16fe1a7445cc05c66a447dfea3433 +integrity 05d1a717ec0430c916a749b94eb90ab74bbfa356 +keys 75aeddd12f205d07b36ed76db3426e974b8f2a21 +selinux 0e0e36774081534783aa8eeb9f6fbddf98d3c061 +tpmdd e8f2f45a4402deb715220b750d892f7a70b0f868 +watchdog 1a695a905c18548062509178b98bc91e67510864 +iommu 6c0b43df74f900e7f31a49d1844f166df0f8afc6 +dwmw2-iommu 2566278551d3db875bc3bbfc41b42f2e80392108 +vfio f70552809419cd2abc0cc6469a07c9792a3aaa6c +jc_docs f3e6a55c3653b071705e266473b87696786dfd99 +trivial 52bbe141f37f093e2c612e97c40d27422e5a1fdf +audit 2b4c7afe79a8a0a0e05edeaded5653c190153f9b +devicetree f83803305b008ca3d75b00092b6493bc19eda60b +mailbox c430cf376fee0b03d9c9293615f9737649de1b12 +spi e767713092def9d711b2e91fd5732b537774c4b4 +tip f69d12a8cfffdd2597d61c9955c1e5374f0c2110 +clockevents cee77c2c5b5764f4a2a8eb14a7343e0d0376f723 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 665f05e0b836d46b22f0b712eb76d8b7f69a5ea0 +irqchip d7e3528eed85b51ddca2f281d2d4e7d687f28d60 +ftrace 97f8827a8c7963756ae7d3ee898675b4667eca73 +rcu 13d4a7b7218285764b89738c061c22d017077ddb +kvm 4340fa55298d17049e71c7a34e04647379c269f3 +kvm-arm 35a2d58588f0992627e74b447ccab21570544c86 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus b1a4286b8f3393857a205ec89607683161b75f90 +kvms390 d01b83d6d981628c9206e775c6748a43a7bf3e16 +xen-tip bdadcaf2a7c19d667c7c021da2ffc8fa18c44031 +percpu 6710e594f71ccaad8101bc64321152af7cd9ea28 +workqueues f1e89a8f335824eeb720701e17fdc933a40fa605 +drivers-x86 b740d2e9233cb33626d3b62210bcfc6a34baa839 +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi b32bd7e7d5c1c04bb351420c09217f38dad8b8f1 +leds cc671d40dfe9d8d4da77a98e33f19768cfc1a523 +ipmi a1b4e31bfabb3172c78890b0a03a050fad082b1c +driver-core 1a695a905c18548062509178b98bc91e67510864 +tty 1a695a905c18548062509178b98bc91e67510864 +usb 1a695a905c18548062509178b98bc91e67510864 +usb-gadget 2a58f9c12bb360f38fb39e470bb5ff94014356e6 +usb-serial b923c6c62981cec5e2d2187fd700c2fc4386fc45 +usb-chipidea-next 764763f0a0c81cbed4d2c7dc2b05e7173ff85b5b +staging 1a695a905c18548062509178b98bc91e67510864 +char-misc 1a695a905c18548062509178b98bc91e67510864 +extcon eb8652bd8d849c218451a8ea820c212c9fe3c0ea +cgroup 332d8a2fd14127e82b061744ad2a7a8e877e3857 +scsi 6b3bacc9a328c113aa439ec5f026cbe4bd40de7c +target-updates 8f0dfb3d8b1120c61f6e2cc3729290db10772b2d +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata 5219d6530ef0bca37bd8c4c637908638ce205ff9 +pinctrl a02fcf38ade9d07d7e6c6341aab44b5ae156df5b +vhost 139ab4d4e68b8cf2a611b06c006a2195dc6bedf1 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg da5cb422f15db65cb6c3f18e4243f573b1ce30f6 +gpio 63e213fc63c0a0421a5b920af78426f86aaab356 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 18c588786c08458f5d965d8735ab48f9e51e0b4b +dma-buf b02da6f8236148009c22167cd7013d5ce04a2d37 +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk 72ad679aa7182d23d269cbe4d655f7e129d3b057 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 1a695a905c18548062509178b98bc91e67510864 +y2038 4b277763c5b3ce6d60168797e6f38260416d9b13 +luto-misc afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 6d9122078097233dbfc4ad3a45512393cddf8540 +coresight c568ba901f2738c4a134d50b019a60d0fc915a86 +rtc c361db5c2c64f1b7ffed5e9cc42e5062432238f2 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 36092ee8ba695fce023b2118ececa6c2a56b1331 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current 160ccc2947695d5fc660538c38ccd44239248d5c +akpm bc11a63e2b25442d715718f87dcef0ff5acf69e8 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..8719752c7516 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,237 @@ +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 +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 +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-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 +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +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/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..9aa3fbed00e3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3002 @@ +$ date -R +Tue, 07 Jun 2016 09:51:07 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at af8c34ce6ae3 Linux 4.7-rc2 +Merging origin/master (3613a6245b9f Merge tag 'edac_fixes_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge origin/master +Updating af8c34ce6ae3..3613a6245b9f +Fast-forward + drivers/edac/edac_mc.c | 3 ++- + drivers/edac/sb_edac.c | 35 ++++++++++++++++++++++------------- + 2 files changed, 24 insertions(+), 14 deletions(-) +Merging fixes/master (b31033aacbd0 of: silence warnings due to max() usage) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + drivers/of/of_reserved_mem.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +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 (ed6aefed726a Revert "ARCv2: spinlock/rwlock/atomics: Delayed retry of failed SCOND with exponential backoff") +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 31 +--- + arch/arc/Makefile | 2 +- + arch/arc/boot/dts/abilis_tb100.dtsi | 2 - + arch/arc/boot/dts/abilis_tb101.dtsi | 2 - + arch/arc/boot/dts/axc001.dtsi | 1 - + arch/arc/boot/dts/axc003.dtsi | 1 - + arch/arc/boot/dts/axc003_idu.dtsi | 1 - + arch/arc/boot/dts/eznps.dts | 1 - + arch/arc/boot/dts/nsim_700.dts | 1 - + arch/arc/boot/dts/nsimosci.dts | 1 - + arch/arc/boot/dts/nsimosci_hs.dts | 1 - + arch/arc/boot/dts/nsimosci_hs_idu.dts | 1 - + arch/arc/boot/dts/skeleton.dtsi | 1 - + arch/arc/boot/dts/skeleton_hs.dtsi | 1 - + arch/arc/boot/dts/skeleton_hs_idu.dtsi | 1 - + arch/arc/boot/dts/vdk_axc003.dtsi | 1 - + arch/arc/boot/dts/vdk_axc003_idu.dtsi | 1 - + arch/arc/include/asm/atomic.h | 45 +---- + arch/arc/include/asm/entry-compact.h | 4 +- + arch/arc/include/asm/mmu_context.h | 2 +- + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/include/asm/processor.h | 2 +- + arch/arc/include/asm/smp.h | 2 +- + arch/arc/include/asm/spinlock.h | 292 --------------------------------- + arch/arc/include/asm/thread_info.h | 2 +- + arch/arc/include/asm/uaccess.h | 2 +- + arch/arc/include/uapi/asm/swab.h | 2 +- + arch/arc/kernel/entry-compact.S | 18 +- + arch/arc/kernel/intc-compact.c | 6 +- + arch/arc/kernel/perf_event.c | 2 +- + arch/arc/kernel/setup.c | 2 +- + arch/arc/kernel/signal.c | 2 +- + arch/arc/kernel/troubleshoot.c | 2 +- + arch/arc/mm/cache.c | 6 +- + arch/arc/mm/dma.c | 2 +- + 35 files changed, 30 insertions(+), 415 deletions(-) +Merging arm-current/fixes (e2dfb4b88014 ARM: fix PTRACE_SETVFPREGS on SMP systems) +$ 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 (8a934efe9434 powerpc/pseries: Fix PCI config address for DDW) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/ptrace.c | 4 ++-- + arch/powerpc/platforms/pseries/iommu.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge sparc/master +Already up-to-date. +Merging net/master (1957598840f4 soreuseport: add compat case for setsockopt SO_ATTACH_REUSEPORT_CBPF) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 151 +++++++++------------ + drivers/net/ethernet/ethoc.c | 7 +- + drivers/net/ethernet/freescale/gianfar.c | 3 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 40 +++++- + drivers/net/ethernet/qlogic/qed/qed_main.c | 45 ++++-- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 4 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 2 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- + drivers/net/ethernet/ti/cpsw.c | 2 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 16 +++ + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 + + drivers/net/wireless/mac80211_hwsim.c | 1 + + drivers/net/wireless/realtek/rtlwifi/core.c | 6 +- + include/net/netfilter/nf_queue.h | 4 +- + include/net/netns/netfilter.h | 2 + + net/compat.c | 3 +- + net/ipv4/udp.c | 10 +- + net/ipv6/netfilter/nf_dup_ipv6.c | 1 + + net/ipv6/udp.c | 12 +- + net/mac80211/mesh.c | 4 + + net/mac80211/sta_info.h | 2 +- + net/netfilter/nf_conntrack_ftp.c | 1 + + net/netfilter/nf_conntrack_helper.c | 9 +- + net/netfilter/nf_conntrack_irc.c | 1 + + net/netfilter/nf_conntrack_sane.c | 1 + + net/netfilter/nf_conntrack_sip.c | 1 + + net/netfilter/nf_conntrack_standalone.c | 2 - + net/netfilter/nf_conntrack_tftp.c | 1 + + net/netfilter/nf_queue.c | 17 ++- + net/netfilter/nf_tables_api.c | 2 + + net/netfilter/nfnetlink_queue.c | 20 ++- + net/rds/recv.c | 2 + + net/sched/sch_drr.c | 4 + + net/sched/sch_hfsc.c | 12 +- + net/sched/sch_prio.c | 4 + + net/sched/sch_red.c | 4 + + net/sched/sch_tbf.c | 4 + + net/tipc/netlink_compat.c | 3 +- + tools/testing/selftests/net/reuseport_bpf.c | 10 +- + 40 files changed, 255 insertions(+), 167 deletions(-) +Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) +$ git merge ipsec/master +Already up-to-date. +Merging ipvs/master (3ec10d3a2ba5 ipvs: update real-server binding of outgoing connections in SIP-pe) +$ git merge ipvs/master +Merge made by the 'recursive' strategy. + include/net/ip_vs.h | 2 +- + net/netfilter/ipvs/ip_vs_conn.c | 5 +++-- + net/netfilter/ipvs/ip_vs_core.c | 5 +++-- + net/netfilter/x_tables.c | 4 ++-- + 4 files changed, 9 insertions(+), 7 deletions(-) +Merging wireless-drivers/master (182fd9eecb28 MAINTAINERS: Add file patterns for wireless device tree bindings) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (6fe04128f158 mac80211: fix fast_tx header alignment) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (0358ccc8ffd8 ALSA: uapi: Add three missing header files to Kbuild file) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/uapi/sound/Kbuild | 3 ++ + sound/pci/hda/patch_realtek.c | 68 +++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 66 insertions(+), 5 deletions(-) +Merging pci-current/for-linus (1a695a905c18 Linux 4.7-rc1) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (1a695a905c18 Linux 4.7-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (1a695a905c18 Linux 4.7-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (7b2c17f82954 usb: musb: Stop bulk endpoint while queue is rotated) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/configfs-usb-gadget-uvc | 58 ++--- + drivers/phy/phy-twl4030-usb.c | 14 +- + drivers/usb/core/quirks.c | 23 +- + drivers/usb/dwc2/core.h | 27 +++ + drivers/usb/dwc2/gadget.c | 24 +- + drivers/usb/dwc3/core.h | 1 + + drivers/usb/dwc3/dwc3-exynos.c | 19 +- + drivers/usb/dwc3/dwc3-st.c | 10 +- + drivers/usb/dwc3/gadget.c | 30 ++- + drivers/usb/gadget/composite.c | 21 +- + drivers/usb/gadget/configfs.c | 1 + + drivers/usb/gadget/function/f_fs.c | 30 +-- + drivers/usb/gadget/function/f_printer.c | 8 - + drivers/usb/gadget/function/f_tcm.c | 20 +- + drivers/usb/gadget/function/f_uac2.c | 13 +- + drivers/usb/gadget/function/storage_common.c | 4 +- + drivers/usb/gadget/legacy/inode.c | 17 +- + drivers/usb/gadget/udc/udc-core.c | 12 +- + drivers/usb/host/ehci-hub.c | 14 +- + drivers/usb/host/xhci-pci.c | 5 + + drivers/usb/host/xhci-plat.c | 3 + + drivers/usb/host/xhci-ring.c | 30 ++- + drivers/usb/host/xhci.c | 29 +-- + drivers/usb/musb/musb_core.c | 85 ++++--- + drivers/usb/musb/musb_core.h | 3 +- + drivers/usb/musb/musb_gadget.c | 34 ++- + drivers/usb/musb/musb_host.c | 68 +++--- + drivers/usb/musb/omap2430.c | 257 ++++++++-------------- + drivers/usb/musb/sunxi.c | 39 ++-- + drivers/usb/phy/phy-twl6030-usb.c | 29 ++- + drivers/usb/storage/uas.c | 2 +- + include/linux/usb/gadget.h | 3 + + include/linux/usb/musb.h | 5 +- + 33 files changed, 509 insertions(+), 429 deletions(-) +Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) +$ 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 (1a695a905c18 Linux 4.7-rc1) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (1a695a905c18 Linux 4.7-rc1) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (540c26087bfb Input: xpad - fix rumble on Xbox One controllers with 2015 firmware) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/xpad.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging crypto-current/master (ab6a11a7c8ef crypto: ccp - Fix AES XTS error for request sizes above 4096) +$ git merge crypto-current/master +Already up-to-date. +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 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 (ce7585f3c4d7 vfio/pci: Allow VPD short read) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (1a77e2bd8c89 kselftests: timers: Add set-tz test case) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/timers/Makefile | 3 +- + tools/testing/selftests/timers/set-tz.c | 119 ++++++++++++++++++++++++++++++++ + 2 files changed, 121 insertions(+), 1 deletion(-) + create mode 100644 tools/testing/selftests/timers/set-tz.c +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 (af8c34ce6ae3 Linux 4.7-rc2) +$ 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 (ed6aefed726a Revert "ARCv2: spinlock/rwlock/atomics: Delayed retry of failed SCOND with exponential backoff") +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (9d1f948e6285 Merge branches 'component', 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging drivers/gpu/drm/arm/hdlcd_drv.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/assembler.h | 4 ++-- + arch/arm/include/asm/ptrace.h | 10 ++++++++++ + arch/arm/kernel/asm-offsets.c | 4 +++- + arch/arm/kernel/entry-armv.S | 12 ++++++------ + arch/arm/kernel/entry-common.S | 2 +- + arch/arm/kernel/entry-header.S | 8 ++++---- + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/process.c | 2 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 10 ++++++++-- + drivers/gpu/drm/armada/armada_drv.c | 9 +++++++-- + drivers/gpu/drm/drm_of.c | 13 +++++++++---- + drivers/gpu/drm/msm/msm_drv.c | 8 +++++++- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 ++++++++++--- + drivers/gpu/drm/sti/sti_drv.c | 9 +++++++-- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 9 +++++++-- + drivers/iommu/mtk_iommu.c | 13 ++++++++++--- + 16 files changed, 93 insertions(+), 35 deletions(-) +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 (813f80af1dc9 ARM: SoC: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 4 + + arch/arm/Kconfig | 34 +- + arch/arm/arm-soc-for-next-contents.txt | 39 +++ + arch/arm/boot/dts/Makefile | 1 + + 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/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/boot/dts/sun6i-a31s-primo81.dts | 2 - + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 2 - + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-at91/Kconfig | 2 +- + arch/arm/mach-bcm/Kconfig | 7 +- + arch/arm/mach-berlin/Kconfig | 2 +- + arch/arm/mach-digicolor/Kconfig | 2 +- + arch/arm/mach-exynos/Kconfig | 3 +- + arch/arm/mach-imx/Kconfig | 2 +- + arch/arm/mach-integrator/Kconfig | 4 +- + arch/arm/mach-meson/Kconfig | 2 +- + arch/arm/mach-mmp/Kconfig | 2 +- + arch/arm/mach-moxart/Kconfig | 2 +- + arch/arm/mach-mv78xx0/Kconfig | 2 +- + arch/arm/mach-mvebu/Kconfig | 4 +- + arch/arm/mach-mxs/Kconfig | 2 +- + arch/arm/mach-nomadik/Kconfig | 2 +- + arch/arm/mach-omap2/Kconfig | 12 +- + arch/arm/mach-omap2/omap-secure.h | 1 + + arch/arm/mach-omap2/omap-smp.c | 48 ++- + arch/arm/mach-orion5x/Kconfig | 2 +- + arch/arm/mach-oxnas/Kconfig | 2 +- + arch/arm/mach-picoxcell/Kconfig | 2 +- + arch/arm/mach-prima2/Kconfig | 2 +- + arch/arm/mach-rockchip/Kconfig | 2 +- + arch/arm/mach-s3c24xx/Kconfig | 2 +- + arch/arm/mach-s3c64xx/Kconfig | 2 +- + arch/arm/mach-s5pv210/Kconfig | 2 +- + arch/arm/mach-shmobile/Kconfig | 2 +- + arch/arm/mach-spear/Kconfig | 2 +- + arch/arm/mach-sti/Kconfig | 2 +- + arch/arm/mach-sunxi/Kconfig | 2 +- + arch/arm/mach-tegra/Kconfig | 2 +- + arch/arm/mach-u300/Kconfig | 2 +- + arch/arm/mach-uniphier/platsmp.c | 18 +- + arch/arm/mach-ux500/Kconfig | 2 +- + arch/arm/mach-vexpress/Kconfig | 2 +- + arch/arm/mach-vt8500/Kconfig | 2 +- + arch/arm/plat-samsung/devs.c | 2 +- + arch/arm64/boot/dts/lg/Makefile | 1 + + arch/arm64/boot/dts/lg/lg1312.dtsi | 2 +- + arch/arm64/boot/dts/lg/lg1313-ref.dts | 36 +++ + arch/arm64/boot/dts/lg/lg1313.dtsi | 351 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + arch/arm64/configs/defconfig | 1 + + drivers/reset/Kconfig | 4 + + drivers/reset/core.c | 37 +++ + drivers/reset/reset-ath79.c | 3 +- + drivers/reset/reset-oxnas.c | 12 +- + drivers/reset/reset-pistachio.c | 12 +- + drivers/reset/reset-socfpga.c | 12 +- + drivers/reset/reset-sunxi.c | 12 +- + drivers/reset/reset-zynq.c | 12 +- + drivers/reset/sti/Kconfig | 1 - + include/linux/reset-controller.h | 4 + + include/linux/reset.h | 4 +- + 74 files changed, 741 insertions(+), 167 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm64/boot/dts/lg/lg1313-ref.dts + create mode 100644 arch/arm64/boot/dts/lg/lg1313.dtsi +Merging amlogic/for-next (71e9a3a9b76a Merge branches 'amlogic/v4.7/soc' and 'amlogic/v4.7/dt' into amlogic/v4.7/integ) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + arch/arm/boot/dts/meson8b.dtsi | 7 + + arch/arm64/Kconfig.platforms | 2 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 20 +++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 9 ++ + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 159 ++++++++++++++++++++- + 7 files changed, 201 insertions(+), 1 deletion(-) +$ git reset --hard HEAD^ +HEAD is now at 4f09dd7c93ed Merge remote-tracking branch 'arm-soc/for-next' +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/for-next (911242a292e9 Merge branch anholt/bcm2835-arm64-next into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 + + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 + + arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm283x.dtsi | 2 ++ + arch/arm64/include/asm/dma-mapping.h | 17 +++++++++++++++-- + drivers/gpu/drm/vc4/vc4_dpi.c | 14 +++----------- + 9 files changed, 62 insertions(+), 13 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi +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/dm814x-clocks.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 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 (1a65133b27b8 Merge branch 'heads/rcar-sysc-for-v4.8' into next) +$ git merge renesas/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/power/renesas,rcar-sysc.txt | 1 + + MAINTAINERS | 1 - + arch/arm/boot/dts/emev2-kzm9d.dts | 16 +- + arch/arm/boot/dts/emev2.dtsi | 26 +-- + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 8 +- + arch/arm/boot/dts/r8a73a4.dtsi | 34 +-- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 12 +- + arch/arm/boot/dts/r8a7740.dtsi | 2 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 5 +- + arch/arm/boot/dts/r8a7778.dtsi | 28 +-- + arch/arm/boot/dts/r8a7779-marzen.dts | 4 +- + arch/arm/boot/dts/r8a7790-lager.dts | 20 +- + arch/arm/boot/dts/r8a7790.dtsi | 232 ++++++++++++--------- + arch/arm/boot/dts/r8a7791-koelsch.dts | 12 +- + arch/arm/boot/dts/r8a7791-porter.dts | 8 +- + arch/arm/boot/dts/r8a7791.dtsi | 224 +++++++++++--------- + arch/arm/boot/dts/r8a7793-gose.dts | 12 +- + arch/arm/boot/dts/r8a7793.dtsi | 198 +++++++++++------- + arch/arm/boot/dts/r8a7794-silk.dts | 6 +- + arch/arm/boot/dts/r8a7794.dtsi | 132 +++++++----- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 11 +- + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 13 +- + arch/arm/mach-shmobile/pm-rmobile.c | 2 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 14 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 98 +++++---- + drivers/Makefile | 1 - + drivers/sh/pm_runtime.c | 9 - + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a7796-sysc.c | 48 +++++ + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + include/dt-bindings/clock/r8a7794-clock.h | 1 - + include/dt-bindings/power/r8a7796-sysc.h | 36 ++++ + 35 files changed, 730 insertions(+), 493 deletions(-) + create mode 100644 drivers/soc/renesas/r8a7796-sysc.c + create mode 100644 include/dt-bindings/power/r8a7796-sysc.h +Merging rockchip/for-next (5e46e8d66d01 Merge branch 'v4.7-clk/fixes' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3288-firefly.dtsi | 31 ++++--- + arch/arm/boot/dts/rk3288-miqi.dts | 26 +++--- + arch/arm/boot/dts/rk3288-popmetal.dts | 31 ++++--- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 31 ++++--- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 101 ++++++++++++++++++++++ + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 1 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 31 ++++--- + arch/arm/boot/dts/rk3288.dtsi | 5 ++ + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 16 ++++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 16 +++- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 12 +++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 54 +++++++++++- + drivers/clk/rockchip/clk-cpu.c | 4 +- + drivers/clk/rockchip/clk-mmc-phase.c | 12 +-- + drivers/clk/rockchip/clk-rk3399.c | 17 +++- + 15 files changed, 294 insertions(+), 94 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi +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 (0bf0477568b7 Merge branch 'for-v4.8/dts-exynos5410-odroid-xu' into for-next) +$ git merge samsung-krzk/for-next +Resolved 'arch/arm/mach-exynos/Kconfig' using previous resolution. +Auto-merging drivers/soc/samsung/pm_domains.c +Auto-merging drivers/of/of_reserved_mem.c +Removing arch/arm/mach-exynos/s5p-dev-mfc.c +Removing arch/arm/mach-exynos/mfc.h +Auto-merging arch/arm/mach-exynos/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig +Removing arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f112b793280e] Merge remote-tracking branch 'samsung-krzk/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/samsung/samsung-boards.txt | 1 + + .../devicetree/bindings/media/s5p-mfc.txt | 39 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 29 + + arch/arm/boot/dts/exynos4210-origen.dts | 4 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 34 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 18 + + arch/arm/boot/dts/exynos4412-odroidx.dts | 11 + + arch/arm/boot/dts/exynos4412-odroidx2.dts | 11 + + arch/arm/boot/dts/exynos4412-origen.dts | 20 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 4 +- + arch/arm/boot/dts/exynos5.dtsi | 215 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 4 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-spring.dts | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 1701 ++++++------ + arch/arm/boot/dts/exynos5410-odroidxu.dts | 580 ++++ + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 210 ++ + arch/arm/boot/dts/exynos5410-smdk5410.dts | 6 +- + arch/arm/boot/dts/exynos5410.dtsi | 333 ++- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 30 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 12 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 4 +- + arch/arm/boot/dts/exynos5420.dtsi | 2769 +++++++++----------- + arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 103 - + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 102 +- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 35 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 35 +- + arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 50 + + arch/arm/boot/dts/exynos54xx.dtsi | 199 ++ + arch/arm/boot/dts/exynos5800-peach-pi.dts | 30 +- + arch/arm/configs/exynos_defconfig | 27 +- + arch/arm/configs/multi_v7_defconfig | 30 +- + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-exynos/Makefile | 3 - + arch/arm/mach-exynos/exynos.c | 19 - + arch/arm/mach-exynos/mfc.h | 16 - + arch/arm/mach-exynos/s5p-dev-mfc.c | 93 - + arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 2 +- + arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/mach-n30.c | 2 +- + arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 2 +- + arch/arm/mach-s3c24xx/pll-s3c2410.c | 3 +- + arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 1 + + arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 1 + + arch/arm/mach-s3c64xx/include/mach/map.h | 2 +- + arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 2 +- + arch/arm/plat-samsung/include/plat/fb-s3c2410.h | 2 +- + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 +- + arch/arm/plat-samsung/pm-check.c | 2 +- + arch/arm/plat-samsung/watchdog-reset.c | 2 +- + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/exynos/exynos7.dtsi | 13 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 2 + + drivers/media/platform/exynos4-is/fimc-core.c | 2 + + drivers/media/platform/exynos4-is/fimc-is.c | 2 + + drivers/media/platform/exynos4-is/fimc-lite.c | 2 + + drivers/media/platform/s5p-g2d/g2d.c | 2 + + drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 + + drivers/media/platform/s5p-mfc/s5p_mfc.c | 198 +- + drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h | 79 + + drivers/media/platform/s5p-tv/mixer_video.c | 2 + + drivers/media/v4l2-core/videobuf2-dma-contig.c | 53 + + drivers/of/of_reserved_mem.c | 85 +- + drivers/soc/samsung/Kconfig | 4 + + drivers/soc/samsung/Makefile | 1 + + .../soc/samsung}/pm_domains.c | 34 +- + include/dt-bindings/clock/exynos5410.h | 76 +- + include/linux/of_reserved_mem.h | 25 +- + include/media/videobuf2-dma-contig.h | 2 + + 74 files changed, 4338 insertions(+), 3073 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi + create mode 100644 arch/arm/boot/dts/exynos5410-odroidxu.dts + delete mode 100644 arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi + create mode 100644 arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi + create mode 100644 arch/arm/boot/dts/exynos54xx.dtsi + delete mode 100644 arch/arm/mach-exynos/mfc.h + delete mode 100644 arch/arm/mach-exynos/s5p-dev-mfc.c + create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h + rename {arch/arm/mach-exynos => drivers/soc/samsung}/pm_domains.c (85%) +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 ee4554d1d6a4] 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 (af8c34ce6ae3 Linux 4.7-rc2) +$ 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 (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + drivers/ssb/driver_gpio.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) +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 (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge parisc-hd/for-next +Already up-to-date. +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 (73be43b48fec s390/time: add leap seconds to initial system time) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/cio.h | 2 +- + arch/s390/include/asm/etr.h | 32 ----- + arch/s390/include/asm/fcx.h | 2 +- + arch/s390/include/asm/jump_label.h | 1 + + arch/s390/include/asm/pgtable.h | 201 ++++++++++++++++++++++++---- + arch/s390/include/asm/processor.h | 17 ++- + arch/s390/include/asm/timex.h | 66 +++++++++- + arch/s390/include/asm/tlbflush.h | 15 +-- + arch/s390/kernel/cache.c | 7 +- + arch/s390/kernel/early.c | 22 ++++ + arch/s390/kernel/machine_kexec.c | 55 ++++---- + arch/s390/kernel/processor.c | 113 +++++++++++----- + arch/s390/kernel/setup.c | 16 ++- + arch/s390/kernel/time.c | 74 ++++++++--- + arch/s390/kernel/vmlinux.lds.S | 9 +- + arch/s390/mm/dump_pagetables.c | 2 +- + arch/s390/mm/init.c | 2 +- + arch/s390/mm/pageattr.c | 263 ++++++++++++++++++++++++++++++++----- + arch/s390/mm/vmem.c | 68 +++++----- + drivers/s390/block/dasd_eckd.c | 4 +- + drivers/s390/char/keyboard.c | 15 +-- + drivers/s390/char/sclp_config.c | 2 +- + drivers/s390/cio/chp.h | 2 +- + drivers/s390/cio/chsc.c | 8 +- + drivers/s390/cio/idset.h | 2 +- + 25 files changed, 752 insertions(+), 248 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 (77bddea4cbbd Merge branch 'for-next-next-4.7-20160606' into for-next-20160606) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 349 +++++++++++++++- + fs/btrfs/ctree.c | 6 +- + fs/btrfs/ctree.h | 15 +- + fs/btrfs/delayed-inode.c | 95 +++-- + fs/btrfs/delayed-inode.h | 10 +- + fs/btrfs/disk-io.c | 20 +- + fs/btrfs/disk-io.h | 2 +- + fs/btrfs/extent-tree.c | 726 +++++++++++++++++++++------------ + fs/btrfs/extent_io.c | 28 +- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/file.c | 48 +-- + fs/btrfs/free-space-cache.c | 18 +- + fs/btrfs/hash.c | 5 + + fs/btrfs/hash.h | 1 + + fs/btrfs/inode.c | 98 +++-- + fs/btrfs/relocation.c | 45 +- + fs/btrfs/super.c | 57 ++- + fs/btrfs/tests/btrfs-tests.c | 6 +- + fs/btrfs/tests/btrfs-tests.h | 27 +- + fs/btrfs/tests/extent-buffer-tests.c | 13 +- + fs/btrfs/tests/extent-io-tests.c | 86 ++-- + fs/btrfs/tests/free-space-tests.c | 76 ++-- + fs/btrfs/tests/free-space-tree-tests.c | 30 +- + fs/btrfs/tests/inode-tests.c | 344 +++++++++------- + fs/btrfs/tests/qgroup-tests.c | 111 ++--- + fs/btrfs/volumes.c | 109 ++++- + include/trace/events/btrfs.h | 139 ++++++- + include/uapi/linux/btrfs.h | 2 +- + 28 files changed, 1693 insertions(+), 777 deletions(-) +Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache) +$ 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 (120212ac703c f2fs: control not to exceed # of cached nat entries) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/acl.c | 9 ++- + fs/f2fs/checkpoint.c | 61 +++++++++++---- + fs/f2fs/data.c | 117 +++++++++-------------------- + fs/f2fs/debug.c | 5 +- + fs/f2fs/dir.c | 91 ++++++++++------------ + fs/f2fs/extent_cache.c | 37 ++++----- + fs/f2fs/f2fs.h | 200 ++++++++++++++++++++++++++++++++++++------------- + fs/f2fs/file.c | 105 +++++++++++--------------- + fs/f2fs/gc.c | 4 +- + fs/f2fs/inline.c | 64 +++++++--------- + fs/f2fs/inode.c | 46 ++++++++---- + fs/f2fs/namei.c | 88 +++++++++------------- + fs/f2fs/node.c | 81 +++++++++----------- + fs/f2fs/node.h | 9 ++- + fs/f2fs/recovery.c | 8 +- + fs/f2fs/segment.c | 14 +++- + fs/f2fs/segment.h | 8 +- + fs/f2fs/super.c | 91 +++++++++++++++++++--- + fs/f2fs/xattr.c | 16 ++-- + 19 files changed, 586 insertions(+), 468 deletions(-) +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 (af8c34ce6ae3 Linux 4.7-rc2) +$ 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 (6510690149a9 ovl: store ovl_entry in inode->i_private for all inodes) +$ git merge overlayfs/overlayfs-next +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 | 89 +++++++++------------------------------ + 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, 101 insertions(+), 116 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 (26f1fe858f27 xfs: reduce lock hold times in buffer writeback) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_alloc.c | 2 +- + fs/xfs/libxfs/xfs_alloc.h | 7 ----- + fs/xfs/libxfs/xfs_attr_leaf.h | 3 --- + fs/xfs/libxfs/xfs_fs.h | 8 ++---- + fs/xfs/libxfs/xfs_rtbitmap.c | 2 +- + fs/xfs/xfs_attr_inactive.c | 2 +- + fs/xfs/xfs_attr_list.c | 2 +- + fs/xfs/xfs_bmap_util.c | 6 ++--- + fs/xfs/xfs_bmap_util.h | 2 -- + fs/xfs/xfs_buf.c | 60 +++++++++++++++++++++++++------------------ + fs/xfs/xfs_buf_item.c | 18 +++++++++---- + fs/xfs/xfs_inode.c | 16 +++--------- + fs/xfs/xfs_inode.h | 7 ----- + fs/xfs/xfs_log.c | 8 +++--- + fs/xfs/xfs_log.h | 5 ---- + fs/xfs/xfs_rtalloc.h | 2 -- + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_super.h | 2 -- + 18 files changed, 65 insertions(+), 89 deletions(-) +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 (1a695a905c18 Linux 4.7-rc1) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (cae7316708c4 efi-pstore: implement efivars_pstore_exit()) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/nvram_64.c | 4 +- + drivers/acpi/apei/erst.c | 7 +- + drivers/firmware/efi/efi-pstore.c | 13 ++ + fs/pstore/Kconfig | 31 ++++- + fs/pstore/inode.c | 1 - + fs/pstore/platform.c | 269 +++++++++++++++++++++++++++++++++----- + fs/pstore/ram.c | 10 +- + include/linux/pstore.h | 3 +- + 8 files changed, 291 insertions(+), 47 deletions(-) +Merging hid/for-next (9037766900ff Merge branch 'for-4.8/i2c-hid' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-elo.c | 2 +- + drivers/hid/hid-multitouch.c | 5 +++++ + drivers/hid/i2c-hid/i2c-hid.c | 1 + + drivers/hid/uhid.c | 33 ++++++++++++++++++++++++--------- + 4 files changed, 31 insertions(+), 10 deletions(-) +Merging i2c/i2c/for-next (1a695a905c18 Linux 4.7-rc1) +$ 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 (0ca457698824 hwmon: add support for Sensirion SHT3x sensors) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/hwmon/ina2xx.txt | 1 + + Documentation/hwmon/abituguru | 2 +- + Documentation/hwmon/max1668 | 2 +- + Documentation/hwmon/sht3x | 72 ++ + drivers/hwmon/Kconfig | 11 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/fam15h_power.c | 8 +- + drivers/hwmon/sht3x.c | 725 +++++++++++++++++++++ + include/linux/platform_data/sht3x.h | 25 + + 9 files changed, 839 insertions(+), 8 deletions(-) + create mode 100644 Documentation/hwmon/sht3x + create mode 100644 drivers/hwmon/sht3x.c + create mode 100644 include/linux/platform_data/sht3x.h +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 (2f9b4c17dbca Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/cpu-freq/core.txt | 4 +- + Documentation/cpu-freq/cpu-drivers.txt | 2 +- + arch/arm64/include/asm/acpi.h | 8 + + arch/arm64/include/asm/numa.h | 2 + + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/acpi_numa.c | 112 ++++++++++++ + arch/arm64/kernel/smp.c | 2 + + arch/arm64/mm/numa.c | 28 +-- + arch/ia64/include/asm/acpi.h | 3 + + arch/ia64/kernel/acpi.c | 2 +- + arch/ia64/kernel/setup.c | 1 + + arch/powerpc/platforms/cell/cpufreq_spudemand.c | 72 ++++---- + arch/x86/include/asm/acpi.h | 1 - + arch/x86/mm/numa.c | 2 +- + arch/x86/mm/srat.c | 116 +----------- + drivers/acpi/Kconfig | 4 +- + drivers/acpi/acpica/acnamesp.h | 3 + + drivers/acpi/acpica/acparser.h | 2 + + drivers/acpi/acpica/dsopcode.c | 6 + + drivers/acpi/acpica/evrgnini.c | 3 +- + drivers/acpi/acpica/exconfig.c | 6 +- + drivers/acpi/acpica/nsload.c | 3 +- + drivers/acpi/acpica/nsparse.c | 163 +++++++++++++---- + drivers/acpi/acpica/psparse.c | 4 +- + drivers/acpi/acpica/psxface.c | 73 ++++++++ + drivers/acpi/acpica/tbxfload.c | 3 +- + drivers/acpi/acpica/utxfinit.c | 3 +- + drivers/acpi/bus.c | 6 +- + drivers/acpi/numa.c | 226 ++++++++++++++++++------ + drivers/acpi/processor_core.c | 26 ++- + drivers/cpufreq/Kconfig | 13 +- + drivers/cpufreq/cpufreq.c | 120 ++++++++----- + drivers/cpufreq/cpufreq_conservative.c | 51 +++--- + drivers/cpufreq/cpufreq_governor.c | 54 ++---- + drivers/cpufreq/cpufreq_governor.h | 24 ++- + drivers/cpufreq/cpufreq_ondemand.c | 15 +- + drivers/cpufreq/cpufreq_performance.c | 19 +- + drivers/cpufreq/cpufreq_powersave.c | 19 +- + drivers/cpufreq/cpufreq_stats.c | 154 +++------------- + drivers/cpufreq/cpufreq_userspace.c | 104 +++++------ + drivers/cpufreq/freq_table.c | 2 - + drivers/of/of_numa.c | 4 +- + drivers/powercap/intel_rapl.c | 3 +- + include/acpi/acpi_numa.h | 4 + + include/acpi/acpixf.h | 6 + + include/acpi/processor.h | 1 + + include/linux/acpi.h | 18 +- + include/linux/cpufreq.h | 35 ++-- + include/linux/cpuidle.h | 3 + + kernel/sched/cpufreq_schedutil.c | 43 +---- + kernel/sched/idle.c | 2 +- + 51 files changed, 921 insertions(+), 660 deletions(-) + create mode 100644 arch/arm64/kernel/acpi_numa.c +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (546afd1a3678 Merge branches 'for-rc' and 'thermal-sysfs-locking' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/Makefile | 3 +- + drivers/thermal/cpu_cooling.c | 16 +- + drivers/thermal/thermal_core.c | 1363 +++++++++---------------------------- + drivers/thermal/thermal_core.h | 26 + + drivers/thermal/thermal_helpers.c | 144 ++++ + drivers/thermal/thermal_sysfs.c | 851 +++++++++++++++++++++++ + include/linux/thermal.h | 6 +- + 7 files changed, 1344 insertions(+), 1065 deletions(-) + create mode 100644 drivers/thermal/thermal_helpers.c + create mode 100644 drivers/thermal/thermal_sysfs.c +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 73f30f1758b9] 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 (4f0382030b6d Merge branch 'topic/sh' into next) +$ git merge slave-dma/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/dma/at_xdmac.c | 82 ++++++++++++++++++++++++++++++++-------------- + drivers/dma/sh/rcar-dmac.c | 2 +- + 3 files changed, 59 insertions(+), 26 deletions(-) +Merging net-next/master (3d9dc408fa6a net: Revert vrf-local changes.) +$ git merge net-next/master +Auto-merging include/linux/acpi.h +Auto-merging drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/net/ethernet/qlogic/qede/qede_main.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_main.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/dsa/dsa.txt | 278 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 328 +- + drivers/net/dsa/bcm_sf2.c | 4 +- + drivers/net/dsa/mv88e6xxx.c | 267 +- + drivers/net/dsa/mv88e6xxx.h | 6 + + drivers/net/ethernet/hisilicon/hns/hnae.c | 18 +- + drivers/net/ethernet/hisilicon/hns/hnae.h | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 247 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 105 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 33 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 250 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h | 7 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 15 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 5 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 10 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 90 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 2 +- + drivers/net/ethernet/hisilicon/hns_mdio.c | 150 +- + drivers/net/ethernet/qlogic/qed/qed.h | 13 + + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 1347 ++- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 24 + + drivers/net/ethernet/qlogic/qed/qed_dev.c | 542 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 8 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 10944 +++++++++++-------- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_hw.h | 12 +- + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 184 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 108 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 27 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 57 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 41 +- + drivers/net/ethernet/qlogic/qed/qed_sp.h | 26 + + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 26 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 40 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 20 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 2 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 22 +- + drivers/net/ethernet/renesas/ravb_main.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 14 +- + drivers/net/ethernet/ti/cpsw.c | 3 - + drivers/net/ethernet/wiznet/w5100.c | 3 +- + drivers/net/fjes/fjes_main.c | 5 +- + drivers/net/hyperv/hyperv_net.h | 19 +- + drivers/net/hyperv/netvsc.c | 11 +- + drivers/net/hyperv/netvsc_drv.c | 22 +- + drivers/net/hyperv/rndis_filter.c | 42 +- + drivers/net/loopback.c | 5 +- + drivers/net/macvlan.c | 48 +- + drivers/net/vrf.c | 6 + + include/linux/acpi.h | 13 + + include/linux/netdev_features.h | 7 +- + include/linux/netdevice.h | 1 + + include/linux/qed/common_hsi.h | 397 +- + include/linux/qed/eth_common.h | 124 +- + include/linux/qed/iscsi_common.h | 1439 +++ + include/linux/qed/qed_chain.h | 556 +- + include/linux/qed/qed_eth_if.h | 1 + + include/linux/qed/qed_if.h | 68 +- + include/linux/qed/rdma_common.h | 44 + + include/linux/qed/roce_common.h | 17 + + include/linux/qed/storage_common.h | 91 + + include/linux/qed/tcp_common.h | 226 + + include/linux/skbuff.h | 8 + + include/net/dsa.h | 55 +- + include/net/sctp/sctp.h | 4 + + include/net/sctp/structs.h | 5 + + include/net/udp.h | 4 +- + net/core/ethtool.c | 1 + + net/core/skbuff.c | 46 +- + net/dsa/Makefile | 2 +- + net/dsa/dsa.c | 214 +- + net/dsa/dsa2.c | 654 ++ + net/dsa/dsa_priv.h | 6 +- + net/dsa/slave.c | 57 +- + net/dsa/tag_brcm.c | 4 +- + net/dsa/tag_dsa.c | 10 +- + net/dsa/tag_edsa.c | 10 +- + net/dsa/tag_trailer.c | 4 +- + net/ipv4/inet_fragment.c | 2 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_output.c | 2 +- + net/ipv6/ip6_output.c | 2 +- + net/mpls/af_mpls.c | 2 +- + net/openvswitch/vport-internal_dev.c | 2 +- + net/rxrpc/af_rxrpc.c | 18 +- + net/rxrpc/ar-accept.c | 2 + + net/rxrpc/ar-ack.c | 2 + + net/rxrpc/ar-call.c | 12 +- + net/rxrpc/ar-connection.c | 2 + + net/rxrpc/ar-connevent.c | 2 + + net/rxrpc/ar-input.c | 2 + + net/rxrpc/ar-internal.h | 30 +- + net/rxrpc/ar-key.c | 4 +- + net/rxrpc/ar-local.c | 2 + + net/rxrpc/ar-output.c | 2 + + net/rxrpc/ar-peer.c | 2 + + net/rxrpc/ar-recvmsg.c | 4 +- + net/rxrpc/ar-skbuff.c | 2 + + net/rxrpc/ar-transport.c | 2 + + net/rxrpc/rxkad.c | 2 + + net/sctp/Makefile | 3 +- + net/sctp/input.c | 57 +- + net/sctp/inqueue.c | 78 +- + net/sctp/offload.c | 98 + + net/sctp/output.c | 366 +- + net/sctp/protocol.c | 3 + + net/sctp/socket.c | 2 + + 113 files changed, 14308 insertions(+), 5980 deletions(-) + create mode 100644 include/linux/qed/iscsi_common.h + create mode 100644 include/linux/qed/rdma_common.h + create mode 100644 include/linux/qed/roce_common.h + create mode 100644 include/linux/qed/storage_common.h + create mode 100644 include/linux/qed/tcp_common.h + create mode 100644 net/dsa/dsa2.c + create mode 100644 net/sctp/offload.c +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 (ed7cbbce5448 udp: Resolve NULL pointer dereference over flow-based vxlan device) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (47ce90f9f08a mwifiex: fix typo) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/carl9170/Kconfig | 8 ++-- + drivers/net/wireless/broadcom/b43/xmit.c | 13 ++++-- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 47 +++++++++++++--------- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 3 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- + 5 files changed, 44 insertions(+), 29 deletions(-) +Merging bluetooth/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (019ae3a91881 cfg80211: Advertise extended capabilities per interface type to userspace) +$ git merge mac80211-next/master +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/80211.tmpl | 1 + + drivers/net/wireless/mac80211_hwsim.c | 97 +++++++++++++++- + include/net/cfg80211.h | 81 +++++++++++--- + include/uapi/linux/nl80211.h | 14 ++- + net/mac80211/debugfs_sta.c | 78 ++++++++++++- + net/wireless/core.c | 30 +++++ + net/wireless/core.h | 4 +- + net/wireless/nl80211.c | 202 +++++++++++++++++++++------------- + net/wireless/nl80211.h | 2 +- + net/wireless/sme.c | 8 +- + 10 files changed, 410 insertions(+), 107 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 (af8c34ce6ae3 Linux 4.7-rc2) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (c666253347a6 Merge branch 'topic/mlx5' into testing/rdma-next) +$ git merge rdma-leon-test/testing/rdma-next +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cache.c | 10 +- + drivers/infiniband/core/device.c | 6 +- + drivers/infiniband/core/iwpm_msg.c | 2 +- + drivers/infiniband/core/mad.c | 6 +- + drivers/infiniband/core/sysfs.c | 19 +- + drivers/infiniband/core/uverbs.h | 12 + + drivers/infiniband/core/uverbs_cmd.c | 528 ++++++++++++++++- + drivers/infiniband/core/uverbs_main.c | 38 ++ + drivers/infiniband/core/verbs.c | 163 +++++- + drivers/infiniband/hw/hfi1/affinity.c | 31 +- + drivers/infiniband/hw/hfi1/chip.c | 6 +- + drivers/infiniband/hw/hfi1/init.c | 2 +- + drivers/infiniband/hw/hfi1/trace.c | 13 - + drivers/infiniband/hw/hfi1/user_sdma.c | 6 +- + drivers/infiniband/hw/mlx4/main.c | 4 +- + drivers/infiniband/hw/mlx5/cq.c | 12 +- + drivers/infiniband/hw/mlx5/main.c | 89 +-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 54 ++ + drivers/infiniband/hw/mlx5/qp.c | 625 ++++++++++++++++++++- + drivers/infiniband/hw/mlx5/user.h | 64 +++ + drivers/infiniband/hw/usnic/usnic_uiom.c | 5 - + drivers/infiniband/sw/rdmavt/qp.c | 6 + + drivers/infiniband/ulp/ipoib/ipoib.h | 1 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 15 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 6 + + drivers/infiniband/ulp/srp/ib_srp.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 68 ++- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 38 ++ + include/linux/mlx5/device.h | 8 +- + include/linux/mlx5/mlx5_ifc.h | 12 +- + include/linux/mlx5/qp.h | 5 +- + include/linux/mlx5/vport.h | 2 + + include/rdma/ib_verbs.h | 87 ++- + include/uapi/rdma/ib_user_verbs.h | 77 +++ + 41 files changed, 1886 insertions(+), 205 deletions(-) +Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings) +$ git merge mtd/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/devices/m25p80.c | 37 +++++++++----- + drivers/mtd/spi-nor/fsl-quadspi.c | 29 +++++------ + drivers/mtd/spi-nor/mtk-quadspi.c | 42 +++++++++------- + drivers/mtd/spi-nor/nxp-spifi.c | 25 +++++----- + drivers/mtd/spi-nor/spi-nor.c | 100 +++++++++++++++++++++++++------------- + include/linux/mtd/spi-nor.h | 8 +-- + 6 files changed, 148 insertions(+), 93 deletions(-) +Merging nand/nand/next (5c72ae1dbb53 mtd: nand: sunxi: update DT bindings) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/omap-gpmc.txt | 7 +- + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 1 + + .../devicetree/bindings/mtd/gpmc-nand.txt | 2 +- + .../devicetree/bindings/mtd/sunxi-nand.txt | 4 + + drivers/mtd/nand/brcmnand/brcmnand.c | 91 +++++- + drivers/mtd/nand/omap2.c | 7 +- + drivers/mtd/nand/sunxi_nand.c | 330 ++++++++++++++++++++- + 7 files changed, 414 insertions(+), 28 deletions(-) +Merging crypto/master (0a7f330c12f2 crypto: sha1-mb - stylistic cleanup) +$ git merge crypto/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 2 +- + .../devicetree/bindings/rng/brcm,bcm2835.txt | 7 +- + MAINTAINERS | 2 + + arch/arm/boot/dts/bcm-nsp.dtsi | 5 + + arch/arm64/include/asm/io.h | 4 +- + arch/powerpc/crypto/aes-spe-regs.h | 2 +- + arch/powerpc/kernel/iomap.c | 24 ++++ + arch/x86/crypto/sha-mb/sha1_mb.c | 110 ++++++++++----- + arch/x86/crypto/sha1_ssse3_glue.c | 6 + + arch/x86/crypto/sha256_ssse3_glue.c | 10 ++ + arch/x86/crypto/sha512_ssse3_glue.c | 6 + + crypto/crypto_user.c | 10 +- + crypto/drbg.c | 33 +++-- + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/bcm2835-rng.c | 46 ++++++- + drivers/char/hw_random/stm32-rng.c | 10 +- + drivers/crypto/caam/Kconfig | 6 +- + drivers/crypto/caam/caamhash.c | 5 +- + drivers/crypto/caam/ctrl.c | 125 +++++++++++------ + drivers/crypto/caam/desc.h | 9 +- + drivers/crypto/caam/desc_constr.h | 44 ++++-- + drivers/crypto/caam/jr.c | 22 +-- + drivers/crypto/caam/pdb.h | 137 +++++++++++++++---- + drivers/crypto/caam/regs.h | 151 ++++++++++++++------- + drivers/crypto/caam/sg_sw_sec4.h | 17 +-- + drivers/crypto/qat/qat_common/qat_algs.c | 8 +- + drivers/crypto/s5p-sss.c | 80 +++++------ + include/asm-generic/io.h | 71 +++++++++- + include/asm-generic/iomap.h | 8 ++ + include/linux/mpi.h | 1 - + lib/digsig.c | 16 ++- + lib/mpi/mpicoder.c | 126 ++--------------- + 32 files changed, 703 insertions(+), 402 deletions(-) +Merging drm/drm-next (66fd7a66e8b9 Merge branch 'drm-intel-next' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging drivers/gpu/drm/arm/hdlcd_drv.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 25 +- + MAINTAINERS | 3 + + arch/x86/kernel/early-quirks.c | 404 ++++----- + drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 3 - + drivers/gpu/drm/drm_atomic_helper.c | 3 + + drivers/gpu/drm/drm_crtc.c | 13 + + drivers/gpu/drm/drm_edid_load.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 33 +- + drivers/gpu/drm/drm_irq.c | 121 +-- + drivers/gpu/drm/drm_mm.c | 4 +- + drivers/gpu/drm/drm_modeset_lock.c | 11 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 7 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- + drivers/gpu/drm/i915/Makefile | 3 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 44 +- + drivers/gpu/drm/i915/i915_debugfs.c | 61 +- + drivers/gpu/drm/i915/i915_dma.c | 120 ++- + drivers/gpu/drm/i915/i915_drv.c | 111 ++- + drivers/gpu/drm/i915/i915_drv.h | 307 +++++-- + drivers/gpu/drm/i915/i915_gem.c | 400 ++++----- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 6 +- + drivers/gpu/drm/i915/i915_gem_context.c | 291 +++--- + drivers/gpu/drm/i915/i915_gem_evict.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 14 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 14 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 239 ++--- + drivers/gpu/drm/i915/i915_gem_gtt.h | 39 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 17 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 48 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 4 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 12 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 81 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 6 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 7 +- + drivers/gpu/drm/i915/i915_irq.c | 485 +++++----- + drivers/gpu/drm/i915/i915_params.c | 4 + + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_reg.h | 17 +- + drivers/gpu/drm/i915/i915_sysfs.c | 9 +- + drivers/gpu/drm/i915/i915_trace.h | 36 +- + drivers/gpu/drm/i915/i915_vgpu.c | 7 +- + drivers/gpu/drm/i915/i915_vgpu.h | 2 +- + drivers/gpu/drm/i915/intel_audio.c | 8 +- + drivers/gpu/drm/i915/intel_bios.c | 19 + + drivers/gpu/drm/i915/intel_bios.h | 16 +- + drivers/gpu/drm/i915/intel_csr.c | 30 +- + drivers/gpu/drm/i915/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 896 +++++++++---------- + drivers/gpu/drm/i915/intel_dp.c | 428 +-------- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 172 ++++ + drivers/gpu/drm/i915/intel_dpio_phy.c | 470 ++++++++++ + drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +- + drivers/gpu/drm/i915/intel_drv.h | 186 ++-- + drivers/gpu/drm/i915/intel_dsi.c | 49 +- + drivers/gpu/drm/i915/intel_dsi.h | 4 + + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 179 ++++ + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 77 +- + drivers/gpu/drm/i915/intel_fbc.c | 4 +- + drivers/gpu/drm/i915/intel_fbdev.c | 35 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 26 +- + drivers/gpu/drm/i915/intel_hdmi.c | 352 +------- + drivers/gpu/drm/i915/intel_hotplug.c | 13 +- + drivers/gpu/drm/i915/intel_lrc.c | 617 ++++++------- + drivers/gpu/drm/i915/intel_lrc.h | 10 +- + drivers/gpu/drm/i915/intel_lvds.c | 2 +- + drivers/gpu/drm/i915/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/intel_opregion.c | 4 +- + drivers/gpu/drm/i915/intel_overlay.c | 147 ++-- + drivers/gpu/drm/i915/intel_panel.c | 8 + + drivers/gpu/drm/i915/intel_pm.c | 1075 +++++++++++++---------- + drivers/gpu/drm/i915/intel_psr.c | 53 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 476 +++++----- + drivers/gpu/drm/i915/intel_ringbuffer.h | 37 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 5 + + drivers/gpu/drm/i915/intel_sprite.c | 27 +- + drivers/gpu/drm/i915/intel_uncore.c | 219 ++--- + drivers/gpu/drm/i915/intel_vbt_defs.h | 6 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_fbdev.c | 14 - + drivers/gpu/drm/nouveau/nouveau_drm.c | 10 +- + drivers/gpu/drm/qxl/qxl_display.c | 1 - + drivers/gpu/drm/radeon/radeon_drv.c | 10 +- + drivers/gpu/drm/vc4/vc4_bo.c | 2 - + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_gem.c | 11 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 8 +- + drivers/gpu/vga/vga_switcheroo.c | 34 +- + drivers/net/ethernet/mellanox/mlx4/pd.c | 4 +- + include/drm/drmP.h | 15 +- + include/drm/drm_dp_helper.h | 1 + + include/drm/i915_drm.h | 3 + + include/linux/io-mapping.h | 10 +- + include/linux/vga_switcheroo.h | 2 + + 96 files changed, 4676 insertions(+), 4139 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c + create mode 100644 drivers/gpu/drm/i915/intel_dpio_phy.c + create mode 100644 drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c +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 (6bb6285582e0 drm/i915/gen9: Add WaVFEStateAfterPipeControlwithMediaStateClear) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_cmd_parser.c | 9 +- + drivers/gpu/drm/i915/i915_debugfs.c | 106 ++-- + drivers/gpu/drm/i915/i915_dma.c | 12 +- + drivers/gpu/drm/i915/i915_drv.c | 18 +- + drivers/gpu/drm/i915/i915_drv.h | 104 ++-- + drivers/gpu/drm/i915/i915_gem.c | 69 ++- + drivers/gpu/drm/i915/i915_gem_context.c | 209 +++---- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 12 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 167 +++--- + drivers/gpu/drm/i915/i915_irq.c | 37 +- + drivers/gpu/drm/i915/i915_params.c | 14 +- + drivers/gpu/drm/i915/i915_params.h | 3 +- + drivers/gpu/drm/i915/i915_reg.h | 5 +- + drivers/gpu/drm/i915/i915_sysfs.c | 2 +- + drivers/gpu/drm/i915/i915_trace.h | 12 +- + drivers/gpu/drm/i915/i915_vgpu.c | 4 +- + drivers/gpu/drm/i915/intel_bios.c | 9 +- + drivers/gpu/drm/i915/intel_crt.c | 2 +- + drivers/gpu/drm/i915/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 863 ++++++++++++++++++----------- + drivers/gpu/drm/i915/intel_dp.c | 41 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 38 +- + drivers/gpu/drm/i915/intel_drv.h | 9 +- + drivers/gpu/drm/i915/intel_dsi.c | 11 +- + drivers/gpu/drm/i915/intel_dvo.c | 18 +- + drivers/gpu/drm/i915/intel_fbdev.c | 4 +- + drivers/gpu/drm/i915/intel_guc.h | 37 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 3 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 153 +++-- + drivers/gpu/drm/i915/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 165 +++--- + drivers/gpu/drm/i915/intel_lrc.h | 9 +- + drivers/gpu/drm/i915/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/intel_opregion.c | 105 ++-- + drivers/gpu/drm/i915/intel_pm.c | 176 ++++-- + drivers/gpu/drm/i915/intel_ringbuffer.c | 5 + + drivers/gpu/drm/i915/intel_ringbuffer.h | 4 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 57 +- + drivers/gpu/drm/i915/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/intel_sprite.c | 16 +- + drivers/gpu/drm/i915/intel_tv.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 7 +- + 44 files changed, 1548 insertions(+), 983 deletions(-) +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 (ddac4b5a6c08 Documentation: add fence-array to kernel DocBook) +$ git merge drm-misc/topic/drm-misc +Recorded preimage for 'Documentation/DocBook/device-drivers.tmpl' +Auto-merging include/linux/fence.h +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/i915_vgpu.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/drm_modes.c +Auto-merging drivers/gpu/drm/drm_fb_cma_helper.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +Auto-merging drivers/gpu/drm/arm/hdlcd_crtc.c +Auto-merging Documentation/DocBook/device-drivers.tmpl +CONFLICT (content): Merge conflict in Documentation/DocBook/device-drivers.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/DocBook/device-drivers.tmpl'. +[master 8c641e81290a] Merge remote-tracking branch 'drm-misc/topic/drm-misc' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/device-drivers.tmpl | 2 + + Documentation/DocBook/gpu.tmpl | 2 +- + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/fence-array.c | 144 +++++++++++++++++++++++ + drivers/dma-buf/fence.c | 8 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 2 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 19 --- + drivers/gpu/drm/armada/armada_crtc.c | 14 +-- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 80 ++++++------- + drivers/gpu/drm/drm_atomic_helper.c | 61 ++++------ + drivers/gpu/drm/drm_bridge.c | 2 +- + drivers/gpu/drm/drm_crtc.c | 100 ++++------------ + drivers/gpu/drm/drm_fb_cma_helper.c | 19 +-- + drivers/gpu/drm/drm_fops.c | 18 +-- + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_irq.c | 12 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + drivers/gpu/drm/drm_plane_helper.c | 10 +- + drivers/gpu/drm/drm_probe_helper.c | 21 +++- + drivers/gpu/drm/drm_vma_manager.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 +- + drivers/gpu/drm/i915/i915_reg.h | 2 +- + drivers/gpu/drm/i915/i915_vgpu.c | 24 ++-- + drivers/gpu/drm/i915/intel_atomic.c | 5 +- + drivers/gpu/drm/i915/intel_dp.c | 16 +-- + drivers/gpu/drm/i915/intel_fbc.c | 3 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 20 ++-- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 10 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 12 +- + drivers/gpu/drm/msm/msm_atomic.c | 37 ++---- + drivers/gpu/drm/nouveau/nouveau_fence.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_usif.c | 1 - + drivers/gpu/drm/omapdrm/omap_drv.c | 11 +- + drivers/gpu/drm/qxl/qxl_display.c | 7 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 6 +- + drivers/gpu/drm/radeon/radeon_pm.c | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 20 ++-- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 +- + drivers/gpu/drm/udl/udl_modeset.c | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 13 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 +- + drivers/gpu/drm/vc4/vc4_kms.c | 10 +- + drivers/gpu/drm/vc4/vc4_plane.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- + drivers/staging/android/sync.h | 3 +- + include/drm/drmP.h | 13 +- + include/drm/drm_atomic.h | 66 ++++++++--- + include/drm/drm_atomic_helper.h | 24 +++- + include/drm/drm_crtc.h | 157 ++++++++++++++++++++----- + include/drm/drm_modes.h | 2 + + include/linux/fence-array.h | 73 ++++++++++++ + include/linux/fence.h | 13 +- + 67 files changed, 709 insertions(+), 443 deletions(-) + create mode 100644 drivers/dma-buf/fence-array.c + create mode 100644 include/linux/fence-array.h +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 (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging drm-vc4/drm-vc4-next (a9402dfe17bd drm/vc4: clean up error exit path on failed dpi_connector allocation) +$ git merge drm-vc4/drm-vc4-next +Already up-to-date. +Merging sunxi/sunxi/for-next (30ce0df9ee51 Merge branches 'sunxi/defconfig-for-4.8', 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/axp209.dtsi | 1 + + arch/arm/boot/dts/sun4i-a10.dtsi | 91 ++++++++++++++++++++++-- + arch/arm/boot/dts/sun5i-a13.dtsi | 122 +++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/sun5i-q8-common.dtsi | 55 +++++++++++++++ + arch/arm/boot/dts/sun5i-r8.dtsi | 120 ++------------------------------ + arch/arm/boot/dts/sun7i-a20.dtsi | 85 +++++++++++++++++++++-- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 2 + + drivers/gpu/drm/sun4i/Kconfig | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_dotclock.c | 39 +++++++++-- + drivers/gpu/drm/sun4i/sun4i_drv.c | 50 ++++++-------- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 16 ++++- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 23 ++++--- + 14 files changed, 438 insertions(+), 173 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 (545c89f17046 Merge remote-tracking branches 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next) +$ git merge regmap/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/base/regmap/regmap-irq.c | 15 +++++++++++---- + include/linux/regmap.h | 10 ++++++++++ + 3 files changed, 22 insertions(+), 4 deletions(-) +Merging sound/for-next (1524c7191be2 ALSA: adlib: Utilize the module_isa_driver macro) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/isa/ad1848/ad1848.c | 13 +------------ + sound/isa/adlib.c | 13 +------------ + sound/isa/cmi8328.c | 13 +------------ + sound/isa/cs423x/cs4231.c | 13 +------------ + sound/isa/galaxy/galaxy.c | 13 +------------ + sound/isa/gus/gusclassic.c | 13 +------------ + sound/isa/gus/gusextreme.c | 13 +------------ + sound/isa/gus/gusmax.c | 13 +------------ + sound/isa/sb/jazz16.c | 13 +------------ + sound/isa/sb/sb8.c | 13 +------------ + sound/isa/sc6000.c | 13 +------------ + 11 files changed, 11 insertions(+), 132 deletions(-) +Merging sound-asoc/for-next (86bb716e9d4d Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/tas571x', 'asoc/topic/tlv320aic31xx' and 'asoc/topic/wm8985' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/samsung/odroidx2_max98090.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/adi,adau7002.txt | 19 + + .../bindings/sound/brcm,cygnus-audio.txt | 67 + + .../devicetree/bindings/sound/cs53l30.txt | 40 + + .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 +- + .../devicetree/bindings/sound/max9860.txt | 28 + + .../devicetree/bindings/sound/mt8173-rt5650.txt | 5 + + .../devicetree/bindings/sound/omap-mcpdm.txt | 10 + + .../devicetree/bindings/sound/rockchip-i2s.txt | 5 + + .../bindings/sound/samsung,odroidx2-max98090.txt | 35 - + .../devicetree/bindings/sound/sgtl5000.txt | 18 +- + Documentation/sound/alsa/soc/machine.txt | 2 +- + MAINTAINERS | 11 +- + include/linux/mfd/arizona/core.h | 10 + + include/sound/soc-dapm.h | 5 +- + include/sound/soc.h | 11 + + sound/soc/atmel/Kconfig | 1 + + sound/soc/bcm/Kconfig | 9 + + sound/soc/bcm/Makefile | 5 + + sound/soc/bcm/cygnus-pcm.c | 861 +++++++++++ + sound/soc/bcm/cygnus-ssp.c | 1529 ++++++++++++++++++++ + sound/soc/bcm/cygnus-ssp.h | 139 ++ + sound/soc/codecs/Kconfig | 25 +- + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/adau7002.c | 80 + + sound/soc/codecs/ak4613.c | 1 - + sound/soc/codecs/ak4642.c | 13 +- + sound/soc/codecs/arizona.c | 43 + + sound/soc/codecs/arizona.h | 19 + + sound/soc/codecs/cs47l24.c | 19 + + sound/soc/codecs/cs53l30.c | 1101 ++++++++++++++ + sound/soc/codecs/cs53l30.h | 458 ++++++ + sound/soc/codecs/hdac_hdmi.c | 20 + + sound/soc/codecs/max9860.c | 753 ++++++++++ + sound/soc/codecs/max9860.h | 162 +++ + sound/soc/codecs/nau8825.c | 461 ++++-- + sound/soc/codecs/nau8825.h | 45 +- + sound/soc/codecs/pcm5102a.c | 1 - + sound/soc/codecs/tas571x.c | 188 +++ + sound/soc/codecs/tas571x.h | 40 + + sound/soc/codecs/tlv320aic31xx.h | 134 +- + sound/soc/codecs/wm5102.c | 1 + + sound/soc/codecs/wm5110.c | 19 + + sound/soc/codecs/wm8985.c | 143 +- + sound/soc/codecs/wm8985.h | 38 + + sound/soc/codecs/wm8998.c | 1 + + sound/soc/codecs/wm_adsp.c | 5 + + sound/soc/codecs/wm_adsp.h | 4 + + sound/soc/davinci/davinci-mcasp.c | 65 +- + sound/soc/davinci/davinci-mcasp.h | 4 +- + sound/soc/dwc/designware_i2s.c | 68 +- + sound/soc/fsl/Kconfig | 1 + + sound/soc/generic/simple-card.c | 31 +- + sound/soc/intel/Kconfig | 16 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 460 ++++++ + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 39 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 39 +- + sound/soc/intel/common/sst-acpi.h | 2 +- + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/bxt-sst.c | 26 +- + sound/soc/intel/skylake/skl-nhlt.c | 40 + + sound/soc/intel/skylake/skl-nhlt.h | 22 + + sound/soc/intel/skylake/skl-sst-dsp.h | 8 + + sound/soc/intel/skylake/skl-sst-ipc.h | 3 + + sound/soc/intel/skylake/skl-sst-utils.c | 256 ++++ + sound/soc/intel/skylake/skl-sst.c | 23 +- + sound/soc/intel/skylake/skl-topology.c | 4 + + sound/soc/intel/skylake/skl.c | 13 +- + sound/soc/intel/skylake/skl.h | 6 + + sound/soc/mediatek/mt8173-rt5650.c | 45 +- + sound/soc/mediatek/mtk-afe-pcm.c | 16 +- + sound/soc/omap/Kconfig | 1 + + sound/soc/omap/omap-mcpdm.c | 74 +- + sound/soc/rockchip/rockchip_i2s.c | 71 +- + sound/soc/rockchip/rockchip_i2s.h | 11 +- + sound/soc/rockchip/rockchip_max98090.c | 65 +- + sound/soc/samsung/Kconfig | 8 - + sound/soc/samsung/Makefile | 2 - + sound/soc/samsung/i2s.c | 31 +- + sound/soc/samsung/odroidx2_max98090.c | 185 --- + sound/soc/sh/rcar/adg.c | 2 +- + sound/soc/sh/rcar/rsrc-card.c | 2 - + sound/soc/soc-dapm.c | 58 +- + sound/soc/soc-pcm.c | 43 +- + 84 files changed, 7719 insertions(+), 617 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.txt + create mode 100644 Documentation/devicetree/bindings/sound/brcm,cygnus-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs53l30.txt + create mode 100644 Documentation/devicetree/bindings/sound/max9860.txt + delete mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt + create mode 100644 sound/soc/bcm/cygnus-pcm.c + create mode 100644 sound/soc/bcm/cygnus-ssp.c + create mode 100644 sound/soc/bcm/cygnus-ssp.h + create mode 100644 sound/soc/codecs/adau7002.c + create mode 100644 sound/soc/codecs/cs53l30.c + create mode 100644 sound/soc/codecs/cs53l30.h + create mode 100644 sound/soc/codecs/max9860.c + create mode 100644 sound/soc/codecs/max9860.h + create mode 100644 sound/soc/intel/boards/bxt_da7219_max98357a.c + create mode 100644 sound/soc/intel/skylake/skl-sst-utils.c + delete mode 100644 sound/soc/samsung/odroidx2_max98090.c +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 (1afca2b66aac Input: add Pegasus Notetaker tablet 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-mt.c | 17 +- + 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/tablet/Kconfig | 15 + + drivers/input/tablet/Makefile | 1 + + drivers/input/tablet/pegasus_notetaker.c | 421 +++++++ + drivers/input/touchscreen/Kconfig | 28 +- + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/migor_ts.c | 6 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 1214 ++++++++++++++++++++ + drivers/input/touchscreen/surface3_spi.c | 427 +++++++ + drivers/input/touchscreen/ti_am335x_tsc.c | 2 +- + 19 files changed, 2504 insertions(+), 22 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/tablet/pegasus_notetaker.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 (29565b2a733e dm mpath: add optional "queue_mode" feature) +$ git merge device-mapper/for-next +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-io.c | 2 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-kcopyd.c | 2 +- + drivers/md/dm-mpath.c | 354 +++++++++++-- + 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 + + 16 files changed, 1588 insertions(+), 1208 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 (ba965b4ebd31 mmc: tmio: make a cast explicit) +$ git merge mmc-uh/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 1 + + MAINTAINERS | 1 + + drivers/mmc/card/block.c | 4 +- + drivers/mmc/core/bus.c | 3 +- + drivers/mmc/core/core.c | 9 +++ + drivers/mmc/core/debugfs.c | 3 +- + drivers/mmc/core/host.c | 2 + + drivers/mmc/core/mmc.c | 84 ++++++++++++++++++++++++++- + drivers/mmc/host/sdhci-of-arasan.c | 20 +++++++ + drivers/mmc/host/sdhci.c | 17 +++++- + drivers/mmc/host/sh_mobile_sdhi.c | 14 +++-- + drivers/mmc/host/tmio_mmc.h | 2 +- + include/linux/mmc/card.h | 1 + + include/linux/mmc/host.h | 12 ++++ + include/linux/mmc/mmc.h | 3 + + 15 files changed, 163 insertions(+), 13 deletions(-) +Merging md/for-next (db76767213be md: simplify the code with md_kick_rdev_from_array) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 26 ++++++++++++-------------- + drivers/md/md.h | 3 +++ + drivers/md/raid5.c | 4 ++-- + 3 files changed, 17 insertions(+), 16 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 (e9f5a58b63ab Merge remote-tracking branch 'regulator/topic/pwm' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/axp20x-regulator.c | 119 +++++++++++++++++++++++++-------- + drivers/regulator/fixed.c | 14 +--- + drivers/regulator/max8973-regulator.c | 16 ++--- + drivers/regulator/mt6397-regulator.c | 95 ++++++++++++++++++++++---- + drivers/regulator/pv88060-regulator.c | 3 - + drivers/regulator/pv88080-regulator.c | 3 - + drivers/regulator/pv88090-regulator.c | 3 - + drivers/regulator/pwm-regulator.c | 5 -- + drivers/regulator/qcom_smd-regulator.c | 14 +++- + drivers/regulator/tps51632-regulator.c | 9 ++- + 10 files changed, 200 insertions(+), 81 deletions(-) +Merging security/next (40d273782ff1 security: tomoyo: simplify the gc kthread creation) +$ git merge security/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + include/linux/capability.h | 5 +++++ + kernel/capability.c | 46 ++++++++++++++++++++++++++++++++++++---------- + net/sysctl_net.c | 2 +- + security/security.c | 29 +++++++++++++++++++++++++---- + security/tomoyo/gc.c | 9 ++------- + 6 files changed, 70 insertions(+), 23 deletions(-) +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 (0e0e36774081 netlabel: add address family checks to netlbl_{sock,req}_delattr()) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + net/netlabel/netlabel_kapi.c | 12 ++++++-- + security/selinux/ss/services.c | 70 +++++++++++++----------------------------- + 2 files changed, 32 insertions(+), 50 deletions(-) +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 (2566278551d3 Merge git://git.infradead.org/intel-iommu) +$ 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 (f3e6a55c3653 Documentation: dmaengine: fix typo for device_resume) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/dmaengine/provider.txt | 2 +- + Documentation/kernel-parameters.txt | 5 +- + Documentation/mic/mpssd/mpssd.c | 4 +- + Documentation/sync_file.txt | 6 +- + Documentation/zh_CN/CodingStyle | 581 +++++++++++++++++++++-------------- + 5 files changed, 359 insertions(+), 239 deletions(-) +Merging trivial/for-next (52bbe141f37f gitignore: fix wording) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (2b4c7afe79a8 audit: fixup: log on errors from filter user rules) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/auditfilter.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging devicetree/for-next (f83803305b00 of: add vendor prefix for UniWest) +$ git merge devicetree/for-next +Resolved 'drivers/of/of_reserved_mem.c' using previous resolution. +Auto-merging drivers/of/of_reserved_mem.c +CONFLICT (content): Merge conflict in drivers/of/of_reserved_mem.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2df5776c1bd6] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/marvell-bt-sd8xxx.txt | 8 ++++---- + Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 7 ++----- + drivers/of/irq.c | 19 ++++++++++--------- + drivers/of/of_reserved_mem.c | 5 ++++- + include/linux/of.h | 2 +- + 6 files changed, 22 insertions(+), 20 deletions(-) +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 (e767713092de Merge remote-tracking branches 'spi/topic/maintainers', 'spi/topic/orion', 'spi/topic/pxa2xx' and 'spi/topic/rockchip' into spi-next) +$ git merge spi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-orion.txt | 49 +++++++++++- + .../devicetree/bindings/spi/spi-rockchip.txt | 11 ++- + MAINTAINERS | 1 + + drivers/spi/spi-orion.c | 88 ++++++++++++++++++++++ + drivers/spi/spi-pxa2xx.c | 10 +-- + drivers/spi/spi-rockchip.c | 3 + + drivers/spi/spi-ti-qspi.c | 7 ++ + 7 files changed, 155 insertions(+), 14 deletions(-) +Merging tip/auto-latest (f69d12a8cfff Merge branch 'locking/core') +$ git merge tip/auto-latest +Auto-merging kernel/sched/idle.c +Merge made by the 'recursive' strategy. + arch/x86/events/core.c | 23 ++ + arch/x86/events/intel/core.c | 94 +++++- + arch/x86/events/intel/rapl.c | 2 +- + arch/x86/events/intel/uncore.c | 43 ++- + arch/x86/events/intel/uncore.h | 4 + + arch/x86/events/intel/uncore_snbep.c | 117 ++++++-- + arch/x86/events/perf_event.h | 10 + + arch/x86/include/asm/topology.h | 21 +- + arch/x86/include/asm/uaccess.h | 23 +- + arch/x86/kernel/cpu/intel.c | 7 +- + arch/x86/kernel/smpboot.c | 25 +- + drivers/firmware/efi/arm-init.c | 14 +- + include/linux/compiler.h | 4 + + include/linux/efi.h | 2 +- + include/linux/futex.h | 12 +- + include/linux/percpu-refcount.h | 12 +- + include/linux/perf_event.h | 15 +- + include/linux/sched.h | 5 + + include/linux/seqlock.h | 7 +- + include/uapi/linux/futex.h | 6 +- + include/uapi/linux/perf_event.h | 6 +- + kernel/bpf/stackmap.c | 2 +- + kernel/events/callchain.c | 14 +- + kernel/events/core.c | 156 +++++++--- + kernel/exit.c | 76 +++++ + kernel/fork.c | 7 + + kernel/futex.c | 557 +++++++++++++++++++++++++++++++++-- + kernel/locking/lockdep.c | 13 +- + kernel/locking/mutex-debug.h | 4 +- + kernel/locking/mutex.c | 9 +- + kernel/locking/mutex.h | 10 +- + kernel/locking/rtmutex.c | 2 +- + kernel/locking/rwsem-xadd.c | 98 ++++-- + kernel/sched/fair.c | 38 +-- + kernel/sched/idle.c | 4 +- + tools/lib/api/fd/array.c | 5 +- + tools/lib/api/fd/array.h | 3 +- + tools/perf/.gitignore | 1 + + tools/perf/arch/x86/util/tsc.c | 2 + + tools/perf/bench/futex-hash.c | 38 ++- + tools/perf/bench/futex.h | 14 + + tools/perf/builtin-record.c | 9 +- + tools/perf/tests/fdarray.c | 8 +- + tools/perf/util/build-id.c | 115 ++++++-- + tools/perf/util/build-id.h | 2 + + tools/perf/util/callchain.h | 1 + + tools/perf/util/data-convert-bt.c | 41 ++- + tools/perf/util/db-export.c | 13 +- + tools/perf/util/dso.h | 5 + + tools/perf/util/event.c | 2 + + tools/perf/util/evlist.c | 43 ++- + tools/perf/util/evlist.h | 2 + + tools/perf/util/evsel.c | 19 +- + tools/perf/util/evsel.h | 2 + + tools/perf/util/parse-events.c | 8 + + tools/perf/util/parse-events.h | 1 + + tools/perf/util/parse-events.l | 1 + + tools/perf/util/session.c | 2 + + tools/perf/util/symbol.c | 87 +++--- + tools/perf/util/thread.c | 11 + + tools/perf/util/thread.h | 2 + + 61 files changed, 1527 insertions(+), 352 deletions(-) +Merging clockevents/clockevents/next (15d7d53f701f Merge branch 'clockevents/clksrc-of-ret-4' into clockevents/next) +$ git merge clockevents/clockevents/next +Recorded preimage for 'arch/arm/Kconfig' +Recorded preimage for 'arch/arm/mach-mxs/Kconfig' +Recorded preimage for 'drivers/clocksource/arm_arch_timer.c' +Auto-merging include/linux/of.h +Auto-merging drivers/clocksource/tango_xtal.c +Auto-merging drivers/clocksource/arm_arch_timer.c +CONFLICT (content): Merge conflict in drivers/clocksource/arm_arch_timer.c +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/mips/ralink/cevt-rt3352.c +Auto-merging arch/arm/mach-u300/Kconfig +Auto-merging arch/arm/mach-prima2/Kconfig +Auto-merging arch/arm/mach-mxs/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig +Auto-merging arch/arm/mach-moxart/Kconfig +Auto-merging arch/arm/mach-integrator/Kconfig +Auto-merging arch/arm/mach-bcm/Kconfig +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/Kconfig'. +Recorded resolution for 'arch/arm/mach-mxs/Kconfig'. +Recorded resolution for 'drivers/clocksource/arm_arch_timer.c'. +[master aea33bb5db0d] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 2 +- + arch/arm/kernel/smp_twd.c | 3 +- + arch/arm/mach-bcm/Kconfig | 2 + + arch/arm/mach-integrator/Kconfig | 2 +- + arch/arm/mach-keystone/Kconfig | 2 +- + arch/arm/mach-moxart/Kconfig | 2 +- + arch/arm/mach-mxs/Kconfig | 2 +- + arch/arm/mach-nspire/Kconfig | 1 + + arch/arm/mach-prima2/Kconfig | 2 + + arch/arm/mach-u300/Kconfig | 2 +- + arch/microblaze/kernel/timer.c | 45 +++++++++++---- + arch/mips/ralink/cevt-rt3352.c | 17 ++++-- + arch/nios2/kernel/time.c | 67 ++++++++++++++------- + drivers/clocksource/Kconfig | 89 +++++++++++++++++++++++++++- + drivers/clocksource/Makefile | 22 +++---- + drivers/clocksource/arm_arch_timer.c | 44 ++++++++------ + drivers/clocksource/arm_global_timer.c | 26 ++++++--- + drivers/clocksource/armv7m_systick.c | 17 ++++-- + drivers/clocksource/asm9260_timer.c | 22 ++++--- + drivers/clocksource/bcm2835_timer.c | 38 ++++++++---- + drivers/clocksource/bcm_kona_timer.c | 9 +-- + drivers/clocksource/cadence_ttc_timer.c | 74 +++++++++++++++--------- + drivers/clocksource/clksrc-dbx500-prcmu.c | 4 +- + drivers/clocksource/clksrc-probe.c | 14 ++++- + drivers/clocksource/clksrc_st_lpc.c | 20 ++++--- + drivers/clocksource/clps711x-timer.c | 10 ++-- + drivers/clocksource/dw_apb_timer_of.c | 4 +- + drivers/clocksource/exynos_mct.c | 32 +++++++---- + drivers/clocksource/fsl_ftm_timer.c | 20 ++++--- + drivers/clocksource/h8300_timer16.c | 12 ++-- + drivers/clocksource/h8300_timer8.c | 11 ++-- + drivers/clocksource/h8300_tpu.c | 10 ++-- + drivers/clocksource/meson6_timer.c | 19 ++++-- + drivers/clocksource/mips-gic-timer.c | 24 +++++--- + drivers/clocksource/moxart_timer.c | 39 ++++++++----- + drivers/clocksource/mps2-timer.c | 8 ++- + drivers/clocksource/mtk_timer.c | 8 ++- + drivers/clocksource/mxs_timer.c | 26 ++++++--- + drivers/clocksource/nomadik-mtu.c | 43 +++++++++----- + drivers/clocksource/pxa_timer.c | 44 ++++++++++---- + drivers/clocksource/qcom-timer.c | 23 ++++---- + drivers/clocksource/rockchip_timer.c | 10 ++-- + drivers/clocksource/samsung_pwm_timer.c | 54 +++++++++-------- + drivers/clocksource/sun4i_timer.c | 43 ++++++++++---- + drivers/clocksource/tango_xtal.c | 10 ++-- + drivers/clocksource/tegra20_timer.c | 24 ++++---- + drivers/clocksource/time-armada-370-xp.c | 96 +++++++++++++++++++++++-------- + drivers/clocksource/time-efm32.c | 16 ++++-- + drivers/clocksource/time-lpc32xx.c | 10 ++-- + drivers/clocksource/time-orion.c | 50 +++++++++++----- + drivers/clocksource/time-pistachio.c | 18 +++--- + drivers/clocksource/timer-atlas7.c | 30 ++++++---- + drivers/clocksource/timer-atmel-pit.c | 41 ++++++++----- + drivers/clocksource/timer-atmel-st.c | 42 +++++++++----- + drivers/clocksource/timer-digicolor.c | 14 +++-- + drivers/clocksource/timer-imx-gpt.c | 50 ++++++++++------ + drivers/clocksource/timer-integrator-ap.c | 57 +++++++++++------- + drivers/clocksource/timer-keystone.c | 13 +++-- + drivers/clocksource/timer-prima2.c | 42 ++++++++++---- + drivers/clocksource/timer-sp804.c | 87 ++++++++++++++++++---------- + drivers/clocksource/timer-stm32.c | 8 ++- + drivers/clocksource/timer-sun5i.c | 33 +++++++---- + drivers/clocksource/timer-ti-32k.c | 8 ++- + drivers/clocksource/timer-u300.c | 36 ++++++++---- + drivers/clocksource/versatile.c | 4 +- + drivers/clocksource/vf_pit_timer.c | 25 +++++--- + drivers/clocksource/vt8500_timer.c | 24 +++++--- + drivers/clocksource/zevio-timer.c | 4 +- + include/clocksource/timer-sp804.h | 8 +-- + include/linux/clk.h | 4 ++ + include/linux/clocksource.h | 2 +- + include/linux/of.h | 3 + + 72 files changed, 1169 insertions(+), 558 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 27e282cd3281 Merge remote-tracking branch 'tip/auto-latest' +Merging next-20160606 version of clockevents +$ git merge -m next-20160606/clockevents cee77c2c5b5764f4a2a8eb14a7343e0d0376f723 +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 (665f05e0b836 EDAC, sb_edac: Readd accidentally dropped Broadwell-D support) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (d7e3528eed85 irqchip: bcm2835: Avoid arch/arm-specific handle_IRQ) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-bcm2835.c | 3 +-- + drivers/irqchip/irq-bcm2836.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) +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 (13d4a7b72182 documentation: Clarify limited control-dependency scope) +$ git merge rcu/rcu/next +Auto-merging kernel/sched/fair.c +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/Requirements.html | 35 ++ + Documentation/RCU/stallwarn.txt | 2 +- + Documentation/RCU/whatisRCU.txt | 3 + + Documentation/memory-barriers.txt | 41 ++ + Documentation/sysctl/kernel.txt | 12 + + include/linux/kernel.h | 1 + + include/linux/rcupdate.h | 23 +- + include/linux/torture.h | 4 + + kernel/rcu/Makefile | 3 +- + kernel/rcu/rcuperf.c | 21 +- + kernel/rcu/rcutorture.c | 9 +- + kernel/rcu/tree.c | 589 +----------------- + kernel/rcu/tree.h | 15 + + kernel/rcu/tree_exp.h | 656 +++++++++++++++++++++ + kernel/rcu/tree_plugin.h | 95 +-- + kernel/rcu/update.c | 7 +- + kernel/rcu/waketorture.c | 537 +++++++++++++++++ + kernel/sched/fair.c | 2 +- + kernel/sysctl.c | 11 + + kernel/torture.c | 176 ++++-- + lib/Kconfig.debug | 51 +- + .../testing/selftests/rcutorture/bin/functions.sh | 12 +- + .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 ++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 34 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 4 +- + .../selftests/rcutorture/bin/parse-console.sh | 7 +- + .../selftests/rcutorture/configs/wake/CFLIST | 1 + + .../selftests/rcutorture/configs/wake/CFcommon | 2 + + tools/testing/selftests/rcutorture/configs/wake/SH | 19 + + .../selftests/rcutorture/configs/wake/SH.boot | 1 + + .../testing/selftests/rcutorture/configs/wake/STI | 19 + + .../selftests/rcutorture/configs/wake/STI.boot | 1 + + .../rcutorture/configs/wake/ver_functions.sh | 43 ++ + tools/testing/selftests/rcutorture/doc/initrd.txt | 22 + + 35 files changed, 1702 insertions(+), 797 deletions(-) + create mode 100644 kernel/rcu/tree_exp.h + create mode 100644 kernel/rcu/waketorture.c + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh +Merging kvm/linux-next (4340fa55298d Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ 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 (d01b83d6d981 KVM: s390: turn on tx even without ctx) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 2 + + Documentation/virtual/kvm/devices/vm.txt | 87 ++++++++++++- + arch/s390/include/asm/cpacf.h | 10 ++ + arch/s390/include/asm/kvm_host.h | 7 +- + arch/s390/include/asm/sclp.h | 18 ++- + arch/s390/include/uapi/asm/kvm.h | 29 +++++ + arch/s390/kvm/gaccess.c | 152 ++++++++++++---------- + arch/s390/kvm/intercept.c | 2 + + arch/s390/kvm/kvm-s390.c | 210 +++++++++++++++++++++++++++++-- + arch/s390/kvm/kvm-s390.h | 6 + + arch/s390/kvm/trace.h | 6 +- + drivers/s390/char/sclp_early.c | 11 +- + 12 files changed, 453 insertions(+), 87 deletions(-) +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 (b32bd7e7d5c1 hsi: use kmemdup) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/cmt_speech.c | 2 +- + drivers/hsi/hsi.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging leds/for-next (cc671d40dfe9 leds: handle suspend/resume in heartbeat trigger) +$ 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 ++++++--- + drivers/leds/trigger/ledtrig-heartbeat.c | 27 +++++++++++++++++++++++++++ + include/linux/leds.h | 23 ++++++++++++----------- + 5 files changed, 48 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 (1a695a905c18 Linux 4.7-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (1a695a905c18 Linux 4.7-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (1a695a905c18 Linux 4.7-rc1) +$ 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 (1a695a905c18 Linux 4.7-rc1) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (1a695a905c18 Linux 4.7-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (eb8652bd8d84 extcon: arizona: Update binding docs to mention new defines for GPSW) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-arizona.txt | 3 +- + drivers/extcon/extcon-usb-gpio.c | 32 ++++++++++++---------- + 2 files changed, 20 insertions(+), 15 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 (6b3bacc9a328 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt | 26 ++ + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 4 +- + MAINTAINERS | 7 + + drivers/scsi/aacraid/commctrl.c | 7 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 20 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 5 + + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/sd.c | 8 +- + drivers/scsi/sd.h | 5 + + drivers/scsi/snic/snic_fwint.h | 2 +- + drivers/scsi/ufs/Kconfig | 16 ++ + drivers/scsi/ufs/Makefile | 2 + + drivers/scsi/ufs/tc-dwc-g210-pci.c | 181 ++++++++++++ + drivers/scsi/ufs/tc-dwc-g210-pltfrm.c | 113 ++++++++ + drivers/scsi/ufs/tc-dwc-g210.c | 319 +++++++++++++++++++++ + drivers/scsi/ufs/tc-dwc-g210.h | 19 ++ + drivers/scsi/ufs/ufshcd-dwc.c | 154 ++++++++++ + drivers/scsi/ufs/ufshcd-dwc.h | 26 ++ + drivers/scsi/ufs/ufshcd-pltfrm.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 89 +++--- + drivers/scsi/ufs/ufshcd.h | 7 + + drivers/scsi/ufs/ufshci-dwc.h | 36 +++ + drivers/scsi/ufs/ufshci.h | 11 + + drivers/scsi/ufs/unipro.h | 39 +++ + 26 files changed, 1039 insertions(+), 64 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt + create mode 100644 drivers/scsi/ufs/tc-dwc-g210-pci.c + create mode 100644 drivers/scsi/ufs/tc-dwc-g210-pltfrm.c + create mode 100644 drivers/scsi/ufs/tc-dwc-g210.c + create mode 100644 drivers/scsi/ufs/tc-dwc-g210.h + create mode 100644 drivers/scsi/ufs/ufshcd-dwc.c + create mode 100644 drivers/scsi/ufs/ufshcd-dwc.h + create mode 100644 drivers/scsi/ufs/ufshci-dwc.h +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 (a02fcf38ade9 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio_oxnas.txt | 47 + + .../devicetree/bindings/pinctrl/oxnas,pinctrl.txt | 57 ++ + .../bindings/pinctrl/pinctrl-max77620.txt | 127 +++ + drivers/pinctrl/Kconfig | 21 + + drivers/pinctrl/Makefile | 2 + + drivers/pinctrl/core.c | 25 +- + drivers/pinctrl/core.h | 2 + + drivers/pinctrl/freescale/pinctrl-imx.c | 26 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 163 ++- + drivers/pinctrl/pinconf-generic.c | 14 +- + drivers/pinctrl/pinconf.c | 8 +- + drivers/pinctrl/pinctrl-digicolor.c | 2 + + drivers/pinctrl/pinctrl-max77620.c | 678 +++++++++++++ + drivers/pinctrl/pinctrl-oxnas.c | 846 ++++++++++++++++ + drivers/pinctrl/pinmux.c | 16 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 1 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 1 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 31 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 8 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra114.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra124.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra20.c | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra210.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra30.c | 4 +- + drivers/pinctrl/uniphier/Kconfig | 20 +- + drivers/pinctrl/uniphier/Makefile | 2 + + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 298 +++--- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 956 ++++++++++++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 1037 ++++++++++++++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 480 +++++---- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 595 +++++------ + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 787 ++++++++------- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 653 ++++++------ + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 581 +++++------ + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 441 +++++---- + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 59 +- + 37 files changed, 6096 insertions(+), 1916 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio_oxnas.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-max77620.txt + create mode 100644 drivers/pinctrl/pinctrl-max77620.c + create mode 100644 drivers/pinctrl/pinctrl-oxnas.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool) +$ git merge vhost/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + tools/virtio/ringtest/Makefile | 4 ++- + tools/virtio/ringtest/README | 4 +++ + tools/virtio/ringtest/noring.c | 69 +++++++++++++++++++++++++++++++++++++ + tools/virtio/ringtest/run-on-all.sh | 4 +-- + 5 files changed, 79 insertions(+), 3 deletions(-) + create mode 100644 tools/virtio/ringtest/noring.c +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 (63e213fc63c0 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-max77620.txt | 25 ++ + .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 + + drivers/gpio/Kconfig | 9 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-max77620.c | 312 +++++++++++++++++++++ + drivers/gpio/gpio-pca953x.c | 1 + + drivers/gpio/gpio-stmpe.c | 17 ++ + 7 files changed, 366 insertions(+) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-max77620.txt + create mode 100644 drivers/gpio/gpio-max77620.c +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 (b02da6f82361 dma-buf: use vma_pages()) +$ 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 (72ad679aa718 clk: nxp: Select MFD_SYSCON for creg driver) +$ git merge clk/clk-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/mach-vexpress/spc.c | 2 +- + arch/powerpc/platforms/512x/clock-commonclk.c | 2 +- + drivers/clk/Kconfig | 1 + + drivers/clk/microchip/clk-pic32mzda.c | 10 +++++----- + include/linux/clk-provider.h | 2 +- + 6 files changed, 10 insertions(+), 8 deletions(-) +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (1a695a905c18 Linux 4.7-rc1) +$ 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 (c361db5c2c64 x86: include linux/ratelimit.h in nmi.c) +$ git merge rtc/rtc-next +Removing include/asm-generic/rtc.h +Removing drivers/char/genrtc.c +Removing arch/x86/include/asm/rtc.h +Removing arch/sh/include/asm/mc146818rtc.h +Removing arch/powerpc/include/asm/rtc.h +Auto-merging arch/parisc/kernel/time.c +Removing arch/parisc/include/asm/rtc.h +Removing arch/parisc/include/asm/mc146818rtc.h +Removing arch/m68k/include/asm/rtc.h +Removing arch/ia64/include/asm/mc146818rtc.h +Removing arch/h8300/include/asm/mc146818rtc.h +Removing arch/frv/include/asm/mc146818rtc.h +Removing arch/alpha/include/asm/rtc.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/alpha/include/asm/rtc.h | 1 - + arch/alpha/kernel/core_marvel.c | 1 - + arch/alpha/kernel/rtc.c | 6 +- + arch/frv/include/asm/mc146818rtc.h | 16 - + arch/h8300/include/asm/mc146818rtc.h | 9 - + arch/ia64/include/asm/mc146818rtc.h | 10 - + arch/m68k/amiga/config.c | 1 - + arch/m68k/apollo/config.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/hp300/config.c | 2 +- + arch/m68k/include/asm/rtc.h | 79 ---- + arch/m68k/kernel/time.c | 48 ++- + arch/m68k/mac/config.c | 3 +- + arch/m68k/mac/misc.c | 1 - + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 2 +- + arch/m68k/sun3/config.c | 1 - + arch/m68k/sun3/intersil.c | 2 +- + arch/m68k/sun3x/time.c | 2 +- + arch/mips/sni/time.c | 1 - + arch/mn10300/include/asm/rtc.h | 2 - + arch/mn10300/kernel/rtc.c | 2 +- + arch/mn10300/proc-mn103e010/proc-init.c | 2 + + arch/mn10300/proc-mn2ws0050/proc-init.c | 1 + + arch/parisc/include/asm/mc146818rtc.h | 9 - + arch/parisc/include/asm/rtc.h | 131 ------- + arch/parisc/kernel/time.c | 36 +- + arch/powerpc/include/asm/rtc.h | 78 ---- + arch/powerpc/kernel/time.c | 29 +- + arch/powerpc/platforms/Kconfig | 11 + + arch/powerpc/platforms/ps3/time.c | 2 +- + arch/sh/include/asm/mc146818rtc.h | 7 - + arch/sh/include/asm/rtc.h | 11 - + arch/sh/kernel/time.c | 33 +- + arch/sparc/include/asm/io_32.h | 10 - + arch/x86/include/asm/mc146818rtc.h | 1 - + arch/x86/include/asm/rtc.h | 1 - + arch/x86/kernel/hpet.c | 3 +- + arch/x86/kernel/nmi.c | 1 + + arch/x86/kernel/rtc.c | 3 +- + arch/x86/platform/efi/efi.c | 1 - + arch/x86/platform/efi/efi_64.c | 1 + + arch/x86/platform/intel-mid/intel_mid_vrtc.c | 1 + + drivers/acpi/acpi_cmos_rtc.c | 2 +- + drivers/base/power/trace.c | 6 +- + drivers/char/Kconfig | 26 -- + drivers/char/Makefile | 1 - + drivers/char/genrtc.c | 539 --------------------------- + drivers/rtc/Kconfig | 12 + + drivers/rtc/Makefile | 1 + + drivers/rtc/interface.c | 28 +- + drivers/rtc/rtc-cmos.c | 12 +- + drivers/rtc/rtc-ds1685.c | 34 +- + drivers/rtc/rtc-efi.c | 6 + + drivers/rtc/rtc-generic.c | 36 +- + drivers/rtc/rtc-max6916.c | 164 ++++++++ + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 4 +- + include/asm-generic/rtc.h | 247 ------------ + include/linux/mc146818rtc.h | 194 ++++++++++ + 62 files changed, 605 insertions(+), 1275 deletions(-) + delete mode 100644 arch/alpha/include/asm/rtc.h + delete mode 100644 arch/frv/include/asm/mc146818rtc.h + delete mode 100644 arch/h8300/include/asm/mc146818rtc.h + delete mode 100644 arch/ia64/include/asm/mc146818rtc.h + delete mode 100644 arch/m68k/include/asm/rtc.h + delete mode 100644 arch/parisc/include/asm/mc146818rtc.h + delete mode 100644 arch/parisc/include/asm/rtc.h + delete mode 100644 arch/powerpc/include/asm/rtc.h + delete mode 100644 arch/sh/include/asm/mc146818rtc.h + delete mode 100644 arch/x86/include/asm/rtc.h + delete mode 100644 drivers/char/genrtc.c + create mode 100644 drivers/rtc/rtc-max6916.c + delete mode 100644 include/asm-generic/rtc.h +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 (160ccc294769 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Auto-merging net/unix/af_unix.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/futex.c +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/linux/fs.h +Removing drivers/block/zram/zcomp_lzo.h +Removing drivers/block/zram/zcomp_lzo.c +Removing drivers/block/zram/zcomp_lz4.h +Removing drivers/block/zram/zcomp_lz4.c +Auto-merging arch/x86/platform/efi/efi_64.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/configs/sunxi_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Merge made by the 'recursive' strategy. + Documentation/blockdev/zram.txt | 82 +- + Documentation/filesystems/Locking | 4 + + Documentation/filesystems/vfs.txt | 11 + + Documentation/kernel-parameters.txt | 6 +- + Documentation/vm/page_migration | 107 +- + arch/alpha/include/asm/pgalloc.h | 4 +- + arch/arc/include/asm/pgalloc.h | 4 +- + arch/arm/boot/dts/keystone.dtsi | 8 + + 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/kexec.h | 24 + + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgalloc.h | 4 +- + arch/arm/include/asm/tlb.h | 29 +- + arch/arm/kernel/machine_kexec.c | 2 +- + arch/arm/kernel/setup.c | 39 +- + arch/arm/mm/dma-mapping.c | 26 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm64/configs/defconfig | 2 +- + arch/arm64/include/asm/pgalloc.h | 2 +- + arch/arm64/mm/dma-mapping.c | 6 +- + arch/avr32/include/asm/pgalloc.h | 6 +- + arch/cris/include/asm/pgalloc.h | 4 +- + arch/frv/mm/pgalloc.c | 6 +- + arch/hexagon/include/asm/pgalloc.h | 4 +- + arch/ia64/include/asm/tlb.h | 31 +- + arch/ia64/kernel/machine_kexec.c | 2 +- + arch/m68k/include/asm/mcf_pgalloc.h | 4 +- + arch/m68k/include/asm/motorola_pgalloc.h | 4 +- + arch/m68k/include/asm/sun3_pgalloc.h | 4 +- + arch/metag/include/asm/pgalloc.h | 5 +- + arch/microblaze/include/asm/pgalloc.h | 4 +- + arch/microblaze/mm/pgtable.c | 3 +- + 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/mips/include/asm/pgalloc.h | 6 +- + arch/mn10300/mm/pgtable.c | 6 +- + arch/nios2/include/asm/pgalloc.h | 5 +- + arch/openrisc/include/asm/pgalloc.h | 2 +- + arch/openrisc/mm/ioremap.c | 2 +- + arch/parisc/configs/generic-64bit_defconfig | 2 +- + arch/parisc/include/asm/pgalloc.h | 7 +- + 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/powerpc/include/asm/book3s/64/pgalloc.h | 12 +- + arch/powerpc/include/asm/jump_label.h | 1 + + arch/powerpc/include/asm/nohash/64/pgalloc.h | 8 +- + arch/powerpc/include/asm/pgtable.h | 6 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 4 +- + arch/powerpc/mm/pgtable_64.c | 3 +- + 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/s390/include/asm/tlb.h | 22 +- + arch/s390/mm/pgalloc.c | 2 +- + arch/score/include/asm/pgalloc.h | 5 +- + 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/sh/include/asm/pgalloc.h | 4 +- + arch/sh/include/asm/tlb.h | 20 +- + arch/sh/mm/pgtable.c | 2 +- + arch/sparc/configs/sparc64_defconfig | 2 +- + arch/sparc/include/asm/pgalloc_64.h | 6 +- + arch/sparc/mm/init_64.c | 6 +- + arch/tile/Kconfig | 1 + + arch/tile/mm/pgtable.c | 2 +- + arch/um/include/asm/tlb.h | 20 +- + arch/um/kernel/mem.c | 4 +- + arch/unicore32/include/asm/pgalloc.h | 2 +- + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/configs/x86_64_defconfig | 2 +- + arch/x86/include/asm/pgalloc.h | 12 +- + arch/x86/kernel/espfix_64.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/mm/pgtable.c | 10 +- + arch/x86/platform/efi/efi_64.c | 2 +- + arch/x86/xen/p2m.c | 2 +- + 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 +- + arch/xtensa/include/asm/pgalloc.h | 2 +- + block/genhd.c | 2 +- + drivers/base/memory.c | 28 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/block/zram/Kconfig | 15 +- + drivers/block/zram/Makefile | 4 +- + drivers/block/zram/zcomp.c | 143 ++- + drivers/block/zram/zcomp.h | 36 +- + drivers/block/zram/zcomp_lz4.c | 56 - + drivers/block/zram/zcomp_lz4.h | 17 - + drivers/block/zram/zcomp_lzo.c | 56 - + drivers/block/zram/zcomp_lzo.h | 17 - + drivers/block/zram/zram_drv.c | 48 +- + drivers/block/zram/zram_drv.h | 5 +- + drivers/memstick/core/ms_block.c | 17 +- + drivers/nvme/host/core.c | 16 +- + drivers/tty/sysrq.c | 1 + + drivers/virtio/virtio_balloon.c | 54 +- + drivers/w1/slaves/w1_ds2406.c | 14 +- + drivers/w1/slaves/w1_ds2408.c | 14 +- + drivers/w1/slaves/w1_ds2413.c | 14 +- + drivers/w1/slaves/w1_ds2423.c | 14 +- + drivers/w1/slaves/w1_ds2431.c | 14 +- + drivers/w1/slaves/w1_ds2433.c | 14 +- + drivers/w1/slaves/w1_ds2760.c | 43 +- + drivers/w1/slaves/w1_ds2780.c | 39 +- + drivers/w1/slaves/w1_ds2781.c | 40 +- + drivers/w1/slaves/w1_ds28e04.c | 14 +- + drivers/w1/w1_family.h | 12 + + drivers/xen/xen-selfballoon.c | 4 +- + fs/befs/linuxvfs.c | 31 +- + fs/ext4/fsync.c | 5 +- + fs/jbd2/journal.c | 32 +- + fs/nilfs2/alloc.c | 45 +- + fs/nilfs2/bmap.c | 4 +- + fs/nilfs2/btree.c | 61 +- + fs/nilfs2/cpfile.c | 22 +- + fs/nilfs2/dat.c | 19 +- + fs/nilfs2/dir.c | 38 +- + fs/nilfs2/direct.c | 10 +- + fs/nilfs2/gcinode.c | 9 +- + fs/nilfs2/ifile.c | 7 +- + fs/nilfs2/inode.c | 32 +- + fs/nilfs2/ioctl.c | 47 +- + fs/nilfs2/mdt.c | 6 +- + fs/nilfs2/namei.c | 6 +- + fs/nilfs2/nilfs.h | 27 +- + fs/nilfs2/page.c | 19 +- + fs/nilfs2/recovery.c | 72 +- + fs/nilfs2/segbuf.c | 6 +- + fs/nilfs2/segment.c | 47 +- + fs/nilfs2/sufile.c | 31 +- + fs/nilfs2/super.c | 206 +-- + fs/nilfs2/sysfs.c | 30 +- + fs/nilfs2/the_nilfs.c | 134 +- + fs/nilfs2/the_nilfs.h | 4 +- + fs/ocfs2/stack_user.c | 11 +- + fs/ocfs2/stackglue.c | 2 - + fs/pipe.c | 32 +- + fs/reiserfs/ibalance.c | 3 +- + include/asm-generic/tlb.h | 58 +- + include/linux/balloon_compaction.h | 53 +- + include/linux/compaction.h | 17 + + include/linux/crc64_ecma.h | 56 + + include/linux/dma-attrs.h | 3 +- + include/linux/dynamic_debug.h | 60 +- + include/linux/frontswap.h | 34 +- + include/linux/fs.h | 2 + + include/linux/gfp.h | 10 +- + include/linux/jump_label.h | 50 +- + include/linux/kexec.h | 46 +- + include/linux/ksm.h | 3 +- + include/linux/memblock.h | 20 +- + include/linux/memcontrol.h | 103 +- + include/linux/memory_hotplug.h | 2 + + include/linux/migrate.h | 2 + + include/linux/mm.h | 2 +- + include/linux/mm_types.h | 73 +- + include/linux/mmdebug.h | 2 + + include/linux/mmzone.h | 4 +- + include/linux/oom.h | 10 +- + include/linux/page-flags.h | 109 +- + include/linux/page_ext.h | 4 +- + include/linux/page_owner.h | 12 +- + include/linux/sem.h | 1 + + include/linux/slab_def.h | 2 +- + include/linux/slub_def.h | 5 + + include/linux/timekeeping.h | 1 + + include/linux/vmstat.h | 6 + + include/trace/events/huge_memory.h | 38 +- + include/uapi/linux/magic.h | 2 + + init/Kconfig | 4 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 +- + kernel/fork.c | 6 +- + kernel/futex.c | 2 + + kernel/jump_label.c | 48 + + kernel/kexec.c | 3 +- + kernel/kexec_core.c | 46 +- + kernel/ksysfs.c | 4 +- + kernel/printk/printk.c | 76 +- + kernel/relay.c | 1 + + kernel/time/timekeeping.c | 13 + + lib/Kconfig | 7 + + lib/Kconfig.debug | 20 +- + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++ + lib/dynamic_debug.c | 7 + + mm/balloon_compaction.c | 94 +- + mm/compaction.c | 118 +- + mm/fadvise.c | 11 + + mm/frontswap.c | 35 +- + mm/gup.c | 2 + + mm/huge_memory.c | 286 +++-- + mm/hugetlb.c | 96 +- + mm/internal.h | 6 + + mm/kasan/kasan.c | 4 +- + mm/ksm.c | 4 +- + mm/memblock.c | 3 + + mm/memcontrol.c | 132 +- + mm/memory.c | 29 +- + mm/memory_hotplug.c | 70 +- + mm/mempolicy.c | 2 + + mm/migrate.c | 257 +++- + mm/mprotect.c | 2 +- + mm/mremap.c | 3 +- + mm/oom_kill.c | 47 +- + mm/page_alloc.c | 142 +- + mm/page_isolation.c | 7 +- + mm/page_owner.c | 159 ++- + mm/slab.c | 80 +- + mm/slab.h | 30 +- + mm/slab_common.c | 49 +- + mm/slub.c | 139 +- + mm/swap.c | 20 +- + mm/swap_state.c | 5 +- + mm/swapfile.c | 2 +- + mm/util.c | 6 +- + mm/vmalloc.c | 6 +- + mm/vmscan.c | 2 +- + mm/vmstat.c | 16 +- + mm/zsmalloc.c | 1354 ++++++++++++++------ + net/unix/af_unix.c | 1 + + samples/kprobes/jprobe_example.c | 6 +- + samples/kprobes/kprobe_example.c | 29 +- + samples/kprobes/kretprobe_example.c | 14 +- + scripts/Makefile.lib | 2 +- + scripts/tags.sh | 3 + + .../selftests/rcutorture/configs/lock/CFcommon | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 +- + tools/vm/page_owner_sort.c | 9 +- + 292 files changed, 4647 insertions(+), 2676 deletions(-) + delete mode 100644 drivers/block/zram/zcomp_lz4.c + delete mode 100644 drivers/block/zram/zcomp_lz4.h + delete mode 100644 drivers/block/zram/zcomp_lzo.c + delete mode 100644 drivers/block/zram/zcomp_lzo.h + 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 + + 798be2afc419...bc11a63e2b25 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (bc11a63e2b25 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..177c5068d1fd --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160607 |