* linux-next: Tree for June 23
@ 2010-06-23 5:45 Stephen Rothwell
2010-06-24 3:27 ` [PATCH -next] zram: fix build errors, depends on BLOCK Randy Dunlap
2010-06-24 3:28 ` [PATCH -next] staging: fix wlan-ng depends Randy Dunlap
0 siblings, 2 replies; 20+ messages in thread
From: Stephen Rothwell @ 2010-06-23 5:45 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8907 bytes --]
Hi all,
Changes since 20100622:
My fixes tree contains:
v4l-dvb: update gfp/slab.h includes
arm: update gfp/slab.h includes
davinci: update gfp/slab.h includes
ocfs2: update gfp/slab.h includes
acpi: update gfp/slab.h includes
The net tree gained a conflict against the net-current tree.
The wireless tree gained a conflict against the net tree and a build
failure so I used the version from next-20100622.
----------------------------------------------------------------------------
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 164 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ 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/for-linus
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
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
CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
Merging sparc/master
Merging tile/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
CONFLICT (content): Merge conflict in fs/ecryptfs/main.c
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 squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Applying: v9fs: fixup for inode_setattr being removed
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
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 ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging ibft/master
Merging swiotlb/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in net/ipv4/ip_output.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/host.h
$ git reset --hard HEAD^
Merging refs/next/20100622/wireless
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
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
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/evergreen.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r600.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_combios.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/rv770.c
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
CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree.
$ git rm -f fs/notify/inotify/inotify.c
Applying: fsnotify: update gfp/slab.h includes
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging catalin/for-next
Merging alacrity/linux-next
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in fs/fs-writeback.c
CONFLICT (content): Merge conflict in net/bridge/br_fdb.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebt_redirect.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebt_ulog.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebtables.c
CONFLICT (content): Merge conflict in net/netfilter/nfnetlink_log.c
CONFLICT (content): Merge conflict in net/netfilter/nfnetlink_queue.c
Applying: net: merge fixups for bridge rcu code
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
Merging hwpoison/hwpoison
CONFLICT (content): Merge conflict in mm/memory-failure.c
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
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/bat_sysfs.c
CONFLICT (delete/modify): drivers/staging/batman-adv/device.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/batman-adv/device.c left in tree.
$ git rm -f drivers/staging/batman-adv/device.c
Merging slabh/slabh
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH -next] zram: fix build errors, depends on BLOCK
2010-06-23 5:45 linux-next: Tree for June 23 Stephen Rothwell
@ 2010-06-24 3:27 ` Randy Dunlap
2010-06-24 4:36 ` Nitin Gupta
2010-06-24 3:28 ` [PATCH -next] staging: fix wlan-ng depends Randy Dunlap
1 sibling, 1 reply; 20+ messages in thread
From: Randy Dunlap @ 2010-06-24 3:27 UTC (permalink / raw)
To: Stephen Rothwell, Nitin Gupta, devel; +Cc: linux-next, LKML, gregkh
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix 49 zram build errors in one swoop. Examples:
drivers/staging/zram/zram_drv.c:225: error: dereferencing pointer to incomplete type
drivers/staging/zram/zram_drv.c:226: error: implicit declaration of function 'bio_for_each_segment'
drivers/staging/zram/zram_drv.c:226: error: expected ';' before '{' token
drivers/staging/zram/zram_drv.c:281: error: implicit declaration of function 'bio_endio'
drivers/staging/zram/zram_drv.c:285: error: implicit declaration of function 'bio_io_error'
drivers/staging/zram/zram_drv.c:545: error: implicit declaration of function 'set_capacity'
drivers/staging/zram/zram_drv.c:548: error: implicit declaration of function 'queue_flag_set_unlocked'
drivers/staging/zram/zram_drv.c:548: error: 'QUEUE_FLAG_NONROT' undeclared (first use in this function)
drivers/staging/zram/zram_drv.c:548: error: dereferencing pointer to incomplete type
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: devel@driverdev.osuosl.org
Cc: Nitin Gupta <ngupta@vflare.org>
---
drivers/staging/zram/Kconfig | 1 +
drivers/staging/zram/zram_drv.c | 1 +
2 files changed, 2 insertions(+)
--- linux-next-20100623.orig/drivers/staging/zram/Kconfig
+++ linux-next-20100623/drivers/staging/zram/Kconfig
@@ -1,5 +1,6 @@
config ZRAM
tristate "Compressed RAM block device support"
+ depends on BLOCK
select LZO_COMPRESS
select LZO_DECOMPRESS
default n
--- linux-next-20100623.orig/drivers/staging/zram/zram_drv.c
+++ linux-next-20100623/drivers/staging/zram/zram_drv.c
@@ -17,6 +17,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
+#include <linux/bio.h>
#include <linux/bitops.h>
#include <linux/blkdev.h>
#include <linux/buffer_head.h>
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH -next] staging: fix wlan-ng depends
2010-06-23 5:45 linux-next: Tree for June 23 Stephen Rothwell
2010-06-24 3:27 ` [PATCH -next] zram: fix build errors, depends on BLOCK Randy Dunlap
@ 2010-06-24 3:28 ` Randy Dunlap
1 sibling, 0 replies; 20+ messages in thread
From: Randy Dunlap @ 2010-06-24 3:28 UTC (permalink / raw)
To: Stephen Rothwell, gregkh, devel; +Cc: linux-next, LKML
From: Randy Dunlap <randy.dunlap@oracle.com>
drivers/built-in.o: In function `wlan_free_wiphy':
(.text+0x3f5eb5): undefined reference to `wiphy_unregister'
drivers/built-in.o: In function `wlan_free_wiphy':
(.text+0x3f5ec4): undefined reference to `wiphy_free'
drivers/built-in.o: In function `wlan_create_wiphy':
(.text+0x3f5f76): undefined reference to `wiphy_new'
drivers/built-in.o: In function `wlan_create_wiphy':
(.text+0x3f6024): undefined reference to `wiphy_register'
drivers/built-in.o: In function `prism2_roamed':
(.text+0x3f61f7): undefined reference to `cfg80211_roamed'
drivers/built-in.o: In function `prism2_disconnected':
(.text+0x3f6223): undefined reference to `cfg80211_disconnected'
drivers/built-in.o: In function `prism2_connect_result':
(.text+0x3f626d): undefined reference to `cfg80211_connect_result'
drivers/built-in.o: In function `prism2_connect':
(.text+0x3f62b6): undefined reference to `ieee80211_frequency_to_channel'
drivers/built-in.o: In function `prism2_scan':
(.text+0x3f6679): undefined reference to `ieee80211_frequency_to_channel'
drivers/built-in.o: In function `prism2_scan':
(.text+0x3f6873): undefined reference to `__ieee80211_get_channel'
drivers/built-in.o: In function `prism2_scan':
(.text+0x3f68cc): undefined reference to `cfg80211_inform_bss'
drivers/built-in.o: In function `prism2_scan':
(.text+0x3f6942): undefined reference to `cfg80211_scan_done'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: devel@driverdev.osuosl.org
---
drivers/staging/wlan-ng/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20100623.orig/drivers/staging/wlan-ng/Kconfig
+++ linux-next-20100623/drivers/staging/wlan-ng/Kconfig
@@ -1,6 +1,6 @@
config PRISM2_USB
tristate "Prism2.5/3 USB driver"
- depends on WLAN && USB
+ depends on WLAN && USB && CFG80211
select WIRELESS_EXT
select WEXT_PRIV
default n
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH -next] zram: fix build errors, depends on BLOCK
2010-06-24 3:27 ` [PATCH -next] zram: fix build errors, depends on BLOCK Randy Dunlap
@ 2010-06-24 4:36 ` Nitin Gupta
2010-06-24 14:32 ` Randy Dunlap
0 siblings, 1 reply; 20+ messages in thread
From: Nitin Gupta @ 2010-06-24 4:36 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, devel, linux-next, LKML, gregkh
On 06/24/2010 08:57 AM, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix 49 zram build errors in one swoop. Examples:
>
> drivers/staging/zram/zram_drv.c:225: error: dereferencing pointer to incomplete type
> drivers/staging/zram/zram_drv.c:226: error: implicit declaration of function 'bio_for_each_segment'
> drivers/staging/zram/zram_drv.c:226: error: expected ';' before '{' token
> drivers/staging/zram/zram_drv.c:281: error: implicit declaration of function 'bio_endio'
> drivers/staging/zram/zram_drv.c:285: error: implicit declaration of function 'bio_io_error'
> drivers/staging/zram/zram_drv.c:545: error: implicit declaration of function 'set_capacity'
> drivers/staging/zram/zram_drv.c:548: error: implicit declaration of function 'queue_flag_set_unlocked'
> drivers/staging/zram/zram_drv.c:548: error: 'QUEUE_FLAG_NONROT' undeclared (first use in this function)
> drivers/staging/zram/zram_drv.c:548: error: dereferencing pointer to incomplete type
>
Thanks for the fix. Strangely, I didn't get any of these
errors when I compiled against mainline.
Nitin
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH -next] zram: fix build errors, depends on BLOCK
2010-06-24 4:36 ` Nitin Gupta
@ 2010-06-24 14:32 ` Randy Dunlap
2010-06-24 15:47 ` Nitin Gupta
0 siblings, 1 reply; 20+ messages in thread
From: Randy Dunlap @ 2010-06-24 14:32 UTC (permalink / raw)
To: ngupta; +Cc: Stephen Rothwell, devel, linux-next, LKML, gregkh
On 06/23/10 21:36, Nitin Gupta wrote:
> On 06/24/2010 08:57 AM, Randy Dunlap wrote:
>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>
>> Fix 49 zram build errors in one swoop. Examples:
>>
>> drivers/staging/zram/zram_drv.c:225: error: dereferencing pointer to incomplete type
>> drivers/staging/zram/zram_drv.c:226: error: implicit declaration of function 'bio_for_each_segment'
>> drivers/staging/zram/zram_drv.c:226: error: expected ';' before '{' token
>> drivers/staging/zram/zram_drv.c:281: error: implicit declaration of function 'bio_endio'
>> drivers/staging/zram/zram_drv.c:285: error: implicit declaration of function 'bio_io_error'
>> drivers/staging/zram/zram_drv.c:545: error: implicit declaration of function 'set_capacity'
>> drivers/staging/zram/zram_drv.c:548: error: implicit declaration of function 'queue_flag_set_unlocked'
>> drivers/staging/zram/zram_drv.c:548: error: 'QUEUE_FLAG_NONROT' undeclared (first use in this function)
>> drivers/staging/zram/zram_drv.c:548: error: dereferencing pointer to incomplete type
>>
>
>
> Thanks for the fix. Strangely, I didn't get any of these
> errors when I compiled against mainline.
This patch isn't against mainline, it's against linux-next.
See subject's "[PATCH -next]" hint.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH -next] zram: fix build errors, depends on BLOCK
2010-06-24 14:32 ` Randy Dunlap
@ 2010-06-24 15:47 ` Nitin Gupta
2010-06-24 15:53 ` Randy Dunlap
0 siblings, 1 reply; 20+ messages in thread
From: Nitin Gupta @ 2010-06-24 15:47 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, devel, linux-next, LKML, gregkh
On 06/24/2010 08:02 PM, Randy Dunlap wrote:
> On 06/23/10 21:36, Nitin Gupta wrote:
>> On 06/24/2010 08:57 AM, Randy Dunlap wrote:
>>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>>
>>> Fix 49 zram build errors in one swoop. Examples:
>>>
>>> drivers/staging/zram/zram_drv.c:225: error: dereferencing pointer to incomplete type
>>> drivers/staging/zram/zram_drv.c:226: error: implicit declaration of function 'bio_for_each_segment'
>>> drivers/staging/zram/zram_drv.c:226: error: expected ';' before '{' token
>>> drivers/staging/zram/zram_drv.c:281: error: implicit declaration of function 'bio_endio'
>>> drivers/staging/zram/zram_drv.c:285: error: implicit declaration of function 'bio_io_error'
>>> drivers/staging/zram/zram_drv.c:545: error: implicit declaration of function 'set_capacity'
>>> drivers/staging/zram/zram_drv.c:548: error: implicit declaration of function 'queue_flag_set_unlocked'
>>> drivers/staging/zram/zram_drv.c:548: error: 'QUEUE_FLAG_NONROT' undeclared (first use in this function)
>>> drivers/staging/zram/zram_drv.c:548: error: dereferencing pointer to incomplete type
>>>
>>
>>
>> Thanks for the fix. Strangely, I didn't get any of these
>> errors when I compiled against mainline.
>
> This patch isn't against mainline, it's against linux-next.
> See subject's "[PATCH -next]" hint.
>
Randy, I understood that your patch is against linux-next. I was just wondering
why the error did not come up when I applied and tested this whole zram thing
against linux mainline.
Anyways, thanks for the fix.
Nitin
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH -next] zram: fix build errors, depends on BLOCK
2010-06-24 15:47 ` Nitin Gupta
@ 2010-06-24 15:53 ` Randy Dunlap
2010-06-24 16:07 ` Nitin Gupta
0 siblings, 1 reply; 20+ messages in thread
From: Randy Dunlap @ 2010-06-24 15:53 UTC (permalink / raw)
To: ngupta; +Cc: Stephen Rothwell, devel, linux-next, LKML, gregkh
On 06/24/10 08:47, Nitin Gupta wrote:
> On 06/24/2010 08:02 PM, Randy Dunlap wrote:
>> On 06/23/10 21:36, Nitin Gupta wrote:
>>> On 06/24/2010 08:57 AM, Randy Dunlap wrote:
>>>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>>>
>>>> Fix 49 zram build errors in one swoop. Examples:
>>>>
>>>> drivers/staging/zram/zram_drv.c:225: error: dereferencing pointer to incomplete type
>>>> drivers/staging/zram/zram_drv.c:226: error: implicit declaration of function 'bio_for_each_segment'
>>>> drivers/staging/zram/zram_drv.c:226: error: expected ';' before '{' token
>>>> drivers/staging/zram/zram_drv.c:281: error: implicit declaration of function 'bio_endio'
>>>> drivers/staging/zram/zram_drv.c:285: error: implicit declaration of function 'bio_io_error'
>>>> drivers/staging/zram/zram_drv.c:545: error: implicit declaration of function 'set_capacity'
>>>> drivers/staging/zram/zram_drv.c:548: error: implicit declaration of function 'queue_flag_set_unlocked'
>>>> drivers/staging/zram/zram_drv.c:548: error: 'QUEUE_FLAG_NONROT' undeclared (first use in this function)
>>>> drivers/staging/zram/zram_drv.c:548: error: dereferencing pointer to incomplete type
>>>>
>>>
>>>
>>> Thanks for the fix. Strangely, I didn't get any of these
>>> errors when I compiled against mainline.
>>
>> This patch isn't against mainline, it's against linux-next.
>> See subject's "[PATCH -next]" hint.
>>
>
> Randy, I understood that your patch is against linux-next. I was just wondering
> why the error did not come up when I applied and tested this whole zram thing
> against linux mainline.
Did you test a build with CONFIG_BLOCK disabled?
> Anyways, thanks for the fix.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH -next] zram: fix build errors, depends on BLOCK
2010-06-24 15:53 ` Randy Dunlap
@ 2010-06-24 16:07 ` Nitin Gupta
0 siblings, 0 replies; 20+ messages in thread
From: Nitin Gupta @ 2010-06-24 16:07 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, devel, linux-next, LKML, gregkh
On 06/24/2010 09:23 PM, Randy Dunlap wrote:
> On 06/24/10 08:47, Nitin Gupta wrote:
>> On 06/24/2010 08:02 PM, Randy Dunlap wrote:
>>> On 06/23/10 21:36, Nitin Gupta wrote:
>>>> On 06/24/2010 08:57 AM, Randy Dunlap wrote:
>>>>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>>>>
>>>>> Fix 49 zram build errors in one swoop. Examples:
>>>>>
>>>>> drivers/staging/zram/zram_drv.c:225: error: dereferencing pointer to incomplete type
>>>>> drivers/staging/zram/zram_drv.c:226: error: implicit declaration of function 'bio_for_each_segment'
>>>>> drivers/staging/zram/zram_drv.c:226: error: expected ';' before '{' token
>>>>> drivers/staging/zram/zram_drv.c:281: error: implicit declaration of function 'bio_endio'
>>>>> drivers/staging/zram/zram_drv.c:285: error: implicit declaration of function 'bio_io_error'
>>>>> drivers/staging/zram/zram_drv.c:545: error: implicit declaration of function 'set_capacity'
>>>>> drivers/staging/zram/zram_drv.c:548: error: implicit declaration of function 'queue_flag_set_unlocked'
>>>>> drivers/staging/zram/zram_drv.c:548: error: 'QUEUE_FLAG_NONROT' undeclared (first use in this function)
>>>>> drivers/staging/zram/zram_drv.c:548: error: dereferencing pointer to incomplete type
>>>>>
>>>>
>>>>
>>>> Thanks for the fix. Strangely, I didn't get any of these
>>>> errors when I compiled against mainline.
>>>
>>> This patch isn't against mainline, it's against linux-next.
>>> See subject's "[PATCH -next]" hint.
>>>
>>
>> Randy, I understood that your patch is against linux-next. I was just wondering
>> why the error did not come up when I applied and tested this whole zram thing
>> against linux mainline.
>
> Did you test a build with CONFIG_BLOCK disabled?
>
Ah, now I got it. No, I didn't test with CONFIG_BLOCK disabled.
Thanks,
Nitin
^ permalink raw reply [flat|nested] 20+ messages in thread
* linux-next: Tree for June 23
@ 2011-06-23 5:54 Stephen Rothwell
0 siblings, 0 replies; 20+ messages in thread
From: Stephen Rothwell @ 2011-06-23 5:54 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10080 bytes --]
Hi all,
Changes since 20110622:
My fixes tree includes (as an experiment) the early part of
mmotm-2011-06-22-13-05.
The powerpc allyesconfig (and probably others) is still broken because we
now build the staging drivers and because of a commit in the net tree.
The breakage in Linus' tree is fixed by one of Andrew's patches above.
The m68knommu tree lost its conflicts.
The galak tree lost its conflicts.
The net tree gained 2 build failures that I have left (see above).
The wireless tree lost a conflict, but gained another against the net
tree and a build failure for which I applied a patch.
The bluetooth tree lost its conflict.
----------------------------------------------------------------------------
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 194 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 sfr@canb.auug.org.au
$ 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
CONFLICT (content): Merge conflict in arch/arm/mm/context.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S
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
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
CONFLICT (content): Merge conflict in fs/ceph/export.c
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
CONFLICT (content): Merge conflict in fs/nfs/pnfs.c
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 of-pci/of-pci
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
CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c
CONFLICT (content): Merge conflict in include/linux/netlink.h
Applying: Bluetooth: include scatterlist.h where needed
Merging bluetooth/master
Merging mtd/master
Merging l2-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
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
CONFLICT (delete/modify): arch/arm/mach-ep93xx/dma-m2p.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-ep93xx/dma-m2p.c left in tree.
CONFLICT (delete/modify): arch/s390/kvm/sie64a.S deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/s390/kvm/sie64a.S left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c
$ git rm -f arch/arm/mach-ep93xx/dma-m2p.c
$ git rm -f arch/s390/kvm/sie64a.S
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
CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/gpio-ep93xx.c
Merging tip/auto-latest
Merging rcu/rcu/next
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
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_linux.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_iw.c
CONFLICT (content): Merge conflict in drivers/staging/usbip/userspace/src/utils.h
Merging bkl-config/config
Merging tmem/linux-next
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/tmem.c
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: Tree for June 23
2009-06-23 5:33 Stephen Rothwell
@ 2009-06-23 6:07 ` Stephen Rothwell
0 siblings, 0 replies; 20+ messages in thread
From: Stephen Rothwell @ 2009-06-23 6:07 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 530 bytes --]
$ git diff --shortstat -M stable..HEAD^
556 files changed, 27596 insertions(+), 7123 deletions(-)
$ git diff --dirstat -M stable..HEAD^
3.8% Documentation/vm/
4.8% arch/x86/kvm/
5.4% arch/x86/
3.4% drivers/acpi/
7.5% drivers/firewire/
8.5% drivers/md/
5.8% drivers/misc/
4.3% drivers/scsi/
6.9% drivers/watchdog/
15.3% drivers/
3.4% fs/
6.1% include/linux/
15.5% mm/
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* linux-next: Tree for June 23
@ 2009-06-23 5:33 Stephen Rothwell
2009-06-23 6:07 ` Stephen Rothwell
0 siblings, 1 reply; 20+ messages in thread
From: Stephen Rothwell @ 2009-06-23 5:33 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 6860 bytes --]
Hi all,
Changes since 20090622:
My fixes tree contains this one commit:
fbdev: work around old compiler bug (this works around a bug in
old compilers).
This tree fails to build for powerpc allyesconfig.
The slab tree lost its conflict and build failure.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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) 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 130 trees (counting Linus' and 19 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ 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/master
Merging quilt/driver-core.current
Merging quilt/usb.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 dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/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
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
CONFLICT (content): Merge conflict in drivers/input/evdev.c
CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (add/add): Merge conflict in drivers/staging/serqt_usb2/serqt_usb2.c
CONFLICT (content): Merge conflict in include/linux/rfkill.h
$ git reset --hard HEAD^
Merging refs/next/20090619/microblaze
Merging mips/mips-for-linux-next
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging bkl-removal/bkl-removal
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 voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
Merging asm-generic/next
Merging quilt/driver-core
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: Tree for June 23
2008-06-23 18:56 ` Pekka J Enberg
@ 2008-06-23 19:21 ` Christoph Lameter
0 siblings, 0 replies; 20+ messages in thread
From: Christoph Lameter @ 2008-06-23 19:21 UTC (permalink / raw)
To: Pekka J Enberg
Cc: Vegard Nossum, Stephen Rothwell, Steven Rostedt, linux-next, LKML
On Mon, 23 Jun 2008, Pekka J Enberg wrote:
> Christoph, while the warning itself seems harmless, I think we need to do
> something like the following; otherwise the return value for
> kmem_cache_defrag() will be incorrect on NUMA machines that have more than
> one N_NORMAL_MEMORY nodes.
Patch looks to be the right fix. Thanks.
Acked-by: Christoph Lameter <clameter@sgi.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: Tree for June 23
2008-06-23 11:02 ` Vegard Nossum
2008-06-23 12:26 ` Vegard Nossum
@ 2008-06-23 18:56 ` Pekka J Enberg
2008-06-23 19:21 ` Christoph Lameter
1 sibling, 1 reply; 20+ messages in thread
From: Pekka J Enberg @ 2008-06-23 18:56 UTC (permalink / raw)
To: Vegard Nossum
Cc: Stephen Rothwell, Steven Rostedt, linux-next, LKML, Christoph Lameter
On Mon, 23 Jun 2008, Vegard Nossum wrote:
> Okay, I can confirm that this happens with today's tree too. I also
> get this (new) warning:
>
> mm/slub.c: In function 'kmem_cache_defrag':
> mm/slub.c:3046: warning: 'reclaimed' may be used uninitialized in this function
>
> Otherwise things seem to work good :-)
Christoph, while the warning itself seems harmless, I think we need to do
something like the following; otherwise the return value for
kmem_cache_defrag() will be incorrect on NUMA machines that have more than
one N_NORMAL_MEMORY nodes.
Pekka
diff --git a/mm/slub.c b/mm/slub.c
index deb8153..7707550 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3043,7 +3043,7 @@ int kmem_cache_defrag(int node)
return 0;
list_for_each_entry(s, &slab_caches, list) {
- unsigned long reclaimed;
+ unsigned long reclaimed = 0;
/*
* Defragmentable caches come first. If the slab cache is not
@@ -3056,7 +3056,7 @@ int kmem_cache_defrag(int node)
int nid;
for_each_node_state(nid, N_NORMAL_MEMORY)
- reclaimed = __kmem_cache_shrink(s, nid,
+ reclaimed += __kmem_cache_shrink(s, nid,
MAX_PARTIAL);
} else
reclaimed = __kmem_cache_shrink(s, node, MAX_PARTIAL);
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: linux-next: Tree for June 23
2008-06-23 17:26 ` Vegard Nossum
@ 2008-06-23 17:43 ` Vegard Nossum
0 siblings, 0 replies; 20+ messages in thread
From: Vegard Nossum @ 2008-06-23 17:43 UTC (permalink / raw)
To: Stephen Rothwell, Steven Rostedt
Cc: linux-next, LKML, Pekka Enberg, Christoph Lameter
On Mon, Jun 23, 2008 at 7:26 PM, Vegard Nossum <vegard.nossum@gmail.com> wrote:
> On Mon, Jun 23, 2008 at 2:26 PM, Vegard Nossum <vegard.nossum@gmail.com> wrote:
>> And additionally, the next two boots hung here (but the third one was okay):
>>
>> http://www.kernel.org/pub/linux/kernel/people/vegard/kernels/20080623-next/DSCF3015.JPG
>>
>> I don't know what these issues are related too. I can try
>> debug_initcall for the hang.
>
> The last initcall to run is populate_rootfs(), however the last
> message on the screen is "debug: unmapping init memory
> f7cb0000..f7ff0000":
>
> http://www.kernel.org/pub/linux/kernel/people/vegard/kernels/20080623-next/DSCF3016.JPG
>
> In fact, it seems to me that init memory is being unmapped before all
> initcalls have finished... that would seem disastrous.
Ah, scratch that. Digging a bit deeper, it becomes obvious that the
initramfs/initrd code is freeing its own memory using the same
function in the end (free_init_pages()) as free_initmem(), so they'll
in fact just print the same message. That doesn't change the fact of
the hang, however...
My config can be found at:
http://www.kernel.org/pub/linux/kernel/people/vegard/kernels/20080623-next/config
Vegard
--
"The animistic metaphor of the bug that maliciously sneaked in while
the programmer was not looking is intellectually dishonest as it
disguises that the error is the programmer's own creation."
-- E. W. Dijkstra, EWD1036
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: Tree for June 23
2008-06-23 12:26 ` Vegard Nossum
@ 2008-06-23 17:26 ` Vegard Nossum
2008-06-23 17:43 ` Vegard Nossum
0 siblings, 1 reply; 20+ messages in thread
From: Vegard Nossum @ 2008-06-23 17:26 UTC (permalink / raw)
To: Stephen Rothwell, Steven Rostedt
Cc: linux-next, LKML, Pekka Enberg, Christoph Lameter
On Mon, Jun 23, 2008 at 2:26 PM, Vegard Nossum <vegard.nossum@gmail.com> wrote:
> And additionally, the next two boots hung here (but the third one was okay):
>
> http://www.kernel.org/pub/linux/kernel/people/vegard/kernels/20080623-next/DSCF3015.JPG
>
> I don't know what these issues are related too. I can try
> debug_initcall for the hang.
The last initcall to run is populate_rootfs(), however the last
message on the screen is "debug: unmapping init memory
f7cb0000..f7ff0000":
http://www.kernel.org/pub/linux/kernel/people/vegard/kernels/20080623-next/DSCF3016.JPG
In fact, it seems to me that init memory is being unmapped before all
initcalls have finished... that would seem disastrous.
Vegard
--
"The animistic metaphor of the bug that maliciously sneaked in while
the programmer was not looking is intellectually dishonest as it
disguises that the error is the programmer's own creation."
-- E. W. Dijkstra, EWD1036
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: Tree for June 23
2008-06-23 11:02 ` Vegard Nossum
@ 2008-06-23 12:26 ` Vegard Nossum
2008-06-23 17:26 ` Vegard Nossum
2008-06-23 18:56 ` Pekka J Enberg
1 sibling, 1 reply; 20+ messages in thread
From: Vegard Nossum @ 2008-06-23 12:26 UTC (permalink / raw)
To: Stephen Rothwell, Steven Rostedt
Cc: linux-next, LKML, Pekka Enberg, Christoph Lameter
On Mon, Jun 23, 2008 at 1:02 PM, Vegard Nossum <vegard.nossum@gmail.com> wrote:
> On Mon, Jun 23, 2008 at 12:26 PM, Vegard Nossum <vegard.nossum@gmail.com> wrote:
>> On Mon, Jun 23, 2008 at 12:23 PM, Vegard Nossum <vegard.nossum@gmail.com> wrote:
>>> Testing tracer sched_switch: PASSED
>>> Testing tracer sysprof: PASSED
>>> Testing tracer ftrace: PASSED
>>> Testing dynamic ftrace: PASSED
>>> Testing tracer irqsoff: PASSED
>>> Testing tracer preemptoff: PASSED
>>> Testing tracer preemptirqsoff: <4>------------[ cut here ]------------
>>> WARNING: at kernel/lockdep.c:2680 check_flags+0x142/0x160()
>>> Pid: 2, comm: kthreadd Not tainted 2.6.26-rc6-next-20080620 #34
>>
>> <-- Oops, wrong version :-(
>>
>> Will try the latest one as well.
>
> Okay, I can confirm that this happens with today's tree too. I also
> get this (new) warning:
>
> mm/slub.c: In function 'kmem_cache_defrag':
> mm/slub.c:3046: warning: 'reclaimed' may be used uninitialized in this function
>
> Otherwise things seem to work good :-)
In fact, I got this stacktrace when I shut down (but I was in a hurry
so I didn't have the time to really investigate it):
http://www.kernel.org/pub/linux/kernel/people/vegard/kernels/20080623-next/DSCF3014.JPG
$ addr2line -e vmlinux -i c01fd0c1
fs/sysfs/dir.c:380
And additionally, the next two boots hung here (but the third one was okay):
http://www.kernel.org/pub/linux/kernel/people/vegard/kernels/20080623-next/DSCF3015.JPG
I don't know what these issues are related too. I can try
debug_initcall for the hang.
Vegard
--
"The animistic metaphor of the bug that maliciously sneaked in while
the programmer was not looking is intellectually dishonest as it
disguises that the error is the programmer's own creation."
-- E. W. Dijkstra, EWD1036
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: Tree for June 23
2008-06-23 10:26 ` Vegard Nossum
@ 2008-06-23 11:02 ` Vegard Nossum
2008-06-23 12:26 ` Vegard Nossum
2008-06-23 18:56 ` Pekka J Enberg
0 siblings, 2 replies; 20+ messages in thread
From: Vegard Nossum @ 2008-06-23 11:02 UTC (permalink / raw)
To: Stephen Rothwell, Steven Rostedt
Cc: linux-next, LKML, Pekka Enberg, Christoph Lameter
On Mon, Jun 23, 2008 at 12:26 PM, Vegard Nossum <vegard.nossum@gmail.com> wrote:
> On Mon, Jun 23, 2008 at 12:23 PM, Vegard Nossum <vegard.nossum@gmail.com> wrote:
>> Testing tracer sched_switch: PASSED
>> Testing tracer sysprof: PASSED
>> Testing tracer ftrace: PASSED
>> Testing dynamic ftrace: PASSED
>> Testing tracer irqsoff: PASSED
>> Testing tracer preemptoff: PASSED
>> Testing tracer preemptirqsoff: <4>------------[ cut here ]------------
>> WARNING: at kernel/lockdep.c:2680 check_flags+0x142/0x160()
>> Pid: 2, comm: kthreadd Not tainted 2.6.26-rc6-next-20080620 #34
>
> <-- Oops, wrong version :-(
>
> Will try the latest one as well.
Okay, I can confirm that this happens with today's tree too. I also
get this (new) warning:
mm/slub.c: In function 'kmem_cache_defrag':
mm/slub.c:3046: warning: 'reclaimed' may be used uninitialized in this function
Otherwise things seem to work good :-)
Vegard
--
"The animistic metaphor of the bug that maliciously sneaked in while
the programmer was not looking is intellectually dishonest as it
disguises that the error is the programmer's own creation."
-- E. W. Dijkstra, EWD1036
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: Tree for June 23
2008-06-23 10:23 ` Vegard Nossum
@ 2008-06-23 10:26 ` Vegard Nossum
2008-06-23 11:02 ` Vegard Nossum
0 siblings, 1 reply; 20+ messages in thread
From: Vegard Nossum @ 2008-06-23 10:26 UTC (permalink / raw)
To: Stephen Rothwell, Steven Rostedt; +Cc: linux-next, LKML
On Mon, Jun 23, 2008 at 12:23 PM, Vegard Nossum <vegard.nossum@gmail.com> wrote:
> Testing tracer sched_switch: PASSED
> Testing tracer sysprof: PASSED
> Testing tracer ftrace: PASSED
> Testing dynamic ftrace: PASSED
> Testing tracer irqsoff: PASSED
> Testing tracer preemptoff: PASSED
> Testing tracer preemptirqsoff: <4>------------[ cut here ]------------
> WARNING: at kernel/lockdep.c:2680 check_flags+0x142/0x160()
> Pid: 2, comm: kthreadd Not tainted 2.6.26-rc6-next-20080620 #34
<-- Oops, wrong version :-(
Will try the latest one as well.
Vegard
--
"The animistic metaphor of the bug that maliciously sneaked in while
the programmer was not looking is intellectually dishonest as it
disguises that the error is the programmer's own creation."
-- E. W. Dijkstra, EWD1036
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: Tree for June 23
2008-06-23 8:25 Stephen Rothwell
@ 2008-06-23 10:23 ` Vegard Nossum
2008-06-23 10:26 ` Vegard Nossum
0 siblings, 1 reply; 20+ messages in thread
From: Vegard Nossum @ 2008-06-23 10:23 UTC (permalink / raw)
To: Stephen Rothwell, Steven Rostedt; +Cc: linux-next, LKML
On Mon, Jun 23, 2008 at 10:25 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
> (patches at
> http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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).
Hi,
I got this:
Testing tracer sched_switch: PASSED
Testing tracer sysprof: PASSED
Testing tracer ftrace: PASSED
Testing dynamic ftrace: PASSED
Testing tracer irqsoff: PASSED
Testing tracer preemptoff: PASSED
Testing tracer preemptirqsoff: <4>------------[ cut here ]------------
WARNING: at kernel/lockdep.c:2680 check_flags+0x142/0x160()
Pid: 2, comm: kthreadd Not tainted 2.6.26-rc6-next-20080620 #34
[<c01388a4>] warn_on_slowpath+0x54/0x70
[<c015a9d5>] ? trace_hardirqs_off_caller+0x15/0xb0
[<c015aa7b>] ? trace_hardirqs_off+0xb/0x10
[<c0109e85>] ? native_sched_clock+0xb5/0x110
[<c05bdb28>] ? _spin_unlock_irqrestore+0x48/0x80
[<c02b5748>] ? debug_locks_off+0x8/0x50
[<c017dcbe>] ? ftrace_record_ip+0x12e/0x240
[<c010455c>] ? mcount_call+0x5/0x9
[<c0159f22>] check_flags+0x142/0x160
[<c014d3c0>] ? kthreadd+0xf0/0x160
[<c015e089>] lock_acquire+0x59/0xd0
[<c014d3c0>] ? kthreadd+0xf0/0x160
[<c05bd2ad>] _spin_lock+0x3d/0x70
[<c014d3c0>] ? kthreadd+0xf0/0x160
[<c014d3c0>] kthreadd+0xf0/0x160
[<c014d2d0>] ? kthreadd+0x0/0x160
[<c0104547>] kernel_thread_helper+0x7/0x10
=======================
---[ end trace a7919e7f17c0a725 ]---
possible reason: unannotated irqs-on.
irq event stamp: 3198
hardirqs last enabled at (3197): [<c015cb2b>] trace_hardirqs_on+0xb/0x10
hardirqs last disabled at (3198): [<c015aa7b>] trace_hardirqs_off+0xb/0x10
softirqs last enabled at (0): [<c01370ad>] copy_process+0x43d/0x1120
softirqs last disabled at (0): [<00000000>] 0x0
PASSED
Testing tracer wakeup: PASSED
Also, shouldn't there be a MAINTAINERS entry or some file in
Documentation/ for ftrace?
Vegard
--
"The animistic metaphor of the bug that maliciously sneaked in while
the programmer was not looking is intellectually dishonest as it
disguises that the error is the programmer's own creation."
-- E. W. Dijkstra, EWD1036
^ permalink raw reply [flat|nested] 20+ messages in thread
* linux-next: Tree for June 23
@ 2008-06-23 8:25 Stephen Rothwell
2008-06-23 10:23 ` Vegard Nossum
0 siblings, 1 reply; 20+ messages in thread
From: Stephen Rothwell @ 2008-06-23 8:25 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 9735 bytes --]
Hi all,
New trees: slab, m68knommu and uclinux (the latter is empty).
Changes since next-20080620:
The driver-core tree lost its conflict against Linus' tree.
The v4l-dvb tree needed a build fixup due to the class_for_each_device
API change and also needed a commit reverted since one of its files is
missing.
The acpi tree gained a conflict with the x86 tree.
The arm tree no longer needs its Kconfig fixup.
The pcmcia tree traded a conflict against the bkl-removal tree for one
against Linus' tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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, it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 95 trees (counting Linus' and 13 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
CONFLICT (content): Merge conflict in kernel/Makefile
CONFLICT (content): Merge conflict in kernel/sched_rt.c
Applying sched: fix rculist split fallout
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/x86/pci/irq.c
CONFLICT (content): Merge conflict in include/linux/device.h
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Applying v4l-dvb: class_for_each_device API change fallout
Created commit 73d15b7: Revert "V4L/DVB (8049): budget-ci: Add support for Technotrend budget C-1501 dvb-c card"
Merging s390/features
CONFLICT (content): Merge conflict in drivers/s390/block/dasd.c
CONFLICT (content): Merge conflict in drivers/s390/block/dasd_eckd.c
CONFLICT (content): Merge conflict in drivers/s390/block/dasd_fba.c
CONFLICT (content): Merge conflict in drivers/s390/char/tape_core.c
CONFLICT (content): Merge conflict in drivers/s390/cio/device_fsm.c
CONFLICT (content): Merge conflict in drivers/s390/net/claw.c
CONFLICT (content): Merge conflict in drivers/s390/net/ctcm_main.c
CONFLICT (content): Merge conflict in drivers/s390/net/lcs.c
Merging sh/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Created commit a7e5ac6: Revert "NFS: handle interface identifiers in incoming IPv6 addresses"
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c
CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c
Merging blackfin/for-linus
Merging nfsd/nfsd-next
CONFLICT (content): Merge conflict in net/sunrpc/auth_gss/auth_gss.c
CONFLICT (content): Merge conflict in net/sunrpc/svc.c
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/master
Merging kvm/master
Merging dlm/next
Merging scsi/master
Applying scsi: fix fallout from the class_find_device API change
Applying scsi: fix fallout from KOBJ_NAME_LEN removal
Merging ia64/test
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging selinux/for-akpm
Merging quilt/m68k
Merging powerpc/powerpc-next
Merging lblnet/master
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging security-testing/next
Merging net/master
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
Applying wireless: fix fallout from device_create removal
Merging sparc/master
CONFLICT (content): Merge conflict in include/asm-m68k/sbus.h
Merging galak/powerpc-next
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/vfs-2.6.25
Merging sound/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_attr.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mid.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
Merging bkl-removal/bkl-removal
Merging trivial/next
Merging ubifs/for_andrew
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/x86/kernel/apic_32.c
CONFLICT (delete/modify): arch/x86/kernel/i8259_64.c deleted in HEAD and modified in block/for-next. Version block/for-next of arch/x86/kernel/i8259_64.c left in tree.
CONFLICT (content): Merge conflict in arch/x86/xen/smp.c
CONFLICT (delete/modify): include/asm-x86/hw_irq_32.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/hw_irq_32.h left in tree.
CONFLICT (delete/modify): include/asm-x86/hw_irq_64.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/hw_irq_64.h left in tree.
CONFLICT (delete/modify): include/asm-x86/mach-default/irq_vectors.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/mach-default/irq_vectors.h left in tree.
CONFLICT (delete/modify): include/asm-x86/mach-voyager/irq_vectors.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/mach-voyager/irq_vectors.h left in tree.
CONFLICT (content): Merge conflict in kernel/Makefile
Applying block: fix up rculist split fallout
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/char/ip2/ip2main.c
CONFLICT (content): Merge conflict in drivers/usb/misc/isight_firmware.c
CONFLICT (content): Merge conflict in drivers/usb/serial/Kconfig
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_3410.h left in tree.
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_5052.h left in tree.
CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c
CONFLICT (content): Merge conflict in sound/pci/Kconfig
CONFLICT (content): Merge conflict in sound/pci/maestro3.c
CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/ide/legacy/ide-cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
CONFLICT (content): Merge conflict in drivers/video/backlight/Kconfig
CONFLICT (content): Merge conflict in drivers/video/backlight/Makefile
Merging kgdb/kgdb-next
Merging slab/for-next
Merging m68knommu/for-linus
Merging uclinux/for-linus
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2011-06-23 5:54 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-23 5:45 linux-next: Tree for June 23 Stephen Rothwell
2010-06-24 3:27 ` [PATCH -next] zram: fix build errors, depends on BLOCK Randy Dunlap
2010-06-24 4:36 ` Nitin Gupta
2010-06-24 14:32 ` Randy Dunlap
2010-06-24 15:47 ` Nitin Gupta
2010-06-24 15:53 ` Randy Dunlap
2010-06-24 16:07 ` Nitin Gupta
2010-06-24 3:28 ` [PATCH -next] staging: fix wlan-ng depends Randy Dunlap
-- strict thread matches above, loose matches on Subject: below --
2011-06-23 5:54 linux-next: Tree for June 23 Stephen Rothwell
2009-06-23 5:33 Stephen Rothwell
2009-06-23 6:07 ` Stephen Rothwell
2008-06-23 8:25 Stephen Rothwell
2008-06-23 10:23 ` Vegard Nossum
2008-06-23 10:26 ` Vegard Nossum
2008-06-23 11:02 ` Vegard Nossum
2008-06-23 12:26 ` Vegard Nossum
2008-06-23 17:26 ` Vegard Nossum
2008-06-23 17:43 ` Vegard Nossum
2008-06-23 18:56 ` Pekka J Enberg
2008-06-23 19:21 ` Christoph Lameter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).