Hi all,
Changes since 20110603:
New tree: arm-lpae
The sparc-current 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 192 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 arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
Merging at91/at91-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 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
CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020ds.dts
CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020rdb.dts
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
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/dev
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
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
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
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging slave-dma/next
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging cpufreq-move/move-drivers
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
CONFLICT (delete/modify): drivers/mmc/host/sdhci-of-core.c deleted in mmc/mmc-next and modified in HEAD. Version HEAD of drivers/mmc/host/sdhci-of-core.c left in tree.
$ git rm -f drivers/mmc/host/sdhci-of-core.c
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 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 apm/for-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 gpio/gpio/next
Merging tip/auto-latest
Merging rcu/rcu/next
CONFLICT (content): Merge conflict in kernel/rcutree.c
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
Merging bkl-config/config
Merging tmem/linux-next
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master
On Mon, 6 Jun 2011 13:20:36 +1000 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20110603:
when CONFIG_IPV6 is not enabled:
ERROR: "ipv6_chk_addr" [net/sctp/sctp.ko] undefined!
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
From: Randy Dunlap <[email protected]>
Date: Mon, 6 Jun 2011 12:55:32 -0700
> On Mon, 6 Jun 2011 13:20:36 +1000 Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20110603:
>
>
> when CONFIG_IPV6 is not enabled:
>
> ERROR: "ipv6_chk_addr" [net/sctp/sctp.ko] undefined!
I'll push the following after some build testing, thanks.
--------------------
sctp: Guard IPV6 specific code properly.
Outside of net/sctp/ipv6.c, IPV6 specific code needs to
be ifdef guarded.
This fixes build failures with IPV6 disabled.
Reported-by: Randy Dunlap <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
---
net/sctp/protocol.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index af0a6b0..ab5ded2 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -637,6 +637,7 @@ void sctp_addr_wq_timeout_handler(unsigned long arg)
" for cmd %d at entry %p\n", &sctp_addr_waitq, &addrw->a, addrw->state,
addrw);
+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
/* Now we send an ASCONF for each association */
/* Note. we currently don't handle link local IPv6 addressees */
if (addrw->a.sa.sa_family == AF_INET6) {
@@ -659,7 +660,7 @@ void sctp_addr_wq_timeout_handler(unsigned long arg)
break;
}
}
-
+#endif
list_for_each_entry(sp, &sctp_auto_asconf_splist, auto_asconf_list) {
struct sock *sk;
--
1.7.5.2
On Mon, 6 Jun 2011 13:20:36 +1000 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20110603:
Does frontswap need to depend on SWAP?
When SWAP is not enabled:
mm/built-in.o: In function `frontswap_curr_pages':
(.text+0x467c1): undefined reference to `swap_lock'
mm/built-in.o: In function `frontswap_curr_pages':
(.text+0x467ce): undefined reference to `swap_list'
mm/built-in.o: In function `frontswap_curr_pages':
(.text+0x467e6): undefined reference to `swap_info'
mm/built-in.o: In function `frontswap_curr_pages':
(.text+0x467fe): undefined reference to `swap_lock'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x4688d): undefined reference to `swap_lock'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x46898): undefined reference to `swap_list'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x468b6): undefined reference to `swap_info'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x4690d): undefined reference to `swap_info'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x469d3): undefined reference to `swap_lock'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x469ec): undefined reference to `try_to_unuse'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x46a1c): undefined reference to `swap_lock'
mm/built-in.o: In function `__frontswap_flush_area':
(.text+0x46aa4): undefined reference to `swap_info'
mm/built-in.o: In function `__frontswap_get_page':
(.text+0x46b1f): undefined reference to `swap_info'
mm/built-in.o: In function `__frontswap_put_page':
(.text+0x46bf8): undefined reference to `swap_info'
mm/built-in.o: In function `__frontswap_flush_page':
(.text+0x46d86): undefined reference to `swap_info'
mm/built-in.o: In function `frontswap_curr_pages':
(.text+0x467c1): undefined reference to `swap_lock'
mm/built-in.o: In function `frontswap_curr_pages':
(.text+0x467ce): undefined reference to `swap_list'
mm/built-in.o: In function `frontswap_curr_pages':
(.text+0x467e6): undefined reference to `swap_info'
mm/built-in.o: In function `frontswap_curr_pages':
(.text+0x467fe): undefined reference to `swap_lock'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x4688d): undefined reference to `swap_lock'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x46898): undefined reference to `swap_list'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x468b6): undefined reference to `swap_info'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x4690d): undefined reference to `swap_info'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x469d3): undefined reference to `swap_lock'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x469ec): undefined reference to `try_to_unuse'
mm/built-in.o: In function `frontswap_shrink':
(.text+0x46a1c): undefined reference to `swap_lock'
mm/built-in.o: In function `__frontswap_flush_area':
(.text+0x46aa4): undefined reference to `swap_info'
mm/built-in.o: In function `__frontswap_get_page':
(.text+0x46b1f): undefined reference to `swap_info'
mm/built-in.o: In function `__frontswap_put_page':
(.text+0x46bf8): undefined reference to `swap_info'
mm/built-in.o: In function `__frontswap_flush_page':
(.text+0x46d86): undefined reference to `swap_info'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Hi Randy --
Indeed you are correct! Thanks for catching that!
Dan
Thanks... for the memory!
I really could use more / my throughput's on the floor
The balloon is flat / my swap disk's fat / I've OOM's in store
Overcommitted so much
(with apologies to Bob Hope)
> -----Original Message-----
> From: Randy Dunlap
> Sent: Monday, June 06, 2011 2:06 PM
> To: Stephen Rothwell; Dan Magenheimer
> Cc: [email protected]; LKML
> Subject: Re: linux-next: Tree for June 6 (frontswap)
>
> On Mon, 6 Jun 2011 13:20:36 +1000 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Changes since 20110603:
>
>
> Does frontswap need to depend on SWAP?
>
> When SWAP is not enabled:
>
> mm/built-in.o: In function `frontswap_curr_pages':
> (.text+0x467c1): undefined reference to `swap_lock'
> mm/built-in.o: In function `frontswap_curr_pages':
> (.text+0x467ce): undefined reference to `swap_list'
> mm/built-in.o: In function `frontswap_curr_pages':
> (.text+0x467e6): undefined reference to `swap_info'
> mm/built-in.o: In function `frontswap_curr_pages':
> (.text+0x467fe): undefined reference to `swap_lock'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x4688d): undefined reference to `swap_lock'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x46898): undefined reference to `swap_list'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x468b6): undefined reference to `swap_info'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x4690d): undefined reference to `swap_info'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x469d3): undefined reference to `swap_lock'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x469ec): undefined reference to `try_to_unuse'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x46a1c): undefined reference to `swap_lock'
> mm/built-in.o: In function `__frontswap_flush_area':
> (.text+0x46aa4): undefined reference to `swap_info'
> mm/built-in.o: In function `__frontswap_get_page':
> (.text+0x46b1f): undefined reference to `swap_info'
> mm/built-in.o: In function `__frontswap_put_page':
> (.text+0x46bf8): undefined reference to `swap_info'
> mm/built-in.o: In function `__frontswap_flush_page':
> (.text+0x46d86): undefined reference to `swap_info'
> mm/built-in.o: In function `frontswap_curr_pages':
> (.text+0x467c1): undefined reference to `swap_lock'
> mm/built-in.o: In function `frontswap_curr_pages':
> (.text+0x467ce): undefined reference to `swap_list'
> mm/built-in.o: In function `frontswap_curr_pages':
> (.text+0x467e6): undefined reference to `swap_info'
> mm/built-in.o: In function `frontswap_curr_pages':
> (.text+0x467fe): undefined reference to `swap_lock'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x4688d): undefined reference to `swap_lock'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x46898): undefined reference to `swap_list'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x468b6): undefined reference to `swap_info'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x4690d): undefined reference to `swap_info'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x469d3): undefined reference to `swap_lock'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x469ec): undefined reference to `try_to_unuse'
> mm/built-in.o: In function `frontswap_shrink':
> (.text+0x46a1c): undefined reference to `swap_lock'
> mm/built-in.o: In function `__frontswap_flush_area':
> (.text+0x46aa4): undefined reference to `swap_info'
> mm/built-in.o: In function `__frontswap_get_page':
> (.text+0x46b1f): undefined reference to `swap_info'
> mm/built-in.o: In function `__frontswap_put_page':
> (.text+0x46bf8): undefined reference to `swap_info'
> mm/built-in.o: In function `__frontswap_flush_page':
> (.text+0x46d86): undefined reference to `swap_info'
>
> ---
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
On 6 June 2011 04:20, Stephen Rothwell <[email protected]> wrote:
> Changes since 20110603:
>
> New tree: arm-lpae
This introduced a few build failures on some ARM platforms (missing a
types.h include). I fixed up the pgtable files and the builds should
be ok in 20110607.
--
Catalin
On Mon, 6 Jun 2011 13:23:09 -0700 (PDT) Dan Magenheimer wrote:
> Hi Randy --
>
> Indeed you are correct! Thanks for catching that!
>
Please fix the tree in linux-next so that this build error does not
continue.
>
> Thanks... for the memory!
> I really could use more / my throughput's on the floor
> The balloon is flat / my swap disk's fat / I've OOM's in store
> Overcommitted so much
> (with apologies to Bob Hope)
>
>
> > -----Original Message-----
> > From: Randy Dunlap
> > Sent: Monday, June 06, 2011 2:06 PM
> > To: Stephen Rothwell; Dan Magenheimer
> > Cc: [email protected]; LKML
> > Subject: Re: linux-next: Tree for June 6 (frontswap)
> >
> > On Mon, 6 Jun 2011 13:20:36 +1000 Stephen Rothwell wrote:
> >
> > > Hi all,
> > >
> > > Changes since 20110603:
> >
> >
> > Does frontswap need to depend on SWAP?
> >
> > When SWAP is not enabled:
> >
> > mm/built-in.o: In function `frontswap_curr_pages':
> > (.text+0x467c1): undefined reference to `swap_lock'
> > mm/built-in.o: In function `frontswap_curr_pages':
> > (.text+0x467ce): undefined reference to `swap_list'
> > mm/built-in.o: In function `frontswap_curr_pages':
> > (.text+0x467e6): undefined reference to `swap_info'
> > mm/built-in.o: In function `frontswap_curr_pages':
> > (.text+0x467fe): undefined reference to `swap_lock'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x4688d): undefined reference to `swap_lock'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x46898): undefined reference to `swap_list'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x468b6): undefined reference to `swap_info'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x4690d): undefined reference to `swap_info'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x469d3): undefined reference to `swap_lock'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x469ec): undefined reference to `try_to_unuse'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x46a1c): undefined reference to `swap_lock'
> > mm/built-in.o: In function `__frontswap_flush_area':
> > (.text+0x46aa4): undefined reference to `swap_info'
> > mm/built-in.o: In function `__frontswap_get_page':
> > (.text+0x46b1f): undefined reference to `swap_info'
> > mm/built-in.o: In function `__frontswap_put_page':
> > (.text+0x46bf8): undefined reference to `swap_info'
> > mm/built-in.o: In function `__frontswap_flush_page':
> > (.text+0x46d86): undefined reference to `swap_info'
> > mm/built-in.o: In function `frontswap_curr_pages':
> > (.text+0x467c1): undefined reference to `swap_lock'
> > mm/built-in.o: In function `frontswap_curr_pages':
> > (.text+0x467ce): undefined reference to `swap_list'
> > mm/built-in.o: In function `frontswap_curr_pages':
> > (.text+0x467e6): undefined reference to `swap_info'
> > mm/built-in.o: In function `frontswap_curr_pages':
> > (.text+0x467fe): undefined reference to `swap_lock'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x4688d): undefined reference to `swap_lock'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x46898): undefined reference to `swap_list'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x468b6): undefined reference to `swap_info'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x4690d): undefined reference to `swap_info'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x469d3): undefined reference to `swap_lock'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x469ec): undefined reference to `try_to_unuse'
> > mm/built-in.o: In function `frontswap_shrink':
> > (.text+0x46a1c): undefined reference to `swap_lock'
> > mm/built-in.o: In function `__frontswap_flush_area':
> > (.text+0x46aa4): undefined reference to `swap_info'
> > mm/built-in.o: In function `__frontswap_get_page':
> > (.text+0x46b1f): undefined reference to `swap_info'
> > mm/built-in.o: In function `__frontswap_put_page':
> > (.text+0x46bf8): undefined reference to `swap_info'
> > mm/built-in.o: In function `__frontswap_flush_page':
> > (.text+0x46d86): undefined reference to `swap_info'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
> From: Randy Dunlap
> Sent: Wednesday, June 08, 2011 10:29 AM
> To: Dan Magenheimer
> Cc: Stephen Rothwell; [email protected]; LKML
> Subject: Re: linux-next: Tree for June 6 (frontswap)
>
> On Mon, 6 Jun 2011 13:23:09 -0700 (PDT) Dan Magenheimer wrote:
>
> > > Does frontswap need to depend on SWAP?
> >
> > Indeed you are correct! Thanks for catching that!
>
> Please fix the tree in linux-next so that this build error does not
> continue.
Sorry, I thought it was just an observation, didn't know
it was breaking your build, so didn't know there was a rush.
I am away from my machines for the rest of the day, but will
get it fixed and resubmitted first thing tomorrow (US time).
Dan
> From: Dan Magenheimer
> Sent: Wednesday, June 08, 2011 11:02 AM
> To: Randy Dunlap
> Cc: Stephen Rothwell; [email protected]; LKML
> Subject: RE: linux-next: Tree for June 6 (frontswap)
>
> > From: Randy Dunlap
> > Sent: Wednesday, June 08, 2011 10:29 AM
> > To: Dan Magenheimer
> > Cc: Stephen Rothwell; [email protected]; LKML
> > Subject: Re: linux-next: Tree for June 6 (frontswap)
> >
> > On Mon, 6 Jun 2011 13:23:09 -0700 (PDT) Dan Magenheimer wrote:
> >
> > > > Does frontswap need to depend on SWAP?
> > >
> > > Indeed you are correct! Thanks for catching that!
> >
> > Please fix the tree in linux-next so that this build error does not
> > continue.
>
> Sorry, I thought it was just an observation, didn't know
> it was breaking your build, so didn't know there was a rush.
> I am away from my machines for the rest of the day, but will
> get it fixed and resubmitted first thing tomorrow (US time).
Got back early. Should be fixed now, hope it is in time
for the next linux-next merge. And sorry for the noise!
Hi Dan,
On Wed, 8 Jun 2011 17:12:06 -0700 (PDT) Dan Magenheimer <[email protected]> wrote:
>
> Got back early. Should be fixed now, hope it is in time
> for the next linux-next merge. And sorry for the noise!
Yeah, it will be in linux-next today (as long as you didn;t break
anything :-)).
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/