* linux-next: Tree for November 11
From: Stephen Rothwell @ 2010-11-11 1:56 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8432 bytes --]
Hi all,
Changes since 20101110:
Added tree: fbdev-current
The voltage tree gained a build failure so I used the version from
next-20101110.
The fsnotify tree still has its build failure so I used the version from
next-20101109.
----------------------------------------------------------------------------
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 179 trees (counting Linus' and 26 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 arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/rc-fixes
Merging 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 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 s5p/for-next
Merging tegra/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-input.c
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
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 mmc/mmc-next
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
$ git reset --hard HEAD^
Merging refs/next/20101110/voltage
Merging security-testing/next
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/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree.
CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree.
CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
$ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
$ git reset --hard HEAD^
Merging refs/next/20101109/fsnotify
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c
CONFLICT (content): Merge conflict in arch/x86/xen/setup.c
Merging swiotlb-xen/master
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 driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/bcm/Bcmchar.c
CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intel_sst_app_interface.c
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the voltage tree
From: Stephen Rothwell @ 2010-11-11 0:36 UTC (permalink / raw)
To: Liam Girdwood; +Cc: linux-next, linux-kernel, Mark Brown
[-- Attachment #1: Type: text/plain, Size: 881 bytes --]
Hi Liam,
After merging the voltage tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/regulator/pcap-regulator.c:155: error: expected declaration specifiers or '...' before 'unsiged'
drivers/regulator/pcap-regulator.c: In function 'pcap_regulator_set_voltage':
drivers/regulator/pcap-regulator.c:175: error: 'selector' undeclared (first use in this function)
drivers/regulator/pcap-regulator.c: At top level:
drivers/regulator/pcap-regulator.c:251: warning: initialization from incompatible pointer type
Caused by commit d2f03ebfe8c63d1e3e1ab2352dd32d161546003e ("regulator:
Report actual configured voltage to set_voltage()"). Please always build
changed files ...
I have used the voltage tree from next-20101110 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for November 10 (kernel/rcutiny)
From: Randy Dunlap @ 2010-11-10 23:36 UTC (permalink / raw)
To: paulmck; +Cc: Stephen Rothwell, linux-next, LKML
In-Reply-To: <20101110230708.GV4032@linux.vnet.ibm.com>
On 11/10/10 15:07, Paul E. McKenney wrote:
> On Wed, Nov 10, 2010 at 09:19:26AM -0800, Randy Dunlap wrote:
>> On Wed, 10 Nov 2010 14:07:19 +1100 Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20101109:
>>
>>
>> when CONFIG_RCU_BOOST is not enabled:
>>
>> In file included from linux-next-20101110/kernel/rcutiny.c:53:
>> linux-next-20101110/kernel/rcutiny_plugin.h: In function 'rcu_preempt_cpu_qs':
>> linux-next-20101110/kernel/rcutiny_plugin.h:413: error: 'struct rcu_preempt_ctrlblk' has no member named 'n_normal_balk_blkd_tasks'
>
> Hello, Randy,
>
> Good catch! Could you please try the following patch?
(you tested this build, didn't you?)
> Thanx, Paul
Yes, this builds. Thanks.
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
> ------------------------------------------------------------------------
>
> diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
> index 297aa35..8cd197c 100644
> --- a/kernel/rcutiny_plugin.h
> +++ b/kernel/rcutiny_plugin.h
> @@ -297,9 +297,17 @@ static int rcu_boost(void)
> * the current grace period, and, if so, tell the rcu_kthread_task to
> * start boosting them. If there is an expedited boost in progress,
> * we wait for it to complete.
> + *
> + * If there are no blocked readers blocking the current grace period,
> + * return 0 to let the caller know, otherwise return 1. Note that this
> + * return value is independent of whether or not boosting was done.
> */
> -static void rcu_initiate_boost(void)
> +static int rcu_initiate_boost(void)
> {
> + if (!rcu_preempt_blocked_readers_cgp()) {
> + RCU_TRACE(rcu_preempt_ctrlblk.n_normal_balk_blkd_tasks++);
> + return 0;
> + }
> if (rcu_preempt_ctrlblk.gp_tasks != NULL &&
> rcu_preempt_ctrlblk.boost_tasks == NULL &&
> rcu_preempt_ctrlblk.boosted_this_gp == 0 &&
> @@ -309,6 +317,7 @@ static void rcu_initiate_boost(void)
> RCU_TRACE(rcu_preempt_ctrlblk.n_normal_boosts++);
> } else
> RCU_TRACE(rcu_initiate_boost_trace());
> + return 1;
> }
>
> /*
> @@ -353,10 +362,13 @@ static int rcu_boost(void)
> }
>
> /*
> - * If there is no RCU priority boosting, we don't initiate boosting.
> + * If there is no RCU priority boosting, we don't initiate boosting,
> + * but we do indicate whether there are blocked readers blocking the
> + * current grace period.
> */
> -static void rcu_initiate_boost(void)
> +static int rcu_initiate_boost(void)
> {
> + return rcu_preempt_blocked_readers_cgp();
> }
>
> /*
> @@ -405,12 +417,12 @@ static void rcu_preempt_cpu_qs(void)
> /* If there is no GP then there is nothing more to do. */
> if (!rcu_preempt_gp_in_progress())
> return;
> - /* If there are blocked readers, go check up on boosting. */
> - if (rcu_preempt_blocked_readers_cgp()) {
> - rcu_initiate_boost();
> + /*
> + * Check up on boosting. If there are no readers blocking the
> + * current grace period, leave.
> + */
> + if (rcu_initiate_boost())
> return;
> - } else
> - RCU_TRACE(rcu_preempt_ctrlblk.n_normal_balk_blkd_tasks++);
>
> /* Advance callbacks. */
> rcu_preempt_ctrlblk.completed = rcu_preempt_ctrlblk.gpnum;
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: Tree for November 10 (kernel/rcutiny)
From: Paul E. McKenney @ 2010-11-10 23:07 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML
In-Reply-To: <20101110091926.dc834e84.randy.dunlap@oracle.com>
On Wed, Nov 10, 2010 at 09:19:26AM -0800, Randy Dunlap wrote:
> On Wed, 10 Nov 2010 14:07:19 +1100 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Changes since 20101109:
>
>
> when CONFIG_RCU_BOOST is not enabled:
>
> In file included from linux-next-20101110/kernel/rcutiny.c:53:
> linux-next-20101110/kernel/rcutiny_plugin.h: In function 'rcu_preempt_cpu_qs':
> linux-next-20101110/kernel/rcutiny_plugin.h:413: error: 'struct rcu_preempt_ctrlblk' has no member named 'n_normal_balk_blkd_tasks'
Hello, Randy,
Good catch! Could you please try the following patch?
Thanx, Paul
------------------------------------------------------------------------
diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
index 297aa35..8cd197c 100644
--- a/kernel/rcutiny_plugin.h
+++ b/kernel/rcutiny_plugin.h
@@ -297,9 +297,17 @@ static int rcu_boost(void)
* the current grace period, and, if so, tell the rcu_kthread_task to
* start boosting them. If there is an expedited boost in progress,
* we wait for it to complete.
+ *
+ * If there are no blocked readers blocking the current grace period,
+ * return 0 to let the caller know, otherwise return 1. Note that this
+ * return value is independent of whether or not boosting was done.
*/
-static void rcu_initiate_boost(void)
+static int rcu_initiate_boost(void)
{
+ if (!rcu_preempt_blocked_readers_cgp()) {
+ RCU_TRACE(rcu_preempt_ctrlblk.n_normal_balk_blkd_tasks++);
+ return 0;
+ }
if (rcu_preempt_ctrlblk.gp_tasks != NULL &&
rcu_preempt_ctrlblk.boost_tasks == NULL &&
rcu_preempt_ctrlblk.boosted_this_gp == 0 &&
@@ -309,6 +317,7 @@ static void rcu_initiate_boost(void)
RCU_TRACE(rcu_preempt_ctrlblk.n_normal_boosts++);
} else
RCU_TRACE(rcu_initiate_boost_trace());
+ return 1;
}
/*
@@ -353,10 +362,13 @@ static int rcu_boost(void)
}
/*
- * If there is no RCU priority boosting, we don't initiate boosting.
+ * If there is no RCU priority boosting, we don't initiate boosting,
+ * but we do indicate whether there are blocked readers blocking the
+ * current grace period.
*/
-static void rcu_initiate_boost(void)
+static int rcu_initiate_boost(void)
{
+ return rcu_preempt_blocked_readers_cgp();
}
/*
@@ -405,12 +417,12 @@ static void rcu_preempt_cpu_qs(void)
/* If there is no GP then there is nothing more to do. */
if (!rcu_preempt_gp_in_progress())
return;
- /* If there are blocked readers, go check up on boosting. */
- if (rcu_preempt_blocked_readers_cgp()) {
- rcu_initiate_boost();
+ /*
+ * Check up on boosting. If there are no readers blocking the
+ * current grace period, leave.
+ */
+ if (rcu_initiate_boost())
return;
- } else
- RCU_TRACE(rcu_preempt_ctrlblk.n_normal_balk_blkd_tasks++);
/* Advance callbacks. */
rcu_preempt_ctrlblk.completed = rcu_preempt_ctrlblk.gpnum;
^ permalink raw reply related
* Re: linux-next: manual merge of the staging tree with the staging.current tree
From: Greg KH @ 2010-11-10 18:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Dan Carpenter, Stephen Hemminger
In-Reply-To: <20101110132420.fe81e1b0.sfr@canb.auug.org.au>
On Wed, Nov 10, 2010 at 01:24:20PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/bcm/Bcmchar.c between commit
> eccbf04a904fc99c54ab37c29a2a4dedcec66e33 ("Staging: bcm: use get_user()
> to access user pointers") from the staging.current tree and commit
> ada692b09f4707a8e06b087b1546d9f5b3f2d37d ("beceem: fix character device
> ioctl") from the staging tree.
>
> I just assumed that the latter supercedes the former and so used the
> staging version of the file. I may well be wrong in this.
That sounds correct, I'll handle the merge when the patches go to Linus.
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the tree
From: Greg KH @ 2010-11-10 18:40 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Joe Perches, Dan Carpenter
In-Reply-To: <20101110132408.67f73665.sfr@canb.auug.org.au>
On Wed, Nov 10, 2010 at 01:24:08PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/intel_sst/intel_sst_app_interface.c between commits from
> the staging.current tree and commit
> d0f40c5041f9c48afbd8f7fbf8a5faa9e5dbd39a ("Staging: intel_sst: Use
> pr_fmt, fix misspellings") from the staging tree.
>
> I have just ignored the changes from the staging tree for today.
Thanks, that works, when these patches go to Linus I'll handle the
merge.
greg k-h
^ permalink raw reply
* Re: linux-next: Tree for November 10 (kernel/rcutiny)
From: Randy Dunlap @ 2010-11-10 17:19 UTC (permalink / raw)
To: Stephen Rothwell, Paul McKenney; +Cc: linux-next, LKML
In-Reply-To: <20101110140719.139ebe51.sfr@canb.auug.org.au>
On Wed, 10 Nov 2010 14:07:19 +1100 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20101109:
when CONFIG_RCU_BOOST is not enabled:
In file included from linux-next-20101110/kernel/rcutiny.c:53:
linux-next-20101110/kernel/rcutiny_plugin.h: In function 'rcu_preempt_cpu_qs':
linux-next-20101110/kernel/rcutiny_plugin.h:413: error: 'struct rcu_preempt_ctrlblk' has no member named 'n_normal_balk_blkd_tasks'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: build failure after merge of the fsnotify tree
From: Lino Sanfilippo @ 2010-11-10 17:14 UTC (permalink / raw)
To: Eric Paris; +Cc: sfr, linux-kernel, linux-next
In-Reply-To: <1289403143.3083.54.camel@localhost.localdomain>
On Wed, Nov 10, 2010 at 10:32:23AM -0500, Eric Paris wrote:
> On Wed, 2010-11-10 at 12:53 +1100, Stephen Rothwell wrote:
> > Hi Eric,
> >
> > After merging the fsnotify tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > fs/notify/mark.c: In function 'fsnotify_add_mark':
> > fs/notify/mark.c:230: error: 'struct fsnotify_group' has no member named 'fanotify_data'
> >
> > Caused by commit 0ed64ab6b338e4269c9f25de83781619ecd624f1 ("fsnotify:
> > code and error path cleanup in fsnotify_add_mark"). This build has
> > CONFIG_FANOTIFY not set.
> >
> > I have used the fsnotify tree from next-20101109 for today.
>
> I wasn't actually that commit it was:
>
> 5876b30fc2c91d67386f91da62b14f159d7bb41f ("fanotify: Do check against
> max_marks and increase number of group marks atomically")
>
> Lino, I knew there was a reason I was happy with the small race. Would
> you like to take another stab or should I just revert?
>
> -Eric
>
Damn, sorry for that.
Please revert it Eric. But we should somehow avoid this race. What about
making max_marks a generic groups attribute?
Lino
^ permalink raw reply
* Re: linux-next: build failure after merge of the fsnotify tree
From: Eric Paris @ 2010-11-10 15:32 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, LinoSanfilippo
In-Reply-To: <20101110125321.79c5c8a2.sfr@canb.auug.org.au>
On Wed, 2010-11-10 at 12:53 +1100, Stephen Rothwell wrote:
> Hi Eric,
>
> After merging the fsnotify tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> fs/notify/mark.c: In function 'fsnotify_add_mark':
> fs/notify/mark.c:230: error: 'struct fsnotify_group' has no member named 'fanotify_data'
>
> Caused by commit 0ed64ab6b338e4269c9f25de83781619ecd624f1 ("fsnotify:
> code and error path cleanup in fsnotify_add_mark"). This build has
> CONFIG_FANOTIFY not set.
>
> I have used the fsnotify tree from next-20101109 for today.
I wasn't actually that commit it was:
5876b30fc2c91d67386f91da62b14f159d7bb41f ("fanotify: Do check against
max_marks and increase number of group marks atomically")
Lino, I knew there was a reason I was happy with the small race. Would
you like to take another stab or should I just revert?
-Eric
^ permalink raw reply
* linux-next: Tree for November 10
From: Stephen Rothwell @ 2010-11-10 3:07 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8743 bytes --]
Hi all,
Changes since 20101109:
Removed tree: aoe (no longer used)
Added trees:
sh-current
rmobile-current
fbdev
Changed trees:
The driver-core{,.current}, tty(,.current}, usb(,.current) and
staging.current quilt series have become git trees.
The staging-next tree has been renamed to staging.
The sh tree changed its structure.
The genesis tree was renamed to rmobile and changed its structure.
Linus' tree lost its build failure.
The fsnotify tree gained a build failure so I used the version from
next-20101109.
The catalin tree lots its conflicts.
The staging tree gained conflicts against the staging.current tree.
----------------------------------------------------------------------------
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 176 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 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/rc-fixes
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 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 s5p/for-next
Merging tegra/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-input.c
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
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 mmc/mmc-next
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 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/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree.
CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree.
CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
$ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
$ git reset --hard HEAD^
Merging refs/next/20101109/fsnotify
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c
CONFLICT (content): Merge conflict in arch/x86/xen/setup.c
Merging swiotlb-xen/master
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 driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/bcm/Bcmchar.c
CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intel_sst_app_interface.c
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree with the staging.current tree
From: Stephen Rothwell @ 2010-11-10 2:24 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Dan Carpenter, Stephen Hemminger
[-- Attachment #1: Type: text/plain, Size: 607 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/bcm/Bcmchar.c between commit
eccbf04a904fc99c54ab37c29a2a4dedcec66e33 ("Staging: bcm: use get_user()
to access user pointers") from the staging.current tree and commit
ada692b09f4707a8e06b087b1546d9f5b3f2d37d ("beceem: fix character device
ioctl") from the staging tree.
I just assumed that the latter supercedes the former and so used the
staging version of the file. I may well be wrong in this.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree with the tree
From: Stephen Rothwell @ 2010-11-10 2:24 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Joe Perches, Dan Carpenter
[-- Attachment #1: Type: text/plain, Size: 481 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/intel_sst/intel_sst_app_interface.c between commits from
the staging.current tree and commit
d0f40c5041f9c48afbd8f7fbf8a5faa9e5dbd39a ("Staging: intel_sst: Use
pr_fmt, fix misspellings") from the staging tree.
I have just ignored the changes from the staging tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the fsnotify tree
From: Stephen Rothwell @ 2010-11-10 1:53 UTC (permalink / raw)
To: Eric Paris; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
Hi Eric,
After merging the fsnotify tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/notify/mark.c: In function 'fsnotify_add_mark':
fs/notify/mark.c:230: error: 'struct fsnotify_group' has no member named 'fanotify_data'
Caused by commit 0ed64ab6b338e4269c9f25de83781619ecd624f1 ("fsnotify:
code and error path cleanup in fsnotify_add_mark"). This build has
CONFIG_FANOTIFY not set.
I have used the fsnotify tree from next-20101109 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for November 9 (acpi_video)
From: Randy Dunlap @ 2010-11-10 1:06 UTC (permalink / raw)
To: Stephen Rothwell, Zhang Rui; +Cc: linux-next, LKML, linux-acpi
In-Reply-To: <20101109151618.a562f77a.sfr@canb.auug.org.au>
On Tue, 9 Nov 2010 15:16:18 +1100 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20101029:
one build had these errors:
drivers/built-in.o: In function `acpi_video_bus_put_one_device':
video.c:(.text+0x59bee): undefined reference to `thermal_cooling_device_unregister'
video.c:(.text+0x59bff): undefined reference to `video_output_unregister'
drivers/built-in.o: In function `acpi_video_device_find_cap':
video.c:(.text+0x5b3fc): undefined reference to `thermal_cooling_device_register'
video.c:(.text+0x5b57b): undefined reference to `video_output_register'
and another one had these errors:
drivers/built-in.o: In function `acpi_video_bus_put_one_device':
video.c:(.text+0xdc14a): undefined reference to `backlight_device_unregister'
drivers/built-in.o: In function `acpi_video_switch_brightness':
video.c:(.text+0xdc821): undefined reference to `backlight_force_update'
drivers/built-in.o: In function `acpi_video_device_find_cap':
video.c:(.text+0xdd8bd): undefined reference to `backlight_device_register'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* linux-next: build warnings after in Linus' tree
From: Stephen Rothwell @ 2010-11-10 0:56 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, Linus
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
Hi Al,
With Linus' tree, today's linux-next build (x86_64 allmodconfig)
produced these warnings:
drivers/xen/xenfs/super.c: In function 'xenfs_mount':
drivers/xen/xenfs/super.c:128: warning: return makes integer from pointer without a cast
drivers/xen/xenfs/super.c: At top level:
drivers/xen/xenfs/super.c:134: warning: initialization from incompatible pointer type
Introduced by commit fc14f2fef682df677d64a145256dbd263df2aa7b ("convert
get_sb_single() users").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Movement of the USB, TTY, Staging, and driver core trees for linux-next
From: Greg KH @ 2010-11-09 17:23 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, linux-usb, linux-serial, devel
Hi Stephen,
As discussed at the kernel summit, I've moved the USB, TTY, Staging, and
driver core trees into git instead of using quilt.
Previously you had been pulling in the quilt trees from kernel.org, so
this should hopefully be easier.
The location of the trees are now at:
USB:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
with the usb-next and usb-linus branches
TTY:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
with the tty-next and tty-linus branches
driver core:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
with the driver-core-next and driver-core-linus branches
staging:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
with the staging-next and staging-linus branches
Note the staging tree has moved from before, it used to be in a
staging-next-2.6.git/ tree, and now it is together with the main staging
development tree in just "staging-2.6.git/"
There are no known interdependancies between these trees, unlike my
previous quilt trees, so merges should be fine (if not, I should find
them as well.)
If there are any problems with this, please let me know.
thanks,
greg k-h
^ permalink raw reply
* linux-next: Tree for November 9
From: Stephen Rothwell @ 2010-11-09 4:16 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8614 bytes --]
Hi all,
Changes since 20101029:
Linus' tree gained a build failure for which I applied a patch.
The mips tree lost its conflicts.
The hid tree gained a conflict against Linus' tree.
The kernel-doc tree lost its conflict.
The mtd tree lost its conflict.
The voltage tree lost its conflict.
The watchdog tree lost its conflicts.
The trivial tree gained conflicts against Linus' and the blackfin trees.
The swiotlb-xen tree lost its conflicts.
The xen-pvhvm 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 176 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 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/rc-fixes
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-input.c
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
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 mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging 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/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree.
CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree.
CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
$ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile
CONFLICT (add/add): Merge conflict in arch/arm/kernel/swp_emulate.c
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/ct-ca9x4.c
CONFLICT (content): Merge conflict in arch/arm/mm/flush.c
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c
CONFLICT (content): Merge conflict in arch/x86/xen/setup.c
Merging swiotlb-xen/master
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 quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging staging-next/staging-next
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
Applying: openpromfs: fix for bad get_sb_single() conversion
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2010-11-09 4:03 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, David S. Miller, Linus
Hi Al,
After merging the scsi-post-merge tree, today's linux-next build (sparc32
defconfig) failed like this:
fs/openpromfs/inode.c: In function 'openprom_mount':
fs/openpromfs/inode.c:422: error: expected ';' before '}' token
Caused by commit fc14f2fef682df677d64a145256dbd263df2aa7b ("convert
get_sb_single() users") from Linus' tree. Pity that conmmit never made
it into the linux-next tree :-(
I added this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 9 Nov 2010 14:58:55 +1100
Subject: [PATCH] openpromfs: fix for bad get_sb_single() conversion
Fixes:
fs/openpromfs/inode.c: In function 'openprom_mount':
fs/openpromfs/inode.c:422: error: expected ';' before '}' token
on sparc.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/openpromfs/inode.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c
index ddb1f41..911e61f 100644
--- a/fs/openpromfs/inode.c
+++ b/fs/openpromfs/inode.c
@@ -418,7 +418,7 @@ out_no_root:
static struct dentry *openprom_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *data)
{
- return mount_single(fs_type, flags, data, openprom_fill_super)
+ return mount_single(fs_type, flags, data, openprom_fill_super);
}
static struct file_system_type openprom_fs_type = {
--
1.7.2.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: build warning after merge of the finaltree
From: Stephen Rothwell @ 2010-11-09 3:51 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Lee, Chun-Yi
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
Hi Dave,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) produced this warning:
In file included from drivers/gpu/stub/poulsbo.c:15:
include/acpi/video.h:22: warning: 'struct acpi_device' declared inside parameter list
include/acpi/video.h:22: warning: its scope is only this definition or declaration, which is probably not what you want
Introduced by commit e26fd1199ebab0d469fc3e037da5932d382f0669 ("gpu: Add
Intel GMA500(Poulsbo) Stub Driver"). Maybe this driver only needs to be
built on x86?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the trivial tree with Linus' tree
From: Stephen Rothwell @ 2010-11-09 2:31 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, "Uwe Kleine-König",
Jing Huang
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/scsi/bfa/bfa_fcpim.c between commit
5fbe25c7a664601666895e8f95eaa59bd9741392 ("[SCSI] bfa: fix comments for c
files") from Linus' tree and commit
b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
typos") from the trivial 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 drivers/scsi/bfa/bfa_fcpim.c
index 135c442,aabbf3d..0000000
--- a/drivers/scsi/bfa/bfa_fcpim.c
+++ b/drivers/scsi/bfa/bfa_fcpim.c
@@@ -2091,8 -2091,8 +2091,8 @@@ bfa_ioim_sm_cleanup_qfull(struct bfa_io
break;
case BFA_IOIM_SM_ABORT:
- /**
+ /*
- * IO is alraedy being cleaned up implicitly
+ * IO is already being cleaned up implicitly
*/
ioim->io_cbfn = __bfa_cb_ioim_abort;
break;
^ permalink raw reply
* linux-next: manual merge of the trivial tree with the tree
From: Stephen Rothwell @ 2010-11-09 2:27 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, "Uwe Kleine-König",
Mike Frysinger
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/blackfin/mach-bf538/include/mach/defBF539.h,
arch/blackfin/mach-bf518/include/mach/defBF51x_base.h and
arch/blackfin/mach-bf527/include/mach/defBF52x_base.h between various
commits from the blackfin tree and commit
b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
typos") from the trivial tree.
I just used the versions from the blackfin tree for now since they moved
large amounts of code around and deleted the latter 2 files.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the hid tree with Linus' tree
From: Stephen Rothwell @ 2010-11-09 1:33 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel, Joe Perches, Dmitry Torokhov
Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-input.c between commit
a0bf0ea809ba0a7621e191ec4cab5775d502ef7e ("Input: hid-input - switch to
using new keycode interface") from Linus' tree and commit
587d145200f26758940099fbbc301fdd43d3f391 ("HID: Remove KERN_DEBUG from
dbg_hid use") from the hid tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/hid/hid-input.c
index bb0b365,76e1f64..0000000
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@@ -165,24 -127,21 +165,24 @@@ static int hidinput_setkeycode(struct i
{
struct hid_device *hid = input_get_drvdata(dev);
struct hid_usage *usage;
- int old_keycode;
- usage = hidinput_find_key(hid, scancode, 0);
+ usage = hidinput_locate_usage(hid, ke, NULL);
if (usage) {
- old_keycode = usage->code;
- usage->code = keycode;
+ *old_keycode = usage->type == EV_KEY ?
+ usage->code : KEY_RESERVED;
+ usage->code = ke->keycode;
- clear_bit(old_keycode, dev->keybit);
+ clear_bit(*old_keycode, dev->keybit);
set_bit(usage->code, dev->keybit);
- dbg_hid(KERN_DEBUG "Assigned keycode %d to HID usage code %x\n",
+ dbg_hid("Assigned keycode %d to HID usage code %x\n",
- keycode, scancode);
- /* Set the keybit for the old keycode if the old keycode is used
- * by another key */
- if (hidinput_find_key (hid, 0, old_keycode))
- set_bit(old_keycode, dev->keybit);
+ usage->code, usage->hid);
+
+ /*
+ * Set the keybit for the old keycode if the old keycode is used
+ * by another key
+ */
+ if (hidinput_find_key(hid, match_keycode, *old_keycode, NULL))
+ set_bit(*old_keycode, dev->keybit);
return 0;
}
^ permalink raw reply
* linux-next: failed to fetch the genesis tree
From: Stephen Rothwell @ 2010-11-09 0:49 UTC (permalink / raw)
To: Paul Mundt; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
Hi Paul,
Fetching the genesis tree today produced this error:
fatal: '/pub/scm/linux/kernel/git/lethal/genesis-2.6.git' does not appear to be a git repository
I will use the version of the tree from next-20101029 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* RO/NX protection for loadable kernel modules
From: Kees Cook @ 2010-11-06 18:28 UTC (permalink / raw)
To: Rusty Russell
Cc: H. Peter Anvin, Siarhei Liakh, linux-kernel,
linux-security-module, linux-next, Arjan van de Ven, James Morris,
Andrew Morton, Andi Kleen, Thomas Gleixner, Ingo Molnar,
Stephen Rothwell, Dave Jones
Peter, anyone? What is the state of this? I can see it in the tip tree,
but it doesn't appear associated with a branch. What will it take to
get this into Linus's tree?
http://git.kernel.org/?p=linux/kernel/git/x86/linux-2.6-tip.git;a=commitdiff;h=65187d24fa3ef60f691f847c792e8eaca7e19251
This feature is needed before the function-pointer const-ification patches
will really have any meaning.
Thanks,
-Kees
On Tue, Oct 19, 2010 at 09:45:39PM -0700, Kees Cook wrote:
> On Mon, Feb 08, 2010 at 11:59:44AM +1030, Rusty Russell wrote:
> > On Tue, 2 Feb 2010 04:36:49 pm H. Peter Anvin wrote:
> > > On 02/01/2010 07:59 PM, Rusty Russell wrote:
> > > > On Tue, 2 Feb 2010 10:09:53 am Siarhei Liakh wrote:
> > > >> This patch is a logical extension of the protection provided by
> > > >> CONFIG_DEBUG_RODATA to LKMs. The protection is provided by splitting
> > > >> module_core and module_init into three logical parts each and setting
> > > >> appropriate page access permissions for each individual section:
> > > >>
> > > >> 1. Code: RO+X
> > > >> 2. RO data: RO+NX
> > > >> 3. RW data: RW+NX
> > > >
> > > > Thanks, applied!
> > >
> > > I also applied this to the -tip tree... do you prefer to carry it or
> > > should I leave it as is?
> >
> > I'm always happy for you to do my work for me! There are no other module
> > patches likely to conflict.
> >
> > Acked-by: Rusty Russell <rusty@rustcorp.com.au>
>
> Sorry for losing track, but where did this patch end up? I don't see it
> in any of the trees I've looked in.
--
Kees Cook
Ubuntu Security Team
^ permalink raw reply
* Re: linux-next: Tree for October 29 (staging/ath6kl)
From: Greg KH @ 2010-11-03 13:31 UTC (permalink / raw)
To: Vipin Mehta
Cc: Greg KH, Randy Dunlap, Martin K. Petersen, Chris Ball,
Stephen Rothwell, driverdevel, linux-next@vger.kernel.org, LKML
In-Reply-To: <35B17FE5076C7040809188FBE7913F983F847B52A2@SC1EXMB-MBCL.global.atheros.com>
On Tue, Nov 02, 2010 at 11:37:23AM -0700, Vipin Mehta wrote:
>
> On Fri, Oct 29, 2010 at 04:16:10PM -0700, Randy Dunlap wrote:
> > On Fri, 29 Oct 2010 12:11:48 +1100 Stephen Rothwell wrote:
> >
> > > Hi all,
> >
> >
> > drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c:288: error: 'struct mmc_host' has no member named 'max_hw_segs'
> > drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c:289: error: 'struct mmc_host' has no member named 'max_hw_segs'
>
> Looks like it was caused by:
> a36274e0184193e393fb82957925c3981a6b0477
>
> mmc: Remove distinction between hw and phys segments
>
>
> and it's a simple fix. I'll do it after -rc1 is out as I'm on my way to
> Boston now...
>
> I had submitted a patch for this a few weeks back and the required
> changes were present in the tag next-20101028. They somehow got
> reverted back in the tag next-20101029. Both Greg and Stephen
> should have the original patch but I can send it again if it helps.
>
> (Sorry my mutt is acting up so sending it through Outlook)
It's now in my tree and will get to Linus soon.
thanks,
greg k-h
^ 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