diff options
| -rw-r--r-- | Next/SHA1s | 243 | ||||
| -rw-r--r-- | Next/Trees | 245 | ||||
| -rw-r--r-- | Next/merge.log | 2174 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2667 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..866d1c287b99 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,243 @@ +Name SHA1 +---- ---- +origin 574673c231a5fad1560249cc3a598907acb36cf9 +fixes 04c1926cb1e1dc1b25d629bd55c501dea5cb06d7 +kbuild-current b36fad65d61fffe4b662d4bfb1ed673c455a36a2 +arc-current bc921f821d60b1593747e7bdf97a009bb24aa6ae +arm-current f6492164ecb19d43687875fdb456845acc504590 +m68k-current 6bd80f372371a7b3f5ff13e4e8a560066299c001 +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes bad60e6f259a01cf9f29a1ef8d435ab6c60b2de9 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 4620a06e4b3c5d076feb9a42ab43dce77c385358 +net 1fe323aa1b2390a0c57fb0b06a782f128d49094c +ipsec 6916fb3b10b3cbe3b1f9f5b680675f53e4e299eb +netfilter 43dcff349f091b6a2f5f491c35d89b173df41acf +ipvs ea43f860d984b00c3e3fa02049412ce94ce9ed5e +wireless-drivers 034fdd4a17ff089c2428ece18efa65c5396810d2 +mac80211 4d0bd46a4d55383f7b925e6cf7865a77e0f0e020 +sound-current 59ec4b57bcaede46546d54d037a21004b9aa5cef +pci-current 29b4817d4018df78086157ea3a55c1d9424a7cfc +driver-core.current 29b4817d4018df78086157ea3a55c1d9424a7cfc +tty.current 29b4817d4018df78086157ea3a55c1d9424a7cfc +usb.current 29b4817d4018df78086157ea3a55c1d9424a7cfc +usb-gadget-fixes 50c763f8c1bac0dc00f7788a75f227276c0efd54 +usb-serial-fixes 647024a7df36014bbc4479d92d88e6b77c0afcf6 +usb-chipidea-fixes ea1d39a31d3b1b6060b6e83e5a29c069a124c68a +staging.current 29b4817d4018df78086157ea3a55c1d9424a7cfc +char-misc.current 29b4817d4018df78086157ea3a55c1d9424a7cfc +input-current 22fe874f380336315dd0440dad475ff326784b22 +crypto-current 2fdea258fde036a87d3396ec9c0ef66f10768530 +ide 797cee982eef9195736afc5e7f3b8f613c41d19a +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes c8952a707556e04374d7b2fdb3a079d63ddf6f2f +kselftest-fixes f80eb4289491f6ddb0788636ce0bd6f5d3a2012a +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 5baaf3b9efe127d239038de9219d381f4d882b26 +drm-intel-fixes 29b4817d4018df78086157ea3a55c1d9424a7cfc +asm-generic b0da6d44157aa6e652de7634343708251ba64146 +arc 29b4817d4018df78086157ea3a55c1d9424a7cfc +arm bf9cb43591825d32c24b244e48ae690fb5516222 +arm-perf 1a695a905c18548062509178b98bc91e67510864 +arm-soc eae5b27ade3da259a1b969bcfb029337f0c0c836 +amlogic 3a8eff5934f4cf7762c96f59aa13083a49767439 +at91 0f59c948faed3715331c2648b46d6d0033d86f5c +bcm2835 aa5c0a1e15c2e6a0e12cdb3719b4cc8ec56d487c +berlin d433580f3b4ef47f16f418a9723c22a78680f931 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 63a404a3f177cc9127a05536580cab2b92752c1f +keystone eef6bb9fc17a5c7b8b624db8b81158b632740319 +mvebu 38b7b9bdeb7a8884de873d087e6bdbefdfae1e42 +omap 370c3261ba8a48ea546ecb3095c9ed3bef19684d +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 289f9fb05d0c81122af489ae59f9f0601c237389 +renesas abda75bfcb2fda3de6231da9b835d1a012d0d08d +rockchip ebbfb5d5627d635d24e2270fa0de2f3017fe3cb5 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 1a695a905c18548062509178b98bc91e67510864 +samsung-krzk 253256f6429442f65a9d3287f1e4ab4674bbceb7 +tegra b551165a45936e8273f47d63d45de84c471f3601 +arm64 747a70e60b7234e8fd9c35dd2f2db10ac1db231d +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k 6bd80f372371a7b3f5ff13e4e8a560066299c001 +m68knommu 10c18b1af25fd45379595483e09a5c8b73668f4b +metag b4d9fa500652a433f434a9a96ec088ab9c90d30b +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips c38d8f514a86d779d0df130d16a289465b89540b +nios2 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f +parisc-hd 523d939ef98fd712632d93a5a2b588e477a7565e +powerpc eea8148c69f3aecbf297b12943a591467a1fb432 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 9f595fd8b54809fed13fc30906ef1e90a3fcfbc9 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 9bce8b2cbebf9f11b41021ccb98c6b18d1796edd +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +sh e61c10e468a42512f5fad74c00b62af5cc19f65f +tile 74050a3188c83a2f12e4714892507b48eee885bf +uml 8a545f185145e3c09348cd74326268ecfc6715a3 +unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22 +xtensa 9e8511ff7e3f18df7d202da06c9704d940fa68f9 +befs 3e35c149e2201d085cce71ebbb3cb6c7fc0224ea +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave d84c090ad3e96f6e66c28fd4b48a69c4eb141fb5 +ceph 96c7a05e0196be3853963e793717d8d3523566be +cifs 8e1e83d236068525bf8416c336162056c512eced +configfs 3dc3afadeb0403fd967b97ee282ab9053d36da2b +ecryptfs 2bdcdbea80bd161467f1dc32b09ccc67ddeefdc0 +ext3 e008bb6134a6e68fd2c827a46b27d017d920de8f +ext4 7bc9491645118c9461bd21099c31755ff6783593 +f2fs c1ece76719205690f4b448460d9b85c130e8021b +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse 7244b9538994bdb60e94232677cbd78e135ebb11 +gfs2 47a9a527946842dd8d83d4c8c8be22b2615b65f5 +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs 8d480326c3d6921ff5f1cc988c993bd572248deb +nfsd 3e5ed3680a2491d35ddef3473936b0f9a42f4c30 +orangefs 78fee0b6846f27872321338db6afe280f059ae99 +overlayfs f200ea288c78526210e3786e09569cb9debe29ed +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 5d71afb0084053687da6b66ce8133a3df3e52fc6 +xfs 3481b68285238054be519ad0c8cad5cc2425e26c +file-locks ca323f65d622265fa85fe9e0493022e0b9e6c9e2 +vfs 3baf32898e1c88792fa7cadc88f601833bdae3da +pci 29b4817d4018df78086157ea3a55c1d9424a7cfc +pstore e976e56423dc1cc01686861fc3e0c6c0ec8cd8b7 +hid de1bcd764ea0adabdc32ed7f74af2da65ae07c51 +i2c 29b4817d4018df78086157ea3a55c1d9424a7cfc +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi 0deb6b2c087a9303386143963a6e6ce2bef08f04 +hwmon-staging 90ed8dc9d1a33e0fd7fa691ec5aa4cc42ba5c7ef +v4l-dvb b6aa39228966e0d3f0bc3306be1892f87792903a +pm 397cbb5e90311b4fe8af62042d1738a6266d7cae +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal 1577ddfac75ff9690ebd0d210bc7f1345c9d29ef +thermal-soc 9a1d2bd3e7fd393b209cb8d66e24c04dca2d2ab4 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 5c93f56f770e69c4cf2dbaebecd6bcca205949f9 +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 5213011706011bff8965de0859b8078ec3240724 +net-next 6cdaf03f8c23fcbfe7d4fa6876e114193bb6b632 +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +netfilter-next 6a492b0f23d28e1f946cdf08e54617484400dafb +ipvs-next ae9442f688c3e6efe1f39cc9e0b906f0a7cd0421 +wireless-drivers-next cb6a115188500a448709df1f2d7698a4e1b7a099 +bluetooth a92bcaae230cf3a85c3ffff7f2568bd98d659851 +mac80211-next 6a492b0f23d28e1f946cdf08e54617484400dafb +rdma 29b4817d4018df78086157ea3a55c1d9424a7cfc +rdma-leon 4c2e07c6a29e0129e975727b9f57eede813eea85 +rdma-leon-test 92d21ac74a9e3c09b0b01c764e530657e4c85c49 +mtd 11e8a7f9aa9427409ceca4ceef39e4ba18cff421 +l2-mtd 1dcff2e4ae728a36876bdb108173f4cbcae128bf +nand 8490c03bd9d40ce71d9b67dcf93e73788ba0516d +crypto 0f95e2ffc58f5d32a90eb1051d17aeebc21cf91d +drm 5c6c201ccbaf9d3901f829441d457293f7ca8ef4 +drm-panel 9bb34c4c730dbfaf9c91af57bf41d0a453067e87 +drm-intel c45eb4fed12d278d3619f1904885bd0d7bcbf036 +drm-tegra 64ea25c3bc86c05c7da6c683b86663f4c90158d6 +drm-misc cfc5adea1955ee8ddb62cc0d20ee454472033b6a +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 0a677125d0ff726ed3d75ab311cf54674bf512bc +hdlcd 523d939ef98fd712632d93a5a2b588e477a7565e +mali-dp 59ba2422b4308b02438506d35d5042df5d42c249 +sunxi 1ec0088a7a09bca3e72c79aad3eb365bf14888b7 +kbuild f6830d5346c932d89187a7b84c4aff1e8f1440f2 +kspp 6fbe16013e52205efaa7ea18ecf88b1d0b5fa390 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 22ad85abfabbf4acdbf60c03c3b879c7d242c1d8 +sound 59ec4b57bcaede46546d54d037a21004b9aa5cef +sound-asoc 7def6d917c26cb5237dfb69d1f486c8360ecb16a +modules 49aadcf1b6f4240751921dad52e86c760d70a5f1 +input a485cb037fe64367ec14813f018edb87799c5eb1 +block b013517951a168c4f60a633e3f39185897cd052f +lightnvm 191d684c5d4f478dcd225ea424b1a3e09f06ace2 +device-mapper 7b94c1f0e520163106fb8d89877c9305722fe034 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh 6ea6257945188ff7f5d1670d5adc964ac78c590c +md 11367799f3d12a5074c4a3c0fa4ea8da2a21a2a4 +mfd f37be01e6dc606f2fcc5e95c9933d948ce19bd35 +backlight 602553073892c18f723f8aa090153a23b1312a16 +battery 4fcd504edbf7c793325511c2df8dcd083958e28a +omap_dss2 ab366b40b8513e7590858229ecbb5e1434a52b54 +regulator de944e0f03c7db8c8ca29ae1d93b59d2a40cbf98 +security 8ccc7d6bad84bebf1f1a6364d1fa04d3d7b575f6 +integrity 56078b570983d6365cbe0ba7eed2cf4c00bffa0a +keys 05638c9bc586a0c8897f7e909aaa0a3d1ff052e0 +selinux c8941881e506174a65344426c716368c47038c05 +tpmdd 82cc1a49b6358394938e759dc4c22b2be773bbad +watchdog 29b4817d4018df78086157ea3a55c1d9424a7cfc +iommu f360d3241f5557f241d55b959e6e65070e77992e +dwmw2-iommu 2566278551d3db875bc3bbfc41b42f2e80392108 +vfio 0991bbdbf5b85bd14a26e783f087b0f2913c93b1 +jc_docs bdf107d87eb8ce1d1313fee40f3de1a1029a3eca +trivial 34df117414d73cb56d128bf7016a4c151f95c313 +audit 523d939ef98fd712632d93a5a2b588e477a7565e +devicetree e973f4ec130ac0eefb9e69b5139ed8a2768250aa +mailbox a68b216676e89fa959a23b583b56f9ce7df81b37 +spi d99d6903e341fc1dbd325a81f26bdc29ced4b306 +tip a064fd509d4b418f329a71325c702f851bab1c0e +clockevents 1d661bf5327a2c059ec967f850e89362e637f4e6 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd a08d6288915c1339ce0c1752097c0f148c0d7d9b +irqchip 77d50b17c990ab55cae8e95b2475ed6427e22af4 +ftrace 78aebca2c955c1c5aeb48e12645e13fe3c3461f2 +rcu 5bc94664884aa0f3a943b9b18cca1be880a643b6 +kvm 29b4817d4018df78086157ea3a55c1d9424a7cfc +kvm-arm 89581f06b2bc225f0c9822fa52e714aa2e3810dd +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus 93d17397e4e2182fdaad503e2f9da46202c0f1c3 +kvms390 9acc317b183fdd3ed3bca218271875c0e808daae +xen-tip d34c30cc1fa80f509500ff192ea6bc7d30671061 +percpu 6710e594f71ccaad8101bc64321152af7cd9ea28 +workqueues d945b5e9f0e35cb56a3783d849b5f0f37da0a7f1 +drivers-x86 29b4817d4018df78086157ea3a55c1d9424a7cfc +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 9c99e5e51988798af2a687ef9b1716dd79388550 +leds 5706c01fcfb313cef7aed6a283b43c5452cf8336 +ipmi 92cad0931b08226e71110380304ad28e12547dcb +driver-core 29b4817d4018df78086157ea3a55c1d9424a7cfc +tty 29b4817d4018df78086157ea3a55c1d9424a7cfc +usb 29b4817d4018df78086157ea3a55c1d9424a7cfc +usb-gadget 15e4292a2d21e9997fdb2b8c014cc461b3f268f0 +usb-serial 29b4817d4018df78086157ea3a55c1d9424a7cfc +usb-chipidea-next 229d43daf8edca4a7f789b7ba9f13775385c8c73 +staging 29b4817d4018df78086157ea3a55c1d9424a7cfc +char-misc 29b4817d4018df78086157ea3a55c1d9424a7cfc +extcon 7fe95fb889faf07ee438384858d38b820973397e +cgroup 1cab4a96cab6310bd6d2c0945210d9b5b67f4eec +scsi c8e18acccb9be6dd1aa4fb8dbc1b98b3b7d6d8e1 +target-updates 291e3e51a34d2f546608bfd31f185151621135b7 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata 737bee9308c457090711684b976e0fe02785a094 +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +pinctrl 9573e7923007961799beff38bc5c5a7635634eef +vhost b226acab2f6aaa45c2af27279b63f622b23a44bd +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg e937b335a738c1d13cd0ff8466c3ff2b8d5da8ac +gpio fbc482ae78c6168d0b7855fda1b47618af4c9b4c +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 53de7c26ded7f5e954bfc202dffc43c0dd165337 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns aeaa4a79ff6a5ed912b7362f206cf8576fca538b +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk d22527fed2f094c2e4f9a66f35b68a090c3d906a +random 59b8d4f1f5d26e4ca92172ff6dcd1492cdb39613 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest d78388dbec256b179f1c42e714cf4acf630067c6 +y2038 549eb7b22e245064dcdc17380538718492f4ca9c +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 523d939ef98fd712632d93a5a2b588e477a7565e +coresight 10156d120e4d30135d800d661b3d58867e9dab65 +rtc 29b4817d4018df78086157ea3a55c1d9424a7cfc +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 0606263f24f3d64960de742c55894190b5df903b +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current ae2066ca0bd4d15c6191112166eb8f5dfcd14ad7 +akpm bbaf266b8bf8abc4fb0062a69d0f6a30fb8cc95c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2d220afe42c8 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,245 @@ +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 +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.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 +sh git git://git.libc.org/linux-sh#for-next +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 +befs git git://github.com/luisbg/linux-befs.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 +freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next +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 +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-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 +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +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 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +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 +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.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 +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +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..6d6422132b11 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2174 @@ +$ date -R +Tue, 09 Aug 2016 09:25:43 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 52ddb7e9dd73 Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux +Merging origin/master (574673c231a5 printk: Remove unnecessary #ifdef CONFIG_PRINTK) +$ git merge origin/master +Updating 52ddb7e9dd73..574673c231a5 +Fast-forward + Documentation/block/biodoc.txt | 4 +- + Documentation/device-mapper/dm-flakey.txt | 2 +- + Documentation/gpu/kms-properties.csv | 1 + + Makefile | 4 +- + arch/x86/lib/hweight.S | 2 + + block/bio-integrity.c | 2 +- + block/bio.c | 6 +- + block/blk-core.c | 26 ++-- + block/blk-merge.c | 8 +- + block/blk-mq.c | 10 +- + block/blk-throttle.c | 8 +- + block/cfq-iosched.c | 4 +- + drivers/block/brd.c | 16 +- + drivers/block/drbd/drbd_main.c | 8 +- + drivers/block/drbd/drbd_receiver.c | 2 +- + drivers/block/drbd/drbd_req.c | 6 +- + drivers/block/drbd/drbd_worker.c | 2 +- + drivers/block/pktcdvd.c | 2 +- + drivers/block/umem.c | 2 +- + drivers/block/zram/zram_drv.c | 23 +-- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/drm_atomic.c | 4 + + drivers/gpu/drm/drm_atomic_helper.c | 7 + + drivers/gpu/drm/drm_blend.c | 238 ++++++++++++++++++++++++++++++ + drivers/gpu/drm/drm_crtc_internal.h | 4 + + drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 - + drivers/gpu/drm/exynos/exynos_drm_plane.c | 67 ++------- + drivers/gpu/drm/exynos/exynos_mixer.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 1 - + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 5 - + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 2 - + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 14 +- + drivers/gpu/drm/sti/sti_cursor.c | 4 +- + drivers/gpu/drm/sti/sti_gdp.c | 4 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 4 +- + drivers/gpu/drm/sti/sti_mixer.c | 9 +- + drivers/gpu/drm/sti/sti_plane.c | 78 ++++------ + drivers/gpu/drm/sti/sti_plane.h | 7 +- + drivers/md/bcache/request.c | 12 +- + drivers/md/bcache/super.c | 2 +- + drivers/md/bcache/writeback.h | 2 +- + drivers/md/dm-cache-target.c | 8 +- + drivers/md/dm-crypt.c | 4 +- + drivers/md/dm-era-target.c | 2 +- + drivers/md/dm-flakey.c | 6 +- + drivers/md/dm-io.c | 6 +- + drivers/md/dm-log-writes.c | 4 +- + drivers/md/dm-mpath.c | 2 +- + drivers/md/dm-raid1.c | 10 +- + drivers/md/dm-region-hash.c | 4 +- + drivers/md/dm-snap.c | 6 +- + drivers/md/dm-stripe.c | 4 +- + drivers/md/dm-thin.c | 8 +- + drivers/md/dm-zero.c | 2 +- + drivers/md/dm.c | 10 +- + drivers/md/linear.c | 2 +- + drivers/md/md.c | 4 +- + drivers/md/multipath.c | 8 +- + drivers/md/raid0.c | 2 +- + drivers/md/raid1.c | 6 +- + drivers/md/raid10.c | 8 +- + drivers/md/raid5-cache.c | 2 +- + drivers/md/raid5.c | 20 +-- + drivers/nvdimm/btt.c | 12 +- + drivers/nvdimm/pmem.c | 16 +- + drivers/target/target_core_iblock.c | 2 +- + fs/block_dev.c | 6 +- + fs/btrfs/check-integrity.c | 10 +- + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/inode.c | 6 +- + fs/btrfs/volumes.c | 6 +- + fs/mpage.c | 2 +- + include/drm/drm_crtc.h | 20 +++ + include/linux/bio.h | 4 +- + include/linux/blk-cgroup.h | 4 +- + include/linux/blk_types.h | 37 ++--- + include/linux/blkdev.h | 2 +- + include/linux/fs.h | 3 +- + include/linux/pagemap.h | 2 +- + include/trace/events/bcache.h | 8 +- + include/trace/events/block.h | 14 +- + kernel/printk/printk.c | 2 - + kernel/trace/blktrace.c | 6 +- + mm/filemap.c | 4 +- + mm/page_io.c | 5 +- + 87 files changed, 551 insertions(+), 373 deletions(-) + create mode 100644 drivers/gpu/drm/drm_blend.c +Merging fixes/master (04c1926cb1e1 Disable the Soft RoCE driver) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + drivers/infiniband/Kconfig | 1 - + drivers/infiniband/sw/Makefile | 1 - + 2 files changed, 2 deletions(-) +Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (bc921f821d60 ARC: Call trace_hardirqs_on() before enabling irqs) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/irqflags-compact.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) +$ 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 (bad60e6f259a Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled) +$ git merge sparc/master +Already up-to-date. +Merging net/master (1fe323aa1b23 sctp: use event->chunk when it's valid) +$ git merge net/master +Auto-merging net/wireless/chan.c +Merge made by the 'recursive' strategy. + Documentation/networking/rxrpc.txt | 21 +- + drivers/net/dsa/b53/b53_regs.h | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 2 + + drivers/net/ethernet/arc/emac_main.c | 6 +- + drivers/net/ethernet/broadcom/tg3.c | 5 +- + drivers/net/ethernet/cadence/macb.h | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c | 10 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 9 +- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 95 +++++---- + drivers/net/ethernet/tundra/tsi108_eth.c | 2 + + drivers/net/vxlan.c | 34 ++-- + drivers/net/wireless/ti/wlcore/main.c | 5 +- + fs/afs/cmservice.c | 78 ++++---- + fs/afs/fsclient.c | 221 +++++++-------------- + fs/afs/internal.h | 14 +- + fs/afs/rxrpc.c | 73 ++++--- + fs/afs/vlclient.c | 11 +- + include/linux/sctp.h | 64 ------ + include/linux/skbuff.h | 52 +++-- + include/net/af_rxrpc.h | 2 +- + include/net/mac80211.h | 3 +- + include/uapi/linux/sctp.h | 64 ++++++ + kernel/bpf/hashtab.c | 84 +++++++- + kernel/bpf/verifier.c | 3 +- + lib/test_rhashtable.c | 2 +- + net/core/filter.c | 29 ++- + net/ipv4/fib_trie.c | 8 +- + net/mac80211/cfg.c | 2 +- + net/mac80211/driver-ops.h | 2 +- + net/mac80211/mesh.c | 10 +- + net/mac80211/rx.c | 2 +- + net/mac80211/status.c | 14 +- + net/mac80211/tx.c | 6 +- + net/openvswitch/conntrack.c | 8 +- + net/openvswitch/vport-internal_dev.c | 2 +- + net/rxrpc/ar-internal.h | 1 + + net/rxrpc/call_accept.c | 1 + + net/rxrpc/call_event.c | 3 + + net/rxrpc/call_object.c | 8 +- + net/rxrpc/input.c | 12 +- + net/rxrpc/recvmsg.c | 25 +-- + net/rxrpc/skbuff.c | 41 +++- + net/sctp/sctp_diag.c | 18 +- + net/sctp/ulpevent.c | 4 +- + net/wireless/chan.c | 1 + + net/wireless/nl80211.c | 34 +++- + samples/bpf/test_maps.c | 15 +- + 50 files changed, 609 insertions(+), 508 deletions(-) +Merging ipsec/master (6916fb3b10b3 xfrm: Ignore socket policies when rebuilding hash tables) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_policy.c | 4 ++++ + net/xfrm/xfrm_user.c | 13 ++++--------- + 2 files changed, 8 insertions(+), 9 deletions(-) +Merging netfilter/master (43dcff349f09 net: qlcnic: avoid superfluous assignement) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes') +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (4d0bd46a4d55 Revert "wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel") +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/wireless/wext-core.c | 25 ++----------------------- + 1 file changed, 2 insertions(+), 23 deletions(-) +Merging sound-current/for-linus (59ec4b57bcae ALSA: hda - Fix headset mic detection problem for two dell machines) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (29b4817d4018 Linux 4.8-rc1) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (29b4817d4018 Linux 4.8-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (29b4817d4018 Linux 4.8-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (29b4817d4018 Linux 4.8-rc1) +$ git merge usb.current/usb-linus +Already up-to-date. +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 (647024a7df36 USB: serial: fix memleak in driver-registration error path) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ftdi_sio.c | 3 +++ + drivers/usb/serial/ftdi_sio_ids.h | 12 ++++++++++++ + drivers/usb/serial/option.c | 22 ++++++++++++++++++++++ + drivers/usb/serial/usb-serial.c | 4 +++- + 4 files changed, 40 insertions(+), 1 deletion(-) +Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (29b4817d4018 Linux 4.8-rc1) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (29b4817d4018 Linux 4.8-rc1) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (22fe874f3803 Input: silead - remove some dead code) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (2fdea258fde0 crypto: caam - defer aead_set_sh_desc in case of zero authsize) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/sha3_generic.c | 16 ++++++++-------- + drivers/crypto/caam/caamalg.c | 13 ++++++++----- + 2 files changed, 16 insertions(+), 13 deletions(-) +Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit) +$ 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 (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci_intrs.c | 85 ++++++++++++++++++++++----------------- + 1 file changed, 49 insertions(+), 36 deletions(-) +Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (29b4817d4018 Linux 4.8-rc1) +$ 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 (29b4817d4018 Linux 4.8-rc1) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (bf9cb4359182 Merge branches 'component', 'cpuidle', 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Resolved 'drivers/gpu/drm/msm/msm_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/rockchip/rockchip_drm_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/sti/sti_drv.c' using previous resolution. +Resolved 'drivers/iommu/mtk_iommu.c' using previous resolution. +Auto-merging drivers/iommu/mtk_iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c +Auto-merging drivers/gpu/drm/sti/sti_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/armada/armada_drv.c +Auto-merging drivers/gpu/drm/arm/hdlcd_drv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 38397b7914e5] Merge remote-tracking branch 'arm/for-next' +$ git diff -M --stat --summary HEAD^.. + 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 | 17 ++++++++++------- + 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 ++++++++++--- + 8 files changed, 68 insertions(+), 25 deletions(-) +Merging arm-perf/for-next/perf (1a695a905c18 Linux 4.7-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (eae5b27ade3d arm-soc: document merges) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/arm-soc-for-next-contents.txt | 24 ++++++++++++++++++++++++ + arch/arm/configs/aspeed_g4_defconfig | 2 +- + arch/arm/configs/aspeed_g5_defconfig | 2 +- + arch/arm/mach-clps711x/Kconfig | 2 +- + arch/arm/mach-shmobile/platsmp.c | 3 +++ + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 3 +++ + 7 files changed, 34 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (3a8eff5934f4 Merge branch 'v4.7/clk' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging drivers/clk/meson/gxbb.c +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 2 ++ + drivers/clk/meson/gxbb.c | 9 +++++++++ + drivers/clk/meson/gxbb.h | 7 +++++-- + include/dt-bindings/clock/gxbb-clkc.h | 4 ++++ + 4 files changed, 20 insertions(+), 2 deletions(-) +Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next) +$ git merge bcm2835/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/berlin2.dtsi | 2 -- + arch/arm/boot/dts/berlin2q.dtsi | 2 -- + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 12 +++++++++--- + 3 files changed, 9 insertions(+), 7 deletions(-) +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 (63a404a3f177 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (38b7b9bdeb7a Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/marvell/armada-39x.txt | 15 +- + arch/arm/boot/dts/armada-370-db.dts | 29 +-- + .../dts/armada-370-seagate-personal-cloud.dtsi | 40 ++-- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 112 +++++----- + arch/arm/boot/dts/armada-370-xp.dtsi | 56 +++-- + arch/arm/boot/dts/armada-370.dtsi | 34 ++- + arch/arm/boot/dts/armada-385-db-ap.dts | 58 +++-- + arch/arm/boot/dts/armada-385-linksys.dtsi | 9 +- + arch/arm/boot/dts/armada-388-clearfog.dts | 56 ++--- + arch/arm/boot/dts/armada-388-db.dts | 25 ++- + arch/arm/boot/dts/armada-388-gp.dts | 30 +-- + arch/arm/boot/dts/armada-388-rd.dts | 25 ++- + arch/arm/boot/dts/armada-38x.dtsi | 48 ++-- + arch/arm/boot/dts/armada-390-db.dts | 175 +++++++++++++++ + arch/arm/boot/dts/armada-390.dtsi | 3 + + arch/arm/boot/dts/armada-395-gp.dts | 163 ++++++++++++++ + arch/arm/boot/dts/armada-395.dtsi | 76 +++++++ + arch/arm/boot/dts/armada-398-db.dts | 56 +++-- + arch/arm/boot/dts/armada-398.dtsi | 10 +- + arch/arm/boot/dts/armada-39x.dtsi | 126 ++++++++--- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 24 +- + arch/arm/boot/dts/armada-xp-db.dts | 24 +- + arch/arm/boot/dts/armada-xp-gp.dts | 24 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 24 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 112 +++++----- + arch/arm/boot/dts/armada-xp.dtsi | 31 +-- + arch/arm/configs/mvebu_v7_defconfig | 3 + + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/armada-8020.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 150 +++++++++++++ + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 1 + + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 246 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 1 + + 33 files changed, 1378 insertions(+), 410 deletions(-) + create mode 100644 arch/arm/boot/dts/armada-390-db.dts + create mode 100644 arch/arm/boot/dts/armada-395-gp.dts + create mode 100644 arch/arm/boot/dts/armada-395.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-db.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +Merging omap/for-next (370c3261ba8a Merge branch 'omap-for-v4.8/soc' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/dm814x-clocks.dtsi | 4 ++-- + arch/arm/mach-omap2/cm33xx.c | 6 ------ + arch/arm/mach-omap2/cminst44xx.c | 6 ------ + arch/arm/mach-omap2/omap_hwmod.c | 8 ++++++++ + arch/arm/mach-omap2/omap_hwmod.h | 4 ++++ + arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 2 ++ + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 ++++++++++++ + 7 files changed, 28 insertions(+), 14 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 (289f9fb05d0c ARM: dts: msm8916: Add smsm and smp2p nodes) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/qcom/msm8916.dtsi | 82 +++++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) +Merging renesas/next (abda75bfcb2f Merge branches 'arm64-dt-for-v4.9' and 'dt-for-v4.9' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7792-blanche.dts | 48 ++++ + arch/arm/boot/dts/r8a7792.dtsi | 459 ++++++++++++++++++++++++++++++ + arch/arm/boot/dts/r8a7794-silk.dts | 70 +++++ + arch/arm/boot/dts/r8a7794.dtsi | 293 ++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 48 ++++ + include/dt-bindings/clock/r8a7794-clock.h | 25 ++ + 6 files changed, 942 insertions(+), 1 deletion(-) +Merging rockchip/for-next (ebbfb5d5627d Merge branch 'v4.8-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 4 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/rk3288-evb-act8846.dts | 4 + + arch/arm/boot/dts/rk3288-evb-rk808.dts | 4 + + arch/arm/boot/dts/rk3288-evb.dtsi | 45 ++- + arch/arm/boot/dts/rk3288-fennec.dts | 382 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 178 ++++++++++ + 7 files changed, 617 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/boot/dts/rk3288-fennec.dts +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (253256f64294 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Resolved 'arch/arm/boot/dts/exynos5420.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/exynos5420.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a1e24bc557a2] Merge remote-tracking branch 'samsung-krzk/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging tegra/for-next (b551165a4593 Merge branch for-4.8/arm64/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging drivers/i2c/i2c-core.c +Auto-merging Documentation/devicetree/bindings/i2c/i2c.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c.txt | 8 ++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 18 ++++++++++++++++++ + drivers/i2c/i2c-core.c | 10 ++++++++-- + 3 files changed, 34 insertions(+), 2 deletions(-) +Merging arm64/for-next/core (747a70e60b72 arm64: Fix copy-on-write referencing in HugeTLB) +$ 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 7109deab735c] 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 (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/include/asm/io.h | 2 ++ + 1 file changed, 2 insertions(+) +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (10c18b1af25f m68knommu: fix user a5 register being overwritten) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/kernel/signal.c | 1 - + 1 file changed, 1 deletion(-) +Merging metag/for-next (b4d9fa500652 metag: Drop show_mem() from mem_init()) +$ git merge metag/for-next +Merge made by the 'recursive' strategy. + arch/metag/mm/init.c | 1 - + 1 file changed, 1 deletion(-) +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 (c38d8f514a86 MIPS: Fix MSA asm warnings in control reg accessors) +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/cavium-octeon/setup.c +Auto-merging arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts +Auto-merging arch/mips/bmips/setup.c +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mips/brcm/soc.txt | 4 +- + arch/mips/Kconfig | 13 ++ + arch/mips/bmips/Kconfig | 20 ++- + arch/mips/bmips/setup.c | 4 +- + arch/mips/boot/dts/brcm/Makefile | 36 +++--- + .../mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts | 22 ++++ + arch/mips/boot/dts/brcm/bcm3368.dtsi | 101 ++++++++++++++++ + .../boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts | 108 +++++++++++++++++ + arch/mips/boot/dts/brcm/bcm63268.dtsi | 134 +++++++++++++++++++++ + ...6358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} | 1 + + .../boot/dts/brcm/bcm6362-neufbox6-sercomm.dts | 22 ++++ + arch/mips/boot/dts/brcm/bcm6362.dtsi | 134 +++++++++++++++++++++ + arch/mips/cavium-octeon/setup.c | 38 +++--- + arch/mips/configs/loongson1c_defconfig | 126 +++++++++++++++++++ + arch/mips/configs/pistachio_defconfig | 1 - + arch/mips/include/asm/cpu-type.h | 3 +- + arch/mips/include/asm/cpu.h | 1 + + arch/mips/include/asm/mach-loongson32/irq.h | 41 ++++++- + arch/mips/include/asm/mach-loongson32/loongson1.h | 5 + + arch/mips/include/asm/mach-loongson32/regs-clk.h | 34 ++++++ + arch/mips/include/asm/mach-loongson32/regs-mux.h | 61 ++++++++++ + arch/mips/loongson32/Kconfig | 15 +++ + arch/mips/loongson32/Makefile | 6 + + arch/mips/loongson32/Platform | 1 + + arch/mips/loongson32/common/irq.c | 55 ++++++++- + arch/mips/loongson32/common/platform.c | 19 +++ + arch/mips/loongson32/common/setup.c | 4 + + arch/mips/loongson32/ls1c/Makefile | 5 + + arch/mips/loongson32/ls1c/board.c | 28 +++++ + 29 files changed, 996 insertions(+), 46 deletions(-) + create mode 100644 arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts + create mode 100644 arch/mips/boot/dts/brcm/bcm3368.dtsi + create mode 100644 arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts + create mode 100644 arch/mips/boot/dts/brcm/bcm63268.dtsi + rename arch/mips/boot/dts/brcm/{bcm96358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} (94%) + create mode 100644 arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts + create mode 100644 arch/mips/boot/dts/brcm/bcm6362.dtsi + create mode 100644 arch/mips/configs/loongson1c_defconfig + create mode 100644 arch/mips/loongson32/ls1c/Makefile + create mode 100644 arch/mips/loongson32/ls1c/board.c +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 (523d939ef98f Linux 4.7) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (eea8148c69f3 powerpc/mm: Move register_process_table() out of ppc_md) +$ 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 (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number) +$ 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 (9bce8b2cbebf s390/qdio: avoid reschedule of outbound tasklet once killed) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/boot/compressed/head.S | 11 +++- + arch/s390/configs/default_defconfig | 2 +- + arch/s390/configs/gcov_defconfig | 2 +- + arch/s390/configs/performance_defconfig | 2 +- + arch/s390/crypto/crc32-vx.c | 6 +- + arch/s390/defconfig | 2 +- + arch/s390/kernel/head.S | 4 +- + arch/s390/lib/string.c | 16 ++--- + drivers/s390/cio/device.c | 2 - + drivers/s390/cio/device_status.c | 7 +- + drivers/s390/cio/io_sch.h | 1 - + drivers/s390/cio/qdio_main.c | 113 ++++++++++++++++---------------- + 12 files changed, 86 insertions(+), 82 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 sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (74050a3188c8 tile-srom: avoid krealloc(... __GFP_ZERO) pattern) +$ git merge tile/master +Merge made by the 'recursive' strategy. + drivers/char/tile-srom.c | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) +Merging uml/linux-next (8a545f185145 hostfs: Freeing an ERR_PTR in hostfs_fill_sb_common()) +$ 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 (9e8511ff7e3f Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next) +$ git merge xtensa/for_next +Auto-merging arch/xtensa/kernel/setup.c +Merge made by the 'recursive' strategy. + Documentation/xtensa/mmu.txt | 173 ++++++++++++++++--- + arch/xtensa/Kconfig | 90 ++++++++-- + arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- + arch/xtensa/boot/boot-elf/bootstrap.S | 7 +- + arch/xtensa/boot/boot-uboot/Makefile | 10 +- + arch/xtensa/include/asm/bitops.h | 2 +- + arch/xtensa/include/asm/cacheasm.h | 11 +- + arch/xtensa/include/asm/fixmap.h | 5 + + arch/xtensa/include/asm/highmem.h | 5 + + arch/xtensa/include/asm/initialize_mmu.h | 44 +++-- + arch/xtensa/include/asm/kmem_layout.h | 74 ++++++++ + arch/xtensa/include/asm/page.h | 27 ++- + arch/xtensa/include/asm/pgtable.h | 7 +- + arch/xtensa/include/asm/processor.h | 2 +- + arch/xtensa/include/asm/sysmem.h | 21 +-- + arch/xtensa/include/asm/vectors.h | 67 +++----- + arch/xtensa/include/uapi/asm/types.h | 3 +- + arch/xtensa/include/uapi/asm/unistd.h | 15 +- + arch/xtensa/kernel/entry.S | 5 +- + arch/xtensa/kernel/head.S | 2 +- + arch/xtensa/kernel/setup.c | 48 +++--- + arch/xtensa/kernel/vmlinux.lds.S | 4 - + arch/xtensa/mm/init.c | 279 +++---------------------------- + 23 files changed, 448 insertions(+), 455 deletions(-) + create mode 100644 arch/xtensa/include/asm/kmem_layout.h +Merging befs/for-next (3e35c149e220 fs: befs: remove ret variable) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/befs.h | 12 ----- + fs/befs/btree.c | 22 ++++----- + fs/befs/datastream.c | 24 ++++------ + fs/befs/io.c | 24 ---------- + fs/befs/io.h | 2 - + fs/befs/linuxvfs.c | 130 +++++++++++++++++++++++++-------------------------- + fs/befs/super.c | 2 +- + 7 files changed, 83 insertions(+), 133 deletions(-) +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (d84c090ad3e9 Fixup: fs_info/root cleanups and qgroups patches) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.h +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 362 +++++++++++++++++++++++++++++++++++++++++++++++-- + fs/btrfs/disk-io.c | 80 ++++++++++- + fs/btrfs/disk-io.h | 2 + + fs/btrfs/extent-tree.c | 13 ++ + fs/btrfs/extent_io.c | 18 ++- + fs/btrfs/file.c | 8 ++ + fs/btrfs/inode.c | 46 +++++-- + fs/btrfs/relocation.c | 95 +++++++++++++ + fs/btrfs/send.c | 125 +++++++++++++++-- + fs/btrfs/tree-log.c | 85 ++++++++++-- + 10 files changed, 797 insertions(+), 37 deletions(-) +Merging ceph/master (96c7a05e0196 rbd: nuke the 32-bit pool id check) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 10 +--------- + fs/ceph/caps.c | 5 ++++- + net/ceph/mon_client.c | 2 +- + net/ceph/osd_client.c | 2 +- + net/ceph/string_table.c | 8 +------- + 5 files changed, 8 insertions(+), 19 deletions(-) +Merging cifs/for-next (8e1e83d23606 Move check for prefix path to within cifs_get_root()) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 29 ++++++++++++----------------- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 31 +++++++++++++++++++++++++++++-- + 3 files changed, 42 insertions(+), 20 deletions(-) +Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. +Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (7bc949164511 ext4: verify extent header depth) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (c1ece7671920 Merge tag 'media/v4.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge f2fs/dev +Already up-to-date. +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (7244b9538994 f2fs: use filemap_check_errors()) +$ git merge fuse/for-next +Auto-merging fs/f2fs/node.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 1 - + fs/btrfs/inode.c | 15 --------------- + fs/btrfs/tree-log.c | 4 ++-- + fs/f2fs/node.c | 7 ++----- + 4 files changed, 4 insertions(+), 23 deletions(-) +$ git am -3 ../patches/0001-btrfs-merge-fix-for-mm-export-filemap_check_errors-t.patch +Applying: btrfs: merge fix for "mm: export filemap_check_errors() to modules" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/btrfs/file.c +$ git add -A . +$ git commit -v -a --amend +[master db85b58faadd] Merge remote-tracking branch 'fuse/for-next' + Date: Tue Aug 9 10:10:59 2016 +1000 +Merging gfs2/for-next (47a9a5279468 GFS2: use BIT() macro) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 2 +- + fs/gfs2/bmap.c | 6 +++--- + fs/gfs2/dir.c | 20 ++++++++++---------- + fs/gfs2/glock.c | 2 +- + fs/gfs2/inode.h | 2 +- + fs/gfs2/ops_fstype.c | 8 ++++---- + fs/gfs2/quota.c | 4 ++-- + fs/gfs2/super.c | 2 +- + 8 files changed, 23 insertions(+), 23 deletions(-) +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (8d480326c3d6 NFSv4: Cap the transport reconnection timer at 1/2 lease period) +$ git merge nfs/linux-next +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/nfs4_fs.h +Merge made by the 'recursive' strategy. + fs/nfs/nfs42proc.c | 2 ++ + fs/nfs/nfs4_fs.h | 4 +++ + fs/nfs/nfs4proc.c | 9 +++---- + fs/nfs/nfs4renewd.c | 20 ++++++++++++++ + fs/nfs/nfs4state.c | 9 +++---- + include/linux/sunrpc/clnt.h | 2 ++ + include/linux/sunrpc/xprt.h | 3 ++- + net/sunrpc/auth_gss/auth_gss.c | 8 +++--- + net/sunrpc/clnt.c | 24 +++++++++++++++++ + net/sunrpc/xprt.c | 26 ++++++++++++------ + net/sunrpc/xprtsock.c | 60 +++++++++++++++++++++++++++++++++--------- + 11 files changed, 130 insertions(+), 37 deletions(-) +Merging nfsd/nfsd-next (3e5ed3680a24 SUNRPC: change UDP socket space reservation) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs3proc.c | 1 - + fs/nfsd/nfs4state.c | 1 - + fs/nfsd/nfs4xdr.c | 1 - + fs/nfsd/nfsproc.c | 1 - + include/linux/sunrpc/svc.h | 16 ---------------- + include/linux/sunrpc/svc_xprt.h | 1 - + net/sunrpc/svc.c | 6 ------ + net/sunrpc/svc_xprt.c | 37 ------------------------------------- + net/sunrpc/svcsock.c | 13 +------------ + 9 files changed, 1 insertion(+), 76 deletions(-) +Merging orangefs/for-next (78fee0b6846f orangefs: fix namespace handling) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (f200ea288c78 Revert "ovl: get_write_access() in truncate") +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/inode.c | 38 ++++++++++++++++++++++++++++------ + fs/locks.c | 53 +++++++++++++++++++++++++++--------------------- + fs/namespace.c | 2 +- + fs/open.c | 17 +++++++++++++--- + fs/overlayfs/copy_up.c | 2 ++ + fs/overlayfs/inode.c | 23 +-------------------- + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/super.c | 2 +- + include/linux/dcache.h | 5 +++-- + include/linux/fs.h | 16 +++++++++++++-- + include/linux/fsnotify.h | 14 ++++++++----- + include/uapi/linux/fs.h | 1 + + 12 files changed, 109 insertions(+), 65 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 (5d71afb00840 ubi: Use bitmaps in Fastmap self-check code) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (3481b6828523 xfs: move (and rename) the deferred bmap-free tracepoints) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (ca323f65d622 locks: Filter /proc/locks output on proc pid ns) +$ git merge file-locks/linux-next +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) +Merging vfs/for-next (3baf32898e1c parisc: use %pD) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + arch/parisc/kernel/cache.c | 2 +- + drivers/gpu/drm/drm_debugfs.c | 4 +- + drivers/gpu/drm/msm/msm_perf.c | 4 +- + drivers/gpu/drm/msm/msm_rd.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 6 +-- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 16 ++++---- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 4 +- + drivers/staging/lustre/lustre/llite/file.c | 4 +- + fs/orangefs/dir.c | 4 +- + fs/orangefs/file.c | 4 +- + fs/orangefs/inode.c | 12 +++--- + fs/orangefs/namei.c | 44 +++++++++++----------- + fs/orangefs/orangefs-debugfs.c | 4 +- + 13 files changed, 53 insertions(+), 59 deletions(-) +Merging pci/next (29b4817d4018 Linux 4.8-rc1) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (e976e56423dc ramoops: use persistent_ram_free() instead of kfree() for freeing prz) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (de1bcd764ea0 Merge branch 'for-4.8/upstream' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (29b4817d4018 Linux 4.8-rc1) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging hwmon-staging/hwmon-next (90ed8dc9d1a3 hwmon: (ltc4151) Make shunt-resistor configurable) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ltc4151.txt | 18 + + Documentation/hwmon/hwmon-kernel-api.txt | 231 +++++++- + drivers/hwmon/adt7411.c | 51 +- + drivers/hwmon/hwmon.c | 612 +++++++++++++++++++-- + drivers/hwmon/ltc4151.c | 22 +- + drivers/hwmon/nct6775.c | 8 +- + drivers/hwmon/ntc_thermistor.c | 107 +--- + drivers/hwmon/pmbus/pmbus.c | 20 +- + include/linux/hwmon.h | 342 ++++++++++++ + 9 files changed, 1281 insertions(+), 130 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/ltc4151.txt +Merging v4l-dvb/master (b6aa39228966 Merge tag 'v4.8-rc1' into patchwork) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/usb/cx231xx/cx231xx-core.c | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) +Merging pm/linux-next (397cbb5e9031 Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/powernv-cpufreq.c | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (1577ddfac75f Merge branches 'thermal-intel' and 'thermal-core' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/clock_cooling.c | 1 + + drivers/thermal/fair_share.c | 2 ++ + drivers/thermal/gov_bang_bang.c | 2 ++ + drivers/thermal/intel_pch_thermal.c | 60 ++++++++++++++++++++++++++++++++++++- + drivers/thermal/intel_powerclamp.c | 11 ++++--- + drivers/thermal/power_allocator.c | 2 ++ + drivers/thermal/step_wise.c | 2 ++ + drivers/thermal/thermal_core.c | 10 +++++-- + drivers/thermal/thermal_hwmon.c | 2 ++ + 9 files changed, 84 insertions(+), 8 deletions(-) +Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Resolved 'drivers/thermal/thermal_core.c' using previous resolution. +Auto-merging drivers/thermal/thermal_core.c +CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/gov_bang_bang.c +Auto-merging drivers/acpi/thermal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fa329612dc34] Merge remote-tracking branch 'thermal-soc/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/thermal/qcom-tsens.txt | 21 + + .../devicetree/bindings/thermal/thermal.txt | 10 +- + Documentation/thermal/sysfs-api.txt | 19 + + drivers/acpi/thermal.c | 1 - + drivers/platform/x86/acerhdf.c | 1 - + drivers/thermal/Kconfig | 5 + + drivers/thermal/Makefile | 4 +- + drivers/thermal/gov_bang_bang.c | 2 +- + drivers/thermal/imx_thermal.c | 1 - + drivers/thermal/of-thermal.c | 47 +- + drivers/thermal/qcom/Kconfig | 11 + + drivers/thermal/qcom/Makefile | 2 + + drivers/thermal/qcom/tsens-8916.c | 113 ++ + drivers/thermal/qcom/tsens-8960.c | 292 ++++ + drivers/thermal/qcom/tsens-8974.c | 244 ++++ + drivers/thermal/qcom/tsens-8996.c | 84 ++ + drivers/thermal/qcom/tsens-common.c | 141 ++ + drivers/thermal/qcom/tsens.c | 200 +++ + drivers/thermal/qcom/tsens.h | 94 ++ + drivers/thermal/rcar_thermal.c | 1 + + drivers/thermal/rockchip_thermal.c | 93 +- + drivers/thermal/thermal_core.c | 1396 +++++--------------- + drivers/thermal/thermal_core.h | 26 + + drivers/thermal/thermal_helpers.c | 174 +++ + drivers/thermal/thermal_sysfs.c | 855 ++++++++++++ + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 30 +- + include/linux/thermal.h | 28 +- + 27 files changed, 2779 insertions(+), 1116 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt + create mode 100644 drivers/thermal/qcom/Kconfig + create mode 100644 drivers/thermal/qcom/Makefile + create mode 100644 drivers/thermal/qcom/tsens-8916.c + create mode 100644 drivers/thermal/qcom/tsens-8960.c + create mode 100644 drivers/thermal/qcom/tsens-8974.c + create mode 100644 drivers/thermal/qcom/tsens-8996.c + create mode 100644 drivers/thermal/qcom/tsens-common.c + create mode 100644 drivers/thermal/qcom/tsens.c + create mode 100644 drivers/thermal/qcom/tsens.h + create mode 100644 drivers/thermal/thermal_helpers.c + create mode 100644 drivers/thermal/thermal_sysfs.c +$ git am -3 ../patches/0001-thermal-fix-up-for-fix-race-condition-when-updating-.patch +Applying: thermal: fix up for "fix race condition when updating cooling device" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/thermal/thermal_helpers.c +$ git add -A . +$ git commit -v -a --amend +[master 2b21e693dfd5] Merge remote-tracking branch 'thermal-soc/next' + Date: Tue Aug 9 10:34:57 2016 +1000 +$ git am -3 ../patches/0001-thermal-fix-up-for-bad-merge-of-drivers-thermal-ther.patch +Applying: thermal: fix up for bad merge of drivers/thermal/thermal_core.c +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/thermal/thermal_core.c +$ git add -A . +$ git commit -v -a --amend +[master 4c5237020415] Merge remote-tracking branch 'thermal-soc/next' + Date: Tue Aug 9 10:34:57 2016 +1000 +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy) +$ 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 (521301170601 Merge branch 'topic/ioatdma' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + Documentation/dmaengine/provider.txt | 11 ++ + drivers/dma/at_hdmac.c | 11 +- + drivers/dma/at_xdmac.c | 8 +- + drivers/dma/coh901318.c | 9 +- + drivers/dma/cppi41.c | 2 +- + drivers/dma/dmaengine.h | 84 ++++++++++++++ + drivers/dma/dw/core.c | 14 +-- + drivers/dma/ep93xx_dma.c | 10 +- + drivers/dma/fsl_raid.c | 10 +- + drivers/dma/fsldma.c | 8 +- + drivers/dma/imx-dma.c | 4 +- + drivers/dma/imx-sdma.c | 7 +- + drivers/dma/ioat/dma.c | 213 ++++++++++++++++++++++++++++++----- + drivers/dma/ioat/init.c | 2 +- + drivers/dma/ioat/registers.h | 2 + + drivers/dma/iop-adma.c | 3 +- + drivers/dma/ipu/ipu_idmac.c | 18 ++- + drivers/dma/mic_x100_dma.c | 6 +- + drivers/dma/mmp_pdma.c | 14 +-- + drivers/dma/mmp_tdma.c | 4 +- + drivers/dma/mpc512x_dma.c | 3 +- + drivers/dma/mv_xor.c | 7 +- + drivers/dma/mxs-dma.c | 3 +- + drivers/dma/nbpfaxi.c | 9 +- + drivers/dma/pch_dma.c | 7 +- + drivers/dma/pl330.c | 10 +- + drivers/dma/ppc4xx/adma.c | 7 +- + drivers/dma/qcom/hidma.c | 11 +- + drivers/dma/sh/rcar-dmac.c | 16 ++- + drivers/dma/sh/shdma-base.c | 12 +- + drivers/dma/sirf-dma.c | 7 +- + drivers/dma/ste_dma40.c | 10 +- + drivers/dma/tegra20-apb-dma.c | 10 +- + drivers/dma/timb_dma.c | 9 +- + drivers/dma/txx9dmac.c | 9 +- + drivers/dma/virt-dma.c | 17 ++- + drivers/dma/xgene-dma.c | 6 +- + drivers/dma/xilinx/xilinx_dma.c | 10 +- + drivers/ntb/ntb_transport.c | 193 ++++++++++++++++++++++++------- + include/linux/dmaengine.h | 16 +++ + 40 files changed, 556 insertions(+), 256 deletions(-) +Merging net-next/master (6cdaf03f8c23 RDS: add __printf format attribute to error reporting functions) +$ git merge net-next/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/aeroflex/greth.c | 42 +-- + drivers/net/ethernet/aeroflex/greth.h | 1 - + drivers/net/ethernet/brocade/bna/bnad.c | 27 +- + drivers/net/ethernet/brocade/bna/bnad.h | 1 - + drivers/net/ethernet/emulex/benet/be.h | 21 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 202 ++++++------- + drivers/net/ethernet/emulex/benet/be_main.c | 422 ++++++++++++++++++++++------ + drivers/net/ethernet/freescale/xgmac_mdio.c | 7 +- + drivers/net/ethernet/marvell/mvneta.c | 60 ++-- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 8 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 18 +- + drivers/net/hyperv/hyperv_net.h | 1 + + drivers/net/hyperv/netvsc.c | 6 +- + drivers/net/hyperv/netvsc_drv.c | 29 +- + drivers/net/hyperv/rndis_filter.c | 24 ++ + drivers/net/phy/Kconfig | 5 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/mscc.c | 161 +++++++++++ + drivers/staging/octeon/ethernet-mdio.c | 63 ++--- + drivers/staging/octeon/ethernet-rgmii.c | 2 +- + drivers/staging/octeon/ethernet.c | 12 +- + drivers/staging/octeon/octeon-ethernet.h | 1 - + net/core/neighbour.c | 3 +- + net/ipv4/igmp.c | 10 + + net/ipv4/ipconfig.c | 50 ++-- + net/ipv6/mcast.c | 10 + + net/rds/ib.h | 1 + + net/rds/rds.h | 1 + + net/sched/sch_hfsc.c | 51 +--- + 29 files changed, 799 insertions(+), 441 deletions(-) + create mode 100644 drivers/net/phy/mscc.c +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (6a492b0f23d2 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge netfilter-next/master +Already up-to-date. +Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL) +$ git merge ipvs-next/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wireless-drivers-next/master (cb6a11518850 wlcore: spi: fix build warning caused by redundant variable) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (a92bcaae230c mac802154: use rate limited warnings for malformed frames) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + include/net/bluetooth/hci_core.h | 2 ++ + net/6lowpan/ndisc.c | 2 -- + net/bluetooth/af_bluetooth.c | 5 +++++ + net/bluetooth/leds.c | 27 +++++++++++++++++++++++++++ + net/bluetooth/leds.h | 10 ++++++++++ + net/mac802154/iface.c | 1 + + net/mac802154/rx.c | 9 +++++++-- + 7 files changed, 52 insertions(+), 4 deletions(-) +Merging mac80211-next/master (6a492b0f23d2 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (29b4817d4018 Linux 4.8-rc1) +$ git merge rdma/for-next +Already up-to-date. +Merging rdma-leon/rdma-next (4c2e07c6a29e Linux 4.7-rc5) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (92d21ac74a9e Linux 4.7-rc7) +$ git merge rdma-leon-test/testing/rdma-next +Already up-to-date. +Merging mtd/master (11e8a7f9aa94 Merge tag 'for-linus-20160801' into HEAD) +$ git merge mtd/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging l2-mtd/master (1dcff2e4ae72 mtd: spi-nor: don't build Cadence QuadSPI on non-ARM) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (8490c03bd9d4 mtd: nand: jz4780: Update MODULE_AUTHOR email address) +$ git merge nand/nand/next +Already up-to-date. +Merging crypto/master (0f95e2ffc58f Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (5c6c201ccbaf drm: Paper over locking inversion after registration rework) +$ git merge drm/drm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_crtc.c | 8 +++----- + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 1 + + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging drm-panel/drm/panel/for-next (9bb34c4c730d drm/panel: simple: Add support for Starry KR122EA0SRA panel) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (c45eb4fed12d drm/i915/fbdev: Check for the framebuffer before use) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_display.c | 10 +--------- + drivers/gpu/drm/i915/intel_fbdev.c | 25 +++++++++++-------------- + drivers/gpu/drm/i915/intel_pm.c | 3 ++- + 3 files changed, 14 insertions(+), 24 deletions(-) +Merging drm-tegra/drm/tegra/for-next (64ea25c3bc86 drm/tegra: sor: Reject HDMI 2.0 modes) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (cfc5adea1955 drm: Make sure drm_vblank_no_hw_counter isn't abused) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Merge made by the 'recursive' strategy. + Documentation/gpu/drm-internals.rst | 9 +- + drivers/gpu/drm/arm/malidp_drv.h | 2 +- + drivers/gpu/drm/arm/malidp_planes.c | 20 +-- + drivers/gpu/drm/armada/armada_overlay.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 22 ++-- + drivers/gpu/drm/drm_agpsupport.c | 6 +- + drivers/gpu/drm/drm_atomic_helper.c | 14 +- + drivers/gpu/drm/drm_auth.c | 2 +- + drivers/gpu/drm/drm_bufs.c | 22 ++-- + drivers/gpu/drm/drm_context.c | 24 ++-- + drivers/gpu/drm/drm_crtc.c | 24 ++-- + drivers/gpu/drm/drm_dma.c | 6 +- + drivers/gpu/drm/drm_drv.c | 14 +- + drivers/gpu/drm/drm_fb_helper.c | 4 +- + drivers/gpu/drm/drm_fops.c | 6 +- + drivers/gpu/drm/drm_ioctl.c | 4 +- + drivers/gpu/drm/drm_irq.c | 21 +-- + drivers/gpu/drm/drm_lock.c | 4 +- + drivers/gpu/drm/drm_mm.c | 142 ++++++++++++++++---- + drivers/gpu/drm/drm_pci.c | 8 +- + drivers/gpu/drm/drm_plane_helper.c | 141 +++++++++++++++----- + drivers/gpu/drm/drm_rect.c | 30 ++--- + drivers/gpu/drm/drm_scatter.c | 6 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 27 +--- + drivers/gpu/drm/drm_vma_manager.c | 43 ++---- + drivers/gpu/drm/i810/i810_drv.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 12 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 20 +-- + drivers/gpu/drm/i915/intel_display.c | 168 ++++++++++++------------ + drivers/gpu/drm/i915/intel_drv.h | 5 +- + drivers/gpu/drm/i915/intel_fbc.c | 14 +- + drivers/gpu/drm/i915/intel_fbdev.c | 6 +- + drivers/gpu/drm/i915/intel_pm.c | 60 ++++----- + drivers/gpu/drm/i915/intel_sprite.c | 100 +++++++------- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 21 ++- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 17 ++- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 120 +++++------------ + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 15 +-- + drivers/gpu/drm/mga/mga_drv.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 10 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 6 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 14 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 10 +- + drivers/gpu/drm/r128/r128_drv.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 31 +---- + drivers/gpu/drm/savage/savage_drv.c | 2 +- + drivers/gpu/drm/sis/sis_drv.c | 2 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 1 + + drivers/gpu/drm/via/via_drv.c | 2 +- + include/drm/drmP.h | 5 +- + include/drm/drm_crtc.h | 30 +++-- + include/drm/drm_mm.h | 12 ++ + include/drm/drm_plane_helper.h | 5 + + include/drm/drm_vma_manager.h | 2 - + 55 files changed, 692 insertions(+), 610 deletions(-) +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference()) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver) +$ git merge mali-dp/for-upstream/mali-dp +Already up-to-date. +Merging sunxi/sunxi/for-next (1ec0088a7a09 Merge branches 'sunxi/clk-fixes-for-4.8', 'sunxi/dt-for-4.9' and 'sunxi/clk-for-4.9' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 32 ++++++--- + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 10 +++ + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 88 +++++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu_common.c | 2 +- + drivers/clk/sunxi-ng/ccu_mux.c | 2 +- + drivers/clk/sunxi-ng/ccu_mux.h | 2 +- + drivers/clk/sunxi-ng/ccu_nk.c | 6 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 40 +++++++++-- + drivers/clk/sunxi-ng/ccu_nkm.h | 23 ++++++ + drivers/clk/sunxi/clk-a10-pll2.c | 4 +- + drivers/clk/sunxi/clk-sun8i-mbus.c | 2 +- + 12 files changed, 189 insertions(+), 23 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts +Merging kbuild/for-next (f6830d5346c9 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kspp/for-next/kspp (6fbe16013e52 Merge branch 'for-next/ro_after_init' into for-next/kspp) +$ git merge kspp/for-next/kspp +Resolved 'arch/arm64/include/asm/uaccess.h' using previous resolution. +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'arch/x86/kernel/x86_init.c' using previous resolution. +Resolved 'arch/x86/kvm/vmx.c' using previous resolution. +Resolved 'drivers/char/random.c' using previous resolution. +Resolved 'include/linux/thread_info.h' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Auto-merging net/core/dev.c +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/Makefile +Auto-merging lib/random32.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/fork.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/thread_info.h +CONFLICT (content): Merge conflict in include/linux/thread_info.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/random.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/init.h +Auto-merging include/linux/genhd.h +Auto-merging include/linux/compiler.h +Auto-merging fs/namespace.c +Auto-merging drivers/char/random.c +CONFLICT (content): Merge conflict in drivers/char/random.c +Auto-merging arch/x86/kvm/vmx.c +CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kernel/x86_init.c +CONFLICT (content): Merge conflict in arch/x86/kernel/x86_init.c +Auto-merging arch/x86/kernel/setup_percpu.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/paravirt.c +Auto-merging arch/x86/kernel/cpu/mtrr/main.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/apic/x2apic_uv_x.c +Auto-merging arch/x86/kernel/apic/x2apic_phys.c +Auto-merging arch/x86/kernel/apic/x2apic_cluster.c +Auto-merging arch/x86/kernel/apic/probe_32.c +Auto-merging arch/x86/kernel/apic/bigsmp_32.c +Auto-merging arch/x86/kernel/apic/apic_noop.c +Auto-merging arch/x86/kernel/apic/apic_flat_64.c +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/include/asm/fpu/xstate.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/lib/uaccess.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm64/include/asm/uaccess.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/uaccess.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/cpuidle.c +Auto-merging arch/arm/include/asm/uaccess.h +Auto-merging arch/arm/Kconfig +Auto-merging Makefile +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d606539d251f] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 5 + + Makefile | 7 - + arch/Kconfig | 32 ++ + arch/arm/Kconfig | 1 + + arch/arm/include/asm/uaccess.h | 11 +- + arch/arm/kernel/cpuidle.c | 2 +- + arch/arm/kernel/setup.c | 10 +- + arch/arm/kernel/smp.c | 2 +- + arch/arm/lib/delay.c | 2 +- + arch/arm/mm/mmu.c | 9 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/uaccess.h | 15 +- + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/uaccess.h | 18 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/uaccess.h | 21 +- + arch/powerpc/kernel/Makefile | 5 + + arch/s390/Kconfig | 1 + + arch/s390/lib/uaccess.c | 2 + + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/uaccess_32.h | 14 +- + arch/sparc/include/asm/uaccess_64.h | 11 +- + arch/x86/Kconfig | 2 + + arch/x86/include/asm/desc.h | 2 +- + arch/x86/include/asm/fpu/xstate.h | 3 +- + arch/x86/include/asm/thread_info.h | 44 ++ + arch/x86/include/asm/uaccess.h | 10 +- + arch/x86/include/asm/uaccess_32.h | 2 + + arch/x86/include/asm/uaccess_64.h | 2 + + arch/x86/kernel/apic/apic_flat_64.c | 6 +- + arch/x86/kernel/apic/apic_noop.c | 2 +- + arch/x86/kernel/apic/bigsmp_32.c | 2 +- + arch/x86/kernel/apic/msi.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 4 +- + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/apic/x2apic_phys.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- + arch/x86/kernel/cpu/common.c | 11 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 2 +- + arch/x86/kernel/ksysfs.c | 2 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/ptrace.c | 6 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/x86_init.c | 6 +- + arch/x86/kvm/svm.c | 2 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/pci/pcbios.c | 7 +- + block/blk-softirq.c | 2 +- + drivers/char/random.c | 4 +- + fs/namespace.c | 1 + + include/linux/compiler-gcc.h | 7 + + include/linux/compiler.h | 4 + + include/linux/fdtable.h | 2 +- + include/linux/genhd.h | 2 +- + include/linux/init.h | 5 +- + include/linux/mmzone.h | 2 + + include/linux/random.h | 15 +- + include/linux/slab.h | 12 + + include/linux/thread_info.h | 24 ++ + init/Kconfig | 2 + + init/main.c | 1 + + kernel/fork.c | 7 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/softirq.c | 4 +- + kernel/time/timer.c | 2 +- + lib/irq_poll.c | 2 +- + lib/random32.c | 2 +- + mm/Makefile | 4 + + mm/page_alloc.c | 32 ++ + mm/slab.c | 30 ++ + mm/slub.c | 40 ++ + mm/usercopy.c | 268 ++++++++++++ + net/core/dev.c | 4 +- + scripts/Kbuild.include | 10 +- + scripts/Makefile.gcc-plugins | 45 +- + scripts/gcc-plugin.sh | 14 + + scripts/gcc-plugins/Makefile | 11 +- + scripts/gcc-plugins/latent_entropy_plugin.c | 639 ++++++++++++++++++++++++++++ + security/Kconfig | 28 ++ + 85 files changed, 1424 insertions(+), 120 deletions(-) + create mode 100644 mm/usercopy.c + create mode 100644 scripts/gcc-plugins/latent_entropy_plugin.c +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 (22ad85abfabb Merge remote-tracking branch 'regmap/fix/rbtree' into regmap-linus) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache-rbtree.c | 38 ++++++++++++++++++++++++++--------- + drivers/base/regmap/regcache.c | 5 +++-- + 2 files changed, 31 insertions(+), 12 deletions(-) +Merging sound/for-next (59ec4b57bcae ALSA: hda - Fix headset mic detection problem for two dell machines) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (7def6d917c26 Merge remote-tracking branches 'asoc/topic/simple' and 'asoc/topic/topology' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../bindings/sound/rockchip,rk3399-gru-sound.txt | 15 + + Documentation/devicetree/bindings/sound/rt5659.txt | 3 + + arch/arm/mach-s3c24xx/mach-mini2440.c | 19 ++ + include/sound/l3.h | 15 +- + include/sound/s3c24xx_uda134x.h | 1 - + include/sound/simple_card_utils.h | 25 ++ + include/sound/soc.h | 8 - + include/uapi/sound/asoc.h | 34 ++- + sound/soc/atmel/atmel-classd.c | 6 +- + sound/soc/atmel/atmel-pdmic.c | 6 +- + sound/soc/codecs/88pm860x-codec.c | 14 +- + sound/soc/codecs/ab8500-codec.c | 24 +- + sound/soc/codecs/ac97.c | 10 +- + sound/soc/codecs/ad1836.c | 14 +- + sound/soc/codecs/ad193x.c | 14 +- + sound/soc/codecs/ad1980.c | 14 +- + sound/soc/codecs/ad73311.c | 10 +- + sound/soc/codecs/adau1373.c | 14 +- + sound/soc/codecs/adau1701.c | 15 +- + sound/soc/codecs/adau1761.c | 14 +- + sound/soc/codecs/adau1781.c | 14 +- + sound/soc/codecs/adau1977.c | 14 +- + sound/soc/codecs/adau7002.c | 10 +- + sound/soc/codecs/adav80x.c | 14 +- + sound/soc/codecs/ads117x.c | 10 +- + sound/soc/codecs/ak4104.c | 10 +- + sound/soc/codecs/ak4535.c | 14 +- + sound/soc/codecs/ak4554.c | 10 +- + sound/soc/codecs/ak4613.c | 14 +- + sound/soc/codecs/ak4641.c | 14 +- + sound/soc/codecs/ak4642.c | 14 +- + sound/soc/codecs/ak4671.c | 14 +- + sound/soc/codecs/ak5386.c | 10 +- + sound/soc/codecs/alc5632.c | 14 +- + sound/soc/codecs/bt-sco.c | 10 +- + sound/soc/codecs/cs35l32.c | 15 +- + sound/soc/codecs/cs35l33.c | 15 +- + sound/soc/codecs/cs4265.c | 15 +- + sound/soc/codecs/cs4270.c | 14 +- + sound/soc/codecs/cs4271.c | 14 +- + sound/soc/codecs/cs42l51.c | 14 +- + sound/soc/codecs/cs42l52.c | 15 +- + sound/soc/codecs/cs42l56.c | 15 +- + sound/soc/codecs/cs42l73.c | 19 +- + sound/soc/codecs/cs42xx8.c | 14 +- + sound/soc/codecs/cs4349.c | 15 +- + sound/soc/codecs/cs47l24.c | 14 +- + sound/soc/codecs/cs53l30.c | 23 +- + sound/soc/codecs/cx20442.c | 10 +- + sound/soc/codecs/da7210.c | 15 +- + sound/soc/codecs/da7213.c | 149 +++++---- + sound/soc/codecs/da7213.h | 12 +- + sound/soc/codecs/da7218.c | 49 ++- + sound/soc/codecs/da7218.h | 2 - + sound/soc/codecs/da7219-aad.c | 18 +- + sound/soc/codecs/da7219.c | 33 +- + sound/soc/codecs/da732x.c | 14 +- + sound/soc/codecs/da9055.c | 15 +- + sound/soc/codecs/dmic.c | 10 +- + sound/soc/codecs/es8328.c | 14 +- + sound/soc/codecs/gtm601.c | 10 +- + sound/soc/codecs/hdmi-codec.c | 79 ++++- + sound/soc/codecs/inno_rk3036.c | 14 +- + sound/soc/codecs/isabelle.c | 14 +- + sound/soc/codecs/jz4740.c | 14 +- + sound/soc/codecs/l3.c | 71 ++++- + sound/soc/codecs/lm49453.c | 14 +- + sound/soc/codecs/max98088.c | 14 +- + sound/soc/codecs/max98095.c | 14 +- + sound/soc/codecs/max98357a.c | 10 +- + sound/soc/codecs/max9850.c | 14 +- + sound/soc/codecs/max9860.c | 14 +- + sound/soc/codecs/max9867.c | 14 +- + sound/soc/codecs/max98925.c | 14 +- + sound/soc/codecs/max98926.c | 14 +- + sound/soc/codecs/mc13783.c | 14 +- + sound/soc/codecs/ml26124.c | 14 +- + sound/soc/codecs/nau8825.c | 92 +++--- + sound/soc/codecs/pcm1681.c | 14 +- + sound/soc/codecs/pcm179x.c | 14 +- + sound/soc/codecs/pcm3008.c | 10 +- + sound/soc/codecs/pcm3168a.c | 14 +- + sound/soc/codecs/pcm512x.c | 14 +- + sound/soc/codecs/rt286.c | 14 +- + sound/soc/codecs/rt298.c | 14 +- + sound/soc/codecs/rt5514.c | 14 +- + sound/soc/codecs/rt5616.c | 14 +- + sound/soc/codecs/rt5631.c | 14 +- + sound/soc/codecs/rt5640.c | 14 +- + sound/soc/codecs/rt5645.c | 14 +- + sound/soc/codecs/rt5651.c | 14 +- + sound/soc/codecs/rt5659.c | 38 ++- + sound/soc/codecs/rt5659.h | 1 + + sound/soc/codecs/rt5670.c | 14 +- + sound/soc/codecs/rt5677.c | 14 +- + sound/soc/codecs/sgtl5000.c | 14 +- + sound/soc/codecs/si476x.c | 10 +- + sound/soc/codecs/sn95031.c | 14 +- + sound/soc/codecs/spdif_receiver.c | 10 +- + sound/soc/codecs/spdif_transmitter.c | 10 +- + sound/soc/codecs/ssm2518.c | 14 +- + sound/soc/codecs/ssm2602.c | 14 +- + sound/soc/codecs/ssm4567.c | 14 +- + sound/soc/codecs/sta32x.c | 14 +- + sound/soc/codecs/sta350.c | 14 +- + sound/soc/codecs/sta529.c | 6 +- + sound/soc/codecs/stac9766.c | 6 +- + sound/soc/codecs/sti-sas.c | 8 +- + sound/soc/codecs/tas2552.c | 14 +- + sound/soc/codecs/tas5086.c | 14 +- + sound/soc/codecs/tas571x.c | 14 +- + sound/soc/codecs/tas5720.c | 14 +- + sound/soc/codecs/tfa9879.c | 15 +- + sound/soc/codecs/tlv320aic23.c | 14 +- + sound/soc/codecs/tlv320aic26.c | 14 +- + sound/soc/codecs/tlv320aic31xx.c | 14 +- + sound/soc/codecs/tlv320aic32x4.c | 14 +- + sound/soc/codecs/tlv320aic3x.c | 14 +- + sound/soc/codecs/tlv320dac33.c | 14 +- + sound/soc/codecs/twl4030.c | 14 +- + sound/soc/codecs/twl6040.c | 14 +- + sound/soc/codecs/uda134x.c | 17 +- + sound/soc/codecs/uda1380.c | 14 +- + sound/soc/codecs/wl1273.c | 14 +- + sound/soc/codecs/wm0010.c | 10 +- + sound/soc/codecs/wm1250-ev1.c | 11 +- + sound/soc/codecs/wm2000.c | 14 +- + sound/soc/codecs/wm2200.c | 14 +- + sound/soc/codecs/wm5100.c | 14 +- + sound/soc/codecs/wm5102.c | 14 +- + sound/soc/codecs/wm5110.c | 14 +- + sound/soc/codecs/wm8350.c | 14 +- + sound/soc/codecs/wm8400.c | 14 +- + sound/soc/codecs/wm8510.c | 14 +- + sound/soc/codecs/wm8523.c | 14 +- + sound/soc/codecs/wm8580.c | 14 +- + sound/soc/codecs/wm8711.c | 14 +- + sound/soc/codecs/wm8727.c | 10 +- + sound/soc/codecs/wm8728.c | 14 +- + sound/soc/codecs/wm8731.c | 14 +- + sound/soc/codecs/wm8737.c | 14 +- + sound/soc/codecs/wm8741.c | 10 +- + sound/soc/codecs/wm8750.c | 14 +- + sound/soc/codecs/wm8753.c | 14 +- + sound/soc/codecs/wm8770.c | 14 +- + sound/soc/codecs/wm8776.c | 14 +- + sound/soc/codecs/wm8782.c | 10 +- + sound/soc/codecs/wm8804.c | 10 +- + sound/soc/codecs/wm8900.c | 14 +- + sound/soc/codecs/wm8903.c | 14 +- + sound/soc/codecs/wm8940.c | 14 +- + sound/soc/codecs/wm8955.c | 14 +- + sound/soc/codecs/wm8961.c | 14 +- + sound/soc/codecs/wm8971.c | 14 +- + sound/soc/codecs/wm8974.c | 14 +- + sound/soc/codecs/wm8978.c | 14 +- + sound/soc/codecs/wm8983.c | 14 +- + sound/soc/codecs/wm8985.c | 14 +- + sound/soc/codecs/wm8988.c | 14 +- + sound/soc/codecs/wm8990.c | 14 +- + sound/soc/codecs/wm8991.c | 14 +- + sound/soc/codecs/wm8995.c | 14 +- + sound/soc/codecs/wm8996.c | 14 +- + sound/soc/codecs/wm8997.c | 14 +- + sound/soc/codecs/wm8998.c | 14 +- + sound/soc/codecs/wm9081.c | 14 +- + sound/soc/codecs/wm9705.c | 14 +- + sound/soc/codecs/wm9712.c | 14 +- + sound/soc/codecs/wm9713.c | 14 +- + sound/soc/dwc/designware_i2s.c | 2 - + sound/soc/generic/Makefile | 6 +- + sound/soc/generic/simple-card-utils.c | 73 +++++ + sound/soc/generic/simple-card.c | 116 ++----- + sound/soc/img/pistachio-internal-dac.c | 14 +- + sound/soc/intel/skylake/bxt-sst.c | 114 ++++++- + sound/soc/intel/skylake/skl-messages.c | 39 ++- + sound/soc/intel/skylake/skl-pcm.c | 20 ++ + sound/soc/intel/skylake/skl-sst-dsp.h | 7 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 29 ++ + sound/soc/intel/skylake/skl-sst-ipc.h | 12 +- + sound/soc/intel/skylake/skl-sst-utils.c | 14 +- + sound/soc/intel/skylake/skl-sst.c | 43 +-- + sound/soc/intel/skylake/skl-topology.c | 55 +++- + sound/soc/intel/skylake/skl-topology.h | 2 +- + sound/soc/intel/skylake/skl-tplg-interface.h | 15 +- + sound/soc/intel/skylake/skl.h | 2 + + sound/soc/rockchip/Kconfig | 11 + + sound/soc/rockchip/Makefile | 2 + + sound/soc/rockchip/rk3399_gru_sound.c | 337 +++++++++++++++++++++ + sound/soc/samsung/ac97.c | 28 +- + sound/soc/samsung/dma.h | 20 +- + sound/soc/samsung/dmaengine.c | 31 -- + sound/soc/samsung/i2s.c | 48 +-- + sound/soc/samsung/idma.c | 1 - + sound/soc/samsung/pcm.c | 26 +- + sound/soc/samsung/s3c-i2s-v2.c | 3 +- + sound/soc/samsung/s3c-i2s-v2.h | 4 +- + sound/soc/samsung/s3c2412-i2s.c | 24 +- + sound/soc/samsung/s3c24xx-i2s.c | 24 +- + sound/soc/samsung/s3c24xx_uda134x.c | 141 ++------- + sound/soc/samsung/smdk_wm8580pcm.c | 1 - + sound/soc/samsung/smdk_wm8994pcm.c | 1 - + sound/soc/samsung/spdif.c | 12 +- + sound/soc/sh/rcar/rsrc-card.c | 93 ++---- + sound/soc/sh/rcar/src.c | 6 +- + sound/soc/sh/rcar/ssi.c | 2 +- + sound/soc/soc-core.c | 15 +- + sound/soc/soc-dapm.c | 10 + + sound/soc/soc-topology.c | 113 ++++++- + sound/soc/sunxi/sun4i-codec.c | 14 +- + 210 files changed, 2652 insertions(+), 1554 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt + create mode 100644 sound/soc/rockchip/rk3399_gru_sound.c +Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (a485cb037fe6 Input: add driver for SiS 9200 family I2C touchscreen controllers) +$ git merge input/next +Already up-to-date. +Merging block/for-next (b013517951a1 Merge branch 'for-4.8/core' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (7b94c1f0e520 dm crypt: increase mempool reserve to better support swapping) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-crypt.c +Merge made by the 'recursive' strategy. + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-round-robin.c | 7 +++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) +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 (6ea625794518 mmc: rtsx_pci: Remove deprecated create_singlethread_workqueue) +$ git merge mmc-uh/next +Already up-to-date. +Merging md/for-next (11367799f3d1 md: Prevent IO hold during accessing to faulty raid5 array) +$ git merge md/for-next +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +Merge made by the 'recursive' strategy. + drivers/md/bitmap.c | 47 +++++++++++++++++++++++++++++++++-------------- + drivers/md/raid10.c | 4 ++-- + drivers/md/raid5.c | 16 +++++++++++++++- + 3 files changed, 50 insertions(+), 17 deletions(-) +Merging mfd/for-mfd-next (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (4fcd504edbf7 power: reset: add reboot mode driver) +$ 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 (de944e0f03c7 Merge remote-tracking branch 'regulator/fix/qcom-smd' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/qcom_smd-regulator.c | 30 ++++++++++++++++-------------- + 1 file changed, 16 insertions(+), 14 deletions(-) +Merging security/next (8ccc7d6bad84 seccomp: Remove 2-phase API documentation) +$ git merge security/next +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + arch/Kconfig | 11 ----------- + arch/um/kernel/skas/syscall.c | 10 +++------- + arch/x86/um/ptrace_32.c | 3 +++ + arch/x86/um/ptrace_64.c | 4 ++++ + include/linux/lsm_hooks.h | 1 - + include/linux/security.h | 1 - + 6 files changed, 10 insertions(+), 20 deletions(-) +Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook) +$ git merge integrity/next +Merge made by the 'recursive' strategy. +Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Auto-merging crypto/asymmetric_keys/pkcs7_verify.c +Auto-merging Documentation/crypto/asymmetric-keys.txt +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 26 ++- + Documentation/security/keys.txt | 217 ++++++++++++++++++++ + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + crypto/asymmetric_keys/Kconfig | 10 + + crypto/asymmetric_keys/Makefile | 13 ++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 59 +++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 ++- + crypto/asymmetric_keys/pkcs8.asn1 | 24 +++ + crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++ + crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++-- + crypto/asymmetric_keys/signature.c | 95 +++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 21 +- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 ++ + include/crypto/public_key.h | 14 +- + include/keys/asymmetric-subtype.h | 9 + + include/keys/system_keyring.h | 12 ++ + include/linux/key-type.h | 11 + + include/linux/keyctl.h | 46 +++++ + include/uapi/linux/keyctl.h | 30 +++ + security/keys/Makefile | 1 + + security/keys/compat.c | 18 ++ + security/keys/internal.h | 39 ++++ + security/keys/keyctl.c | 24 +++ + security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++ + 33 files changed, 1584 insertions(+), 52 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 crypto/asymmetric_keys/pkcs8.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c + create mode 100644 include/linux/keyctl.h + create mode 100644 security/keys/keyctl_pkey.c +Merging selinux/next (c8941881e506 selinux: Implement dentry_create_files_as() hook) +$ git merge selinux/next +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging fs/overlayfs/copy_up.c +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 22 ++++++++++ + fs/overlayfs/dir.c | 22 +++++++--- + include/linux/lsm_hooks.h | 36 ++++++++++++++++ + include/linux/security.h | 24 +++++++++++ + security/lsm_audit.c | 4 +- + security/security.c | 27 ++++++++++++ + security/selinux/hooks.c | 90 +++++++++++++++++++++++++++++++++------- + security/smack/smack_netfilter.c | 4 +- + 8 files changed, 205 insertions(+), 24 deletions(-) +Merging tpmdd/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family)) +$ git merge tpmdd/next +Already up-to-date. +Merging watchdog/master (29b4817d4018 Linux 4.8-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (f360d3241f55 Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/rockchip', 'arm/smmu' and 'core' 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 (0991bbdbf5b8 vfio: platform: check reset call return code during release) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (bdf107d87eb8 DocBook: use DOCBOOKS="" to ignore DocBooks instead of IGNORE_DOCBOOKS=1) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (523d939ef98f Linux 4.7) +$ git merge audit/next +Already up-to-date. +Merging devicetree/for-next (e973f4ec130a xtensa: Partially Revert "xtensa: Remove unnecessary of_platform_populate with default match table") +$ git merge devicetree/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (a68b216676e8 mailbox: Fix format and type mismatches in Broadcom PDC driver) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (d99d6903e341 Merge remote-tracking branches 'spi/topic/jcore', 'spi/topic/pic32-sqi' and 'spi/topic/rspi' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/jcore,spi.txt | 34 +++ + drivers/spi/Kconfig | 7 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-img-spfi.c | 2 - + drivers/spi/spi-jcore.c | 232 +++++++++++++++++++++ + drivers/spi/spi-mt65xx.c | 1 - + drivers/spi/spi-pic32-sqi.c | 6 +- + drivers/spi/spi-qup.c | 1 - + drivers/spi/spi-rspi.c | 14 +- + drivers/spi/spi-sh-msiof.c | 3 + + 10 files changed, 291 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/jcore,spi.txt + create mode 100644 drivers/spi/spi-jcore.c +Merging tip/auto-latest (a064fd509d4b Merge branch 'x86/asm') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/entry/entry_64.S | 3 +-- + drivers/clocksource/arm_arch_timer.c | 26 +++++++++++++++++++++++--- + kernel/futex.c | 23 ++++++++++++++++++++++- + 3 files changed, 46 insertions(+), 6 deletions(-) +Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check) +$ git merge clockevents/clockevents/next +Already up-to-date. +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 (a08d6288915c Merge branch 'edac-fixes-for-4.8' into for-next) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + .../bindings/arm/altera/socfpga-eccmgr.txt | 79 ++++++++++++ + arch/arm/boot/dts/socfpga_arria10.dtsi | 16 +++ + drivers/edac/Kconfig | 28 +++++ + drivers/edac/altera_edac.c | 139 +++++++++++++++++++-- + drivers/edac/amd64_edac.c | 15 ++- + drivers/edac/sb_edac.c | 15 ++- + 6 files changed, 277 insertions(+), 15 deletions(-) +Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (5bc94664884a rcu: Avoid redundant quiescent-state chasing) +$ git merge rcu/rcu/next +Resolved 'kernel/rcu/tree.c' using previous resolution. +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree_exp.h +Auto-merging kernel/rcu/tree.c +CONFLICT (content): Merge conflict in kernel/rcu/tree.c +Auto-merging kernel/cpu.c +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/list.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 24d2bfbea567] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++ + .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++ + .../Expedited-Grace-Periods.html | 476 ++++++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++ + Documentation/RCU/torture.txt | 15 - + include/linux/list.h | 7 +- + include/linux/rcupdate.h | 1 + + kernel/cpu.c | 1 + + kernel/rcu/Makefile | 3 +- + kernel/rcu/rcutorture.c | 7 +- + kernel/rcu/tree.c | 47 +- + kernel/rcu/tree.h | 1 + + kernel/rcu/tree_exp.h | 124 +-- + kernel/rcu/tree_plugin.h | 1 + + kernel/rcu/tree_trace.c | 7 +- + kernel/rcu/update.c | 3 +- + kernel/rcu/waketorture.c | 537 +++++++++++++ + kernel/sched/core.c | 7 + + kernel/torture.c | 27 +- + lib/Kconfig.debug | 20 + + .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../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 ++ + 38 files changed, 5782 insertions(+), 98 deletions(-) + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg + 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 (29b4817d4018 Linux 4.8-rc1) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (89581f06b2bc arm64: KVM: Set cpsr before spsr on fault injection) +$ 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 (93d17397e4e2 KVM: PPC: Book3S HV: Save/restore TM state in H_CEDE) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (9acc317b183f KVM: s390: let ptff intercepts result in cc=3) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (d34c30cc1fa8 xen: add static initialization of steal_clock op to xen_time_ops) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (29b4817d4018 Linux 4.8-rc1) +$ 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 (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (5706c01fcfb3 leds: is31fl32xx: define complete i2c_device_id table) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (29b4817d4018 Linux 4.8-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (29b4817d4018 Linux 4.8-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (29b4817d4018 Linux 4.8-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable()) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (29b4817d4018 Linux 4.8-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (229d43daf8ed usb: chipidea: imx: set over current polarity per dts setting) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 2 ++ + .../devicetree/bindings/usb/usbmisc-imx.txt | 1 + + drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++ + drivers/usb/chipidea/ci_hdrc_imx.h | 1 + + drivers/usb/chipidea/udc.c | 9 +++------ + drivers/usb/chipidea/usbmisc_imx.c | 22 +++++++++++++++++----- + 6 files changed, 27 insertions(+), 11 deletions(-) +Merging staging/staging-next (29b4817d4018 Linux 4.8-rc1) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (29b4817d4018 Linux 4.8-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (7fe95fb889fa extcon: Add new EXTCON_CHG_WPT for Wireless Power Transfer device) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-adc-jack.c | 27 +- + drivers/extcon/extcon-arizona.c | 13 +- + drivers/extcon/extcon-gpio.c | 2 +- + drivers/extcon/extcon.c | 774 ++++++++++++++++++++++++++------- + include/linux/extcon.h | 175 +++++++- + include/linux/extcon/extcon-adc-jack.h | 4 +- + 6 files changed, 803 insertions(+), 192 deletions(-) +Merging cgroup/for-next (1cab4a96cab6 Merge branch 'for-4.8' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (c8e18acccb9b ipr: Fix error return code in ipr_probe_ioa()) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation") +$ 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 (737bee9308c4 libata-scsi: better style in ata_msense_*()) +$ git merge libata/for-next +Already up-to-date. +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging pinctrl/for-next (9573e7923007 pinctrl: fix pincontrol definition for marvell) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (b226acab2f6a VSOCK: Use kvfree()) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (e937b335a738 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gpio/for-next (fbc482ae78c6 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + Documentation/gpio/board.txt | 6 +++--- + Documentation/gpio/gpio-legacy.txt | 16 ++++------------ + arch/arm64/Kconfig | 1 - + arch/arm64/Kconfig.platforms | 12 ++++++------ + arch/blackfin/Kconfig | 2 +- + drivers/gpio/Kconfig | 21 --------------------- + tools/gpio/gpio-event-mon.c | 2 +- + 7 files changed, 15 insertions(+), 45 deletions(-) +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 (53de7c26ded7 Merge branch 'for-4.8/regulator' into for-next) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d5e06da241d6] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging userns/for-next (aeaa4a79ff6a fs: Call d_automount with the filesystems creds) +$ 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 (d22527fed2f0 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes) +$ git merge random/dev +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (d78388dbec25 selftests: media_tests add a new video device test) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID) +$ git merge y2038/y2038 +Merge made by the 'recursive' strategy. + fs/afs/main.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ 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 (523d939ef98f Linux 4.7) +$ git merge livepatching/for-next +Already up-to-date. +Merging coresight/next (10156d120e4d coresight: fix handling of ETM trace register access via sysfs) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 28 ++++---- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 2 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 25 +++---- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 62 +++++++++++++----- + drivers/hwtracing/coresight/coresight-etm4x.c | 63 ++++++++---------- + drivers/hwtracing/coresight/coresight-etm4x.h | 3 + + drivers/hwtracing/coresight/coresight-funnel.c | 20 +++--- + drivers/hwtracing/coresight/coresight-priv.h | 15 ++++- + .../coresight/coresight-replicator-qcom.c | 18 ++--- + drivers/hwtracing/coresight/coresight-replicator.c | 20 ++---- + drivers/hwtracing/coresight/coresight-stm.c | 46 ++++++++----- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 12 +++- + drivers/hwtracing/coresight/coresight-tmc.c | 76 ++++++++++------------ + drivers/hwtracing/coresight/coresight-tmc.h | 4 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 18 ++--- + drivers/hwtracing/coresight/coresight.c | 27 ++++---- + drivers/hwtracing/coresight/of_coresight.c | 3 +- + 18 files changed, 239 insertions(+), 207 deletions(-) +Merging rtc/rtc-next (29b4817d4018 Linux 4.8-rc1) +$ git merge rtc/rtc-next +Already up-to-date. +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 (0606263f24f3 Merge branch 'for-4.8/libnvdimm' 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 (ae2066ca0bd4 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging mm/page_alloc.c +Auto-merging include/linux/random.h +Auto-merging drivers/char/random.c +Auto-merging block/genhd.c +Merge made by the 'recursive' strategy. + Documentation/DMA-attributes.txt | 17 ++ + Kbuild | 12 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/kernel/process.c | 3 +- + arch/arm64/kernel/process.c | 8 +- + arch/ia64/kernel/Makefile | 8 +- + arch/powerpc/kernel/fadump.c | 1 + + arch/powerpc/kernel/iommu.c | 6 +- + arch/tile/mm/mmap.c | 3 +- + arch/um/Makefile | 2 +- + arch/unicore32/kernel/process.c | 3 +- + arch/x86/kernel/e820.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/process.c | 3 +- + arch/x86/kernel/sys_x86_64.c | 5 +- + arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +- + arch/x86/um/user-offsets.c | 4 +- + block/genhd.c | 2 +- + drivers/char/random.c | 36 ++- + drivers/nvme/host/pci.c | 3 +- + fs/compat.c | 14 -- + fs/proc/base.c | 44 ++-- + include/linux/compat.h | 1 - + include/linux/crc64_ecma.h | 56 +++++ + include/linux/dma-mapping.h | 5 + + include/linux/kbuild.h | 2 +- + include/linux/kexec.h | 2 + + include/linux/memcontrol.h | 15 ++ + include/linux/mm.h | 2 +- + include/linux/oom.h | 43 +--- + include/linux/random.h | 2 +- + include/trace/events/zsmalloc.h | 76 +++++++ + ipc/msg.c | 5 +- + kernel/sysctl.c | 10 - + kernel/watchdog.c | 1 - + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++++++++++++++++++ + mm/memcontrol.c | 171 ++++++++------- + mm/oom_kill.c | 202 +++++++++-------- + mm/page_alloc.c | 20 +- + mm/page_owner.c | 2 +- + mm/slab.c | 25 ++- + mm/slab.h | 15 +- + mm/slub.c | 19 +- + mm/vmstat.c | 2 +- + mm/zsmalloc.c | 27 ++- + scripts/mod/Makefile | 11 +- + 48 files changed, 872 insertions(+), 372 deletions(-) + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/trace/events/zsmalloc.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: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: ipc/sem.c: fix complex_count vs. simple op race +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 1f56a7d9cc8c...bbaf266b8bf8 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (bbaf266b8bf8 ipc/sem.c: fix complex_count vs. simple op race) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +- + include/linux/sem.h | 1 + + ipc/sem.c | 138 +++++++++++++++---------- + 3 files changed, 85 insertions(+), 57 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..6779ea062b4d --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..20479a981c58 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160809 |