Re: linux-next: Tree for Jan 16
On Thu, Jan 17, 2019 at 11:34:01AM -0700, Jens Axboe wrote: > On 1/17/19 11:32 AM, Guenter Roeck wrote: > > On Thu, Jan 17, 2019 at 06:35:55PM +0800, Ming Lei wrote: > >>> > >>> Hi Guenter, > >>> > >>> Could you share me the .config? > >> > > Any 32 bit configuration from affected architectures should work. > > > >> From your dmesg log, looks the test is run on i386, so please > >> feel free to try the following patch: > >> > >> https://marc.info/?l=linux-kernel=154772088110800=2 > >> > > Is this still relevant ? Today's image is fine. > > The patches were pulled, I think Ming would still appreciate it if > you could test the previous tree with that patch on top. > next-20190116 with Ming's patch added and "sh: generate uapi header and syscall table header files" reverted: Qemu test results: total: 343 pass: 343 fail: 0 Note though that my tests do not run any block device stress tests. Guenter
Re: linux-next: Tree for Jan 16
On 1/17/19 11:32 AM, Guenter Roeck wrote: > On Thu, Jan 17, 2019 at 06:35:55PM +0800, Ming Lei wrote: >>> >>> Hi Guenter, >>> >>> Could you share me the .config? >> > Any 32 bit configuration from affected architectures should work. > >> From your dmesg log, looks the test is run on i386, so please >> feel free to try the following patch: >> >> https://marc.info/?l=linux-kernel=154772088110800=2 >> > Is this still relevant ? Today's image is fine. The patches were pulled, I think Ming would still appreciate it if you could test the previous tree with that patch on top. -- Jens Axboe
Re: linux-next: Tree for Jan 16
On Thu, Jan 17, 2019 at 06:35:55PM +0800, Ming Lei wrote: > > > > Hi Guenter, > > > > Could you share me the .config? > Any 32 bit configuration from affected architectures should work. > From your dmesg log, looks the test is run on i386, so please > feel free to try the following patch: > > https://marc.info/?l=linux-kernel=154772088110800=2 > Is this still relevant ? Today's image is fine. Thanks, Guenter
Re: linux-next: Tree for Jan 16
On Thu, Jan 17, 2019 at 04:49:03PM +0800, Ming Lei wrote: > On Wed, Jan 16, 2019 at 12:35:47PM -0800, Guenter Roeck wrote: > > On Wed, Jan 16, 2019 at 05:38:38PM +1100, Stephen Rothwell wrote: > > > Hi all, > > > > > > Changes since 20190115: > > > > > > The vfs tree still had its build failure for which I applied a patch. > > > > > > The drm-misc tree gained conflicts against the drm-intel tree. > > > > > > The mali-dp tree still had its failure for which I applied a merge > > > fix patch. > > > > > > The block tree gained a conflict against the fscrypt tree and build > > > failures for which I applied 2 merge fix patches and a fix patch. > > > > > > Non-merge commits (relative to Linus' tree): 1975 > > > 2069 files changed, 67760 insertions(+), 30784 deletions(-) > > > > > > > Time for a damage report. > > > > Build results: > > total: 159 pass: 148 fail: 11 > > Failed builds: > > alpha:allmodconfig > > ia64:defconfig > > ia64:allnoconfig > > ia64:tinyconfig > > powerpc:ppc6xx_defconfig > > sh:defconfig > > sh:allnoconfig > > sh:tinyconfig > > sh:dreamcast_defconfig > > sh:microdev_defconfig > > sh:shx3_defconfig > > Qemu test results: > > total: 343 pass: 230 fail: 113 > > [details dropped] > > > > I won't address the build failures; I assume the culprits know through > > 0day. See https://kerneltests.org/builders/ for details and logs. > > > > The main culprit of the qemu test failures is a block subsystem commit. > > bisect log and bisected backtrace below. It may well be that there are > > other failures in that subsystem - backtraces are not always the same. > > Affected architectures are arm, mips, ppc, parisc, sparc, and x86. > > sh4 may be affected as well, but all sh4 images fail to build and can > > not be tested at this time. > > > > Also, I suspect that the observed crashes may hide other failures - > > I had seen some boot stalls in next-20190115 (not bisected). > > > > Guenter > > > > --- > > # bad: [cbeb3db684f72d744e74c567542faac796d9cbd8] Add linux-next specific > > files for 20190116 > > # good: [1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8] Linux 5.0-rc2 > > git bisect start 'HEAD' 'v5.0-rc2' > > # good: [11822c837bf744c38fab8370899338884d30f30b] Merge remote-tracking > > branch 'nfc-next/master' > > git bisect good 11822c837bf744c38fab8370899338884d30f30b > > # bad: [8c4aa656d7befa3ca3c5c2856eeabc30317d9775] Merge remote-tracking > > branch 'apparmor/apparmor-next' > > git bisect bad 8c4aa656d7befa3ca3c5c2856eeabc30317d9775 > > # good: [2465c219c523ed47f2adae88805d3bb68fbc51c0] Merge remote-tracking > > branch 'drm-misc/for-linux-next' > > git bisect good 2465c219c523ed47f2adae88805d3bb68fbc51c0 > > # good: [afa8e20f9d4d5aacf9158b7be36ec81ec499aa5c] Merge remote-tracking > > branch 'sound-asoc/for-next' > > git bisect good afa8e20f9d4d5aacf9158b7be36ec81ec499aa5c > > # bad: [ae563d4fc73ad2cfd1408e72fd3aa67c4f5c9c8d] Merge remote-tracking > > branch 'kgdb/kgdb-next' > > git bisect bad ae563d4fc73ad2cfd1408e72fd3aa67c4f5c9c8d > > # bad: [6cb6b5a89b70120f840f37e94ee10f9b8ffdabd9] Merge remote-tracking > > branch 'block/for-next' > > git bisect bad 6cb6b5a89b70120f840f37e94ee10f9b8ffdabd9 > > # bad: [93670fad03e97d5526b23fe67a3fe2be52e21732] block: kill > > QUEUE_FLAG_NO_SG_MERGE > > git bisect bad 93670fad03e97d5526b23fe67a3fe2be52e21732 > > # bad: [beab05e0114623255b4d5cd3776df6da26be42b0] block: introduce > > bvec_last_segment() > > git bisect bad beab05e0114623255b4d5cd3776df6da26be42b0 > > # good: [f3effe4c1240a36a487ba1ff134478236a69b32d] block: rename bvec > > helpers > > git bisect good f3effe4c1240a36a487ba1ff134478236a69b32d > > # good: [cad1e6bb0ecfebbb3168ebc46dcf5e39f7bf2268] block: introduce > > bio_for_each_bvec() and rq_for_each_bvec() > > git bisect good cad1e6bb0ecfebbb3168ebc46dcf5e39f7bf2268 > > # bad: [73f4209ccda9cf3d403692517bc90d5431c1ef2d] block: use > > bio_for_each_bvec() to map sg > > git bisect bad 73f4209ccda9cf3d403692517bc90d5431c1ef2d > > # bad: [258cfdfaf7bd729e759a0a91fd00ac9794796ad3] block: use > > bio_for_each_bvec() to compute multi-page bvec count > > git bisect bad 258cfdfaf7bd729e759a0a91fd00ac9794796ad3 > > # first bad commit: [258cfdfaf7bd729e759a0a91fd00ac9794796ad3] block: use > > bio_for_each_bvec() to compute multi-page bvec count > > > > -- > > Bisected backtrace: > > > > [ 24.745267] BUG: unable to handle kernel paging request at 0959bd38 > > [ 24.745267] #PF error: [normal kernel read fault] > > [ 24.745267] *pde = > > [ 24.745267] Oops: [#1] SMP > > [ 24.745267] CPU: 0 PID: 7 Comm: kworker/u2:0 Not tainted > > 5.0.0-rc2-next-20190116 #1 > > [ 24.745267] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS > > rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 > > [ 24.745267] Workqueue: events_unbound async_run_entry_fn > > [ 24.745267] EIP: blk_rq_map_sg+0x1cd/0x510 > > [ 24.745267] Code: e8 a8 f2 01
Re: linux-next: Tree for Jan 16
On Wed, Jan 16, 2019 at 12:35:47PM -0800, Guenter Roeck wrote: > On Wed, Jan 16, 2019 at 05:38:38PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20190115: > > > > The vfs tree still had its build failure for which I applied a patch. > > > > The drm-misc tree gained conflicts against the drm-intel tree. > > > > The mali-dp tree still had its failure for which I applied a merge > > fix patch. > > > > The block tree gained a conflict against the fscrypt tree and build > > failures for which I applied 2 merge fix patches and a fix patch. > > > > Non-merge commits (relative to Linus' tree): 1975 > > 2069 files changed, 67760 insertions(+), 30784 deletions(-) > > > > Time for a damage report. > > Build results: > total: 159 pass: 148 fail: 11 > Failed builds: > alpha:allmodconfig > ia64:defconfig > ia64:allnoconfig > ia64:tinyconfig > powerpc:ppc6xx_defconfig > sh:defconfig > sh:allnoconfig > sh:tinyconfig > sh:dreamcast_defconfig > sh:microdev_defconfig > sh:shx3_defconfig > Qemu test results: > total: 343 pass: 230 fail: 113 > [details dropped] > > I won't address the build failures; I assume the culprits know through > 0day. See https://kerneltests.org/builders/ for details and logs. > > The main culprit of the qemu test failures is a block subsystem commit. > bisect log and bisected backtrace below. It may well be that there are > other failures in that subsystem - backtraces are not always the same. > Affected architectures are arm, mips, ppc, parisc, sparc, and x86. > sh4 may be affected as well, but all sh4 images fail to build and can > not be tested at this time. > > Also, I suspect that the observed crashes may hide other failures - > I had seen some boot stalls in next-20190115 (not bisected). > > Guenter > > --- > # bad: [cbeb3db684f72d744e74c567542faac796d9cbd8] Add linux-next specific > files for 20190116 > # good: [1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8] Linux 5.0-rc2 > git bisect start 'HEAD' 'v5.0-rc2' > # good: [11822c837bf744c38fab8370899338884d30f30b] Merge remote-tracking > branch 'nfc-next/master' > git bisect good 11822c837bf744c38fab8370899338884d30f30b > # bad: [8c4aa656d7befa3ca3c5c2856eeabc30317d9775] Merge remote-tracking > branch 'apparmor/apparmor-next' > git bisect bad 8c4aa656d7befa3ca3c5c2856eeabc30317d9775 > # good: [2465c219c523ed47f2adae88805d3bb68fbc51c0] Merge remote-tracking > branch 'drm-misc/for-linux-next' > git bisect good 2465c219c523ed47f2adae88805d3bb68fbc51c0 > # good: [afa8e20f9d4d5aacf9158b7be36ec81ec499aa5c] Merge remote-tracking > branch 'sound-asoc/for-next' > git bisect good afa8e20f9d4d5aacf9158b7be36ec81ec499aa5c > # bad: [ae563d4fc73ad2cfd1408e72fd3aa67c4f5c9c8d] Merge remote-tracking > branch 'kgdb/kgdb-next' > git bisect bad ae563d4fc73ad2cfd1408e72fd3aa67c4f5c9c8d > # bad: [6cb6b5a89b70120f840f37e94ee10f9b8ffdabd9] Merge remote-tracking > branch 'block/for-next' > git bisect bad 6cb6b5a89b70120f840f37e94ee10f9b8ffdabd9 > # bad: [93670fad03e97d5526b23fe67a3fe2be52e21732] block: kill > QUEUE_FLAG_NO_SG_MERGE > git bisect bad 93670fad03e97d5526b23fe67a3fe2be52e21732 > # bad: [beab05e0114623255b4d5cd3776df6da26be42b0] block: introduce > bvec_last_segment() > git bisect bad beab05e0114623255b4d5cd3776df6da26be42b0 > # good: [f3effe4c1240a36a487ba1ff134478236a69b32d] block: rename bvec helpers > git bisect good f3effe4c1240a36a487ba1ff134478236a69b32d > # good: [cad1e6bb0ecfebbb3168ebc46dcf5e39f7bf2268] block: introduce > bio_for_each_bvec() and rq_for_each_bvec() > git bisect good cad1e6bb0ecfebbb3168ebc46dcf5e39f7bf2268 > # bad: [73f4209ccda9cf3d403692517bc90d5431c1ef2d] block: use > bio_for_each_bvec() to map sg > git bisect bad 73f4209ccda9cf3d403692517bc90d5431c1ef2d > # bad: [258cfdfaf7bd729e759a0a91fd00ac9794796ad3] block: use > bio_for_each_bvec() to compute multi-page bvec count > git bisect bad 258cfdfaf7bd729e759a0a91fd00ac9794796ad3 > # first bad commit: [258cfdfaf7bd729e759a0a91fd00ac9794796ad3] block: use > bio_for_each_bvec() to compute multi-page bvec count > > -- > Bisected backtrace: > > [ 24.745267] BUG: unable to handle kernel paging request at 0959bd38 > [ 24.745267] #PF error: [normal kernel read fault] > [ 24.745267] *pde = > [ 24.745267] Oops: [#1] SMP > [ 24.745267] CPU: 0 PID: 7 Comm: kworker/u2:0 Not tainted > 5.0.0-rc2-next-20190116 #1 > [ 24.745267] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS > rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 > [ 24.745267] Workqueue: events_unbound async_run_entry_fn > [ 24.745267] EIP: blk_rq_map_sg+0x1cd/0x510 > [ 24.745267] Code: e8 a8 f2 01 00 8b 5d d0 8b 75 e8 89 f9 03 75 cc 89 f2 f7 > d2 > 23 93 54 03 00 00 83 c2 01 39 bb 6c 03 00 00 0f 46 8b 6c 03 00 00 <8b> 18 39 > ca > 0f 47 d1 89 f1 c1 ee 0c 83 e3 03 81 e1 ff 0f 00 00 89 > [ 24.745267] EAX: 0959bd38 EBX: cfbfb500 ECX: 00ff EDX:
Re: linux-next: Tree for Jan 16
On Wed, Jan 16, 2019 at 05:38:38PM +1100, Stephen Rothwell wrote: > Hi all, > > Changes since 20190115: > > The vfs tree still had its build failure for which I applied a patch. > > The drm-misc tree gained conflicts against the drm-intel tree. > > The mali-dp tree still had its failure for which I applied a merge > fix patch. > > The block tree gained a conflict against the fscrypt tree and build > failures for which I applied 2 merge fix patches and a fix patch. > > Non-merge commits (relative to Linus' tree): 1975 > 2069 files changed, 67760 insertions(+), 30784 deletions(-) > Time for a damage report. Build results: total: 159 pass: 148 fail: 11 Failed builds: alpha:allmodconfig ia64:defconfig ia64:allnoconfig ia64:tinyconfig powerpc:ppc6xx_defconfig sh:defconfig sh:allnoconfig sh:tinyconfig sh:dreamcast_defconfig sh:microdev_defconfig sh:shx3_defconfig Qemu test results: total: 343 pass: 230 fail: 113 [details dropped] I won't address the build failures; I assume the culprits know through 0day. See https://kerneltests.org/builders/ for details and logs. The main culprit of the qemu test failures is a block subsystem commit. bisect log and bisected backtrace below. It may well be that there are other failures in that subsystem - backtraces are not always the same. Affected architectures are arm, mips, ppc, parisc, sparc, and x86. sh4 may be affected as well, but all sh4 images fail to build and can not be tested at this time. Also, I suspect that the observed crashes may hide other failures - I had seen some boot stalls in next-20190115 (not bisected). Guenter --- # bad: [cbeb3db684f72d744e74c567542faac796d9cbd8] Add linux-next specific files for 20190116 # good: [1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8] Linux 5.0-rc2 git bisect start 'HEAD' 'v5.0-rc2' # good: [11822c837bf744c38fab8370899338884d30f30b] Merge remote-tracking branch 'nfc-next/master' git bisect good 11822c837bf744c38fab8370899338884d30f30b # bad: [8c4aa656d7befa3ca3c5c2856eeabc30317d9775] Merge remote-tracking branch 'apparmor/apparmor-next' git bisect bad 8c4aa656d7befa3ca3c5c2856eeabc30317d9775 # good: [2465c219c523ed47f2adae88805d3bb68fbc51c0] Merge remote-tracking branch 'drm-misc/for-linux-next' git bisect good 2465c219c523ed47f2adae88805d3bb68fbc51c0 # good: [afa8e20f9d4d5aacf9158b7be36ec81ec499aa5c] Merge remote-tracking branch 'sound-asoc/for-next' git bisect good afa8e20f9d4d5aacf9158b7be36ec81ec499aa5c # bad: [ae563d4fc73ad2cfd1408e72fd3aa67c4f5c9c8d] Merge remote-tracking branch 'kgdb/kgdb-next' git bisect bad ae563d4fc73ad2cfd1408e72fd3aa67c4f5c9c8d # bad: [6cb6b5a89b70120f840f37e94ee10f9b8ffdabd9] Merge remote-tracking branch 'block/for-next' git bisect bad 6cb6b5a89b70120f840f37e94ee10f9b8ffdabd9 # bad: [93670fad03e97d5526b23fe67a3fe2be52e21732] block: kill QUEUE_FLAG_NO_SG_MERGE git bisect bad 93670fad03e97d5526b23fe67a3fe2be52e21732 # bad: [beab05e0114623255b4d5cd3776df6da26be42b0] block: introduce bvec_last_segment() git bisect bad beab05e0114623255b4d5cd3776df6da26be42b0 # good: [f3effe4c1240a36a487ba1ff134478236a69b32d] block: rename bvec helpers git bisect good f3effe4c1240a36a487ba1ff134478236a69b32d # good: [cad1e6bb0ecfebbb3168ebc46dcf5e39f7bf2268] block: introduce bio_for_each_bvec() and rq_for_each_bvec() git bisect good cad1e6bb0ecfebbb3168ebc46dcf5e39f7bf2268 # bad: [73f4209ccda9cf3d403692517bc90d5431c1ef2d] block: use bio_for_each_bvec() to map sg git bisect bad 73f4209ccda9cf3d403692517bc90d5431c1ef2d # bad: [258cfdfaf7bd729e759a0a91fd00ac9794796ad3] block: use bio_for_each_bvec() to compute multi-page bvec count git bisect bad 258cfdfaf7bd729e759a0a91fd00ac9794796ad3 # first bad commit: [258cfdfaf7bd729e759a0a91fd00ac9794796ad3] block: use bio_for_each_bvec() to compute multi-page bvec count -- Bisected backtrace: [ 24.745267] BUG: unable to handle kernel paging request at 0959bd38 [ 24.745267] #PF error: [normal kernel read fault] [ 24.745267] *pde = [ 24.745267] Oops: [#1] SMP [ 24.745267] CPU: 0 PID: 7 Comm: kworker/u2:0 Not tainted 5.0.0-rc2-next-20190116 #1 [ 24.745267] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 [ 24.745267] Workqueue: events_unbound async_run_entry_fn [ 24.745267] EIP: blk_rq_map_sg+0x1cd/0x510 [ 24.745267] Code: e8 a8 f2 01 00 8b 5d d0 8b 75 e8 89 f9 03 75 cc 89 f2 f7 d2 23 93 54 03 00 00 83 c2 01 39 bb 6c 03 00 00 0f 46 8b 6c 03 00 00 <8b> 18 39 ca 0f 47 d1 89 f1 c1 ee 0c 83 e3 03 81 e1 ff 0f 00 00 89 [ 24.745267] EAX: 0959bd38 EBX: cfbfb500 ECX: 00ff EDX: [ 24.745267] ESI: EDI: 00ff EBP: cf8b3bd8 ESP: cf8b3b94 [ 24.745267] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00200212 [ 24.745267] CR0: 80050033 CR2: 0959bd38 CR3: 09e72000 CR4: 003406d0 [ 24.745267] Call Trace: [ 24.745267]
Re: linux-next: Tree for Jan 16 (PCI config warning?)
Hi, On 1/16/2019 12:00 PM, Randy Dunlap wrote: On 1/15/19 10:38 PM, Stephen Rothwell wrote: Hi all, Changes since 20190115: on x86_64: when CONFIG_PCI is not enabled (via randconfig): WARNING: unmet direct dependencies detected for PCI_LOCKLESS_CONFIG Depends on [n]: PCI [=n] Selected by [y]: - X86 [=y] It looks like we'll have to continue peeling the onion some more time. Can you please attach the kernel configuration file used? Can I assume that this tree includes Rafael's latest pm pull? Sinan
Re: linux-next: Tree for Jan 16 (PCI config warning?)
On 1/15/19 10:38 PM, Stephen Rothwell wrote: > Hi all, > > Changes since 20190115: > on x86_64: when CONFIG_PCI is not enabled (via randconfig): WARNING: unmet direct dependencies detected for PCI_LOCKLESS_CONFIG Depends on [n]: PCI [=n] Selected by [y]: - X86 [=y] -- ~Randy
linux-next: Tree for Jan 16
Hi all, Changes since 20190115: The vfs tree still had its build failure for which I applied a patch. The drm-misc tree gained conflicts against the drm-intel tree. The mali-dp tree still had its failure for which I applied a merge fix patch. The block tree gained a conflict against the fscrypt tree and build failures for which I applied 2 merge fix patches and a fix patch. Non-merge commits (relative to Linus' tree): 1975 2069 files changed, 67760 insertions(+), 30784 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 295 trees (counting Linus' and 69 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (7939f8beecf1 Merge tag 'trace-v5.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging fixes/master (0ce4e20ca4ea x86/syscalls: Mark expected switch fall-throughs) Merging kbuild-current/fixes (beedd844b014 openrisc: remove unneeded code in arch/openrisc/Makefile) Merging arc-current/for-curr (5fac3149be6f ARC: adjust memblock_reserve of kernel memory) Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential uninitialized return) Merging arm64-fixes/for-next/fixes (279667212ab2 arm64: kexec_file: return successfully even if kaslr-seed doesn't exist) Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related crashes) Merging powerpc-fixes/fixes (7bea7ac0ca01 powerpc/syscalls: Fix syscall tracing) Merging sparc/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (7939f8beecf1 Merge tag 'trace-v5.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging bpf/master (86edaed37963 bpf: libbpf: retry loading program on EAGAIN) Merging ipsec/master (35e6103861a3 xfrm: refine validation of template and selector families) Merging netfilter/master (2314e879747e netfilter: nft_flow_offload: fix checking method of conntrack helper) Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) Merging wireless-drivers/master (bfeffd155283 Linux 5.0-rc1) Merging mac80211/master (1d51b4b1d3f2 Merge tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k) Merging rdma-fixes/for-rc (d6f4a21f309d RDMA/uverbs: Mark ioctl responses with UVERBS_ATTR_F_VALID_OUTPUT) Merging sound-current/for-linus (687ae9e287b3 ASoC: intel: skl: Fix display power regression) Merging sound-asoc-fixes/for-linus (906e2be2ce0e Merge branch 'asoc-5.0' into asoc-linus) Merging regmap-fixes/for-linus (b3ffce399349 Merge branch 'regmap-5.0' into regmap-linus) Merging regulator-fixes/for-linus (b4c4aa249eff Merge branch 'regulator-5.0' into regulator-linus) Merging spi-fixes/for-linus (dd14aa37977c Merge branch 'spi-5.0' into spi-linus) Merging pci-current/for-linus (2e8cb2cf1bd6 PCI: Fix PCI kconfig menu organization) Merging driver-core.current/driver-core-linus (1c7fc5cbc339 Linux 5.0-rc2) Merging tty.current/tty-linus (1c7fc5cbc339 Linux 5.0-rc2) Merging usb.current/usb-linus (1c7fc5cbc339 Linux 5.0-rc2) Merging usb-gadget-fixes/fixes (4a995e3496de usb: dwc2: gadget: Fix Remote Wakeup interrupt bit clearing) Merging
linux-next: Tree for Jan 16
Hi all, News: I am now compiling with gcc 7.2.1 compilers, and 2.28.2 binutils (except for sparc64 where the latest I could get to build was 2.25.2). My final powerpc builds are done with gcc 5.2.1 as the 7.2.1 compiler hung for one build. Changes since 20180115: The printk tree gained a conflict against Linus' tree. The net-next tree gained conflicts against the net tree. The mac80211-next tree gained a conflict against the mac80211 tree. The akpm tree gained a conflict against the net-next tree for which I dropped a patch. Non-merge commits (relative to Linus' tree): 8951 9128 files changed, 371825 insertions(+), 238260 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 256 trees (counting Linus' and 44 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (a8750ddca918 Linux 4.15-rc8) Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging kbuild-current/fixes (36c1681678b5 genksyms: drop *.hash.c from .gitignore) Merging arc-current/for-curr (b2cd1df66037 Linux 4.15-rc7) Merging arm-current/fixes (36b0cb84ee85 ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch) Merging m68k-current/for-linus (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (349524bc0da6 powerpc: Don't preempt_disable() in show_cpuinfo()) Merging sparc/master (59585b4be9ae sparc64: repair calling incorrect hweight function from stubs) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (db9ca5cacbda Merge branch 'ipv4-Make-neigh-lookup-keys-for-loopback-point-to-point-devices-be-INADDR_ANY') Merging bpf/master (68fda450a7df bpf: fix 32-bit divide by zero) Merging ipsec/master (76a420119181 xfrm: Fix a race in the xdst pcpu cache.) Merging netfilter/master (889c604fd0b5 netfilter: x_tables: fix int overflow in xt_alloc_table_info()) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (49fdde89e2b8 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging mac80211/master (59b179b48ce2 cfg80211: check dev_set_name() return value) Merging rdma-fixes/for-rc (57194fa763bf IB/hfi1: Prevent a NULL dereference) Merging sound-current/for-linus (b3defb791b26 ALSA: seq: Make ioctls race-free) Merging pci-current/for-linus (03a551734cfc x86/PCI: Move and shrink AMD 64-bit window to avoid conflict) Merging driver-core.current/driver-core-linus (30a7acd57389 Linux 4.15-rc6) Merging tty.current/tty-linus (30a7acd57389 Linux 4.15-rc6) Merging usb.current/usb-linus (a8750ddca918 Linux 4.15-rc8) Merging usb-gadget-fixes/fixes (b2cd1df66037 Linux 4.15-rc7) Merging usb-serial-fixes/usb-linus (d14ac576d10f USB: serial: cp210x: add new device ID ELV ALC 8xxx) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (2b88212c4cc6 phy: rcar-gen3-usb2: select USB_COMMON) Merging staging.current/staging-linus (a8750ddca918 Linux 4.15-rc8) Merging char-misc.current/char-misc-linus (a8750ddca918 Linux 4.15-rc8) Merging input-current/for-linus (4d94e776bd29
linux-next: Tree for Jan 16
Hi all, News: I am now compiling with gcc 7.2.1 compilers, and 2.28.2 binutils (except for sparc64 where the latest I could get to build was 2.25.2). My final powerpc builds are done with gcc 5.2.1 as the 7.2.1 compiler hung for one build. Changes since 20180115: The printk tree gained a conflict against Linus' tree. The net-next tree gained conflicts against the net tree. The mac80211-next tree gained a conflict against the mac80211 tree. The akpm tree gained a conflict against the net-next tree for which I dropped a patch. Non-merge commits (relative to Linus' tree): 8951 9128 files changed, 371825 insertions(+), 238260 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 256 trees (counting Linus' and 44 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (a8750ddca918 Linux 4.15-rc8) Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging kbuild-current/fixes (36c1681678b5 genksyms: drop *.hash.c from .gitignore) Merging arc-current/for-curr (b2cd1df66037 Linux 4.15-rc7) Merging arm-current/fixes (36b0cb84ee85 ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch) Merging m68k-current/for-linus (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (349524bc0da6 powerpc: Don't preempt_disable() in show_cpuinfo()) Merging sparc/master (59585b4be9ae sparc64: repair calling incorrect hweight function from stubs) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (db9ca5cacbda Merge branch 'ipv4-Make-neigh-lookup-keys-for-loopback-point-to-point-devices-be-INADDR_ANY') Merging bpf/master (68fda450a7df bpf: fix 32-bit divide by zero) Merging ipsec/master (76a420119181 xfrm: Fix a race in the xdst pcpu cache.) Merging netfilter/master (889c604fd0b5 netfilter: x_tables: fix int overflow in xt_alloc_table_info()) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (49fdde89e2b8 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging mac80211/master (59b179b48ce2 cfg80211: check dev_set_name() return value) Merging rdma-fixes/for-rc (57194fa763bf IB/hfi1: Prevent a NULL dereference) Merging sound-current/for-linus (b3defb791b26 ALSA: seq: Make ioctls race-free) Merging pci-current/for-linus (03a551734cfc x86/PCI: Move and shrink AMD 64-bit window to avoid conflict) Merging driver-core.current/driver-core-linus (30a7acd57389 Linux 4.15-rc6) Merging tty.current/tty-linus (30a7acd57389 Linux 4.15-rc6) Merging usb.current/usb-linus (a8750ddca918 Linux 4.15-rc8) Merging usb-gadget-fixes/fixes (b2cd1df66037 Linux 4.15-rc7) Merging usb-serial-fixes/usb-linus (d14ac576d10f USB: serial: cp210x: add new device ID ELV ALC 8xxx) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (2b88212c4cc6 phy: rcar-gen3-usb2: select USB_COMMON) Merging staging.current/staging-linus (a8750ddca918 Linux 4.15-rc8) Merging char-misc.current/char-misc-linus (a8750ddca918 Linux 4.15-rc8) Merging input-current/for-linus (4d94e776bd29
linux-next: Tree for Jan 16
Hi all, Changes since 20170113: Non-merge commits (relative to Linus' tree): 3275 4116 files changed, 129983 insertions(+), 77532 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 251 trees (counting Linus' and 36 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (c92816275674 Merge tag 'char-misc-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions) Merging arc-current/for-curr (e51d5d02f688 ARCv2: IRQ: Call entry/exit functions for chained handlers in MCIP) Merging arm-current/fixes (ddc37832a134 ARM: 8634/1: hw_breakpoint: blacklist Scorpion CPUs) Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list()) Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) Merging powerpc-fixes/fixes (69973b830859 Linux 4.9) Merging sparc/master (4bbc84ffd137 sparc: use symbolic names for tsb indexing) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (003c941057ea tcp: fix tcp_fastopen unaligned access complaints on sparc) Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl) Merging netfilter/master (bf99b4ded5f8 tcp: fix mark propagation with fwmark_reflect enabled) Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging wireless-drivers/master (60f59ce02785 rtlwifi: rtl_usb: Fix missing entry in USB driver's private data) Merging mac80211/master (dbef53621116 mac80211: prevent skb/txq mismatch) Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (27d3eef42093 Revert "PCI: Add runtime PM support for PCIe ports") Merging driver-core.current/driver-core-linus (c7334ce814f7 Revert "driver core: Add deferred_probe attribute to devices in sysfs") Merging tty.current/tty-linus (802c03881f29 sysrq: attach sysrq handler correctly for 32-bit kernel) Merging usb.current/usb-linus (97f9c5f211d1 Merge tag 'usb-serial-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) Merging usb-gadget-fixes/fixes (43aef5c2ca90 usb: gadget: Fix copy/pasted error message) Merging usb-serial-fixes/usb-linus (2d5a9c72d0c4 USB: serial: ch341: fix control-message error handling) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1) Merging staging.current/staging-linus (a121103c9228 Linux 4.10-rc3) Merging char-misc.current/char-misc-linus (c8a6a09c1c61 vme: Fix wrong pointer utilization in ca91cx42_slave_get) Merging input-current/for-linus (1c3415a06b10 Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data) Merging crypto-current/master (07825f0acd85 crypto: aesni - Fix failure when built-in with modular pcbc) Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE
linux-next: Tree for Jan 16
Hi all, Changes since 20170113: Non-merge commits (relative to Linus' tree): 3275 4116 files changed, 129983 insertions(+), 77532 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 251 trees (counting Linus' and 36 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (c92816275674 Merge tag 'char-misc-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions) Merging arc-current/for-curr (e51d5d02f688 ARCv2: IRQ: Call entry/exit functions for chained handlers in MCIP) Merging arm-current/fixes (ddc37832a134 ARM: 8634/1: hw_breakpoint: blacklist Scorpion CPUs) Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list()) Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) Merging powerpc-fixes/fixes (69973b830859 Linux 4.9) Merging sparc/master (4bbc84ffd137 sparc: use symbolic names for tsb indexing) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (003c941057ea tcp: fix tcp_fastopen unaligned access complaints on sparc) Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl) Merging netfilter/master (bf99b4ded5f8 tcp: fix mark propagation with fwmark_reflect enabled) Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging wireless-drivers/master (60f59ce02785 rtlwifi: rtl_usb: Fix missing entry in USB driver's private data) Merging mac80211/master (dbef53621116 mac80211: prevent skb/txq mismatch) Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (27d3eef42093 Revert "PCI: Add runtime PM support for PCIe ports") Merging driver-core.current/driver-core-linus (c7334ce814f7 Revert "driver core: Add deferred_probe attribute to devices in sysfs") Merging tty.current/tty-linus (802c03881f29 sysrq: attach sysrq handler correctly for 32-bit kernel) Merging usb.current/usb-linus (97f9c5f211d1 Merge tag 'usb-serial-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) Merging usb-gadget-fixes/fixes (43aef5c2ca90 usb: gadget: Fix copy/pasted error message) Merging usb-serial-fixes/usb-linus (2d5a9c72d0c4 USB: serial: ch341: fix control-message error handling) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1) Merging staging.current/staging-linus (a121103c9228 Linux 4.10-rc3) Merging char-misc.current/char-misc-linus (c8a6a09c1c61 vme: Fix wrong pointer utilization in ca91cx42_slave_get) Merging input-current/for-linus (1c3415a06b10 Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data) Merging crypto-current/master (07825f0acd85 crypto: aesni - Fix failure when built-in with modular pcbc) Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE
Re: linux-next: Tree for Jan 16 (mips build errors due to MIPSR6 patches)
On Fri, Jan 16, 2015 at 07:47:57PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20150115:
>
> The i2c tree gained a build failure so I used the version from
> next-20150115.
>
> The wireless-drivers-next tree gained a conflict against the
> wireless-drivers tree.
>
> The usb-gadget tree gained a conflict against the usb.current tree.
>
> Non-merge commits (relative to Linus' tree): 3219
> 3111 files changed, 98486 insertions(+), 52594 deletions(-)
>
>
>
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
> are tracking the linux-next tree using git, you should not use "git pull"
> to do so as that will try to merge the new linux-next release with the
> old one. You should use "git fetch" and checkout or reset to the new
> master.
>
Today's tree has a number of new mips related build errors.
Building mips:defconfig ... failed
Building mips:allmodconfig ... failed
Error log:
In file included from ./arch/mips/include/asm/sgiarcs.h:16:0,
from ./arch/mips/include/asm/sgialib.h:15,
from arch/mips/sgi-ip22/ip22-mc.c:16:
./arch/mips/include/asm/fw/arc/types.h:18:15: error: expected identifier or '('
before '.' token
(more of those)
In file included from ./arch/mips/include/asm/sgialib.h:15:0,
from arch/mips/sgi-ip22/ip22-mc.c:16:
./arch/mips/include/asm/sgiarcs.h:89:2: error: unknown type name '_PULONG'
./arch/mips/include/asm/sgiarcs.h:188:2: error: expected
specifier-qualifier-list before '.' token
./arch/mips/include/asm/sgiarcs.h:252:2: error: unknown type name '_PLONG'
(more of those)
In file included from arch/mips/sgi-ip22/ip22-mc.c:16:0:
./arch/mips/include/asm/sgialib.h:20:8: error: expected identifier or '('
before '.' token
(more or those)
---
Bisect points to commit 9119e8276d ("MIPS: asm: hazards: Add MIPSR6
definitions"). Looking into the patch, I wonder if the following is correct.
-#if defined(CONFIG_CPU_MIPSR2) && !defined(CONFIG_CPU_CAVIUM_OCTEON)
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) &&
!defined(CONFIG_CPU_CAVIUM_OCTEON)
This change appears to be missing a ( ) around the first two defined()
statements. Fixing that doesn't resolve the problem, though. Reverting
the patch doesn't fix the problem either, so something else must be wrong.
-
Building mips:cavium_octeon_defconfig ... failed
Error log:
arch/mips/kernel/branch.c: In function '__compute_return_epc_for_insn':
arch/mips/kernel/branch.c:785:2: error: duplicate case value
arch/mips/kernel/branch.c:753:2: error: previously used here
arch/mips/kernel/branch.c:808:2: error: duplicate case value
arch/mips/kernel/branch.c:769:2: error: previously used here
arch/mips/kernel/branch.c:818:2: error: duplicate case value
arch/mips/kernel/branch.c:761:2: error: previously used here
arch/mips/kernel/branch.c:826:2: error: duplicate case value
arch/mips/kernel/branch.c:776:2: error: previously used here
Bisect points to commit 2f1da3620ff2 ("MIPS: Emulate the new MIPS R6 branch
compact (BC) instruction"). Looking into the code, the patch quite obviously
conflicts with cavium support.
Guenter
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Jan 16 (mips build errors due to MIPSR6 patches)
On Fri, Jan 16, 2015 at 07:47:57PM +1100, Stephen Rothwell wrote:
Hi all,
Changes since 20150115:
The i2c tree gained a build failure so I used the version from
next-20150115.
The wireless-drivers-next tree gained a conflict against the
wireless-drivers tree.
The usb-gadget tree gained a conflict against the usb.current tree.
Non-merge commits (relative to Linus' tree): 3219
3111 files changed, 98486 insertions(+), 52594 deletions(-)
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use git pull
to do so as that will try to merge the new linux-next release with the
old one. You should use git fetch and checkout or reset to the new
master.
Today's tree has a number of new mips related build errors.
Building mips:defconfig ... failed
Building mips:allmodconfig ... failed
Error log:
In file included from ./arch/mips/include/asm/sgiarcs.h:16:0,
from ./arch/mips/include/asm/sgialib.h:15,
from arch/mips/sgi-ip22/ip22-mc.c:16:
./arch/mips/include/asm/fw/arc/types.h:18:15: error: expected identifier or '('
before '.' token
(more of those)
In file included from ./arch/mips/include/asm/sgialib.h:15:0,
from arch/mips/sgi-ip22/ip22-mc.c:16:
./arch/mips/include/asm/sgiarcs.h:89:2: error: unknown type name '_PULONG'
./arch/mips/include/asm/sgiarcs.h:188:2: error: expected
specifier-qualifier-list before '.' token
./arch/mips/include/asm/sgiarcs.h:252:2: error: unknown type name '_PLONG'
(more of those)
In file included from arch/mips/sgi-ip22/ip22-mc.c:16:0:
./arch/mips/include/asm/sgialib.h:20:8: error: expected identifier or '('
before '.' token
(more or those)
---
Bisect points to commit 9119e8276d (MIPS: asm: hazards: Add MIPSR6
definitions). Looking into the patch, I wonder if the following is correct.
-#if defined(CONFIG_CPU_MIPSR2) !defined(CONFIG_CPU_CAVIUM_OCTEON)
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
!defined(CONFIG_CPU_CAVIUM_OCTEON)
This change appears to be missing a ( ) around the first two defined()
statements. Fixing that doesn't resolve the problem, though. Reverting
the patch doesn't fix the problem either, so something else must be wrong.
-
Building mips:cavium_octeon_defconfig ... failed
Error log:
arch/mips/kernel/branch.c: In function '__compute_return_epc_for_insn':
arch/mips/kernel/branch.c:785:2: error: duplicate case value
arch/mips/kernel/branch.c:753:2: error: previously used here
arch/mips/kernel/branch.c:808:2: error: duplicate case value
arch/mips/kernel/branch.c:769:2: error: previously used here
arch/mips/kernel/branch.c:818:2: error: duplicate case value
arch/mips/kernel/branch.c:761:2: error: previously used here
arch/mips/kernel/branch.c:826:2: error: duplicate case value
arch/mips/kernel/branch.c:776:2: error: previously used here
Bisect points to commit 2f1da3620ff2 (MIPS: Emulate the new MIPS R6 branch
compact (BC) instruction). Looking into the code, the patch quite obviously
conflicts with cavium support.
Guenter
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: Tree for Jan 16
Hi all, Changes since 20150115: The i2c tree gained a build failure so I used the version from next-20150115. The wireless-drivers-next tree gained a conflict against the wireless-drivers tree. The usb-gadget tree gained a conflict against the usb.current tree. Non-merge commits (relative to Linus' tree): 3219 3111 files changed, 98486 insertions(+), 52594 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 234 trees (counting Linus' and 32 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (f800c25b7a76 Merge branch 'thermal-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (1e3479225acb ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error) Merging m68k-current/for-linus (f27bd5bfeda5 m68k: Wire up execveat) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) Merging powerpc-merge-mpe/fixes (a87e810f61b4 powerpc: Work around gcc bug in current_thread_info()) Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) Merging net/master (01fbd3f55cca sh_eth: Fix addition of .trscer_err_mask to wrong SoC data) Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.) Merging sound-current/for-linus (92cb46584e10 ALSA: fireworks: fix an endianness bug for transaction length) Merging pci-current/for-linus (487d9ab17a2d sparc/PCI: Clip bridge windows to fit in upstream windows) Merging wireless-drivers/master (781f51d4c203 Merge tag 'iwlwifi-for-kalle-2015-01-13' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (72392ed0eb6f kernfs: Fix kernfs_name_compare) Merging tty.current/tty-linus (31ec77aca72e serial: samsung: Add the support for Exynos5433 SoC) Merging usb.current/usb-linus (f8359dae68bd Merge tag 'fixes-for-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging usb-gadget-fixes/fixes (39e60635a015 usb: dwc3: gadget: Stop TRB preparation after limit is reached) Merging usb-serial-fixes/usb-linus (04f9c6e6d175 usb: serial: handle -ENODEV quietly in generic_submit_read_urb) Merging staging.current/staging-linus (a307d1d6d4cf staging: vt6655: fix sparse warning: argument type) Merging char-misc.current/char-misc-linus (7b7c54914f73 mcb: mcb-pci: Only remap the 1st 0x200 bytes of BAR 0) Merging input-current/for-linus (029b18361921 Input: uinput - fix ioctl nr overflow for UI_GET_SYSNAME/VERSION) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (3e14dcf7cb80 crypto: add missing crypto module aliases) Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap) Merging rr-fixes/fixes (574732c73d15
linux-next: Tree for Jan 16
Hi all, Changes since 20150115: The i2c tree gained a build failure so I used the version from next-20150115. The wireless-drivers-next tree gained a conflict against the wireless-drivers tree. The usb-gadget tree gained a conflict against the usb.current tree. Non-merge commits (relative to Linus' tree): 3219 3111 files changed, 98486 insertions(+), 52594 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use git pull to do so as that will try to merge the new linux-next release with the old one. You should use git fetch and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 234 trees (counting Linus' and 32 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (f800c25b7a76 Merge branch 'thermal-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (1e3479225acb ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error) Merging m68k-current/for-linus (f27bd5bfeda5 m68k: Wire up execveat) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) Merging powerpc-merge-mpe/fixes (a87e810f61b4 powerpc: Work around gcc bug in current_thread_info()) Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) Merging net/master (01fbd3f55cca sh_eth: Fix addition of .trscer_err_mask to wrong SoC data) Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.) Merging sound-current/for-linus (92cb46584e10 ALSA: fireworks: fix an endianness bug for transaction length) Merging pci-current/for-linus (487d9ab17a2d sparc/PCI: Clip bridge windows to fit in upstream windows) Merging wireless-drivers/master (781f51d4c203 Merge tag 'iwlwifi-for-kalle-2015-01-13' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (72392ed0eb6f kernfs: Fix kernfs_name_compare) Merging tty.current/tty-linus (31ec77aca72e serial: samsung: Add the support for Exynos5433 SoC) Merging usb.current/usb-linus (f8359dae68bd Merge tag 'fixes-for-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging usb-gadget-fixes/fixes (39e60635a015 usb: dwc3: gadget: Stop TRB preparation after limit is reached) Merging usb-serial-fixes/usb-linus (04f9c6e6d175 usb: serial: handle -ENODEV quietly in generic_submit_read_urb) Merging staging.current/staging-linus (a307d1d6d4cf staging: vt6655: fix sparse warning: argument type) Merging char-misc.current/char-misc-linus (7b7c54914f73 mcb: mcb-pci: Only remap the 1st 0x200 bytes of BAR 0) Merging input-current/for-linus (029b18361921 Input: uinput - fix ioctl nr overflow for UI_GET_SYSNAME/VERSION) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard stripe) Merging crypto-current/master (3e14dcf7cb80 crypto: add missing crypto module aliases) Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap) Merging rr-fixes/fixes (574732c73d15 param:
linux-next: Tree for Jan 16
Hi all, This tree fails (more than usual) the powerpc allyesconfig build. Changes since 20140115: Dropped tree: sh (complex merge conflicts against very old commits) New tree: uml The powerpc tree still had its build failure. The libata tree gained a conflict against the arm-soc tree. The net-next tree gained a conflict against the uml tree. The device-mapper tree lost its build failure. The tip tree gained a build failure for which I reverted an idle tree commit. The kvm tree still had its build failure so I used the version from next-20140109. Non-merge commits (relative to Linus' tree): 9316 8699 files changed, 446302 insertions(+), 232089 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. I am currently merging 209 trees (counting Linus' and 29 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (2e67c56248b7 Merge branch 'akpm' (incoming from Andrew)) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux) Merging arc-current/for-curr (1e01c7eb7c43 ARC: Allow conditional multiple inclusion of uapi/asm/unistd.h) Merging arm-current/fixes (b25f3e1c3584 ARM: 7938/1: OMAP4/highbank: Flush L2 cache before disabling) Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (b3084f4db3ae powerpc/thp: Fix crash on mremap) Merging sparc/master (ef350bb7c5e0 Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) Merging net/master (51bb352f1559 qlge: Fix vlan netdev features.) Merging ipsec/master (965cdea82569 dccp: catch failed request_module call in dccp_probe init) Merging sound-current/for-linus (150116bcfbd9 ALSA: hiface: Fix typo in 352800 rate definition) Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers) Merging wireless/master (2eff7c791a18 Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes) Merging driver-core.current/driver-core-linus (413541dd66d5 Linux 3.13-rc5) Merging tty.current/tty-linus (413541dd66d5 Linux 3.13-rc5) Merging usb.current/usb-linus (413541dd66d5 Linux 3.13-rc5) Merging staging.current/staging-linus (413541dd66d5 Linux 3.13-rc5) Merging char-misc.current/char-misc-linus (802eee95bde7 Linux 3.13-rc6) Merging input-current/for-linus (8e2f2325b73f Input: xpad - add new USB IDs for Logitech F310 and F710) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (efb753b8e013 crypto: ixp4xx - Fix kernel compile error) Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions) Merging devicetree-current/devicetree/merge (6f041e99fc7b of: Fix NULL dereference in unflatten_and_copy()) Merging
linux-next: Tree for Jan 16
Hi all, This tree fails (more than usual) the powerpc allyesconfig build. Changes since 20140115: Dropped tree: sh (complex merge conflicts against very old commits) New tree: uml The powerpc tree still had its build failure. The libata tree gained a conflict against the arm-soc tree. The net-next tree gained a conflict against the uml tree. The device-mapper tree lost its build failure. The tip tree gained a build failure for which I reverted an idle tree commit. The kvm tree still had its build failure so I used the version from next-20140109. Non-merge commits (relative to Linus' tree): 9316 8699 files changed, 446302 insertions(+), 232089 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use git pull to do so as that will try to merge the new linux-next release with the old one. You should use git fetch as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. I am currently merging 209 trees (counting Linus' and 29 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (2e67c56248b7 Merge branch 'akpm' (incoming from Andrew)) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make make install not depend on vmlinux) Merging arc-current/for-curr (1e01c7eb7c43 ARC: Allow conditional multiple inclusion of uapi/asm/unistd.h) Merging arm-current/fixes (b25f3e1c3584 ARM: 7938/1: OMAP4/highbank: Flush L2 cache before disabling) Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (b3084f4db3ae powerpc/thp: Fix crash on mremap) Merging sparc/master (ef350bb7c5e0 Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) Merging net/master (51bb352f1559 qlge: Fix vlan netdev features.) Merging ipsec/master (965cdea82569 dccp: catch failed request_module call in dccp_probe init) Merging sound-current/for-linus (150116bcfbd9 ALSA: hiface: Fix typo in 352800 rate definition) Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers) Merging wireless/master (2eff7c791a18 Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes) Merging driver-core.current/driver-core-linus (413541dd66d5 Linux 3.13-rc5) Merging tty.current/tty-linus (413541dd66d5 Linux 3.13-rc5) Merging usb.current/usb-linus (413541dd66d5 Linux 3.13-rc5) Merging staging.current/staging-linus (413541dd66d5 Linux 3.13-rc5) Merging char-misc.current/char-misc-linus (802eee95bde7 Linux 3.13-rc6) Merging input-current/for-linus (8e2f2325b73f Input: xpad - add new USB IDs for Logitech F310 and F710) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard stripe) Merging crypto-current/master (efb753b8e013 crypto: ixp4xx - Fix kernel compile error) Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions) Merging devicetree-current/devicetree/merge (6f041e99fc7b of: Fix NULL dereference in unflatten_and_copy()) Merging
linux-next: Tree for Jan 16
Hi all, Changes since 20130115: Dropped tree: samung (many conflicts) The powerpc tree lost a build failure but still has another. The arm-soc tree gained conflicts against the slave-dma tree. The tegra tree gained conflicts against the arm-soc tree. I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 211 trees (counting Linus' and 28 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (406089d Merge tag 'trace-3.8-rc3-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging fixes/master (d287b87 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging kbuild-current/rc-fixes (02f3e53 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) Merging arm-current/fixes (d106de3 ARM: 7614/1: mm: fix wrong branch from Cortex-A9 to PJ4b) Merging m68k-current/for-linus (e7e29b4 m68k: Wire up finit_module) Merging powerpc-merge/merge (e6449c9 powerpc: Add missing NULL terminator to avoid boot panic on PPC40x) Merging sparc/master (b7c13f7 sparc: remove __devinit, __devexit annotations) Merging net/master (daf3ec6 tg3: Fix crc errors on jumbo frame receive) Merging sound-current/for-linus (6f54c36 ALSA: hda/hdmi - Work around "alsactl restore" errors) Merging pci-current/for-linus (9e16721 PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported) Merging wireless/master (4668cce ath9k: disable the tasklet before taking the PCU lock) Merging driver-core.current/driver-core-linus (f1688e0 debugfs: convert gid= argument from decimal, not octal) Merging tty.current/tty-linus (d1c3ed6 Linux 3.8-rc2) Merging usb.current/usb-linus (8cf65dc usb: ftdi_sio: Crucible Technologies COMET Caller ID - pid added) Merging staging.current/staging-linus (397c606 staging: zram: fix invalid memory references during disk write) Merging char-misc.current/char-misc-linus (e6028db mei: fix mismatch in mutex unlock-lock in mei_amthif_read()) Merging input-current/for-linus (bec7a4b Input: lm8323 - fix checking PWM interrupt status) Merging md-current/for-linus (a9add5d md/raid5: add blktrace calls) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (a2c0911 crypto: caam - Updated SEC-4.0 device tree binding for ERA information.) Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops) Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option) CONFLICT (content): Merge conflict in arch/x86/Kconfig Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS) Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().) Merging gpio-current/gpio/merge (bc1008c gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG) Merging rr-fixes/fixes (52441fa module: prevent warning when finit_module a 0 sized file) Merging asm-generic/master (fb9de7e xtensa: Use
linux-next: Tree for Jan 16
Hi all, Changes since 20130115: Dropped tree: samung (many conflicts) The powerpc tree lost a build failure but still has another. The arm-soc tree gained conflicts against the slave-dma tree. The tegra tree gained conflicts against the arm-soc tree. I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use git pull to do so as that will try to merge the new linux-next release with the old one. You should use git fetch as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 211 trees (counting Linus' and 28 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (406089d Merge tag 'trace-3.8-rc3-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging fixes/master (d287b87 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging kbuild-current/rc-fixes (02f3e53 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) Merging arm-current/fixes (d106de3 ARM: 7614/1: mm: fix wrong branch from Cortex-A9 to PJ4b) Merging m68k-current/for-linus (e7e29b4 m68k: Wire up finit_module) Merging powerpc-merge/merge (e6449c9 powerpc: Add missing NULL terminator to avoid boot panic on PPC40x) Merging sparc/master (b7c13f7 sparc: remove __devinit, __devexit annotations) Merging net/master (daf3ec6 tg3: Fix crc errors on jumbo frame receive) Merging sound-current/for-linus (6f54c36 ALSA: hda/hdmi - Work around alsactl restore errors) Merging pci-current/for-linus (9e16721 PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported) Merging wireless/master (4668cce ath9k: disable the tasklet before taking the PCU lock) Merging driver-core.current/driver-core-linus (f1688e0 debugfs: convert gid= argument from decimal, not octal) Merging tty.current/tty-linus (d1c3ed6 Linux 3.8-rc2) Merging usb.current/usb-linus (8cf65dc usb: ftdi_sio: Crucible Technologies COMET Caller ID - pid added) Merging staging.current/staging-linus (397c606 staging: zram: fix invalid memory references during disk write) Merging char-misc.current/char-misc-linus (e6028db mei: fix mismatch in mutex unlock-lock in mei_amthif_read()) Merging input-current/for-linus (bec7a4b Input: lm8323 - fix checking PWM interrupt status) Merging md-current/for-linus (a9add5d md/raid5: add blktrace calls) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (a2c0911 crypto: caam - Updated SEC-4.0 device tree binding for ERA information.) Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops) Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option) CONFLICT (content): Merge conflict in arch/x86/Kconfig Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS) Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().) Merging gpio-current/gpio/merge (bc1008c gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG) Merging rr-fixes/fixes (52441fa module: prevent warning when finit_module a 0 sized file) Merging asm-generic/master (fb9de7e xtensa: Use generic
