headers
Stephen Rothwell | 20 May 2013 06:49
Picon
Picon

linux-next: Tree for May 20

Hi all,

Changes since 20130517:

The usb.current tree gained a conflict against Linus' tree.

The rr-fixes tree gained a build failure so I used the version from
next-20130515.

The akpm tree gained conflicts against Linus' and the net-next 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/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,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
(Continue reading)

Permalink | Reply | 1 comment |
headers
Stephen Rothwell | 20 May 2013 06:04
Picon
Picon

linux-next: manual merge of the akpm tree with Linus' tree

Hi Andrew,

Today's linux-next merge of the akpm tree got conflicts in
fs/btrfs/inode.c and fs/btrfs/volumes.c between commit 9be3395bcd4a
("Btrfs: use a btrfs bioset instead of abusing bio internals") from
Linus' tree and commit "block: prep work for batch completion" from the
akpm tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

I also noticed that a single conversion of bio_endio to bio_endio_batch
is done in the akpm patch but bio_endio_batch is not introduced until a
later patch ... :-(

--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au

diff --cc fs/btrfs/inode.c
index af978f7,551c8bd..0000000
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
 <at>  <at>  <at>  -6932,14 -6928,11 +6932,15  <at>  <at>  <at>  struct btrfs_dio_private 
  	/* IO errors */
  	int errors;

 +	/* orig_bio is our btrfs_io_bio */
  	struct bio *orig_bio;
 +
(Continue reading)

Permalink | Reply | 1 comment |
headers
Stephen Rothwell | 20 May 2013 02:51
Picon
Picon

linux-next: build failure after merge of the rr-fixes tree

Hi Rusty,

After merging the rr-fixes tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/dma/iovlock.c: In function 'dma_pin_iovec_pages':
drivers/dma/iovlock.c:98:21: error: dereferencing pointer to incomplete type
   down_read(&current->mm->mmap_sem);
                     ^
drivers/dma/iovlock.c:101:11: error: dereferencing pointer to incomplete type
    current->mm,
           ^
drivers/dma/iovlock.c:108:19: error: dereferencing pointer to incomplete type
   up_read(&current->mm->mmap_sem);
                   ^

Caused by commit 11227d242a8c ("Hoist memcpy_fromiovec/memcpy_toiovec
into lib/").  Clearly, net/tcp.h was indirectly including sched.h or
asm/current.h.  Changing inclusions is fraught with problems since people
do not follow Rule 1 (in Documentation/SubmitChecklist) consistently.  :-(

I have used the rr-fixes tree from next-20130515 (since the fix in
rr-fixes in next-20130516/7 conflicts with the better fix now in Linus'
tree) for today.

--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
Permalink | Reply | 1 comment |
headers
Stephen Rothwell | 20 May 2013 02:21
Picon
Picon

linux-next: manual merge of the usb.current tree with Linus' tree

Hi Greg,

Today's linux-next merge of the usb.current tree got a conflict in
drivers/usb/host/ohci-nxp.c between commit bb522812a1a6
("drivers/usb/host: don't check resource with devm_ioremap_resource")
from Linus' tree and commit b3517d5de80e ("usb: ohci: fix goto wrong tag
in err case") from the usb.current tree.

The former remove a bit of code modified by the latter, so I did that and
can carry the fix as necessary (no action is required).

--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
Permalink | Reply | 1 comment |
headers
Eric Paris | 17 May 2013 21:08
Picon
Favicon

Re: linux-next: build warning after merge of the final tree (in Linus' tree)

On Fri, 2013-05-17 at 10:47 +0530, Viresh Kumar wrote:
> On Wed, May 15, 2013 at 7:02 PM, Eric Paris <eparis <at> redhat.com> wrote:
> > On Wed, 2013-05-15 at 13:20 +1000, Stephen Rothwell wrote:
> >> Hi ,
> >>
> >> After merging the final tree, today's linux-next build (i386 defconfig)
> >> produced this warning:
> >>
> >> kernel/auditfilter.c: In function 'audit_data_to_entry':
> >> kernel/auditfilter.c:426:3: warning: this decimal constant is unsigned only in ISO C90 [enabled by default]
> >>
> >> Introduced by commit 780a7654cee8 ("audit: Make testing for a valid
> >> loginuid explicit") from Linus' tree.
> >
> > Thank you, I'll fix it up.  What am I likely missing that I don't see it
> > on my builds?  I'm using gcc 4.8.  Is there a config option that enables
> > additional warnings?
> 
> Is  this fixed? I couldn't find a relevant patch in linux-next/master for it.

Something should be posted by the end of the day.  Sorry for the delay.
Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 16 May 2013 07:08
Picon
Picon

linux-next: Tree for May 16

Hi all,

Changes since 20130515:

New tree: mvebu

The renesas tree gained a conflict against Linus' tree.

The akpm tree lost a patch that turned up elsewhere.

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

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/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,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
(Continue reading)

Permalink | Reply | 1 comment |
headers
Stephen Rothwell | 16 May 2013 05:22
Picon
Picon

linux-next: manual merge of the renesas tree with Linus' tree

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/board-lager.c between commit 65be2de17aae ("ARM:
shmobile: use r8a7790 timer setup code on Lager") from Linus' tree and
commit 993340a1390d ("ARM: shmobile: use r8a7790 timer setup code on
Lager") from the renesas tree.

These are the same patch but different commits :-( and there are further
commits touching this file in the renesas tree.  Please clean up your
tree and remove anything that has already gone upstream as different
patches.  I used the renesas tree version of this file.

--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
Permalink | Reply | 2 comments |
headers
Stephen Rothwell | 15 May 2013 05:26
Picon
Picon

linux-next: Tree for May 15

Hi all,

Changes since 20130514:

I have started doing some builds with gcc 4.8.0 and while I can't easily
tell if I am getting more or less warnings, the ones I do get are now
much more verbose.   This is a hint to people to clean some of them up,
please!

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

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/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,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
(Continue reading)

Permalink | Reply | 12 comments |
headers
Stephen Rothwell | 15 May 2013 05:20
Picon
Picon

linux-next: build warning after merge of the final tree (in Linus' tree)

Hi ,

After merging the final tree, today's linux-next build (i386 defconfig)
produced this warning:

kernel/auditfilter.c: In function 'audit_data_to_entry':
kernel/auditfilter.c:426:3: warning: this decimal constant is unsigned only in ISO C90 [enabled by default]

Introduced by commit 780a7654cee8 ("audit: Make testing for a valid
loginuid explicit") from Linus' tree.

--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
Permalink | Reply | 3 comments |
headers
Stephen Rothwell | 14 May 2013 06:17
Picon
Picon

linux-next: Tree for May 14

Hi all,

Changes since 20130513:

<crickets :-)>

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

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/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,
sparc64 and arm 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 225 trees (counting Linus' and 31 trees of patches pending
(Continue reading)

Permalink | Reply | 30 comments |
headers
Randy Dunlap | 13 May 2013 21:45
Favicon

Re: linux-next: Tree for May 8 (dlm)

[resending since mail server dropped it]

On 05/13/13 12:34, Randy Dunlap wrote:
> On 05/13/13 12:31, Randy Dunlap wrote:
>> On 05/13/13 09:30, Randy Dunlap wrote:
>>> On 05/13/13 02:18, Steven Whitehouse wrote:
>>>> Hi,
>>>>
>>>> On Thu, 2013-05-09 at 10:08 -0700, Randy Dunlap wrote:
>>>>> On 05/09/13 09:50, David Teigland wrote:
>>>>>> On Thu, May 09, 2013 at 09:47:45AM +1000, Stephen Rothwell wrote:
>>>>>>> [Just forwarding to David ...]
>>>>>>>
>>>>>>> On Wed, 08 May 2013 11:04:45 -0700 Randy Dunlap <rdunlap <at> infradead.org> wrote:
>>>>>>>>
>>>>>>>> on x86_64:
>>>>>>>>
>>>>>>>> when CONFIG_GFS2_FS_LOCKING_DLM=y and CONFIG_DLM=m:
>>>>>>>>
>>>>>>>> fs/built-in.o: In function `gfs2_lock':
>>>>>>>> file.c:(.text+0xa512c): undefined reference to `dlm_posix_get'
>>>>>>>> file.c:(.text+0xa5140): undefined reference to `dlm_posix_unlock'
>>>>>>>> file.c:(.text+0xa514a): undefined reference to `dlm_posix_lock'
>>>>>>
>>>>>> gfs2/file.c calls the dlm directly, so I suppose gfs2 itself needs
>>>>>> to depend on the dlm.  It's been like this for a long time, so I
>>>>>> don't know why it only appeared now.
>>>>>
>>>>> Agreed to both statements.
>>>>>
(Continue reading)

Permalink | Reply | 3 comments |

Gmane