Home Home > GIT Browse > SLE12-SP3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-01-20 16:17:55 +0100
committerMichal Suchanek <msuchanek@suse.de>2019-01-20 16:28:51 +0100
commit1c34c09e536e9ef8fbb992559a82e51730ccf87f (patch)
tree4a8e477ccb5db1553e456aaf24f492044d84a283
parentdc4235a4abab6be90993db4c9a8c79adf6cb40a8 (diff)
Fix misordered patch hunks.
- Refresh patches.arch/0049-ACPI-CPPC-Add-prefix-cppc-to-cpudata-structure-name.patch. - Refresh patches.arch/s390-sles12sp3-01-02-dasd-remove-casts-to-dasd_-_private.patch. - Refresh patches.drivers/i2c-designware-baytrail-Add-support-for-cherrytrail. - Refresh patches.fixes/0003-xfs-return-start-block-of-first-bad-log-record-durin.patch. - Refresh patches.suse/sched-core-Kill-sched_class-task_waking-to-clean-up-the-migration-logic.patch. - Refresh patches.suse/0004-mm-memory_hotplug-get-rid-of-is_zone_device_section.patch. Failed to load patch "patches.fixes/0003-xfs-return-start-block-of-first-bad-log-record-durin.patch" Misordered hunks: #1 at line 4306 and #2 at line 4257 Failed to load patch "patches.arch/s390-sles12sp3-01-02-dasd-remove-casts-to-dasd_-_private.patch" Misordered hunks: #13 at line 1514 and #14 at line 1513 Failed to load patch "patches.suse/sched-core-Kill-sched_class-task_waking-to-clean-up-the-migration-logic.patch" Misordered hunks: #1 at line 1168 and #2 at line 1141 Failed to load patch "patches.arch/0049-ACPI-CPPC-Add-prefix-cppc-to-cpudata-structure-name.patch" Misordered hunks: #2 at line 100 and #3 at line 66 Failed to load patch "patches.drivers/i2c-designware-baytrail-Add-support-for-cherrytrail" Misordered hunks: #3 at line 100 and #4 at line 77 Failed to load patch "patches.suse/0004-mm-memory_hotplug-get-rid-of-is_zone_device_section.patch" Hunks #3 and #4 overlap with more than just context
-rw-r--r--patches.arch/0049-ACPI-CPPC-Add-prefix-cppc-to-cpudata-structure-name.patch23
-rw-r--r--patches.arch/s390-sles12sp3-01-02-dasd-remove-casts-to-dasd_-_private.patch96
-rw-r--r--patches.drivers/i2c-designware-baytrail-Add-support-for-cherrytrail14
-rw-r--r--patches.fixes/0003-xfs-return-start-block-of-first-bad-log-record-durin.patch2
-rw-r--r--patches.suse/0004-mm-memory_hotplug-get-rid-of-is_zone_device_section.patch28
-rw-r--r--patches.suse/sched-core-Kill-sched_class-task_waking-to-clean-up-the-migration-logic.patch20
6 files changed, 87 insertions, 96 deletions
diff --git a/patches.arch/0049-ACPI-CPPC-Add-prefix-cppc-to-cpudata-structure-name.patch b/patches.arch/0049-ACPI-CPPC-Add-prefix-cppc-to-cpudata-structure-name.patch
index 1190fd9fee..6eef0a82ca 100644
--- a/patches.arch/0049-ACPI-CPPC-Add-prefix-cppc-to-cpudata-structure-name.patch
+++ b/patches.arch/0049-ACPI-CPPC-Add-prefix-cppc-to-cpudata-structure-name.patch
@@ -20,8 +20,6 @@ Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
include/acpi/cppc_acpi.h | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
-diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
-index 715fe8001d59..3d1ae6d37178 100644
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
@@ -409,13 +409,13 @@ end:
@@ -40,11 +38,9 @@ index 715fe8001d59..3d1ae6d37178 100644
struct acpi_psd_package *pdomain;
struct acpi_psd_package *match_pdomain;
struct cpc_desc *cpc_ptr, *match_cpc_ptr;
-diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
-index e6a33596dea3..6588ec567d93 100644
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
-@@ -30,7 +30,7 @@
+@@ -39,7 +39,7 @@
* performance capabilities, desired performance level
* requested etc.
*/
@@ -53,7 +49,7 @@ index e6a33596dea3..6588ec567d93 100644
/* Capture the max KHz from DMI */
static u64 cppc_dmi_max_khz;
-@@ -100,7 +100,7 @@
+@@ -78,7 +78,7 @@ static int cppc_cpufreq_set_target(struc
unsigned int target_freq,
unsigned int relation)
{
@@ -62,7 +58,7 @@ index e6a33596dea3..6588ec567d93 100644
struct cpufreq_freqs freqs;
int ret = 0;
-@@ -66,7 +66,7 @@ static int cppc_verify_policy(struct cpufreq_policy *policy)
+@@ -108,7 +108,7 @@ static int cppc_verify_policy(struct cpu
static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy)
{
int cpu_num = policy->cpu;
@@ -71,7 +67,7 @@ index e6a33596dea3..6588ec567d93 100644
int ret;
cpu->perf_ctrls.desired_perf = cpu->perf_caps.lowest_perf;
-@@ -79,7 +79,7 @@ static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy)
+@@ -121,7 +121,7 @@ static void cppc_cpufreq_stop_cpu(struct
static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
{
@@ -80,7 +76,7 @@ index e6a33596dea3..6588ec567d93 100644
unsigned int cpu_num = policy->cpu;
int ret = 0;
-@@ -135,7 +135,7 @@ static struct cpufreq_driver cppc_cpufreq_driver = {
+@@ -190,7 +190,7 @@ static struct cpufreq_driver cppc_cpufre
static int __init cppc_cpufreq_init(void)
{
int i, ret = 0;
@@ -89,7 +85,7 @@ index e6a33596dea3..6588ec567d93 100644
if (acpi_disabled)
return -ENODEV;
-@@ -145,7 +145,7 @@ static int __init cppc_cpufreq_init(void)
+@@ -200,7 +200,7 @@ static int __init cppc_cpufreq_init(void
return -ENOMEM;
for_each_possible_cpu(i) {
@@ -98,7 +94,7 @@ index e6a33596dea3..6588ec567d93 100644
if (!all_cpu_data[i])
goto out;
-@@ -176,7 +176,7 @@ out:
+@@ -236,7 +236,7 @@ out:
static void __exit cppc_cpufreq_exit(void)
{
@@ -107,8 +103,6 @@ index e6a33596dea3..6588ec567d93 100644
int i;
cpufreq_unregister_driver(&cppc_cpufreq_driver);
-diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h
-index 0e83cc3009bc..427a7c3e6c75 100644
--- a/include/acpi/cppc_acpi.h
+++ b/include/acpi/cppc_acpi.h
@@ -119,7 +119,7 @@ struct cppc_perf_fb_ctrs {
@@ -129,6 +123,3 @@ index 0e83cc3009bc..427a7c3e6c75 100644
extern unsigned int cppc_get_transition_latency(int cpu);
#endif /* _CPPC_ACPI_H*/
---
-2.11.0
-
diff --git a/patches.arch/s390-sles12sp3-01-02-dasd-remove-casts-to-dasd_-_private.patch b/patches.arch/s390-sles12sp3-01-02-dasd-remove-casts-to-dasd_-_private.patch
index 0a76828c20..3ba843c34b 100644
--- a/patches.arch/s390-sles12sp3-01-02-dasd-remove-casts-to-dasd_-_private.patch
+++ b/patches.arch/s390-sles12sp3-01-02-dasd-remove-casts-to-dasd_-_private.patch
@@ -337,7 +337,7 @@ Acked-by: John Jolly <jjolly@suse.com>
}
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
-@@ -218,10 +218,9 @@ check_XRC (struct ccw1 *de_ccw,
+@@ -212,10 +212,9 @@ check_XRC (struct ccw1 *de_ccw,
struct DE_eckd_data *data,
struct dasd_device *device)
{
@@ -349,7 +349,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (!private->rdc_data.facilities.XRC_supported)
return 0;
-@@ -243,13 +242,11 @@ static int
+@@ -237,13 +236,11 @@ static int
define_extent(struct ccw1 *ccw, struct DE_eckd_data *data, unsigned int trk,
unsigned int totrk, int cmd, struct dasd_device *device)
{
@@ -364,7 +364,7 @@ Acked-by: John Jolly <jjolly@suse.com>
ccw->cmd_code = DASD_ECKD_CCW_DEFINE_EXTENT;
ccw->flags = 0;
ccw->count = 16;
-@@ -331,10 +328,9 @@ define_extent(struct ccw1 *ccw, struct D
+@@ -322,10 +319,9 @@ define_extent(struct ccw1 *ccw, struct D
static int check_XRC_on_prefix(struct PFX_eckd_data *pfxdata,
struct dasd_device *device)
{
@@ -376,7 +376,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (!private->rdc_data.facilities.XRC_supported)
return 0;
-@@ -355,12 +351,10 @@ static void fill_LRE_data(struct LRE_eck
+@@ -346,12 +342,10 @@ static void fill_LRE_data(struct LRE_eck
struct dasd_device *device, unsigned int reclen,
unsigned int tlf)
{
@@ -390,7 +390,7 @@ Acked-by: John Jolly <jjolly@suse.com>
memset(data, 0, sizeof(*data));
sector = 0;
if (rec_on_trk) {
-@@ -497,8 +491,8 @@ static int prefix_LRE(struct ccw1 *ccw,
+@@ -488,8 +482,8 @@ static int prefix_LRE(struct ccw1 *ccw,
u16 heads, beghead, endhead;
int rc = 0;
@@ -401,7 +401,7 @@ Acked-by: John Jolly <jjolly@suse.com>
dedata = &pfxdata->define_extent;
lredata = &pfxdata->locate_record;
-@@ -643,12 +637,10 @@ locate_record(struct ccw1 *ccw, struct L
+@@ -633,12 +627,10 @@ locate_record(struct ccw1 *ccw, struct L
unsigned int rec_on_trk, int no_rec, int cmd,
struct dasd_device * device, int reclen)
{
@@ -415,7 +415,7 @@ Acked-by: John Jolly <jjolly@suse.com>
DBF_DEV_EVENT(DBF_INFO, device,
"Locate: trk %d, rec %d, no_rec %d, cmd %d, reclen %d",
trk, rec_on_trk, no_rec, cmd, reclen);
-@@ -812,10 +804,9 @@ static void create_uid(struct dasd_eckd_
+@@ -802,10 +794,9 @@ static void create_uid(struct dasd_eckd_
*/
static int dasd_eckd_generate_uid(struct dasd_device *device)
{
@@ -427,7 +427,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (!private)
return -ENODEV;
if (!private->ned || !private->gneq)
-@@ -828,11 +819,10 @@ static int dasd_eckd_generate_uid(struct
+@@ -818,11 +809,10 @@ static int dasd_eckd_generate_uid(struct
static int dasd_eckd_get_uid(struct dasd_device *device, struct dasd_uid *uid)
{
@@ -441,7 +441,7 @@ Acked-by: John Jolly <jjolly@suse.com>
spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
*uid = private->uid;
spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
-@@ -1046,10 +1036,9 @@ static unsigned char dasd_eckd_path_acce
+@@ -1036,10 +1026,9 @@ static unsigned char dasd_eckd_path_acce
static void dasd_eckd_clear_conf_data(struct dasd_device *device)
{
@@ -453,7 +453,7 @@ Acked-by: John Jolly <jjolly@suse.com>
private->conf_data = NULL;
private->conf_len = 0;
for (i = 0; i < 8; i++) {
-@@ -1074,7 +1063,7 @@ static int dasd_eckd_read_conf(struct da
+@@ -1060,7 +1049,7 @@ static int dasd_eckd_read_conf(struct da
struct dasd_uid *uid;
char print_path_uid[60], print_device_uid[60];
@@ -462,7 +462,7 @@ Acked-by: John Jolly <jjolly@suse.com>
path_data = &device->path_data;
opm = ccw_device_get_path_mask(device->cdev);
conf_data_saved = 0;
-@@ -1237,11 +1225,10 @@ static u32 get_fcx_max_data(struct dasd_
+@@ -1193,11 +1182,10 @@ static int dasd_eckd_read_conf(struct da
static int verify_fcx_max_data(struct dasd_device *device, __u8 lpm)
{
@@ -475,7 +475,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (private->fcx_max_data) {
mdc = ccw_device_get_mdc(device->cdev, lpm);
if ((mdc < 0)) {
-@@ -1267,15 +1254,10 @@ static int verify_fcx_max_data(struct da
+@@ -1223,15 +1211,10 @@ static int verify_fcx_max_data(struct da
static int rebuild_device_uid(struct dasd_device *device,
struct path_verification_work_data *data)
{
@@ -483,19 +483,19 @@ Acked-by: John Jolly <jjolly@suse.com>
- struct dasd_path *path_data;
- __u8 lpm, opm;
- int rc;
-+ struct dasd_eckd_private *private = device->private;
-+ struct dasd_path *path_data = &device->path_data;
-+ __u8 lpm, opm = path_data->opm;
-+ int rc = -ENODEV;
-
- rc = -ENODEV;
- private = (struct dasd_eckd_private *) device->private;
- path_data = &device->path_data;
- opm = device->path_data.opm;
++ struct dasd_eckd_private *private = device->private;
++ struct dasd_path *path_data = &device->path_data;
++ __u8 lpm, opm = path_data->opm;
++ int rc = -ENODEV;
for (lpm = 0x80; lpm; lpm >>= 1) {
if (!(lpm & opm))
-@@ -1514,14 +1498,13 @@ static void dasd_eckd_reset_path(struct
+@@ -1465,14 +1448,13 @@ static int dasd_eckd_verify_path(struct
static int dasd_eckd_read_features(struct dasd_device *device)
{
@@ -511,7 +511,7 @@ Acked-by: John Jolly <jjolly@suse.com>
memset(&private->features, 0, sizeof(struct dasd_rssd_features));
cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ + 1 /* RSSD */,
(sizeof(struct dasd_psf_prssd_data) +
-@@ -1513,11 +1639,9 @@ dasd_eckd_psf_ssc(struct dasd_device *de
+@@ -1607,11 +1589,9 @@ dasd_eckd_psf_ssc(struct dasd_device *de
static int dasd_eckd_validate_server(struct dasd_device *device,
unsigned long flags)
{
@@ -525,7 +525,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (private->uid.type == UA_BASE_PAV_ALIAS ||
private->uid.type == UA_HYPER_PAV_ALIAS)
return 0;
-@@ -1515,14 +1199,13 @@ static int dasd_eckd_read_conf(struct da
+@@ -1664,14 +1644,13 @@ static void dasd_eckd_kick_validate_serv
static u32 get_fcx_max_data(struct dasd_device *device)
{
@@ -542,7 +542,7 @@ Acked-by: John Jolly <jjolly@suse.com>
fcx_in_css = css_general_characteristics.fcx;
fcx_in_gneq = private->gneq->reserved2[7] & 0x04;
fcx_in_features = private->features.feature[40] & 0x80;
-@@ -1718,7 +1699,7 @@ static void dasd_eckd_kick_validate_serv
+@@ -1696,7 +1675,7 @@ static u32 get_fcx_max_data(struct dasd_
static int
dasd_eckd_check_characteristics(struct dasd_device *device)
{
@@ -551,7 +551,7 @@ Acked-by: John Jolly <jjolly@suse.com>
struct dasd_block *block;
struct dasd_uid temp_uid;
int rc, i;
-@@ -1737,7 +1718,6 @@ dasd_eckd_check_characteristics(struct d
+@@ -1715,7 +1694,6 @@ dasd_eckd_check_characteristics(struct d
dev_info(&device->cdev->dev,
"The DASD is not operating in multipath mode\n");
}
@@ -559,7 +559,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (!private) {
private = kzalloc(sizeof(*private), GFP_KERNEL | GFP_DMA);
if (!private) {
-@@ -1746,7 +1726,7 @@ dasd_eckd_check_characteristics(struct d
+@@ -1724,7 +1702,7 @@ dasd_eckd_check_characteristics(struct d
"failed\n");
return -ENOMEM;
}
@@ -568,7 +568,7 @@ Acked-by: John Jolly <jjolly@suse.com>
} else {
memset(private, 0, sizeof(*private));
}
-@@ -1862,10 +1842,9 @@ out_err1:
+@@ -1839,10 +1817,9 @@ out_err1:
static void dasd_eckd_uncheck_device(struct dasd_device *device)
{
@@ -580,7 +580,7 @@ Acked-by: John Jolly <jjolly@suse.com>
dasd_alias_disconnect_device_from_lcu(device);
private->ned = NULL;
private->sneq = NULL;
-@@ -1891,7 +1870,7 @@ static void dasd_eckd_uncheck_device(str
+@@ -1865,7 +1842,7 @@ static void dasd_eckd_uncheck_device(str
static struct dasd_ccw_req *
dasd_eckd_analysis_ccw(struct dasd_device *device)
{
@@ -589,7 +589,7 @@ Acked-by: John Jolly <jjolly@suse.com>
struct eckd_count *count_data;
struct LO_eckd_data *LO_data;
struct dasd_ccw_req *cqr;
-@@ -1899,8 +1878,6 @@ dasd_eckd_analysis_ccw(struct dasd_devic
+@@ -1873,8 +1850,6 @@ dasd_eckd_analysis_ccw(struct dasd_devic
int cplength, datasize;
int i;
@@ -598,7 +598,7 @@ Acked-by: John Jolly <jjolly@suse.com>
cplength = 8;
datasize = sizeof(struct DE_eckd_data) + 2*sizeof(struct LO_eckd_data);
cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize, device);
-@@ -1974,11 +1951,9 @@ static int dasd_eckd_analysis_evaluation
+@@ -1948,11 +1923,9 @@ static int dasd_eckd_analysis_evaluation
static void dasd_eckd_analysis_callback(struct dasd_ccw_req *init_cqr,
void *data)
{
@@ -612,7 +612,7 @@ Acked-by: John Jolly <jjolly@suse.com>
private->init_cqr_status = dasd_eckd_analysis_evaluation(init_cqr);
dasd_sfree_request(init_cqr, device);
dasd_kick_device(device);
-@@ -2005,15 +1980,13 @@ static int dasd_eckd_start_analysis(stru
+@@ -1979,15 +1952,13 @@ static int dasd_eckd_start_analysis(stru
static int dasd_eckd_end_analysis(struct dasd_block *block)
{
@@ -630,7 +630,7 @@ Acked-by: John Jolly <jjolly@suse.com>
status = private->init_cqr_status;
private->init_cqr_status = -1;
if (status == INIT_CQR_ERROR) {
-@@ -2111,9 +2084,8 @@ raw:
+@@ -2085,9 +2056,8 @@ raw:
static int dasd_eckd_do_analysis(struct dasd_block *block)
{
@@ -641,7 +641,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (private->init_cqr_status < 0)
return dasd_eckd_start_analysis(block);
else
-@@ -2140,9 +2112,8 @@ static int dasd_eckd_basic_to_known(stru
+@@ -2117,9 +2087,8 @@ static int dasd_eckd_basic_to_known(stru
static int
dasd_eckd_fill_geometry(struct dasd_block *block, struct hd_geometry *geo)
{
@@ -652,7 +652,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (dasd_check_blocksize(block->bp_block) == 0) {
geo->sectors = recs_per_track(&private->rdc_data,
0, block->bp_block);
-@@ -2353,8 +2324,8 @@ dasd_eckd_build_format(struct dasd_devic
+@@ -2156,8 +2125,8 @@ dasd_eckd_build_format(struct dasd_devic
if (!startdev)
startdev = base;
@@ -663,7 +663,7 @@ Acked-by: John Jolly <jjolly@suse.com>
rpt = recs_per_track(&base_priv->rdc_data, 0, fdata->blksize);
-@@ -2619,9 +2590,7 @@ dasd_eckd_format_build_ccw_req(struct da
+@@ -2407,9 +2376,7 @@ dasd_eckd_format_build_ccw_req(struct da
static int dasd_eckd_format_sanity_checks(struct dasd_device *base,
struct format_data_t *fdata)
{
@@ -674,7 +674,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (fdata->start_unit >=
(private->real_cyl * private->rdc_data.trk_per_cyl)) {
-@@ -2670,16 +2639,14 @@ static int dasd_eckd_format_process_data
+@@ -2447,16 +2414,14 @@ static int dasd_eckd_format_process_data
struct format_data_t *fdata,
int enable_pav)
{
@@ -692,7 +692,7 @@ Acked-by: John Jolly <jjolly@suse.com>
rc = dasd_eckd_format_sanity_checks(base, fdata);
if (rc)
return rc;
-@@ -3049,9 +3017,8 @@ static void dasd_eckd_check_for_device_c
+@@ -2576,9 +2541,8 @@ static void dasd_eckd_check_for_device_c
{
char mask;
char *sense = NULL;
@@ -703,7 +703,7 @@ Acked-by: John Jolly <jjolly@suse.com>
/* first of all check for state change pending interrupt */
mask = DEV_STAT_ATTENTION | DEV_STAT_DEV_END | DEV_STAT_UNIT_EXCEP;
if ((scsw_dstat(&irb->scsw) & mask) == mask) {
-@@ -3140,7 +3107,7 @@ static struct dasd_ccw_req *dasd_eckd_bu
+@@ -2667,7 +2631,7 @@ static struct dasd_ccw_req *dasd_eckd_bu
struct dasd_device *basedev;
basedev = block->base;
@@ -712,7 +712,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (rq_data_dir(req) == READ)
cmd = DASD_ECKD_CCW_READ_MT;
else if (rq_data_dir(req) == WRITE)
-@@ -3496,8 +3463,8 @@ static int prepare_itcw(struct itcw *itc
+@@ -3023,8 +2987,8 @@ static int prepare_itcw(struct itcw *itc
/* setup prefix data */
@@ -723,7 +723,7 @@ Acked-by: John Jolly <jjolly@suse.com>
dedata = &pfxdata.define_extent;
lredata = &pfxdata.locate_record;
-@@ -3800,7 +3767,7 @@ static struct dasd_ccw_req *dasd_eckd_bu
+@@ -3313,7 +3277,7 @@ static struct dasd_ccw_req *dasd_eckd_bu
struct dasd_ccw_req *cqr;
basedev = block->base;
@@ -732,7 +732,7 @@ Acked-by: John Jolly <jjolly@suse.com>
/* Calculate number of blocks/records per track. */
blksize = block->bp_block;
-@@ -4025,7 +3992,7 @@ dasd_eckd_free_cp(struct dasd_ccw_req *c
+@@ -3538,7 +3502,7 @@ dasd_eckd_free_cp(struct dasd_ccw_req *c
if (!dasd_page_cache)
goto out;
@@ -741,7 +741,7 @@ Acked-by: John Jolly <jjolly@suse.com>
blksize = cqr->block->bp_block;
blk_per_trk = recs_per_track(&private->rdc_data, 0, blksize);
recid = blk_rq_pos(req) >> cqr->block->s2b_shift;
-@@ -4109,7 +4076,7 @@ static struct dasd_ccw_req *dasd_eckd_bu
+@@ -3622,7 +3586,7 @@ static struct dasd_ccw_req *dasd_eckd_bu
startdev = dasd_alias_get_start_dev(base);
if (!startdev)
startdev = base;
@@ -750,7 +750,7 @@ Acked-by: John Jolly <jjolly@suse.com>
if (private->count >= DASD_ECKD_CHANQ_MAX_SIZE)
return ERR_PTR(-EBUSY);
-@@ -4132,7 +4099,7 @@ static int dasd_eckd_free_alias_cp(struc
+@@ -3645,7 +3609,7 @@ static int dasd_eckd_free_alias_cp(struc
unsigned long flags;
spin_lock_irqsave(get_ccwdev_lock(cqr->memdev->cdev), flags);
@@ -759,7 +759,7 @@ Acked-by: John Jolly <jjolly@suse.com>
private->count--;
spin_unlock_irqrestore(get_ccwdev_lock(cqr->memdev->cdev), flags);
return dasd_eckd_free_cp(cqr, req);
-@@ -4142,15 +4109,14 @@ static int
+@@ -3655,15 +3619,14 @@ static int
dasd_eckd_fill_info(struct dasd_device * device,
struct dasd_information2_t * info)
{
@@ -778,7 +778,7 @@ Acked-by: John Jolly <jjolly@suse.com>
info->confdata_size = min((unsigned long)private->conf_len,
sizeof(info->configuration_data));
memcpy(info->configuration_data, private->conf_data,
-@@ -4463,8 +4429,7 @@ dasd_eckd_performance(struct dasd_device
+@@ -3976,8 +3939,7 @@ dasd_eckd_performance(struct dasd_device
static int
dasd_eckd_get_attrib(struct dasd_device *device, void __user *argp)
{
@@ -788,7 +788,7 @@ Acked-by: John Jolly <jjolly@suse.com>
struct attrib_data_t attrib = private->attrib;
int rc;
-@@ -4488,8 +4453,7 @@ dasd_eckd_get_attrib(struct dasd_device
+@@ -4001,8 +3963,7 @@ dasd_eckd_get_attrib(struct dasd_device
static int
dasd_eckd_set_attrib(struct dasd_device *device, void __user *argp)
{
@@ -798,7 +798,7 @@ Acked-by: John Jolly <jjolly@suse.com>
struct attrib_data_t attrib;
if (!capable(CAP_SYS_ADMIN))
-@@ -4977,15 +4941,13 @@ static int dasd_eckd_pm_freeze(struct da
+@@ -4465,15 +4426,13 @@ static int dasd_eckd_pm_freeze(struct da
static int dasd_eckd_restore_device(struct dasd_device *device)
{
@@ -815,7 +815,7 @@ Acked-by: John Jolly <jjolly@suse.com>
/* Read Configuration Data */
rc = dasd_eckd_read_conf(device);
if (rc) {
-@@ -5049,14 +5011,12 @@ out_err:
+@@ -4537,14 +4496,12 @@ out_err:
static int dasd_eckd_reload_device(struct dasd_device *device)
{
@@ -831,7 +831,7 @@ Acked-by: John Jolly <jjolly@suse.com>
spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
old_base = private->uid.base_unit_addr;
spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
-@@ -5103,12 +5063,10 @@ static int dasd_eckd_read_message_buffer
+@@ -4591,12 +4548,10 @@ static int dasd_eckd_read_message_buffer
{
struct dasd_rssd_messages *message_buf;
struct dasd_psf_prssd_data *prssdp;
@@ -844,7 +844,7 @@ Acked-by: John Jolly <jjolly@suse.com>
cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ + 1 /* RSSD */,
(sizeof(struct dasd_psf_prssd_data) +
sizeof(struct dasd_rssd_messages)),
-@@ -5537,14 +5495,13 @@ static int dasd_eckd_cuir_remove_path(st
+@@ -4864,14 +4819,13 @@ static int dasd_eckd_cuir_quiesce(struct
struct subchannel_id sch_id,
struct dasd_cuir_message *cuir)
{
@@ -860,7 +860,7 @@ Acked-by: John Jolly <jjolly@suse.com>
/* active devices */
list_for_each_entry_safe(dev, n, &private->lcu->active_devices,
alias_list) {
-@@ -5599,13 +5556,12 @@ out_err:
+@@ -4927,13 +4881,12 @@ static int dasd_eckd_cuir_resume(struct
struct subchannel_id sch_id,
struct dasd_cuir_message *cuir)
{
@@ -970,7 +970,7 @@ Acked-by: John Jolly <jjolly@suse.com>
}
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
-@@ -476,7 +476,7 @@ struct dasd_device {
+@@ -445,7 +445,7 @@ struct dasd_device {
/* Device discipline stuff. */
struct dasd_discipline *discipline;
struct dasd_discipline *base_discipline;
diff --git a/patches.drivers/i2c-designware-baytrail-Add-support-for-cherrytrail b/patches.drivers/i2c-designware-baytrail-Add-support-for-cherrytrail
index 408551d1cb..68e82c0064 100644
--- a/patches.drivers/i2c-designware-baytrail-Add-support-for-cherrytrail
+++ b/patches.drivers/i2c-designware-baytrail-Add-support-for-cherrytrail
@@ -23,7 +23,7 @@ Acked-by: Takashi Iwai <tiwai@suse.de>
--- a/drivers/i2c/busses/i2c-designware-baytrail.c
+++ b/drivers/i2c/busses/i2c-designware-baytrail.c
-@@ -24,18 +24,27 @@
+@@ -25,18 +25,27 @@
#define SEMAPHORE_TIMEOUT 100
#define PUNIT_SEMAPHORE 0x7
@@ -53,7 +53,7 @@ Acked-by: Takashi Iwai <tiwai@suse.de>
if (ret) {
dev_err(dev->dev, "iosf failed to read punit semaphore\n");
return ret;
-@@ -50,8 +59,8 @@ static void reset_semaphore(struct dw_i2
+@@ -49,8 +58,8 @@ static int get_sem(struct dw_i2c_dev *de
static void reset_semaphore(struct dw_i2c_dev *dev)
{
@@ -64,7 +64,7 @@ Acked-by: Takashi Iwai <tiwai@suse.de>
dev_err(dev->dev, "iosf failed to reset punit semaphore during write\n");
pm_qos_update_request(&dev->pm_qos, PM_QOS_DEFAULT_VALUE);
-@@ -100,7 +100,8 @@
+@@ -58,7 +67,8 @@ static void reset_semaphore(struct dw_i2
static int baytrail_i2c_acquire(struct dw_i2c_dev *dev)
{
@@ -74,7 +74,7 @@ Acked-by: Takashi Iwai <tiwai@suse.de>
int ret;
unsigned long start, end;
-@@ -77,8 +87,7 @@ static int baytrail_i2c_acquire(struct d
+@@ -78,8 +88,7 @@ static int baytrail_i2c_acquire(struct d
pm_qos_update_request(&dev->pm_qos, 0);
/* host driver writes to side band semaphore register */
@@ -84,7 +84,7 @@ Acked-by: Takashi Iwai <tiwai@suse.de>
if (ret) {
dev_err(dev->dev, "iosf punit semaphore request failed\n");
goto out;
-@@ -102,8 +111,7 @@ static int baytrail_i2c_acquire(struct d
+@@ -104,8 +113,7 @@ static int baytrail_i2c_acquire(struct d
out:
reset_semaphore(dev);
@@ -96,7 +96,7 @@ Acked-by: Takashi Iwai <tiwai@suse.de>
else
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
-@@ -113,6 +113,8 @@ struct dw_i2c_dev {
+@@ -116,6 +116,8 @@ struct dw_i2c_dev {
#define ACCESS_16BIT 0x00000002
#define ACCESS_INTR_MASK 0x00000004
@@ -170,7 +170,7 @@ Acked-by: Takashi Iwai <tiwai@suse.de>
MODULE_DEVICE_TABLE(pci, i2_designware_pci_ids);
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
-@@ -120,7 +120,7 @@ static const struct acpi_device_id dw_i2
+@@ -121,7 +121,7 @@ static const struct acpi_device_id dw_i2
{ "INT3432", 0 },
{ "INT3433", 0 },
{ "80860F41", 0 },
diff --git a/patches.fixes/0003-xfs-return-start-block-of-first-bad-log-record-durin.patch b/patches.fixes/0003-xfs-return-start-block-of-first-bad-log-record-durin.patch
index 80812da1da..0ce00f62cd 100644
--- a/patches.fixes/0003-xfs-return-start-block-of-first-bad-log-record-durin.patch
+++ b/patches.fixes/0003-xfs-return-start-block-of-first-bad-log-record-durin.patch
@@ -30,7 +30,7 @@ Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
-@@ -4306,10 +4306,12 @@ xlog_do_recovery_pass(
+@@ -4245,10 +4245,12 @@ xlog_do_recovery_pass(
struct xlog *log,
xfs_daddr_t head_blk,
xfs_daddr_t tail_blk,
diff --git a/patches.suse/0004-mm-memory_hotplug-get-rid-of-is_zone_device_section.patch b/patches.suse/0004-mm-memory_hotplug-get-rid-of-is_zone_device_section.patch
index 8fcef66cf7..75a784f41a 100644
--- a/patches.suse/0004-mm-memory_hotplug-get-rid-of-is_zone_device_section.patch
+++ b/patches.suse/0004-mm-memory_hotplug-get-rid-of-is_zone_device_section.patch
@@ -45,7 +45,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
-@@ -651,7 +651,7 @@ int arch_add_memory(int nid, u64 start,
+@@ -657,7 +657,7 @@ int arch_add_memory(int nid, u64 start,
zone = pgdat->node_zones +
zone_for_memory(nid, start, size, ZONE_NORMAL, for_device);
@@ -56,7 +56,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
printk("%s: Problem encountered in __add_pages() as ret=%d\n",
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
-@@ -122,7 +122,7 @@ int arch_add_memory(int nid, u64 start,
+@@ -130,7 +130,7 @@ int arch_add_memory(int nid, u64 start,
zone = pgdata->node_zones +
zone_for_memory(nid, start, size, 0, for_device);
@@ -67,7 +67,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
#ifdef CONFIG_MEMORY_HOTREMOVE
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
-@@ -156,7 +156,7 @@ int arch_add_memory(int nid, u64 start,
+@@ -178,7 +178,7 @@ int arch_add_memory(int nid, u64 start,
continue;
nr_pages = (start_pfn + size_pages > zone_end_pfn) ?
zone_end_pfn - start_pfn : size_pages;
@@ -78,7 +78,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
start_pfn += nr_pages;
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
-@@ -492,7 +492,7 @@ int arch_add_memory(int nid, u64 start,
+@@ -498,7 +498,7 @@ int arch_add_memory(int nid, u64 start,
ret = __add_pages(nid, pgdat->node_zones +
zone_for_memory(nid, start, size, ZONE_NORMAL,
for_device),
@@ -89,7 +89,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
-@@ -828,7 +828,7 @@ int arch_add_memory(int nid, u64 start,
+@@ -831,7 +831,7 @@ int arch_add_memory(int nid, u64 start,
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -100,7 +100,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
#ifdef CONFIG_MEMORY_HOTREMOVE
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
-@@ -695,7 +695,7 @@ int arch_add_memory(int nid, u64 start,
+@@ -710,7 +710,7 @@ int arch_add_memory(int nid, u64 start,
init_memory_mapping(start, start + size);
@@ -111,7 +111,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
/* update max_pfn, max_low_pfn and high_memory */
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
-@@ -662,14 +662,6 @@ static int add_memory_block(int base_sec
+@@ -647,14 +647,6 @@ static int add_memory_block(int base_sec
return 0;
}
@@ -126,7 +126,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
/*
* need an interface for the VM to add new memory regions,
* but without onlining it.
-@@ -679,9 +671,6 @@ int register_new_memory(int nid, struct
+@@ -664,9 +656,6 @@ int register_new_memory(int nid, struct
int ret = 0;
struct memory_block *mem;
@@ -136,7 +136,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
mutex_lock(&mem_sysfs_mutex);
mem = find_memory_block(section);
-@@ -717,11 +706,16 @@ static int remove_memory_block(unsigned
+@@ -702,11 +691,16 @@ static int remove_memory_block(unsigned
{
struct memory_block *mem;
@@ -156,7 +156,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
unregister_mem_sect_under_nodes(mem, __section_nr(section));
mem->section_count--;
-@@ -724,6 +724,7 @@ static int remove_memory_block(unsigned
+@@ -715,6 +709,7 @@ static int remove_memory_block(unsigned
else
put_device(&mem->dev);
@@ -177,7 +177,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
extern int memory_add_physaddr_to_nid(u64 start);
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
-@@ -286,7 +286,7 @@ void register_page_bootmem_info_node(str
+@@ -462,7 +462,7 @@ static int __meminit __add_zone(struct z
}
static int __meminit __add_section(int nid, struct zone *zone,
@@ -186,7 +186,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
{
int ret;
-@@ -316,6 +317,9 @@ static int __meminit __add_section(int n
+@@ -479,6 +479,9 @@ static int __meminit __add_section(int n
if (ret < 0)
return ret;
@@ -196,7 +196,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
return register_new_memory(nid, __pfn_to_section(phys_start_pfn));
}
-@@ -326,7 +330,7 @@ static int __meminit __add_section(int n
+@@ -489,7 +492,7 @@ static int __meminit __add_section(int n
* add the new pages.
*/
int __ref __add_pages(int nid, struct zone *zone, unsigned long phys_start_pfn,
@@ -205,7 +205,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
{
unsigned long i;
int err = 0;
-@@ -337,7 +341,7 @@ int __ref __add_pages(int nid, unsigned
+@@ -516,7 +519,7 @@ int __ref __add_pages(int nid, struct zo
}
for (i = start_sec; i <= end_sec; i++) {
diff --git a/patches.suse/sched-core-Kill-sched_class-task_waking-to-clean-up-the-migration-logic.patch b/patches.suse/sched-core-Kill-sched_class-task_waking-to-clean-up-the-migration-logic.patch
index 29db3b31e8..3a7f37f236 100644
--- a/patches.suse/sched-core-Kill-sched_class-task_waking-to-clean-up-the-migration-logic.patch
+++ b/patches.suse/sched-core-Kill-sched_class-task_waking-to-clean-up-the-migration-logic.patch
@@ -33,7 +33,7 @@ Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -1840,11 +1840,8 @@ ttwu_do_activate(struct rq *rq, struct t
+@@ -1843,11 +1843,8 @@ ttwu_do_activate(struct rq *rq, struct t
if (p->sched_contributes_to_load)
rq->nr_uninterruptible--;
@@ -46,7 +46,7 @@ Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
#endif
ttwu_activate(rq, p, en_flags);
-@@ -2084,10 +2081,6 @@ try_to_wake_up(struct task_struct *p, un
+@@ -2194,10 +2191,6 @@ try_to_wake_up(struct task_struct *p, un
cpu = select_task_rq(p, p->wake_cpu, SD_BALANCE_WAKE, wake_flags);
if (task_cpu(p) != cpu) {
wake_flags |= WF_MIGRATED;
@@ -59,7 +59,7 @@ Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
#endif /* CONFIG_SMP */
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
-@@ -3210,7 +3210,7 @@ static inline void check_schedstat_requi
+@@ -3241,7 +3241,7 @@ static inline void check_schedstat_requi
*
* WAKEUP (remote)
*
@@ -68,7 +68,7 @@ Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
* vruntime -= min_vruntime
*
* enqueue
-@@ -3229,7 +3229,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
+@@ -3260,7 +3260,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
* Update the normalized vruntime before updating min_vruntime
* through calling update_curr().
*/
@@ -77,7 +77,7 @@ Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
se->vruntime += cfs_rq->min_vruntime;
/*
-@@ -4733,33 +4733,6 @@ static unsigned long cpu_avg_load_per_ta
+@@ -4807,33 +4807,6 @@ static unsigned long cpu_avg_load_per_ta
return 0;
}
@@ -111,7 +111,7 @@ Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
#ifdef CONFIG_FAIR_GROUP_SCHED
/*
* effective_load() calculates the load change as seen from the root_task_group
-@@ -5278,6 +5251,32 @@ select_task_rq_fair(struct task_struct *
+@@ -5361,6 +5334,32 @@ select_task_rq_fair(struct task_struct *
static void migrate_task_rq_fair(struct task_struct *p)
{
/*
@@ -144,7 +144,7 @@ Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
* We are supposed to update the task to "current" time, then its up to date
* and ready to go to new CPU/cfs_rq. But we have difficulty in getting
* what current time is, so simply throw away the out-of-date time. This
-@@ -8575,7 +8574,6 @@ const struct sched_class fair_sched_clas
+@@ -8649,7 +8648,6 @@ const struct sched_class fair_sched_clas
.rq_online = rq_online_fair,
.rq_offline = rq_offline_fair,
@@ -154,7 +154,7 @@ Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
#endif
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
-@@ -1168,7 +1168,7 @@ extern const u32 sched_prio_to_wmult[40];
+@@ -1167,7 +1167,7 @@ extern const u32 sched_prio_to_wmult[40]
*
* ENQUEUE_HEAD - place at front of runqueue (tail if not specified)
* ENQUEUE_REPLENISH - CBS (replenish runtime and postpone deadline)
@@ -163,7 +163,7 @@ Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
*
*/
-@@ -1141,9 +1141,9 @@ extern const u32 sched_prio_to_wmult[40]
+@@ -1182,9 +1182,9 @@ extern const u32 sched_prio_to_wmult[40]
#define ENQUEUE_HEAD 0x08
#define ENQUEUE_REPLENISH 0x10
#ifdef CONFIG_SMP
@@ -175,7 +175,7 @@ Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
#endif
#define RETRY_TASK ((void *)-1UL)
-@@ -1179,7 +1179,6 @@ struct sched_class {
+@@ -1215,7 +1215,6 @@ struct sched_class {
int (*select_task_rq)(struct task_struct *p, int task_cpu, int sd_flag, int flags);
void (*migrate_task_rq)(struct task_struct *p);