Changes since 20110420:
Dropped tree: xen
The gfs2 tree lost its conflicts.
The v4l-dvb tree lost its conflicts.
The kbuild tree lost its build failure.
The fbdev tree lost its build failure.
----------------------------------------------------------------------------
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/v2.6/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
and sparc64 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 185 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.
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 Rothwell [email protected]
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-core.c
CONFLICT (delete/modify): drivers/i2c/busses/i2c-intel-mid.c deleted in bjdooks-i2c/next-i2c and modified in HEAD. Version HEAD of drivers/i2c/busses/i2c-intel-mid.c left in tree.
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c
$ git rm -f drivers/i2c/busses/i2c-intel-mid.c
Applying: i2c-designware: mdelay use needs linux/delay.h inclusion
Applying: i2c: designware-pcidrv depends on PCI
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/cpupowerutils
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2x00queue.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2x00queue.h
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/mfd-core.c
CONFLICT (content): Merge conflict in include/linux/mfd/core.h
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
CONFLICT (content): Merge conflict in drivers/platform/x86/intel_pmic_gpio.c
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c
Merging staging/staging-next
Merging slabh/slabh
Merging bkl-config/config
Merging cleancache/linux-next
Merging scsi-post-merge/merge-base:master
$ git checkout scsi-post-merge/master
On Thu, 21 Apr 2011 13:20:45 +1000 Stephen Rothwell wrote:
> Changes since 20110420:
on i386:
ERROR: "__udivdi3" [drivers/md/raid456.ko] undefined!
in raid45_takeover_raid0()
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On Thu, 21 Apr 2011 13:20:45 +1000 Stephen Rothwell wrote:
> Changes since 20110420:
on i386:
drivers/edac/i82975x_edac.c:298: warning: integer constant is too large for 'unsigned long' type
which is:
if (info->xeap & 1)
page |= 0x100000000ul; <<<<<<<<<<<<<<<
but page is unsigned long (32 bits), while 0x100000000ul is more than 32 bits,
so that line isn't setting a bit in <page>. Is it a bug, or this driver isn't
applicable to X86_32, or what?
thanks,
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
From: Randy Dunlap <[email protected]>
arch/x86/kvm/emulate.c:2598: warning: integer constant is too large for 'long' type
Signed-off-by: Randy Dunlap <[email protected]>
---
arch/x86/kvm/emulate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20110421.orig/arch/x86/kvm/emulate.c
+++ linux-next-20110421/arch/x86/kvm/emulate.c
@@ -2595,7 +2595,7 @@ static int check_svme_pa(struct x86_emul
u64 rax = kvm_register_read(ctxt->vcpu, VCPU_REGS_RAX);
/* Valid physical address? */
- if (rax & 0xffff000000000000)
+ if (rax & 0xffff000000000000ULL)
return emulate_gp(ctxt, 0);
return check_svme(ctxt);
On Thu, Apr 21, 2011 at 9:21 PM, Randy Dunlap <[email protected]> wrote:
> On Thu, 21 Apr 2011 13:20:45 +1000 Stephen Rothwell wrote:
>
>> Changes since 20110420:
>
>
> on i386:
>
> drivers/edac/i82975x_edac.c:298: warning: integer constant is too large for 'unsigned long' type
>
> which is:
>
> ? ? ? ?if (info->xeap & 1)
> ? ? ? ? ? ? ? ?page |= 0x100000000ul; <<<<<<<<<<<<<<<
>
> but page is unsigned long (32 bits), while 0x100000000ul is more than 32 bits,
> so that line isn't setting a bit in <page>. ?Is it a bug, or this driver isn't
> applicable to X86_32, or what?
>
would defining page variable to unsigned long long solve it for x86_32?
That would still not fix the wrong error-info reported by the driver - this is
fixed by the patch-set titled '[RFC PATCH 2.6.37 0/4] i3000_edac : merge
i82975x support' dated 2011-02-14 in the linux-edac archives.
Please advise on getting the patch into main-stream. The I3000 is a re-labeled
i82975x (or vice-versa). Hence the patch-set to merge the drivers. If separate
i82975x driver is needed - I can provide the patch. The reported bug is not
present in the merge-patched driver.
Thanks,
Arvind.
On 04/23/11 01:21, Arvind R wrote:
> On Thu, Apr 21, 2011 at 9:21 PM, Randy Dunlap <[email protected]> wrote:
>> On Thu, 21 Apr 2011 13:20:45 +1000 Stephen Rothwell wrote:
>>
>>> Changes since 20110420:
>>
>>
>> on i386:
>>
>> drivers/edac/i82975x_edac.c:298: warning: integer constant is too large for 'unsigned long' type
>>
>> which is:
>>
>> if (info->xeap & 1)
>> page |= 0x100000000ul; <<<<<<<<<<<<<<<
>>
>> but page is unsigned long (32 bits), while 0x100000000ul is more than 32 bits,
>> so that line isn't setting a bit in <page>. Is it a bug, or this driver isn't
>> applicable to X86_32, or what?
>>
> would defining page variable to unsigned long long solve it for x86_32?
I think that the goal should be to get your 4-patch series merged.
> That would still not fix the wrong error-info reported by the driver - this is
> fixed by the patch-set titled '[RFC PATCH 2.6.37 0/4] i3000_edac : merge
> i82975x support' dated 2011-02-14 in the linux-edac archives.
>
> Please advise on getting the patch into main-stream. The I3000 is a re-labeled
> i82975x (or vice-versa). Hence the patch-set to merge the drivers. If separate
> i82975x driver is needed - I can provide the patch. The reported bug is not
> present in the merge-patched driver.
Doug, any plans to merge this 4-patch series from Arvind?
Arvind, was [email protected] copied on this patch series?
and was the I3000 driver maintainer copied? (added)
I can't tell this from the marc.info archives.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On Sat, Apr 23, 2011 at 9:15 PM, Randy Dunlap <[email protected]> wrote:
> On 04/23/11 01:21, Arvind R wrote:
>> On Thu, Apr 21, 2011 at 9:21 PM, Randy Dunlap <[email protected]> wrote:
>>> On Thu, 21 Apr 2011 13:20:45 +1000 Stephen Rothwell wrote:
>>>
>>>> Changes since 20110420:
>>>
>>>
>>> on i386:
>>>
>>> drivers/edac/i82975x_edac.c:298: warning: integer constant is too large for 'unsigned long' type
> I think that the goal should be to get your 4-patch series merged.
>
>> That would still not fix the wrong error-info reported by the driver - this is
>> fixed by the patch-set titled '[RFC PATCH 2.6.37 0/4] i3000_edac : merge
>> i82975x support' dated 2011-02-14 in the linux-edac archives.
>>
>> Please advise on getting the patch into main-stream. The I3000 is a re-labeled
>> i82975x (or vice-versa). Hence the patch-set to merge the drivers. If separate
>> i82975x driver is needed - I can provide the patch. The reported bug is not
>> present in the merge-patched driver.
>
> Doug, any plans to merge this 4-patch series from Arvind?
>
> Arvind, was [email protected] copied on this patch series?
No - thought that the bluesmoke-list had moved to linux-edac.
>
> and was the I3000 driver maintainer copied? ?(added)
> I can't tell this from the marc.info archives.
Added myself to the driver maintainer in the i3000_edac.c file. The
patch-set adds support for i82975x in the i3000 driver, which is
better structured.
TODO:
1. Change Kconfig file - select I3000 for i82975x support
2. Delete i82975x_edac.c file
3. Update MAINTAINERS file
>
Arvind
On 04/21/2011 07:09 PM, Randy Dunlap wrote:
> From: Randy Dunlap<[email protected]>
>
> arch/x86/kvm/emulate.c:2598: warning: integer constant is too large for 'long' type
Applied, thanks.
--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.
On Sat, April 23, 2011 11:29 pm, Arvind R wrote:
> On Sat, Apr 23, 2011 at 9:15 PM, Randy Dunlap <[email protected]>
> wrote:
>> On 04/23/11 01:21, Arvind R wrote:
>>> On Thu, Apr 21, 2011 at 9:21 PM, Randy Dunlap <[email protected]>
>>> wrote:
>>>> On Thu, 21 Apr 2011 13:20:45 +1000 Stephen Rothwell wrote:
>>>>
>>>>> Changes since 20110420:
>>>>
>>>>
>>>> on i386:
>>>>
>>>> drivers/edac/i82975x_edac.c:298: warning: integer constant is too
>>>> large for 'unsigned long' type
>
>> I think that the goal should be to get your 4-patch series merged.
>>
>>> That would still not fix the wrong error-info reported by the driver -
>>> this is
>>> fixed by the patch-set titled '[RFC PATCH 2.6.37 0/4] i3000_edac :
>>> merge
>>> i82975x support' dated 2011-02-14 in the linux-edac archives.
>>>
>>> Please advise on getting the patch into main-stream. The I3000 is a
>>> re-labeled
>>> i82975x (or vice-versa). Hence the patch-set to merge the drivers. If
>>> separate
>>> i82975x driver is needed - I can provide the patch. The reported bug is
>>> not
>>> present in the merge-patched driver.
>>
>> Doug, any plans to merge this 4-patch series from Arvind?
>>
>> Arvind, was [email protected] copied on this patch
>> series?
> No - thought that the bluesmoke-list had moved to linux-edac.
>
If bluesmoke-devel is obsolete, the MAINTAINERS file
needs to be updated.
>>
>> and was the I3000 driver maintainer copied? ?(added)
>> I can't tell this from the marc.info archives.
> Added myself to the driver maintainer in the i3000_edac.c file. The
> patch-set adds support for i82975x in the i3000 driver, which is
> better structured.
> TODO:
> 1. Change Kconfig file - select I3000 for i82975x support
> 2. Delete i82975x_edac.c file
> 3. Update MAINTAINERS file
Did the other EDAC-I3000 maintainer respond?
thanks,
--
~Randy
On Mon, Apr 25, 2011 at 7:43 AM, Randy Dunlap <[email protected]> wrote:
>
> On Sat, April 23, 2011 11:29 pm, Arvind R wrote:
>> On Sat, Apr 23, 2011 at 9:15 PM, Randy Dunlap <[email protected]>
>> wrote:
>>> On 04/23/11 01:21, Arvind R wrote:
>>>> On Thu, Apr 21, 2011 at 9:21 PM, Randy Dunlap <[email protected]>
>>>> wrote:
>>>>> On Thu, 21 Apr 2011 13:20:45 +1000 Stephen Rothwell wrote:
>>>>>
>>>>>> Changes since 20110420:
>>>>>
>>>>>
>>>>> on i386:
>>>>>
>>>>> drivers/edac/i82975x_edac.c:298: warning: integer constant is too
>>>>> large for 'unsigned long' type
>>
>>> I think that the goal should be to get your 4-patch series merged.
>>>
>>>> That would still not fix the wrong error-info reported by the driver -
>>>> this is
>>>> fixed by the patch-set titled '[RFC PATCH 2.6.37 0/4] i3000_edac :
>>>> merge
>>>> i82975x support' dated 2011-02-14 in the linux-edac archives.
>>>>
>>>> Please advise on getting the patch into main-stream. The I3000 is a
>>>> re-labeled
>>>> i82975x (or vice-versa). Hence the patch-set to merge the drivers. If
>>>> separate
>>>> i82975x driver is needed - I can provide the patch. The reported bug is
>>>> not
>>>> present in the merge-patched driver.
>>>
>>> Doug, any plans to merge this 4-patch series from Arvind?
>>>
>>> Arvind, was [email protected] copied on this patch
>>> series?
>> No - thought that the bluesmoke-list had moved to linux-edac.
>>
>
> If bluesmoke-devel is obsolete, the MAINTAINERS file
> needs to be updated.
>
>>>
>>> and was the I3000 driver maintainer copied? ?(added)
>>> I can't tell this from the marc.info archives.
>> Added myself to the driver maintainer in the i3000_edac.c file. The
>> patch-set adds support for i82975x in the i3000 driver, which is
>> better structured.
>> TODO:
>> ? ? 1. Change Kconfig file - select I3000 for i82975x support
>> ? ? 2. Delete i82975x_edac.c file
>> ? ? 3. Update MAINTAINERS file
>
> Did the other EDAC-I3000 maintainer respond?
No, though CC'ed to.
Arvind
On Sun, Apr 24, 2011 at 21:13:16 -0500, Randy Dunlap wrote:
> > Added myself to the driver maintainer in the i3000_edac.c file. The
> > patch-set adds support for i82975x in the i3000 driver, which is
> > better structured.
> > TODO:
> > 1. Change Kconfig file - select I3000 for i82975x support
> > 2. Delete i82975x_edac.c file
> > 3. Update MAINTAINERS file
>
> Did the other EDAC-I3000 maintainer respond?
I'm happy to let Arvind take over this driver; I haven't done any edac
work in quite a while.
Acked-by: Jason Uhlenkott <[email protected]>