Merge tag 'v3.0.30' into uek2-2.6.39-300#14252075

This is the 3.0.30 stable release

Conflicts:
	drivers/xen/xenbus/xenbus_probe_frontend.c

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>

diff --cc Makefile
Simple merge

diff --cc drivers/net/ksz884x.c
index 33bcebfc6fc574ef4efe966e1ff836323ac7e03f,95b6664e93667d68b3d958d44998acbb9922fdf7..ec2a83d5f389c0798d4a1eef5fdd0515c15144e6
--- 1/drivers/net/ksz884x.c
--- 2/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@@ -5674,10 -5676,10 +5674,10 @@@ static int netdev_set_mac_address(struc
                hw_del_addr(hw, dev->dev_addr);
        else {
                hw->mac_override = 1;
 -              memcpy(hw->override_addr, mac->sa_data, MAC_ADDR_LEN);
 +              memcpy(hw->override_addr, mac->sa_data, ETH_ALEN);
        }
  
-       memcpy(dev->dev_addr, mac->sa_data, MAX_ADDR_LEN);
+       memcpy(dev->dev_addr, mac->sa_data, ETH_ALEN);
  
        interrupt = hw_block_intr(hw);
  

diff --cc fs/btrfs/ctree.h
index 09fd107aed194c9c782b0c256cacf8435ed55bc6,66179bcb16f6dc1711c793ca757e458523d52812..84933d0b33b105e54b53a8a8ff956e08edb52da7
--- 1/fs/btrfs/ctree.h
--- 2/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@@ -2025,58 -1972,9 +2025,58 @@@ BTRFS_SETGET_STACK_FUNCS(root_last_snap
  
  static inline bool btrfs_root_readonly(struct btrfs_root *root)
  {
-       return root->root_item.flags & BTRFS_ROOT_SUBVOL_RDONLY;
+       return (root->root_item.flags & cpu_to_le64(BTRFS_ROOT_SUBVOL_RDONLY)) != 0;
  }
  
 +/* struct btrfs_root_backup */
 +BTRFS_SETGET_STACK_FUNCS(backup_tree_root, struct btrfs_root_backup,
 +                 tree_root, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_tree_root_gen, struct btrfs_root_backup,
 +                 tree_root_gen, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_tree_root_level, struct btrfs_root_backup,
 +                 tree_root_level, 8);
 +
 +BTRFS_SETGET_STACK_FUNCS(backup_chunk_root, struct btrfs_root_backup,
 +                 chunk_root, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_chunk_root_gen, struct btrfs_root_backup,
 +                 chunk_root_gen, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_chunk_root_level, struct btrfs_root_backup,
 +                 chunk_root_level, 8);
 +
 +BTRFS_SETGET_STACK_FUNCS(backup_extent_root, struct btrfs_root_backup,
 +                 extent_root, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_extent_root_gen, struct btrfs_root_backup,
 +                 extent_root_gen, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_extent_root_level, struct btrfs_root_backup,
 +                 extent_root_level, 8);
 +
 +BTRFS_SETGET_STACK_FUNCS(backup_fs_root, struct btrfs_root_backup,
 +                 fs_root, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_fs_root_gen, struct btrfs_root_backup,
 +                 fs_root_gen, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_fs_root_level, struct btrfs_root_backup,
 +                 fs_root_level, 8);
 +
 +BTRFS_SETGET_STACK_FUNCS(backup_dev_root, struct btrfs_root_backup,
 +                 dev_root, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_dev_root_gen, struct btrfs_root_backup,
 +                 dev_root_gen, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_dev_root_level, struct btrfs_root_backup,
 +                 dev_root_level, 8);
 +
 +BTRFS_SETGET_STACK_FUNCS(backup_csum_root, struct btrfs_root_backup,
 +                 csum_root, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_csum_root_gen, struct btrfs_root_backup,
 +                 csum_root_gen, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_csum_root_level, struct btrfs_root_backup,
 +                 csum_root_level, 8);
 +BTRFS_SETGET_STACK_FUNCS(backup_total_bytes, struct btrfs_root_backup,
 +                 total_bytes, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_bytes_used, struct btrfs_root_backup,
 +                 bytes_used, 64);
 +BTRFS_SETGET_STACK_FUNCS(backup_num_devices, struct btrfs_root_backup,
 +                 num_devices, 64);
 +
  /* struct btrfs_super_block */
  
  BTRFS_SETGET_STACK_FUNCS(super_bytenr, struct btrfs_super_block, bytenr, 64);

diff --cc fs/ocfs2/suballoc.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge