linux-next: manual merge of the trivial tree with the ext4 tree

linux-next: manual merge of the trivial tree with the ext4 tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
fs/ext4/ext4.h between commit 673c610033a8202c037ecd068c7a235495acda17
("ext4: Move struct ext4_mount_options from ext4.h to super.c") from the
ext4 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 fs/ext4/ext4.h
index 2a73925,1f253a9..0000000
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@@ -561,7 -561,23 +561,7 @@@ struct ext4_new_group_data 
  #define EXT4_IOC32_SETVERSION_OLD	FS_IOC32_SETVERSION
  #endif
  
- /* Max physical block we can addres w/o extents */
 -
 -/*
 - *  Mount options
 - */
 -struct ext4_mount_options {
 -	unsigned long s_mount_opt;
 -	uid_t s_resuid;
 -	gid_t s_resgid;
 -	unsigned long s_commit_interval;
 -	u32 s_min_batch_time, s_max_batch_time;
 -#ifdef CONFIG_QUOTA
 -	int s_jquota_fmt;
 -	char *s_qf_names[MAXQUOTAS];
 -#endif
 -};
 -
+ /* Max physical block we can address w/o extents */
  #define EXT4_MAX_BLOCK_FILE_PHYS	0xFFFFFFFF
  
  /*

Re: linux-next: manual merge of the trivial tree with the ext4 tree

[Uwe Kleine-König]

Hi Stephen,

On Fri, Dec 31, 2010 at 12:57:21PM +1100, Stephen Rothwell wrote:
> diff --cc fs/ext4/ext4.h
> index 2a73925,1f253a9..0000000
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@@ -561,7 -561,23 +561,7 @@@ struct ext4_new_group_data 
>   #define EXT4_IOC32_SETVERSION_OLD	FS_IOC32_SETVERSION
>   #endif
>   
> - /* Max physical block we can addres w/o extents */
>  -
>  -/*
>  - *  Mount options
>  - */
>  -struct ext4_mount_options {
>  -	unsigned long s_mount_opt;
>  -	uid_t s_resuid;
>  -	gid_t s_resgid;
>  -	unsigned long s_commit_interval;
>  -	u32 s_min_batch_time, s_max_batch_time;
>  -#ifdef CONFIG_QUOTA
>  -	int s_jquota_fmt;
>  -	char *s_qf_names[MAXQUOTAS];
>  -#endif
>  -};
>  -
> + /* Max physical block we can address w/o extents */
>   #define EXT4_MAX_BLOCK_FILE_PHYS	0xFFFFFFFF
>   
>   /*
> 
Looks correct.

Independant of this I think it would be better to define
EXT4_MAX_BLOCK_FILE_PHYS to 0xFFFFFFFFUL to have the same type on all
platforms.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

linux-next: manual merge of the trivial tree with the ext4 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
fs/ext4/balloc.c between commit 4433871130f36585fde38e7dd817433296648945
("ext4: fold ext4_free_blocks() and ext4_mb_free_blocks()") from the ext4
tree and commit 15dcf8433b514d1dc1b80d87a0798c2db2c37e95 ("tree-wide: fix
some typos and punctuation in comments") from the trivial tree.

The former moved the comment fixed by the latter and fixed the typo along
the way.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the trivial tree with the ext4 tree

[Jiri Kosina]

On Wed, 25 Nov 2009, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> fs/ext4/balloc.c between commit 4433871130f36585fde38e7dd817433296648945
> ("ext4: fold ext4_free_blocks() and ext4_mb_free_blocks()") from the ext4
> tree and commit 15dcf8433b514d1dc1b80d87a0798c2db2c37e95 ("tree-wide: fix
> some typos and punctuation in comments") from the trivial tree.
> 
> The former moved the comment fixed by the latter and fixed the typo along
> the way.

Dropped the mballoc hunk from my queue, thanks.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: linux-next: manual merge of the trivial tree with the ext4 tree

[tytso]

On Wed, Nov 25, 2009 at 12:16:43PM +0100, Jiri Kosina wrote:
> On Wed, 25 Nov 2009, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the trivial tree got a conflict in
> > fs/ext4/balloc.c between commit 4433871130f36585fde38e7dd817433296648945
> > ("ext4: fold ext4_free_blocks() and ext4_mb_free_blocks()") from the ext4
> > tree and commit 15dcf8433b514d1dc1b80d87a0798c2db2c37e95 ("tree-wide: fix
> > some typos and punctuation in comments") from the trivial tree.
> > 
> > The former moved the comment fixed by the latter and fixed the typo along
> > the way.
> 
> Dropped the mballoc hunk from my queue, thanks.

You mean balloc hunk, I hope.  (In the commit in question, I moved the
comment from fs/ext4/balloc.c to fs/ext4/mballoc.c.)

						- Ted

Re: linux-next: manual merge of the trivial tree with the ext4 tree

[Jiri Kosina]

On Wed, 25 Nov 2009, tytso@mit.edu wrote:

> > > Today's linux-next merge of the trivial tree got a conflict in
> > > fs/ext4/balloc.c between commit 4433871130f36585fde38e7dd817433296648945
> > > ("ext4: fold ext4_free_blocks() and ext4_mb_free_blocks()") from the ext4
> > > tree and commit 15dcf8433b514d1dc1b80d87a0798c2db2c37e95 ("tree-wide: fix
> > > some typos and punctuation in comments") from the trivial tree.
> > > 
> > > The former moved the comment fixed by the latter and fixed the typo along
> > > the way.
> > 
> > Dropped the mballoc hunk from my queue, thanks.
> 
> You mean balloc hunk, I hope.  (In the commit in question, I moved the
> comment from fs/ext4/balloc.c to fs/ext4/mballoc.c.)

Yup, sorry, I have been looking at completely different patch while 
writing the mail and got side-tracked.

Anyway, the conflict between ext4 and trivial trees should be gone now.

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: linux-next: manual merge of the trivial tree with the ext4 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

Hi Jiri,

On Wed, 25 Nov 2009 12:16:43 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrote:
>
> Dropped the mballoc hunk from my queue, thanks.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]