forked from rpms/kernel
		
	Linux v3.19-5015-gc7d7b9867155
This commit is contained in:
		
							parent
							
								
									fe6305dc49
								
							
						
					
					
						commit
						87b2a17d8c
					
				| @ -59,7 +59,7 @@ index 5fa2e3035509..f2ffff2addbb 100644 | |||||||
|  ifdef CONFIG_DEBUG_INFO |  ifdef CONFIG_DEBUG_INFO | ||||||
|  ifdef CONFIG_DEBUG_INFO_SPLIT |  ifdef CONFIG_DEBUG_INFO_SPLIT | ||||||
| diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
 | diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
 | ||||||
| index e5ea3ab856bf..c10f3879e212 100644
 | index 79a9bb67aeaf..7a97851042f8 100644
 | ||||||
| --- a/lib/Kconfig.debug
 | --- a/lib/Kconfig.debug
 | ||||||
| +++ b/lib/Kconfig.debug
 | +++ b/lib/Kconfig.debug
 | ||||||
| @@ -165,7 +165,23 @@ config DEBUG_INFO_DWARF4
 | @@ -165,7 +165,23 @@ config DEBUG_INFO_DWARF4
 | ||||||
|  | |||||||
| @ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com> | |||||||
|  1 file changed, 6 insertions(+) |  1 file changed, 6 insertions(+) | ||||||
| 
 | 
 | ||||||
| diff --git a/drivers/char/mem.c b/drivers/char/mem.c
 | diff --git a/drivers/char/mem.c b/drivers/char/mem.c
 | ||||||
| index fc9637812d78..dde50e5bf527 100644
 | index bd117a1019f7..b59b3eb6674e 100644
 | ||||||
| --- a/drivers/char/mem.c
 | --- a/drivers/char/mem.c
 | ||||||
| +++ b/drivers/char/mem.c
 | +++ b/drivers/char/mem.c
 | ||||||
| @@ -167,6 +167,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
 | @@ -167,6 +167,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
 | ||||||
| @ -26,7 +26,7 @@ index fc9637812d78..dde50e5bf527 100644 | |||||||
|  	if (!valid_phys_addr_range(p, count)) |  	if (!valid_phys_addr_range(p, count)) | ||||||
|  		return -EFAULT; |  		return -EFAULT; | ||||||
|   |   | ||||||
| @@ -505,6 +508,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
 | @@ -516,6 +519,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
 | ||||||
|  	char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ |  	char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ | ||||||
|  	int err = 0; |  	int err = 0; | ||||||
|   |   | ||||||
|  | |||||||
| @ -4243,6 +4243,7 @@ CONFIG_F2FS_FS_XATTR=y | |||||||
| CONFIG_F2FS_FS_POSIX_ACL=y | CONFIG_F2FS_FS_POSIX_ACL=y | ||||||
| CONFIG_F2FS_FS_SECURITY=y | CONFIG_F2FS_FS_SECURITY=y | ||||||
| # CONFIG_F2FS_CHECK_FS is not set | # CONFIG_F2FS_CHECK_FS is not set | ||||||
|  | # CONFIG_F2FS_IO_TRACE is not set | ||||||
| 
 | 
 | ||||||
| # | # | ||||||
| # Network File Systems | # Network File Systems | ||||||
| @ -4262,6 +4263,7 @@ CONFIG_NFSD=m | |||||||
| CONFIG_NFSD_V3=y | CONFIG_NFSD_V3=y | ||||||
| CONFIG_NFSD_V3_ACL=y | CONFIG_NFSD_V3_ACL=y | ||||||
| CONFIG_NFSD_V4=y | CONFIG_NFSD_V4=y | ||||||
|  | CONFIG_NFSD_PNFS=y | ||||||
| CONFIG_NFSD_V4_SECURITY_LABEL=y | CONFIG_NFSD_V4_SECURITY_LABEL=y | ||||||
| CONFIG_NFS_FSCACHE=y | CONFIG_NFS_FSCACHE=y | ||||||
| # CONFIG_NFS_USE_LEGACY_DNS is not set | # CONFIG_NFS_USE_LEGACY_DNS is not set | ||||||
| @ -5274,6 +5276,7 @@ CONFIG_FRONTSWAP=y | |||||||
| CONFIG_ZSWAP=y | CONFIG_ZSWAP=y | ||||||
| CONFIG_ZBUD=y | CONFIG_ZBUD=y | ||||||
| CONFIG_ZSMALLOC=y | CONFIG_ZSMALLOC=y | ||||||
|  | # CONFIG_ZSMALLOC_STAT is not set | ||||||
| # CONFIG_PGTABLE_MAPPING is not set | # CONFIG_PGTABLE_MAPPING is not set | ||||||
| 
 | 
 | ||||||
| # CONFIG_MDIO_GPIO is not set | # CONFIG_MDIO_GPIO is not set | ||||||
| @ -5359,6 +5362,7 @@ CONFIG_PSTORE_RAM=m | |||||||
| # CONFIG_TEST_USER_COPY is not set | # CONFIG_TEST_USER_COPY is not set | ||||||
| # CONFIG_TEST_BPF is not set | # CONFIG_TEST_BPF is not set | ||||||
| # CONFIG_TEST_UDELAY is not set | # CONFIG_TEST_UDELAY is not set | ||||||
|  | # CONFIG_TEST_HEXDUMP is not set | ||||||
| # CONFIG_TEST_RHASHTABLE is not set | # CONFIG_TEST_RHASHTABLE is not set | ||||||
| 
 | 
 | ||||||
| # CONFIG_AVERAGE is not set | # CONFIG_AVERAGE is not set | ||||||
| @ -5379,6 +5383,8 @@ CONFIG_BCMA_DRIVER_GPIO=y | |||||||
| # CONFIG_GOOGLE_FIRMWARE is not set | # CONFIG_GOOGLE_FIRMWARE is not set | ||||||
| # CONFIG_INTEL_MID_PTI is not set | # CONFIG_INTEL_MID_PTI is not set | ||||||
| CONFIG_IOMMU_SUPPORT=y | CONFIG_IOMMU_SUPPORT=y | ||||||
|  | # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set | ||||||
|  | # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set | ||||||
| 
 | 
 | ||||||
| # CONFIG_MAILBOX is not set | # CONFIG_MAILBOX is not set | ||||||
| # CONFIG_ALTERA_MBOX is not set | # CONFIG_ALTERA_MBOX is not set | ||||||
|  | |||||||
| @ -14,10 +14,10 @@ Upstream-status: Fedora mustard | |||||||
|  1 file changed, 1 insertion(+), 2 deletions(-) |  1 file changed, 1 insertion(+), 2 deletions(-) | ||||||
| 
 | 
 | ||||||
| diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
 | diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
 | ||||||
| index 56d46ffb08e1..1c8db250df88 100644
 | index a08cda955285..e320e1e679cf 100644
 | ||||||
| --- a/drivers/block/floppy.c
 | --- a/drivers/block/floppy.c
 | ||||||
| +++ b/drivers/block/floppy.c
 | +++ b/drivers/block/floppy.c
 | ||||||
| @@ -4634,8 +4634,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
 | @@ -4633,8 +4633,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
 | ||||||
|  	{"PNP0700", 0}, |  	{"PNP0700", 0}, | ||||||
|  	{} |  	{} | ||||||
|  }; |  }; | ||||||
|  | |||||||
| @ -69,7 +69,7 @@ Summary: The Linux kernel | |||||||
| # The rc snapshot level | # The rc snapshot level | ||||||
| %define rcrev 0 | %define rcrev 0 | ||||||
| # The git snapshot level | # The git snapshot level | ||||||
| %define gitrev 4 | %define gitrev 5 | ||||||
| # Set rpm version accordingly | # Set rpm version accordingly | ||||||
| %define rpmversion 3.%{upstream_sublevel}.0 | %define rpmversion 3.%{upstream_sublevel}.0 | ||||||
| %endif | %endif | ||||||
| @ -2209,6 +2209,9 @@ fi | |||||||
| #                                    ||----w | | #                                    ||----w | | ||||||
| #                                    ||     || | #                                    ||     || | ||||||
| %changelog | %changelog | ||||||
|  | * Fri Feb 13 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git5.1 | ||||||
|  | - Linux v3.19-5015-gc7d7b9867155 | ||||||
|  | 
 | ||||||
| * Thu Feb 12 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git4.1 | * Thu Feb 12 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git4.1 | ||||||
| - Linux v3.19-4542-g8cc748aa76c9 | - Linux v3.19-4542-g8cc748aa76c9 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -19,10 +19,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> | |||||||
|  1 file changed, 2 insertions(+), 1 deletion(-) |  1 file changed, 2 insertions(+), 1 deletion(-) | ||||||
| 
 | 
 | ||||||
| diff --git a/lib/Kconfig b/lib/Kconfig
 | diff --git a/lib/Kconfig b/lib/Kconfig
 | ||||||
| index 54cf309a92a5..64f8bb4882fb 100644
 | index cd177caf3876..c81dea0ae574 100644
 | ||||||
| --- a/lib/Kconfig
 | --- a/lib/Kconfig
 | ||||||
| +++ b/lib/Kconfig
 | +++ b/lib/Kconfig
 | ||||||
| @@ -382,7 +382,8 @@ config CHECK_SIGNATURE
 | @@ -391,7 +391,8 @@ config CHECK_SIGNATURE
 | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
|  config CPUMASK_OFFSTACK |  config CPUMASK_OFFSTACK | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								sources
									
									
									
									
									
								
							| @ -1,3 +1,3 @@ | |||||||
| d3fc8316d4d4d04b65cbc2d70799e763  linux-3.19.tar.xz | d3fc8316d4d4d04b65cbc2d70799e763  linux-3.19.tar.xz | ||||||
| 15d8d2f97ce056488451a5bfb2944603  perf-man-3.19.tar.gz | 15d8d2f97ce056488451a5bfb2944603  perf-man-3.19.tar.gz | ||||||
| 99edddd55ccd2254cdaf97898949cb78  patch-3.19-git4.xz | b0fbaaa54036f35db20f1d6cfae2aab9  patch-3.19-git5.xz | ||||||
|  | |||||||
| @ -20,7 +20,7 @@ Signed-off-by: Dave Jones <davej@redhat.com> | |||||||
|  1 file changed, 29 insertions(+) |  1 file changed, 29 insertions(+) | ||||||
| 
 | 
 | ||||||
| diff --git a/kernel/watchdog.c b/kernel/watchdog.c
 | diff --git a/kernel/watchdog.c b/kernel/watchdog.c
 | ||||||
| index 70bf11815f84..4eeb9923472b 100644
 | index 3174bf8e3538..d0a8abec3df9 100644
 | ||||||
| --- a/kernel/watchdog.c
 | --- a/kernel/watchdog.c
 | ||||||
| +++ b/kernel/watchdog.c
 | +++ b/kernel/watchdog.c
 | ||||||
| @@ -19,6 +19,7 @@
 | @@ -19,6 +19,7 @@
 | ||||||
|  | |||||||
| @ -44,7 +44,7 @@ index 4ddaf66ea35f..00b440307419 100644 | |||||||
|  	} |  	} | ||||||
|  	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); |  	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); | ||||||
| diff --git a/drivers/char/mem.c b/drivers/char/mem.c
 | diff --git a/drivers/char/mem.c b/drivers/char/mem.c
 | ||||||
| index 4c58333b4257..fc9637812d78 100644
 | index 9a6b63783a94..bd117a1019f7 100644
 | ||||||
| --- a/drivers/char/mem.c
 | --- a/drivers/char/mem.c
 | ||||||
| +++ b/drivers/char/mem.c
 | +++ b/drivers/char/mem.c
 | ||||||
| @@ -27,6 +27,7 @@
 | @@ -27,6 +27,7 @@
 | ||||||
| @ -55,7 +55,7 @@ index 4c58333b4257..fc9637812d78 100644 | |||||||
|   |   | ||||||
|  #include <asm/uaccess.h> |  #include <asm/uaccess.h> | ||||||
|   |   | ||||||
| @@ -571,6 +572,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
 | @@ -582,6 +583,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
 | ||||||
|  	unsigned long i = *ppos; |  	unsigned long i = *ppos; | ||||||
|  	const char __user *tmp = buf; |  	const char __user *tmp = buf; | ||||||
|   |   | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user