Skip to contentSkip to conversation

linux-next: Tree for September 1

PATCH In review Stephen Rothwell 5 participants 8 messages Sep 1, 2010 – Sep 2, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi all,

Changes since 20100831:

My fixes tree is empty again.

The net tree still has its build failure for which I have reverted a commit.

I still have a patch to the drivers-x86 tree to remove a Kconfig warning.

----------------------------------------------------------------------------

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 171 trees (counting Linus' and 22 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 Jan Dittmer for adding the linux-next tree to his build tests at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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.

Signature · 194 lines
Cheers,
Stephen Rothwell                    [email protected]

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/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 kbuild-current/rc-fixes
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
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 gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c
CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig
CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c
Merging s5p/for-next
Merging tegra/for-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/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging tile/master
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 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 pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/IR/ir-raw-event.c
CONFLICT (add/add): Merge conflict in drivers/media/video/s5p-fimc/fimc-core.c
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 ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging swiotlb-xen/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (content): Merge conflict in net/mac80211/main.c
Merging mtd/master
Merging crypto/master
Merging sound-asoc/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/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
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
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 quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging limits/writable_limits
Merging omap_dss2/for-next
Merging xen/upstream/xen
Merging rcu/rcu/next
Merging tip/auto-latest
Merging lost-spurious-irq/lost-spurious-irq
CONFLICT (content): Merge conflict in drivers/ata/libata-core.c
CONFLICT (content): Merge conflict in include/linux/libata.h
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Applying: Fix Kconfig mistaken update
Merging hwpoison/hwpoison
Merging sysctl/master
Merging bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging staging-next/staging-next
Merging slabh/slabh
Merging scsi-post-merge/merge-base:master
$ git checkout scsi-post-merge/master
[master 35d31d4] Revert "starfire: use BUILD_BUG_ON for netdrv_addr_t"
#1 lore raw

PATCH 1/1 oprofile: fix build when CONFIG_PM is disabled

From: Randy Dunlap <[email protected]>

Using do/while for a function-returning-a-value does not make gcc happy, so change it to a static inline function. (happens when CONFIG_PM is not enabled)

arch/x86/oprofile/nmi_int.c:784: error: expected expression before 'do'

---
 arch/x86/oprofile/nmi_int.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/oprofile/nmi_int.c +4 -1
@@ -585,7 +585,10 @@ static void exit_sysfs(void)
 }
 
 #else
-#define init_sysfs() do { } while (0)
+static inline int init_sysfs(void)
+{
+	return 0;
+}
 #define exit_sysfs() do { } while (0)
 #endif /* CONFIG_PM */
 
#2 lore raw

Re: [PATCH next&mainline] oprofile: fix build when CONFIG_PM is disabled

Quoted 9 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Using do/while for a function-returning-a-value does not make gcc happy, so change it to a static inline function. (happens when CONFIG_PM is not enabled)

arch/x86/oprofile/nmi_int.c:784: error: expected expression before 'do'

I already sent a fix to Ingo that fixes this.

Will update my for-next branch as soon as it is applied in tip.

Thanks,

-Robert

Signature · 2 lines
Advanced Micro Devices, Inc.
Operating System Research Center
#3 lore raw

Re: [PATCH next&mainline] oprofile: fix build when CONFIG_PM is disabled

Quoted 7 lines · On Wed, 1 Sep 2010 18:50:02 +0200 Robert Richter wrote:
Quoted 6 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Using do/while for a function-returning-a-value does not make gcc happy, so change it to a static inline function. (happens when CONFIG_PM is not enabled)

Quoted 7 lines
Quoted 3 lines

arch/x86/oprofile/nmi_int.c:784: error: expected expression before 'do'

I already sent a fix to Ingo that fixes this.

Will update my for-next branch as soon as it is applied in tip.

Good.

But I looked at oprofile.git and didn't see any such patch. Did I miss it there? Can you point me to it, please?

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#4 lore raw

Re: [PATCH next&mainline] oprofile: fix build when CONFIG_PM is disabled

In reply to Robert Richter
Quoted 7 lines · Robert Richter
Quoted 6 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Using do/while for a function-returning-a-value does not make gcc happy, so change it to a static inline function. (happens when CONFIG_PM is not enabled)

Quoted 7 lines
Quoted 3 lines

arch/x86/oprofile/nmi_int.c:784: error: expected expression before 'do'

I already sent a fix to Ingo that fixes this.

Will update my for-next branch as soon as it is applied in tip.

The patch is now upstream in urgent of the oprofile tree. For-next is also updated.

Sorry for the trouble.

-Robert

Signature · 2 lines
Advanced Micro Devices, Inc.
Operating System Research Center
#5 lore raw

Re: [PATCH next&mainline] oprofile: fix build when CONFIG_PM is disabled

In reply to Randy Dunlap
Quoted 7 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Using do/while for a function-returning-a-value does not make gcc happy, so change it to a static inline function. (happens when CONFIG_PM is not enabled)

arch/x86/oprofile/nmi_int.c:784: error: expected expression before 'do'

Yeah, i reported this to Robert a few hours ago, with the same suggested solution.

Thanks,

Ingo

maintainer
#6 lore raw
In reply to Stephen Rothwell

From: Stephen Rothwell <[email protected]>
Date: Wed, 1 Sep 2010 13:36:14 +1000

Quoted 2 lines

The net tree still has its build failure for which I have reverted a commit.

Stephen I'm about to commit the following to net-next-2.6 in the meantime to deal with that so you don't have to revert whilst Fujita works on the more cleaner solution.

--------------------
starfire: Temporary kludge to fix powerpc build.

Add a dma_addr_t 64-bit case for powerpc with 64-bit phys addresses.

---
 drivers/net/starfire.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/starfire.c +1 -1
index c3bf288..4adf124 100644
@@ -148,7 +148,7 @@ static int full_duplex[MAX_UNITS] = {0, };
  * This SUCKS.
  * We need a much better method to determine if dma_addr_t is 64-bit.
  */
-#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
+#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) || (defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT))
 /* 64-bit dma_addr_t */
 #define ADDR_64BITS	/* This chip uses 64 bit addresses. */
 #define netdrv_addr_t __le64
Signature · 1 line
1.7.2.2
#7 lore raw

Hi Dave,

Quoted 10 lines · On Wed, 01 Sep 2010 18:38:35 -0700 (PDT) David Miller <[email protected]>…

From: Stephen Rothwell <[email protected]>
Date: Wed, 1 Sep 2010 13:36:14 +1000

Quoted 2 lines

The net tree still has its build failure for which I have reverted a commit.

Stephen I'm about to commit the following to net-next-2.6 in the meantime to deal with that so you don't have to revert whilst Fujita works on the more cleaner solution.

OK, thanks. I still reverted the commit today as I fetched your tree before you committed this.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/