* Re: linux-next: kvm tree build warning
From: Stephen Rothwell @ 2009-07-06 6:01 UTC (permalink / raw)
To: Gleb Natapov; +Cc: Avi Kivity, linux-next, linux-kernel
In-Reply-To: <20090706052855.GL881@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
Hi Gleb,
On Mon, 6 Jul 2009 08:28:55 +0300 Gleb Natapov <gleb@redhat.com> wrote:
>
> Yes sorry. I see that Sheng Yang already posted the fix.
Thanks.
--
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
* Re: linux-next: kvm tree build warning
From: Gleb Natapov @ 2009-07-06 5:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Avi Kivity, linux-next, linux-kernel
In-Reply-To: <20090706113752.8dec663a.sfr@canb.auug.org.au>
On Mon, Jul 06, 2009 at 11:37:52AM +1000, Stephen Rothwell wrote:
> Hi Avi,
>
> Today's linux-next build (x86_64_allmodconfig) produced this warning:
>
> arch/x86/kvm/lapic.c: In function 'apic_mmio_write':
> arch/x86/kvm/lapic.c:834: warning: 'return' with no value, in function returning non-void
>
> Introduced by commit 55b23c7377c9f9f0b4a4b90950f0e18b26ac45e8 ("KVM:
> x2apic interface to lapic").
>
Yes sorry. I see that Sheng Yang already posted the fix.
--
Gleb.
^ permalink raw reply
* linux-next: manual merge of the percpu tree with the tip tree
From: Stephen Rothwell @ 2009-07-06 5:06 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter
Cc: linux-next, linux-kernel, Frederic Weisbecker, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
arch/x86/kernel/cpu/perf_counter.c between commit
0406ca6d8e849d9dd027c8cb6791448e81411aef ("perf_counter: Ignore the nmi
call frames in the x86-64 backtraces") from the tip tree and commit
245b2e70eabd797932adb263a65da0bab3711753 ("percpu: clean up percpu
variable definitions") from the percpu tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/kernel/cpu/perf_counter.c
index 36c3dc7,13bd6d6..0000000
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@@ -1559,9 -1559,8 +1559,9 @@@ void callchain_store(struct perf_callch
entry->ip[entry->nr++] = ip;
}
- static DEFINE_PER_CPU(struct perf_callchain_entry, irq_entry);
- static DEFINE_PER_CPU(struct perf_callchain_entry, nmi_entry);
+ static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry);
+ static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry);
+static DEFINE_PER_CPU(int, in_nmi_frame);
static void
^ permalink raw reply
* linux-next: manual merge of the suspend tree with the microblaze tree
From: Stephen Rothwell @ 2009-07-06 4:00 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, linux-kernel, John Linn, Michal Simek, Magnus Damm
Hi Rafael,
Today's linux-next merge of the suspend tree got a conflict in
arch/microblaze/include/asm/device.h between commit
19aff4132a289ec83ca6eee8b3db28855b9f06af ("microblaze: Adding
dev_arch_data functions") from the microblaze tree and commit
c959b4101b10723eeb190ef2e82765dd529c26b6 ("Driver Core: Add platform
device arch data V3") from the suspend tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
P.S. Michal, that microblaze commit has an invalid email address for the
Author (John Linn <linnj@xaqlinnj41.(none)>).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/microblaze/include/asm/device.h
index afa0987,30286db..0000000
--- a/arch/microblaze/include/asm/device.h
+++ b/arch/microblaze/include/asm/device.h
@@@ -16,18 -16,9 +16,21 @@@ struct dev_archdata
struct device_node *of_node;
};
+static inline void dev_archdata_set_node(struct dev_archdata *ad,
+ struct device_node *np)
+{
+ ad->of_node = np;
+}
+
+static inline struct device_node *
+dev_archdata_get_node(const struct dev_archdata *ad)
+{
+ return ad->of_node;
+}
+
+ struct pdev_archdata {
+ };
+
#endif /* _ASM_MICROBLAZE_DEVICE_H */
^ permalink raw reply
* linux-next: ttydev tree build failure
From: Stephen Rothwell @ 2009-07-06 3:26 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
Hi Alan,
Today's linux-next build (x86_64 allmodconfig) failed like this:
ERROR: "pm_set_vt_switch" [drivers/video/geode/lxfb.ko] undefined!
ERROR: "pm_set_vt_switch" [drivers/video/geode/gxfb.ko] undefined!
Caused by commit 2da31885ce1c33ac1bed80857ad5c9de2b95a189
("vt-pm-extract") which renamed pm_set_vt_switch to pm_vt_set_switch.
I have used the version of the ttydev tree from next-20090703 for today.
--
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
* [PATCH Resend2] Remove 'SBC8240 Wind River' Device Driver Code
From: Subrata Modak @ 2009-07-06 2:17 UTC (permalink / raw)
To: linux-mtd
Cc: dwmw2, linux-kernel, linux-next, Scott Wood, Jim Cromie,
Stephen Rothwell, Linuxppc-dev, carolyn.j.smith, Sachin P Sant,
Balbir Singh
In-Reply-To: <20090701135247.27488.10776.sendpatchset@subratamodak.linux.ibm.com>
Hi,
Is there somebody else whom i should also address to get an attention
for this patch ? I apolozise if i have not included someone. Kindly
connect to the concerned.
Regards--
Subrata
On Wed, 2009-07-01 at 19:22 +0530, Subrata Modak wrote:
> Hi,
>
> Linux next tree(20090626) produced the following build error:
>
> CC [M] drivers/mtd/maps/sbc8240.o
> drivers/mtd/maps/sbc8240.c:31:1: warning: "DEBUG" redefined
> In file included from drivers/mtd/maps/sbc8240.c:23:
> include/linux/mtd/mtd.h:333:1: warning: this is the location of the previous definition
> drivers/mtd/maps/sbc8240.c: In function 'init_sbc8240_mtd':
> drivers/mtd/maps/sbc8240.c:172: warning: passing argument 1 of 'simple_map_init' from incompatible pointer type
> drivers/mtd/maps/sbc8240.c:177: error: 'struct mtd_info' has no member named 'module'
> make[3]: *** [drivers/mtd/maps/sbc8240.o] Error 1
> make[2]: *** [drivers/mtd/maps] Error 2
> make[1]: *** [drivers/mtd] Error 2
> make: *** [drivers] Error 2
>
> I remember reporting this back in April, when it was suggested to remove
> the code as it is no more used:
> http://lkml.org/lkml/2009/4/21/476,
>
> I tried to gather some more info about this driver from the link
> mentioned in Kconfig:
> http://www.windriver.com/products/sbc8240/,
> without much success.
>
> The original author of this driver code has no problem, as she has
> expressed by the following mail:
>
> >On Tue, 2009-06-30 at 09:37 -0700, carolyn.j.smith@tektronix.com wrote:
> >Hello Subrata,
> >
> > I am the original author of this file and have no objection to its removal
> > from the 2.6 kernel. I added it to the 2.4 kernel when I ported Linux to
> > the SBC8240 board many years ago. I haven't used the board in several years.
> >
> > Regards,
> > Carolyn
> >
>
> Last time i did not address: linux-mtd@lists.infradead.org. If there are
> no issues, can you please apply this patch to remove it ?
>
> To: linux-mtd@lists.infradead.org,
> Cc: David Woodhouse <dwmw2@infradead.org>,
> Cc: Scott Wood <scottwood@freescale.com>,
> Cc: Jim Cromie <jim.cromie@gmail.com>,
> Cc: carolyn.j.smith@exgate.tek.com,
> Cc: dwmw2@infradead.org,
> Cc: Sachin P Sant <sachinp@linux.vnet.ibm.com>,
> Cc: Balbir Singh <balbir@linux.vnet.ibm.com>,
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
> Cc: linux-kernel <linux-kernel@vger.kernel.org>,
> Cc: Linuxppc-dev <Linuxppc-dev@ozlabs.org>,
> Cc: linux-next <linux-next@vger.kernel.org>,
> --
>
> Signed-off-by: Subrata Modak <subrata@linux.vnet.ibm.com>
> Tested-on-PPC64-by: Subrata Modak <subrata@linux.vnet.ibm.com>
> ---
>
> diff -uprN a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
> --- a/drivers/mtd/maps/Kconfig 2009-06-26 07:36:23.000000000 -0500
> +++ b/drivers/mtd/maps/Kconfig 2009-06-26 07:39:34.000000000 -0500
> @@ -284,13 +284,6 @@ config MTD_L440GX
>
> BE VERY CAREFUL.
>
> -config MTD_SBC8240
> - tristate "Flash device on SBC8240"
> - depends on MTD_JEDECPROBE && 8260
> - help
> - Flash access on the SBC8240 board from Wind River. See
> - <http://www.windriver.com/products/sbc8240/>
> -
> config MTD_TQM8XXL
> tristate "CFI Flash device mapped on TQM8XXL"
> depends on MTD_CFI && TQM8xxL
> diff -uprN a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
> --- a/drivers/mtd/maps/Makefile 2009-06-26 07:36:23.000000000 -0500
> +++ b/drivers/mtd/maps/Makefile 2009-06-26 07:40:03.000000000 -0500
> @@ -50,7 +50,6 @@ obj-$(CONFIG_MTD_UCLINUX) += uclinux.o
> obj-$(CONFIG_MTD_NETtel) += nettel.o
> obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o
> obj-$(CONFIG_MTD_H720X) += h720x-flash.o
> -obj-$(CONFIG_MTD_SBC8240) += sbc8240.o
> obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o
> obj-$(CONFIG_MTD_IXP2000) += ixp2000.o
> obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o
> diff -uprN a/drivers/mtd/maps/sbc8240.c b/drivers/mtd/maps/sbc8240.c
> --- a/drivers/mtd/maps/sbc8240.c 2009-06-26 07:36:23.000000000 -0500
> +++ b/drivers/mtd/maps/sbc8240.c 1969-12-31 18:00:00.000000000 -0600
> @@ -1,250 +0,0 @@
> -/*
> - * Handle mapping of the flash memory access routines on the SBC8240 board.
> - *
> - * Carolyn Smith, Tektronix, Inc.
> - *
> - * This code is GPLed
> - */
> -
> -/*
> - * The SBC8240 has 2 flash banks.
> - * Bank 0 is a 512 KiB AMD AM29F040B; 8 x 64 KiB sectors.
> - * It contains the U-Boot code (7 sectors) and the environment (1 sector).
> - * Bank 1 is 4 x 1 MiB AMD AM29LV800BT; 15 x 64 KiB sectors, 1 x 32 KiB sector,
> - * 2 x 8 KiB sectors, 1 x 16 KiB sectors.
> - * Both parts are JEDEC compatible.
> - */
> -
> -#include <linux/module.h>
> -#include <linux/types.h>
> -#include <linux/kernel.h>
> -#include <asm/io.h>
> -
> -#include <linux/mtd/mtd.h>
> -#include <linux/mtd/map.h>
> -#include <linux/mtd/cfi.h>
> -
> -#ifdef CONFIG_MTD_PARTITIONS
> -#include <linux/mtd/partitions.h>
> -#endif
> -
> -#define DEBUG
> -
> -#ifdef DEBUG
> -# define debugk(fmt,args...) printk(fmt ,##args)
> -#else
> -# define debugk(fmt,args...)
> -#endif
> -
> -
> -#define WINDOW_ADDR0 0xFFF00000 /* 512 KiB */
> -#define WINDOW_SIZE0 0x00080000
> -#define BUSWIDTH0 1
> -
> -#define WINDOW_ADDR1 0xFF000000 /* 4 MiB */
> -#define WINDOW_SIZE1 0x00400000
> -#define BUSWIDTH1 8
> -
> -#define MSG_PREFIX "sbc8240:" /* prefix for our printk()'s */
> -#define MTDID "sbc8240-%d" /* for mtdparts= partitioning */
> -
> -
> -static struct map_info sbc8240_map[2] = {
> - {
> - .name = "sbc8240 Flash Bank #0",
> - .size = WINDOW_SIZE0,
> - .bankwidth = BUSWIDTH0,
> - },
> - {
> - .name = "sbc8240 Flash Bank #1",
> - .size = WINDOW_SIZE1,
> - .bankwidth = BUSWIDTH1,
> - }
> -};
> -
> -#define NUM_FLASH_BANKS ARRAY_SIZE(sbc8240_map)
> -
> -/*
> - * The following defines the partition layout of SBC8240 boards.
> - *
> - * See include/linux/mtd/partitions.h for definition of the
> - * mtd_partition structure.
> - *
> - * The *_max_flash_size is the maximum possible mapped flash size
> - * which is not necessarily the actual flash size. It must correspond
> - * to the value specified in the mapping definition defined by the
> - * "struct map_desc *_io_desc" for the corresponding machine.
> - */
> -
> -#ifdef CONFIG_MTD_PARTITIONS
> -
> -static struct mtd_partition sbc8240_uboot_partitions [] = {
> - /* Bank 0 */
> - {
> - .name = "U-boot", /* U-Boot Firmware */
> - .offset = 0,
> - .size = 0x00070000, /* 7 x 64 KiB sectors */
> - .mask_flags = MTD_WRITEABLE, /* force read-only */
> - },
> - {
> - .name = "environment", /* U-Boot environment */
> - .offset = 0x00070000,
> - .size = 0x00010000, /* 1 x 64 KiB sector */
> - },
> -};
> -
> -static struct mtd_partition sbc8240_fs_partitions [] = {
> - {
> - .name = "jffs", /* JFFS filesystem */
> - .offset = 0,
> - .size = 0x003C0000, /* 4 * 15 * 64KiB */
> - },
> - {
> - .name = "tmp32",
> - .offset = 0x003C0000,
> - .size = 0x00020000, /* 4 * 32KiB */
> - },
> - {
> - .name = "tmp8a",
> - .offset = 0x003E0000,
> - .size = 0x00008000, /* 4 * 8KiB */
> - },
> - {
> - .name = "tmp8b",
> - .offset = 0x003E8000,
> - .size = 0x00008000, /* 4 * 8KiB */
> - },
> - {
> - .name = "tmp16",
> - .offset = 0x003F0000,
> - .size = 0x00010000, /* 4 * 16KiB */
> - }
> -};
> -
> -/* trivial struct to describe partition information */
> -struct mtd_part_def
> -{
> - int nums;
> - unsigned char *type;
> - struct mtd_partition* mtd_part;
> -};
> -
> -static struct mtd_info *sbc8240_mtd[NUM_FLASH_BANKS];
> -static struct mtd_part_def sbc8240_part_banks[NUM_FLASH_BANKS];
> -
> -
> -#endif /* CONFIG_MTD_PARTITIONS */
> -
> -
> -static int __init init_sbc8240_mtd (void)
> -{
> - static struct _cjs {
> - u_long addr;
> - u_long size;
> - } pt[NUM_FLASH_BANKS] = {
> - {
> - .addr = WINDOW_ADDR0,
> - .size = WINDOW_SIZE0
> - },
> - {
> - .addr = WINDOW_ADDR1,
> - .size = WINDOW_SIZE1
> - },
> - };
> -
> - int devicesfound = 0;
> - int i,j;
> -
> - for (i = 0; i < NUM_FLASH_BANKS; i++) {
> - printk (KERN_NOTICE MSG_PREFIX
> - "Probing 0x%08lx at 0x%08lx\n", pt[i].size, pt[i].addr);
> -
> - sbc8240_map[i].map_priv_1 =
> - (unsigned long) ioremap (pt[i].addr, pt[i].size);
> - if (!sbc8240_map[i].map_priv_1) {
> - printk (MSG_PREFIX "failed to ioremap\n");
> - for (j = 0; j < i; j++) {
> - iounmap((void *) sbc8240_map[j].map_priv_1);
> - sbc8240_map[j].map_priv_1 = 0;
> - }
> - return -EIO;
> - }
> - simple_map_init(&sbc8240_mtd[i]);
> -
> - sbc8240_mtd[i] = do_map_probe("jedec_probe", &sbc8240_map[i]);
> -
> - if (sbc8240_mtd[i]) {
> - sbc8240_mtd[i]->module = THIS_MODULE;
> - devicesfound++;
> - } else {
> - if (sbc8240_map[i].map_priv_1) {
> - iounmap((void *) sbc8240_map[i].map_priv_1);
> - sbc8240_map[i].map_priv_1 = 0;
> - }
> - }
> - }
> -
> - if (!devicesfound) {
> - printk(KERN_NOTICE MSG_PREFIX
> - "No suppported flash chips found!\n");
> - return -ENXIO;
> - }
> -
> -#ifdef CONFIG_MTD_PARTITIONS
> - sbc8240_part_banks[0].mtd_part = sbc8240_uboot_partitions;
> - sbc8240_part_banks[0].type = "static image";
> - sbc8240_part_banks[0].nums = ARRAY_SIZE(sbc8240_uboot_partitions);
> - sbc8240_part_banks[1].mtd_part = sbc8240_fs_partitions;
> - sbc8240_part_banks[1].type = "static file system";
> - sbc8240_part_banks[1].nums = ARRAY_SIZE(sbc8240_fs_partitions);
> -
> - for (i = 0; i < NUM_FLASH_BANKS; i++) {
> -
> - if (!sbc8240_mtd[i]) continue;
> - if (sbc8240_part_banks[i].nums == 0) {
> - printk (KERN_NOTICE MSG_PREFIX
> - "No partition info available, registering whole device\n");
> - add_mtd_device(sbc8240_mtd[i]);
> - } else {
> - printk (KERN_NOTICE MSG_PREFIX
> - "Using %s partition definition\n", sbc8240_part_banks[i].mtd_part->name);
> - add_mtd_partitions (sbc8240_mtd[i],
> - sbc8240_part_banks[i].mtd_part,
> - sbc8240_part_banks[i].nums);
> - }
> - }
> -#else
> - printk(KERN_NOTICE MSG_PREFIX
> - "Registering %d flash banks at once\n", devicesfound);
> -
> - for (i = 0; i < devicesfound; i++) {
> - add_mtd_device(sbc8240_mtd[i]);
> - }
> -#endif /* CONFIG_MTD_PARTITIONS */
> -
> - return devicesfound == 0 ? -ENXIO : 0;
> -}
> -
> -static void __exit cleanup_sbc8240_mtd (void)
> -{
> - int i;
> -
> - for (i = 0; i < NUM_FLASH_BANKS; i++) {
> - if (sbc8240_mtd[i]) {
> - del_mtd_device (sbc8240_mtd[i]);
> - map_destroy (sbc8240_mtd[i]);
> - }
> - if (sbc8240_map[i].map_priv_1) {
> - iounmap ((void *) sbc8240_map[i].map_priv_1);
> - sbc8240_map[i].map_priv_1 = 0;
> - }
> - }
> -}
> -
> -module_init (init_sbc8240_mtd);
> -module_exit (cleanup_sbc8240_mtd);
> -
> -MODULE_LICENSE ("GPL");
> -MODULE_AUTHOR ("Carolyn Smith <carolyn.smith@tektronix.com>");
> -MODULE_DESCRIPTION ("MTD map driver for SBC8240 boards");
> -
>
> ---
> Regards--
> Subrata
>
^ permalink raw reply
* linux-next: manual merge of the rr tree with Linus' tree
From: Stephen Rothwell @ 2009-07-06 2:05 UTC (permalink / raw)
To: Rusty Russell
Cc: linux-next, linux-kernel, Tim Anderson, Ralf Baechle, Mike Travis
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/mips/kernel/smp-cmp.c between commit
0365070f05f12f1648b4adf22cfb52ec7a8a371c ("MIPS: CMP: activate CMP
support") from Linus' tree and commit
e7cb633472a7c3b197e2696e6a3d19a981e8988f
("cpumask:use-cpumap-accessors-mips") from the rr tree.
The former removes the code that the latter modifies in this file, so I
used the former version.
--
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
* linux-next: kvm tree build warning
From: Stephen Rothwell @ 2009-07-06 1:37 UTC (permalink / raw)
To: Avi Kivity; +Cc: linux-next, linux-kernel, Gleb Natapov
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
Hi Avi,
Today's linux-next build (x86_64_allmodconfig) produced this warning:
arch/x86/kvm/lapic.c: In function 'apic_mmio_write':
arch/x86/kvm/lapic.c:834: warning: 'return' with no value, in function returning non-void
Introduced by commit 55b23c7377c9f9f0b4a4b90950f0e18b26ac45e8 ("KVM:
x2apic interface to lapic").
--
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
* Re: linux-next submission requirements (Was: [RFC PATCH] linker script: unify usage of discard definition)
From: Tejun Heo @ 2009-07-04 4:07 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-arch@vger.kernel.org, Linux Kernel, linux-next
In-Reply-To: <20090704140347.6c4496d2.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Tejun,
>
> On Sat, 04 Jul 2009 12:18:02 +0900 Tejun Heo <tj@kernel.org> wrote:
>> Stephen Rothwell wrote:
>>> [This is not aimed just at you ... this patch just gave me an
>>> opportunity to point this out again.]
>> It's not _in_ the branch. It's on _top_ of the branch.
>
> Ah, sorry, I read that as "at the top of". In that case, this is not
> aimed at you at all :-)
:-)
--
tejun
^ permalink raw reply
* Re: linux-next submission requirements (Was: [RFC PATCH] linker script: unify usage of discard definition)
From: Stephen Rothwell @ 2009-07-04 4:03 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-arch@vger.kernel.org, Linux Kernel, linux-next
In-Reply-To: <4A4EC9EA.9070005@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
Hi Tejun,
On Sat, 04 Jul 2009 12:18:02 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Stephen Rothwell wrote:
> >
> > [This is not aimed just at you ... this patch just gave me an
> > opportunity to point this out again.]
>
> It's not _in_ the branch. It's on _top_ of the branch.
Ah, sorry, I read that as "at the top of". In that case, this is not
aimed at you at all :-)
--
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
* Re: linux-next submission requirements (Was: [RFC PATCH] linker script: unify usage of discard definition)
From: Tejun Heo @ 2009-07-04 3:18 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-arch@vger.kernel.org, Linux Kernel, linux-next
In-Reply-To: <20090704113448.49a722d2.sfr@canb.auug.org.au>
Hello,
Stephen Rothwell wrote:
> Hi Tejun,
>
> [This is not aimed just at you ... this patch just gave me an
> opportunity to point this out again.]
>
> On Sat, 04 Jul 2009 08:37:28 +0900 Tejun Heo <tj@kernel.org> wrote:
>> This patch is on top of the current percpu#for-next.
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git for-next
>>
>> Thanks.
>>
>> NOT_SIGNED_OFF_YET
>
> Well, given no SOB and that this is a RFC patch, it should *not* be in a
> branch that is pulled into linux-next.
It's not _in_ the branch. It's on _top_ of the branch.
Thanks.
--
tejun
^ permalink raw reply
* linux-next submission requirements (Was: [RFC PATCH] linker script: unify usage of discard definition)
From: Stephen Rothwell @ 2009-07-04 1:34 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-arch@vger.kernel.org, Linux Kernel, linux-next
In-Reply-To: <4A4E9638.20304@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]
Hi Tejun,
[This is not aimed just at you ... this patch just gave me an
opportunity to point this out again.]
On Sat, 04 Jul 2009 08:37:28 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> This patch is on top of the current percpu#for-next.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git for-next
>
> Thanks.
>
> NOT_SIGNED_OFF_YET
Well, given no SOB and that this is a RFC patch, it should *not* be in a
branch that is pulled into linux-next.
This is what I send to any maintainer that submits a tree for linux-next
inclusion (and before anyone else points it out: this was not true early
on):
"all patches/commits in the tree/series must have been:
posted to a relevant mailing list
reviewed
unit tested
destined for the next merge window (or the current release)
*before* they are included. The linux-next tree is for integration
testing and to lower the impact of conflicts between subsystems in the
next merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary."
--
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
* Re: [PATCH -next] gadget audio: select SND_PCM
From: David Brownell @ 2009-07-03 21:22 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, akpm, linux-next-u79uwXL29TY76Z2rM5mHXA, LKML,
lud
In-Reply-To: <20090703132657.3289cdcf.randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
On Friday 03 July 2009, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
>
> Fix USB gadget audio: select SND_PCM, like many other sound
> drivers do, to fix build errors:
>
> drivers/built-in.o: In function `f_audio_playback_work':
> audio.c:(.text+0x15a3e7): undefined reference to `snd_pcm_kernel_ioctl'
> audio.c:(.text+0x15a471): undefined reference to `snd_pcm_lib_write'
> drivers/built-in.o: In function `_snd_pcm_hw_param_set':
> audio.c:(.text+0x15aca7): undefined reference to `snd_interval_refine'
> drivers/built-in.o: In function `gaudio_setup':
> (.init.text+0x12adf): undefined reference to `_snd_pcm_hw_params_any'
> drivers/built-in.o: In function `gaudio_setup':
> (.init.text+0x12b43): undefined reference to `snd_pcm_kernel_ioctl'
>
> Signed-off-by: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
Acked-by: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
> ---
> drivers/usb/gadget/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> --- linux-next-20090703.orig/drivers/usb/gadget/Kconfig
> +++ linux-next-20090703/drivers/usb/gadget/Kconfig
> @@ -604,6 +604,7 @@ config USB_ZERO_HNPTEST
> config USB_AUDIO
> tristate "Audio Gadget (EXPERIMENTAL)"
> depends on SND
> + select SND_PCM
> help
> Gadget Audio is compatible with USB Audio Class specification 1.0.
> It will include at least one AudioControl interface, zero or more
>
>
>
>
> ---
> ~Randy
> LPC 2009, Sept. 23-25, Portland, Oregon
> http://linuxplumbersconf.org/2009/
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH -next] gadget audio: select SND_PCM
From: Randy Dunlap @ 2009-07-03 20:26 UTC (permalink / raw)
To: Stephen Rothwell, akpm,
dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA, LKML, lud
In-Reply-To: <20090703162443.16495147.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
From: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
Fix USB gadget audio: select SND_PCM, like many other sound
drivers do, to fix build errors:
drivers/built-in.o: In function `f_audio_playback_work':
audio.c:(.text+0x15a3e7): undefined reference to `snd_pcm_kernel_ioctl'
audio.c:(.text+0x15a471): undefined reference to `snd_pcm_lib_write'
drivers/built-in.o: In function `_snd_pcm_hw_param_set':
audio.c:(.text+0x15aca7): undefined reference to `snd_interval_refine'
drivers/built-in.o: In function `gaudio_setup':
(.init.text+0x12adf): undefined reference to `_snd_pcm_hw_params_any'
drivers/built-in.o: In function `gaudio_setup':
(.init.text+0x12b43): undefined reference to `snd_pcm_kernel_ioctl'
Signed-off-by: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
---
drivers/usb/gadget/Kconfig | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20090703.orig/drivers/usb/gadget/Kconfig
+++ linux-next-20090703/drivers/usb/gadget/Kconfig
@@ -604,6 +604,7 @@ config USB_ZERO_HNPTEST
config USB_AUDIO
tristate "Audio Gadget (EXPERIMENTAL)"
depends on SND
+ select SND_PCM
help
Gadget Audio is compatible with USB Audio Class specification 1.0.
It will include at least one AudioControl interface, zero or more
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* linux-next: Tree for July 3
From: Stephen Rothwell @ 2009-07-03 6:24 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 6804 bytes --]
Hi all,
Changes since 20090702:
Dropped tree: sfi (build problems)
This tree fails to build for powerpc allyesconfig.
The xfs tree gained a build failure so I used the version from
next-20090702.
----------------------------------------------------------------------------
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 132 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
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
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
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
$ git reset --hard HEAD^
Merging refs/next/20090702/xfs
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
$ git checkout HEAD drivers/platform/x86/eeepc-laptop.c
[master 6233d2e] Revert "eeepc-laptop: Register as a pci-hotplug device"
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
CONFLICT (content): Merge conflict in arch/powerpc/platforms/powermac/setup.c
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
CONFLICT (content): Merge conflict in drivers/char/tty_ldisc.c
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 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/include/asm/termios.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/alpha/include/asm/percpu.h
CONFLICT (content): Merge conflict in arch/mn10300/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in include/linux/percpu-defs.h
Merging sfi/sfi-test
$ git reset --hard HEAD^
Merging asm-generic/next
Merging quilt/driver-core
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
Applying: rr/pmac: fix for cpumask accessor changes
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH] un-static xfs_read_agf
From: Felix Blyakher @ 2009-07-03 4:45 UTC (permalink / raw)
To: Eric Sandeen
Cc: Stephen Rothwell, David Chinner, xfs-masters, linux-next,
linux-kernel, Christoph Hellwig
In-Reply-To: <4A4D6E7F.4060204@sandeen.net>
On Jul 2, 2009, at 9:35 PM, Eric Sandeen wrote:
> CONFIG_XFS_DEBUG builds still need xfs_read_agf to be
> non-static, oops.
>
> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Felix Blyakher <felixb@sgi.com>
>
> ---
>
> Index: linux-2.6/fs/xfs/xfs_ag.h
> ===================================================================
> --- linux-2.6.orig/fs/xfs/xfs_ag.h
> +++ linux-2.6/fs/xfs/xfs_ag.h
> @@ -91,6 +91,9 @@ typedef struct xfs_agf {
> #define XFS_AGF_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGF_DADDR(mp))
> #define XFS_BUF_TO_AGF(bp) ((xfs_agf_t *)XFS_BUF_PTR(bp))
>
> +extern int xfs_read_agf(struct xfs_mount *mp, struct xfs_trans *tp,
> + xfs_agnumber_t agno, int flags, struct xfs_buf **bpp);
> +
> /*
> * Size of the unlinked inode hash table in the agi.
> */
> Index: linux-2.6/fs/xfs/xfs_alloc.c
> ===================================================================
> --- linux-2.6.orig/fs/xfs/xfs_alloc.c
> +++ linux-2.6/fs/xfs/xfs_alloc.c
> @@ -2248,7 +2248,7 @@ xfs_alloc_put_freelist(
> /*
> * Read in the allocation group header (free/alloc section).
> */
> -STATIC int /* error */
> +int /* error */
> xfs_read_agf(
> struct xfs_mount *mp, /* mount point structure */
> struct xfs_trans *tp, /* transaction pointer */
>
^ permalink raw reply
* [PATCH] un-static xfs_read_agf
From: Eric Sandeen @ 2009-07-03 2:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Chinner, xfs-masters, linux-next, linux-kernel,
Christoph Hellwig, Felix Blyakher
In-Reply-To: <20090703100551.e3f21aa0.sfr@canb.auug.org.au>
CONFIG_XFS_DEBUG builds still need xfs_read_agf to be
non-static, oops.
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
Index: linux-2.6/fs/xfs/xfs_ag.h
===================================================================
--- linux-2.6.orig/fs/xfs/xfs_ag.h
+++ linux-2.6/fs/xfs/xfs_ag.h
@@ -91,6 +91,9 @@ typedef struct xfs_agf {
#define XFS_AGF_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGF_DADDR(mp))
#define XFS_BUF_TO_AGF(bp) ((xfs_agf_t *)XFS_BUF_PTR(bp))
+extern int xfs_read_agf(struct xfs_mount *mp, struct xfs_trans *tp,
+ xfs_agnumber_t agno, int flags, struct xfs_buf **bpp);
+
/*
* Size of the unlinked inode hash table in the agi.
*/
Index: linux-2.6/fs/xfs/xfs_alloc.c
===================================================================
--- linux-2.6.orig/fs/xfs/xfs_alloc.c
+++ linux-2.6/fs/xfs/xfs_alloc.c
@@ -2248,7 +2248,7 @@ xfs_alloc_put_freelist(
/*
* Read in the allocation group header (free/alloc section).
*/
-STATIC int /* error */
+int /* error */
xfs_read_agf(
struct xfs_mount *mp, /* mount point structure */
struct xfs_trans *tp, /* transaction pointer */
^ permalink raw reply
* linux-next: xfs tree build failure
From: Stephen Rothwell @ 2009-07-03 0:05 UTC (permalink / raw)
To: David Chinner, xfs-masters
Cc: linux-next, linux-kernel, Eric Sandeen, Christoph Hellwig,
Felix Blyakher
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
Hi David,
Today's linux-next build (x86_64 allmodconfig) failed like this:
fs/xfs/xfs_log_recover.c: In function 'xlog_recover_check_summary':
fs/xfs/xfs_log_recover.c:4046: error: implicit declaration of function 'xfs_read_agf'
Caused by commit 370f048214b4e9aa2102fa3c454ae1374da287c5 ("xfs: add more
statics & drop some unused functions").
I have used the xfs tree from next-20090702 for today.
--
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
* linux-next: Tree for July 2
From: Stephen Rothwell @ 2009-07-02 6:10 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 6790 bytes --]
Hi all,
Changes since 20090701:
Dropped tree: sfi (build problems)
This tree fails to build for powerpc allyesconfig.
The pci tree lost its conflicts and build failure.
The kvm tree lost its conflict.
The block tree lost its conflict.
----------------------------------------------------------------------------
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 132 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
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
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
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
$ git checkout HEAD drivers/platform/x86/eeepc-laptop.c
[master f0e3ef6] Revert "eeepc-laptop: Register as a pci-hotplug device"
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
CONFLICT (content): Merge conflict in arch/powerpc/platforms/powermac/setup.c
Applying: rr/pmac: fix for cpumask accessor changes
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
CONFLICT (content): Merge conflict in drivers/char/tty_ldisc.c
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 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/include/asm/termios.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/alpha/include/asm/percpu.h
CONFLICT (content): Merge conflict in arch/mn10300/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in include/linux/percpu-defs.h
Merging sfi/sfi-test
$ git reset --hard HEAD^
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
* Re: linux-next: manual merge of the kvm tree with Linus' tree
From: Davide Libenzi @ 2009-07-01 15:11 UTC (permalink / raw)
To: Gregory Haskins
Cc: Avi Kivity, Stephen Rothwell, linux-next,
Linux Kernel Mailing List, Andrew Morton
In-Reply-To: <4A4B56FE.8060407@novell.com>
On Wed, 1 Jul 2009, Gregory Haskins wrote:
> Just to be clear: the final form will need to be wake_up_poll(), not
> wake_up_locked_poll.
Yep, sorry I missed that one.
- Davide
^ permalink raw reply
* Re: linux-next: boot failure
From: Sachin Sant @ 2009-07-01 14:46 UTC (permalink / raw)
To: Eric Paris; +Cc: Stephen Rothwell, linux-next, LKML
In-Reply-To: <1246451712.22562.38.camel@dhcp235-23.rdu.redhat.com>
Eric Paris wrote:
> I will check the makefiles to see if kernel/built-in.o is linked in
> before fs/buildin-in.o. I don't see a reason why audit watches need to
> be that early in the kernel init process. This isn't happening on my
> system so I'm asking if anyone hitting it can apply this patch and test?
>
> Audit: audit watch init should not be before fsnotify init
>
> From: Eric Paris <eparis@redhat.com>
With this patch i am able to boot today's next on my machines.
Tested-by : Sachin Sant <sachinp@in.ibm.com>
Thanks
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ permalink raw reply
* [PATCH Resend] Remove 'SBC8240 Wind River' Device Driver Code
From: Subrata Modak @ 2009-07-01 13:52 UTC (permalink / raw)
To: linux-mtd
Cc: linux-kernel, linux-next, Scott Wood, Jim Cromie,
Stephen Rothwell, Linuxppc-dev, carolyn.j.smith, Sachin P Sant,
Subrata Modak, Balbir Singh, David Woodhouse
Hi,
Linux next tree(20090626) produced the following build error:
CC [M] drivers/mtd/maps/sbc8240.o
drivers/mtd/maps/sbc8240.c:31:1: warning: "DEBUG" redefined
In file included from drivers/mtd/maps/sbc8240.c:23:
include/linux/mtd/mtd.h:333:1: warning: this is the location of the previous definition
drivers/mtd/maps/sbc8240.c: In function 'init_sbc8240_mtd':
drivers/mtd/maps/sbc8240.c:172: warning: passing argument 1 of 'simple_map_init' from incompatible pointer type
drivers/mtd/maps/sbc8240.c:177: error: 'struct mtd_info' has no member named 'module'
make[3]: *** [drivers/mtd/maps/sbc8240.o] Error 1
make[2]: *** [drivers/mtd/maps] Error 2
make[1]: *** [drivers/mtd] Error 2
make: *** [drivers] Error 2
I remember reporting this back in April, when it was suggested to remove
the code as it is no more used:
http://lkml.org/lkml/2009/4/21/476,
I tried to gather some more info about this driver from the link
mentioned in Kconfig:
http://www.windriver.com/products/sbc8240/,
without much success.
The original author of this driver code has no problem, as she has
expressed by the following mail:
>On Tue, 2009-06-30 at 09:37 -0700, carolyn.j.smith@tektronix.com wrote:
>Hello Subrata,
>
> I am the original author of this file and have no objection to its removal
> from the 2.6 kernel. I added it to the 2.4 kernel when I ported Linux to
> the SBC8240 board many years ago. I haven't used the board in several years.
>
> Regards,
> Carolyn
>
Last time i did not address: linux-mtd@lists.infradead.org. If there are
no issues, can you please apply this patch to remove it ?
To: linux-mtd@lists.infradead.org,
Cc: David Woodhouse <dwmw2@infradead.org>,
Cc: Scott Wood <scottwood@freescale.com>,
Cc: Jim Cromie <jim.cromie@gmail.com>,
Cc: carolyn.j.smith@exgate.tek.com,
Cc: dwmw2@infradead.org,
Cc: Sachin P Sant <sachinp@linux.vnet.ibm.com>,
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>,
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
Cc: Linuxppc-dev <Linuxppc-dev@ozlabs.org>,
Cc: linux-next <linux-next@vger.kernel.org>,
--
Signed-off-by: Subrata Modak <subrata@linux.vnet.ibm.com>
Tested-on-PPC64-by: Subrata Modak <subrata@linux.vnet.ibm.com>
---
diff -uprN a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
--- a/drivers/mtd/maps/Kconfig 2009-06-26 07:36:23.000000000 -0500
+++ b/drivers/mtd/maps/Kconfig 2009-06-26 07:39:34.000000000 -0500
@@ -284,13 +284,6 @@ config MTD_L440GX
BE VERY CAREFUL.
-config MTD_SBC8240
- tristate "Flash device on SBC8240"
- depends on MTD_JEDECPROBE && 8260
- help
- Flash access on the SBC8240 board from Wind River. See
- <http://www.windriver.com/products/sbc8240/>
-
config MTD_TQM8XXL
tristate "CFI Flash device mapped on TQM8XXL"
depends on MTD_CFI && TQM8xxL
diff -uprN a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
--- a/drivers/mtd/maps/Makefile 2009-06-26 07:36:23.000000000 -0500
+++ b/drivers/mtd/maps/Makefile 2009-06-26 07:40:03.000000000 -0500
@@ -50,7 +50,6 @@ obj-$(CONFIG_MTD_UCLINUX) += uclinux.o
obj-$(CONFIG_MTD_NETtel) += nettel.o
obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o
obj-$(CONFIG_MTD_H720X) += h720x-flash.o
-obj-$(CONFIG_MTD_SBC8240) += sbc8240.o
obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o
obj-$(CONFIG_MTD_IXP2000) += ixp2000.o
obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o
diff -uprN a/drivers/mtd/maps/sbc8240.c b/drivers/mtd/maps/sbc8240.c
--- a/drivers/mtd/maps/sbc8240.c 2009-06-26 07:36:23.000000000 -0500
+++ b/drivers/mtd/maps/sbc8240.c 1969-12-31 18:00:00.000000000 -0600
@@ -1,250 +0,0 @@
-/*
- * Handle mapping of the flash memory access routines on the SBC8240 board.
- *
- * Carolyn Smith, Tektronix, Inc.
- *
- * This code is GPLed
- */
-
-/*
- * The SBC8240 has 2 flash banks.
- * Bank 0 is a 512 KiB AMD AM29F040B; 8 x 64 KiB sectors.
- * It contains the U-Boot code (7 sectors) and the environment (1 sector).
- * Bank 1 is 4 x 1 MiB AMD AM29LV800BT; 15 x 64 KiB sectors, 1 x 32 KiB sector,
- * 2 x 8 KiB sectors, 1 x 16 KiB sectors.
- * Both parts are JEDEC compatible.
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <asm/io.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/cfi.h>
-
-#ifdef CONFIG_MTD_PARTITIONS
-#include <linux/mtd/partitions.h>
-#endif
-
-#define DEBUG
-
-#ifdef DEBUG
-# define debugk(fmt,args...) printk(fmt ,##args)
-#else
-# define debugk(fmt,args...)
-#endif
-
-
-#define WINDOW_ADDR0 0xFFF00000 /* 512 KiB */
-#define WINDOW_SIZE0 0x00080000
-#define BUSWIDTH0 1
-
-#define WINDOW_ADDR1 0xFF000000 /* 4 MiB */
-#define WINDOW_SIZE1 0x00400000
-#define BUSWIDTH1 8
-
-#define MSG_PREFIX "sbc8240:" /* prefix for our printk()'s */
-#define MTDID "sbc8240-%d" /* for mtdparts= partitioning */
-
-
-static struct map_info sbc8240_map[2] = {
- {
- .name = "sbc8240 Flash Bank #0",
- .size = WINDOW_SIZE0,
- .bankwidth = BUSWIDTH0,
- },
- {
- .name = "sbc8240 Flash Bank #1",
- .size = WINDOW_SIZE1,
- .bankwidth = BUSWIDTH1,
- }
-};
-
-#define NUM_FLASH_BANKS ARRAY_SIZE(sbc8240_map)
-
-/*
- * The following defines the partition layout of SBC8240 boards.
- *
- * See include/linux/mtd/partitions.h for definition of the
- * mtd_partition structure.
- *
- * The *_max_flash_size is the maximum possible mapped flash size
- * which is not necessarily the actual flash size. It must correspond
- * to the value specified in the mapping definition defined by the
- * "struct map_desc *_io_desc" for the corresponding machine.
- */
-
-#ifdef CONFIG_MTD_PARTITIONS
-
-static struct mtd_partition sbc8240_uboot_partitions [] = {
- /* Bank 0 */
- {
- .name = "U-boot", /* U-Boot Firmware */
- .offset = 0,
- .size = 0x00070000, /* 7 x 64 KiB sectors */
- .mask_flags = MTD_WRITEABLE, /* force read-only */
- },
- {
- .name = "environment", /* U-Boot environment */
- .offset = 0x00070000,
- .size = 0x00010000, /* 1 x 64 KiB sector */
- },
-};
-
-static struct mtd_partition sbc8240_fs_partitions [] = {
- {
- .name = "jffs", /* JFFS filesystem */
- .offset = 0,
- .size = 0x003C0000, /* 4 * 15 * 64KiB */
- },
- {
- .name = "tmp32",
- .offset = 0x003C0000,
- .size = 0x00020000, /* 4 * 32KiB */
- },
- {
- .name = "tmp8a",
- .offset = 0x003E0000,
- .size = 0x00008000, /* 4 * 8KiB */
- },
- {
- .name = "tmp8b",
- .offset = 0x003E8000,
- .size = 0x00008000, /* 4 * 8KiB */
- },
- {
- .name = "tmp16",
- .offset = 0x003F0000,
- .size = 0x00010000, /* 4 * 16KiB */
- }
-};
-
-/* trivial struct to describe partition information */
-struct mtd_part_def
-{
- int nums;
- unsigned char *type;
- struct mtd_partition* mtd_part;
-};
-
-static struct mtd_info *sbc8240_mtd[NUM_FLASH_BANKS];
-static struct mtd_part_def sbc8240_part_banks[NUM_FLASH_BANKS];
-
-
-#endif /* CONFIG_MTD_PARTITIONS */
-
-
-static int __init init_sbc8240_mtd (void)
-{
- static struct _cjs {
- u_long addr;
- u_long size;
- } pt[NUM_FLASH_BANKS] = {
- {
- .addr = WINDOW_ADDR0,
- .size = WINDOW_SIZE0
- },
- {
- .addr = WINDOW_ADDR1,
- .size = WINDOW_SIZE1
- },
- };
-
- int devicesfound = 0;
- int i,j;
-
- for (i = 0; i < NUM_FLASH_BANKS; i++) {
- printk (KERN_NOTICE MSG_PREFIX
- "Probing 0x%08lx at 0x%08lx\n", pt[i].size, pt[i].addr);
-
- sbc8240_map[i].map_priv_1 =
- (unsigned long) ioremap (pt[i].addr, pt[i].size);
- if (!sbc8240_map[i].map_priv_1) {
- printk (MSG_PREFIX "failed to ioremap\n");
- for (j = 0; j < i; j++) {
- iounmap((void *) sbc8240_map[j].map_priv_1);
- sbc8240_map[j].map_priv_1 = 0;
- }
- return -EIO;
- }
- simple_map_init(&sbc8240_mtd[i]);
-
- sbc8240_mtd[i] = do_map_probe("jedec_probe", &sbc8240_map[i]);
-
- if (sbc8240_mtd[i]) {
- sbc8240_mtd[i]->module = THIS_MODULE;
- devicesfound++;
- } else {
- if (sbc8240_map[i].map_priv_1) {
- iounmap((void *) sbc8240_map[i].map_priv_1);
- sbc8240_map[i].map_priv_1 = 0;
- }
- }
- }
-
- if (!devicesfound) {
- printk(KERN_NOTICE MSG_PREFIX
- "No suppported flash chips found!\n");
- return -ENXIO;
- }
-
-#ifdef CONFIG_MTD_PARTITIONS
- sbc8240_part_banks[0].mtd_part = sbc8240_uboot_partitions;
- sbc8240_part_banks[0].type = "static image";
- sbc8240_part_banks[0].nums = ARRAY_SIZE(sbc8240_uboot_partitions);
- sbc8240_part_banks[1].mtd_part = sbc8240_fs_partitions;
- sbc8240_part_banks[1].type = "static file system";
- sbc8240_part_banks[1].nums = ARRAY_SIZE(sbc8240_fs_partitions);
-
- for (i = 0; i < NUM_FLASH_BANKS; i++) {
-
- if (!sbc8240_mtd[i]) continue;
- if (sbc8240_part_banks[i].nums == 0) {
- printk (KERN_NOTICE MSG_PREFIX
- "No partition info available, registering whole device\n");
- add_mtd_device(sbc8240_mtd[i]);
- } else {
- printk (KERN_NOTICE MSG_PREFIX
- "Using %s partition definition\n", sbc8240_part_banks[i].mtd_part->name);
- add_mtd_partitions (sbc8240_mtd[i],
- sbc8240_part_banks[i].mtd_part,
- sbc8240_part_banks[i].nums);
- }
- }
-#else
- printk(KERN_NOTICE MSG_PREFIX
- "Registering %d flash banks at once\n", devicesfound);
-
- for (i = 0; i < devicesfound; i++) {
- add_mtd_device(sbc8240_mtd[i]);
- }
-#endif /* CONFIG_MTD_PARTITIONS */
-
- return devicesfound == 0 ? -ENXIO : 0;
-}
-
-static void __exit cleanup_sbc8240_mtd (void)
-{
- int i;
-
- for (i = 0; i < NUM_FLASH_BANKS; i++) {
- if (sbc8240_mtd[i]) {
- del_mtd_device (sbc8240_mtd[i]);
- map_destroy (sbc8240_mtd[i]);
- }
- if (sbc8240_map[i].map_priv_1) {
- iounmap ((void *) sbc8240_map[i].map_priv_1);
- sbc8240_map[i].map_priv_1 = 0;
- }
- }
-}
-
-module_init (init_sbc8240_mtd);
-module_exit (cleanup_sbc8240_mtd);
-
-MODULE_LICENSE ("GPL");
-MODULE_AUTHOR ("Carolyn Smith <carolyn.smith@tektronix.com>");
-MODULE_DESCRIPTION ("MTD map driver for SBC8240 boards");
-
---
Regards--
Subrata
^ permalink raw reply
* Re: linux-next: Tree for July 1 (fix CONFIG_AUDIT_WATCH=n build)
From: Eric Paris @ 2009-07-01 13:06 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Stephen Rothwell, linux-next, LKML
In-Reply-To: <200907011506.16145.bzolnier@gmail.com>
On Wed, 2009-07-01 at 15:06 +0200, Bartlomiej Zolnierkiewicz wrote:
> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Subject: [PATCH] audit: fix CONFIG_AUDIT_WATCH=n build
>
> Fix:
Already noted by Alexander Beregalov and fixed in my tree for tomorrow.
Sorry I committed an old version yesterday. I need to get better moving
patches between trees..... :(
-Eric
^ permalink raw reply
* Re: linux-next: Tree for July 1 (fix CONFIG_AUDIT_WATCH=n build)
From: Bartlomiej Zolnierkiewicz @ 2009-07-01 13:06 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Eric Paris
In-Reply-To: <20090701183903.bd203c62.sfr@canb.auug.org.au>
Hi,
On Wednesday 01 July 2009 10:39:03 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090630:
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] audit: fix CONFIG_AUDIT_WATCH=n build
Fix:
kernel/auditfilter.c: In function ‘audit_data_to_entry’:
kernel/auditfilter.c:501: error: expected expression before ‘{’ token
kernel/auditfilter.c: In function ‘audit_add_rule’:
kernel/auditfilter.c:891: error: expected expression before ‘{’ token
make[1]: *** [kernel/auditfilter.o] Error 1
make: *** [kernel/auditfilter.o] Error 2
introduced by commit de85e5bc3690c3063aea790279e898adb5bac0ba
("Audit: split audit watch Kconfig").
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
BTW defines are passé (using static inlines instead for CONFIG_AUDIT=n
and CONFIG_AUDIT_WATCH=n stuff would be an even better solution)..
kernel/audit.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Index: b/kernel/audit.h
===================================================================
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -117,12 +117,11 @@ extern int audit_watch_compare(struct au
#else
#define audit_put_watch(w) {}
#define audit_get_watch(w) {}
-#define audit_to_watch(k, p, l, o) { -EINVAL }
-#define audit_add_watch(k, l) { -EINVAL }
+#define audit_to_watch(k, p, l, o) (-EINVAL)
+#define audit_add_watch(k, l) (-EINVAL)
#define audit_remove_watch_rule(k) BUG()
#define audit_watch_path(w) ""
#define audit_watch_compare(w, i, d) 0
-
#endif /* CONFIG_AUDIT_WATCH */
#ifdef CONFIG_AUDIT_TREE
^ permalink raw reply
* Re: next-20090630: audit/fsnotify build failure
From: Eric Paris @ 2009-07-01 12:38 UTC (permalink / raw)
To: Alexander Beregalov; +Cc: linux-next
In-Reply-To: <a4423d670907010507g5c1d205epd8383319f9db6aa@mail.gmail.com>
On Wed, 2009-07-01 at 16:07 +0400, Alexander Beregalov wrote:
> Hi Eric
>
> Another problem today (0701)
>
> kernel/auditfilter.c: In function 'audit_data_to_entry':
> kernel/auditfilter.c:501: error: expected expression before '{' token
> kernel/auditfilter.c: In function 'audit_add_rule':
> kernel/auditfilter.c:891: error: expected expression before '{' token
>
> CONFIG_AUDIT_WATCH is not set
This one is just me being stupid and committing the wrong version to the
tree :( Thank you so much for testing this!
s/{ -EINVAL }/-EINVAL/
-Eric
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox